@neocompose/cli 0.89.9 → 0.89.10

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.89.10
+
+### Patch Changes
+
+- e676c54: Preserve explicit child-override types when selectors return local variables or use other equivalent bodies, including typed partial overrides and source round trips.
+- af6aa88: Validate delegate bodies inside variant and generic constructor arguments in the editor. Bind child selectors and method groups to the variant target, preserve concrete child types through preparation, and execute constructor-backed child overrides without requiring authored IDs.
+
 ## 0.89.9
 
 ### Patch Changes

package/dist/neo-runtime.mjs

@@ -19371,7 +19371,7 @@ var init_registry = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.89.9",
+      cliVersion: "0.89.10",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -52473,6 +52473,16 @@ function readVariantSelection(value, label) {
   }
   return { classId, variantId, rowValueId: rowValueId ?? null };
 }
+function variantConstructorRecord(row, schemaKeys) {
+  const recipe = isLiteralValueContent(row) ? row.constructorArgs : void 0;
+  const result = {};
+  if (recipe == null) return result;
+  for (let index = 0; index < schemaKeys.length; index++) {
+    const argument2 = recipe[`__arg_${index}__`];
+    if (argument2 !== void 0) result[schemaKeys[index]] = argument2;
+  }
+  return result;
+}
 function resolveVariantGraph(selection2, ctx) {
   const variantId = selection2.variantId;
   if (variantId === null) {
@@ -52510,20 +52520,14 @@ function resolveVariantGraph(selection2, ctx) {
     );
   }
   const effectiveRoot = { ...root };
-  const recipe = row.constructorArgs;
-  if (typeof recipe === "object" && recipe !== null) {
-    const settledVariantSlots = [
-      ["Initialize", 0],
-      ["Apply", 1],
-      ["Overrides", 2],
-      ["ChildOverrides", 3]
-    ];
-    for (const [schemaKey, argumentIndex] of settledVariantSlots) {
-      if (effectiveRoot[schemaKey] !== void 0) continue;
-      const argument2 = recipe[`__arg_${argumentIndex}__`];
-      if (argument2 === void 0 || argument2 === null) continue;
-      effectiveRoot[schemaKey] = argument2;
-    }
+  const recipe = variantConstructorRecord(row, [
+    "Initialize",
+    "Apply",
+    "Overrides",
+    "ChildOverrides"
+  ]);
+  for (const [key, value] of Object.entries(recipe)) {
+    if (effectiveRoot[key] === void 0) effectiveRoot[key] = value;
   }
   return {
     variantId,
@@ -52618,7 +52622,7 @@ function invokeVariantClosure(args) {
     [DELEGATE_LEXICAL_THIS]: lexicalThis,
     [DELEGATE_LEXICAL_ROOT]: ctx.rootValue
   };
-  return invokeDelegateValue(bound, parameters, ctx);
+  return invokeDelegateValue(bound, parameters, ctx, void 0, lexicalThis);
 }
 function writeVariantOverrideSlot(target, schemaKey, value, ctx, answeredValueIds) {
   assertStoredReplayMutableValue(target, ctx, "variant override", schemaKey);
@@ -52814,6 +52818,32 @@ function replacesInterfaceSlotRow(member, target, overrideRow, ctx) {
   if (targetRow === null) return false;
   return classIdForValueRow(targetRow, ctx) !== overrideRow.classId;
 }
+function readVariantChildOverrideSlot(entryRow, schemaKey, ctx) {
+  const entry = readRowValue(entryRow, ctx);
+  if (typeof entry !== "object" || entry === null || Array.isArray(entry))
+    return null;
+  const classId = classIdForValueRow(entryRow, ctx);
+  const memberId = classId == null ? null : cachedMergedSchemaMemberId(classId, schemaKey, ctx);
+  const member = memberId === null ? null : evalMemberById(ctx.vm, memberId);
+  if (member === null) {
+    throw new NSGetterRuntimeError(
+      `Child override '${entryRow.id}' has no '${schemaKey}' member.`
+    );
+  }
+  const slot = readClassMember({
+    member,
+    schemaKey,
+    record: entry,
+    expandedRecord: () => variantConstructorRecord(entryRow, ["Selector", "Overrides"]),
+    mode: "runtime"
+  });
+  if (slot.kind === "value") return slot.value;
+  if (slot.kind === "declaration") {
+    const result = readDeclarationDefault(member, ctx);
+    return result.matched ? result.value : null;
+  }
+  return null;
+}
 function applyVariantDeclarativeHalves(instance, graph, ctx, answeredValueIds) {
   applyVariantPartial(
     instance,
@@ -52852,14 +52882,13 @@ function applyVariantDeclarativeHalves(instance, graph, ctx, answeredValueIds) {
         `Variant '${graph.name}' references missing child-override row '${entryId}'.`
       );
     }
-    const entry = entryRow.value;
+    const entry = readRowValue(entryRow, ctx);
     if (typeof entry !== "object" || entry === null || Array.isArray(entry)) {
       continue;
     }
-    const entryRecord = entry;
     const label = `Variant '${graph.name}' child override '${entryId}'`;
     const child2 = invokeVariantClosure({
-      closureValueId: entryRecord.Selector,
+      closureValueId: readVariantChildOverrideSlot(entryRow, "Selector", ctx),
       ctx,
       label: `${label} Selector`,
       lexicalThis: instance,
@@ -52872,7 +52901,7 @@ function applyVariantDeclarativeHalves(instance, graph, ctx, answeredValueIds) {
     }
     applyVariantPartial(
       child2,
-      entryRecord.Overrides,
+      readVariantChildOverrideSlot(entryRow, "Overrides", ctx),
       ctx,
       label,
       answeredValueIds
@@ -52994,7 +53023,7 @@ function collectVariantDeclarativeAnsweredSlots(instance, graph, ctx) {
     }
     const label = `Variant '${graph.name}' child override '${entryId}'`;
     const child2 = invokeVariantClosure({
-      closureValueId: Reflect.get(entryRow.value, "Selector"),
+      closureValueId: readVariantChildOverrideSlot(entryRow, "Selector", ctx),
       ctx,
       label: `${label} Selector`,
       lexicalThis: instance,
@@ -53007,7 +53036,7 @@ function collectVariantDeclarativeAnsweredSlots(instance, graph, ctx) {
     }
     collectVariantPartialAnsweredSlots(
       child2,
-      Reflect.get(entryRow.value, "Overrides"),
+      readVariantChildOverrideSlot(entryRow, "Overrides", ctx),
       ctx,
       label,
       slots
@@ -90865,7 +90894,7 @@ var init_neoscript_language_context_adapter = __esm({
     init_dialogue_types();
     init_dialogue_group_language();
     init_analyzer_types();
-    NEOSCRIPT_COMPILER_ADAPTER_REVISION = 7;
+    NEOSCRIPT_COMPILER_ADAPTER_REVISION = 8;
     UNKNOWN_TYPE2 = {
       kind: "primitive",
       name: "unknown"
@@ -98903,10 +98932,8 @@ function knownGeneratorExpression(expression, scope, environment) {
 function validateExpression(expression, expected, scope, environment, uri, range2, diagnostics, anchor, storedValue = true) {
   const sourceOnly = expected !== void 0 && (isNeoVariantTypeName(expected.name) || expected.name === "NeoAction" || expected.name === "ImageRef");
   let receiver = expression;
-  if (environment.checkComputedInitializers) {
-    while (receiver.kind === "member") receiver = receiver.receiver;
-  }
-  const computed = environment.checkComputedInitializers && !sourceOnly && (expression.kind === "member" && (receiver.kind !== "ident" || receiver.typeQualifier !== void 0) || [
+  while (receiver.kind === "member") receiver = receiver.receiver;
+  const computed = (environment.checkComputedInitializers || expected?.name === "NeoDelegate") && !sourceOnly && (expression.kind === "member" && (receiver.kind !== "ident" || receiver.typeQualifier !== void 0) || [
     "binary",
     "unary",
     "force",
@@ -99521,7 +99548,7 @@ function validateStoredExpression(expression, expected, scope, environment, uri,
     }
     expression.args.forEach((argument2, index) => {
       const authoredName = expression.argumentNames?.[index];
-      const named = declaration.name === NEO_LOOKUP_VARIANT_FOLDER_TYPE_NAME ? authoredName ?? NEO_LOOKUP_VARIANT_FOLDER_CONSTRUCTOR_ARGUMENTS[index]?.name : authoredName;
+      const named = declaration.name === NEO_LOOKUP_VARIANT_FOLDER_TYPE_NAME ? authoredName ?? NEO_LOOKUP_VARIANT_FOLDER_CONSTRUCTOR_ARGUMENTS[index]?.name : authoredName ?? parameters?.[index]?.name;
       if (declaration.name === NEO_LOOKUP_VARIANT_FOLDER_TYPE_NAME && named === "collection") {
         return;
       }
@@ -99554,7 +99581,7 @@ function validateStoredExpression(expression, expected, scope, environment, uri,
             entry,
             void 0,
             scope,
-            environment,
+            { ...environment, variantSelectorThis: siteTypeArguments[0] },
             uri,
             range2,
             diagnostics,
@@ -99606,11 +99633,12 @@ function validateStoredExpression(expression, expected, scope, environment, uri,
           return;
         }
       }
+      const selectorThis = declaration.name === NEO_ANIMATION_CHILD_OVERRIDE_TYPE_NAME && named === "selector" ? environment.variantSelectorThis : void 0;
       validateExpression(
         argument2,
         expectedSemanticType,
-        scope,
-        environment,
+        selectorThis === void 0 ? scope : new Map(scope).set("this", selectorThis),
+        selectorThis === void 0 ? environment : { ...environment, staticMember: false },
         uri,
         range2,
         diagnostics,
@@ -149898,7 +149926,9 @@ function compileInlineDelegateConstructorArguments(args) {
     );
   }
   const env = isClassSlotMember(ownerMember) ? slotRowEnv(ownerMember, row, document).env : resolveInstanceEnv(classId, void 0, document.classes);
-  const thisClass = findSchemaPlacement(rootOwner?.id ?? "", document.classes)?.ownerClass ?? null;
+  for (const [paramId, memberId] of Object.entries(row.genericBindings ?? {})) {
+    env.set(paramId, { kind: "member", memberId });
+  }
   const compiled = { ...constructorArgs2 };
   for (const [argumentKey, argument2] of Object.entries(constructorArgs2)) {
     if (!isUncompiledInlineDelegateArgument(argument2)) continue;
@@ -149945,7 +149975,7 @@ function compileInlineDelegateConstructorArguments(args) {
         constructors: document.constructors ?? [],
         variants: document.variants ?? [],
         variantFolders: document.variantFolders ?? [],
-        thisClass,
+        thisClass: args.thisClassForMember(settledMember),
         returnTypeInfo: substituted.returnTypeInfo,
         argumentTypes: substituted.argumentTypes,
         name: `${settledMember.name} argument`,
@@ -150026,6 +150056,29 @@ function compileValueBodies(args) {
 function createDelegateValueBodyCompiler(postDocument, targetIds, prepared) {
   const scope = prepared ?? delegateValueBodyOwnership(postDocument, targetIds);
   const { ownerByValueId, rootOwnerByValueId } = scope;
+  const variantSelectorScopes = /* @__PURE__ */ new WeakMap();
+  const thisClassForMember = (document, rootOwner, memberId) => {
+    let selectors = variantSelectorScopes.get(document);
+    if (selectors === void 0) {
+      const classes = new Map(document.classes.map((type2) => [type2.id, type2]));
+      const selectorId = document.classes.find(
+        (type2) => type2.system?.worldKind === "animationChildOverride"
+      )?.schema.Selector;
+      const targets = /* @__PURE__ */ new Map();
+      for (const variant2 of document.variants ?? []) {
+        const target = classes.get(variant2.classId);
+        if (target !== void 0)
+          targets.set(variantRootMemberId(variant2.id), target);
+      }
+      selectors = { selectorId, targets };
+      variantSelectorScopes.set(document, selectors);
+    }
+    if (memberId !== void 0 && memberId === selectors.selectorId && rootOwner !== void 0) {
+      const target = selectors.targets.get(rootOwner.id);
+      if (target !== void 0) return target;
+    }
+    return findSchemaPlacement(rootOwner?.id ?? "", document.classes)?.ownerClass ?? null;
+  };
   const compilationProjects = /* @__PURE__ */ new WeakMap();
   if (prepared !== void 0)
     compilationProjects.set(prepared.document, prepared.compilationProject);
@@ -150046,7 +150099,11 @@ function createDelegateValueBodyCompiler(postDocument, targetIds, prepared) {
       );
     }
     const rootOwner = rootOwnerByValueId.get(row.id);
-    const thisClass = findSchemaPlacement(rootOwner?.id ?? "", document.classes)?.ownerClass ?? null;
+    const thisClass = thisClassForMember(
+      document,
+      rootOwner,
+      getOptionalString(member, "id")
+    );
     const compiled = { ...row, value: { ...row.value } };
     try {
       compiled.value = compileDelegateClosureValue(row.value.code, {
@@ -150086,6 +150143,7 @@ function createDelegateValueBodyCompiler(postDocument, targetIds, prepared) {
     row,
     ownerMember: ownerByValueId.get(row.id),
     rootOwner: rootOwnerByValueId.get(row.id) ?? null,
+    thisClassForMember: (member) => thisClassForMember(document, rootOwnerByValueId.get(row.id), member.id),
     compilationProject: compilationProjectFor(document)
   });
   const ownershipIds = (valueId) => ({
@@ -159758,6 +159816,21 @@ var init_client_commit_preparation = __esm({
   }
 });
 
+// ../src/models/members/animation-child-binding-id.ts
+function pendingAnimationChildBindingMemberId(classId) {
+  return `${PREFIX}${encodeURIComponent(classId)}`;
+}
+function pendingAnimationChildBindingClassId(token) {
+  return token.startsWith(PREFIX) ? decodeURIComponent(token.slice(PREFIX.length)) : null;
+}
+var PREFIX;
+var init_animation_child_binding_id = __esm({
+  "../src/models/members/animation-child-binding-id.ts"() {
+    "use strict";
+    PREFIX = "__pending__:animation-child-binding:";
+  }
+});
+
 // src/project-source/trusted-commit-verification.ts
 function verifyProjectSourceCommitAgainstStateV4(args) {
   const root = "/neo-source-verify-virtual";
@@ -159956,6 +160029,14 @@ function validateAssignments(value) {
   return assignments;
 }
 function derivedAssignment(pendingId2) {
+  const animationClass = pendingAnimationChildBindingClassId(pendingId2);
+  if (animationClass !== null)
+    return {
+      ownerLocator: animationClass,
+      derive: worldAnimationChildOverrideBindingMemberId,
+      label: "Animation child binding assignment",
+      ownerNoun: "class"
+    };
   const genericArgument = pendingGenericArgumentIdentity(pendingId2);
   if (genericArgument !== null)
     return {
@@ -160079,6 +160160,10 @@ function relocatedAssignment(pendingId2, assignments, byPosition, used) {
     return assignments.has(rebuilt) ? rebuilt : null;
   }
   for (const [owner, rebuild] of [
+    [
+      pendingAnimationChildBindingClassId(pendingId2),
+      pendingAnimationChildBindingMemberId
+    ],
     [pendingMemberValueMemberId(pendingId2), pendingMemberValueId],
     [pendingEntryMemberDeclaringId(pendingId2), pendingEntryMemberId],
     [
@@ -160408,6 +160493,8 @@ var ProjectSourceCommitVerificationError, ABSENT_DIFFERENCE_VALUE;
 var init_trusted_commit_verification = __esm({
   "src/project-source/trusted-commit-verification.ts"() {
     "use strict";
+    init_animation_child_binding_id();
+    init_world_system_classes();
     init_tuple_element_member_id();
     init_identity_rewriter();
     init_generic_argument_member_id();
@@ -163352,6 +163439,7 @@ function lowerVariantGraph(context, binding, created) {
   const storedSource = {
     memberId: rootMember.id,
     purpose: "stored",
+    variantTargetClassId: binding.targetClassId,
     initializer: binding.initializer,
     source: binding.source,
     label: binding.label
@@ -164861,12 +164949,11 @@ function constructorArgumentValueSlices(context, authoredSlice) {
   if (cached !== void 0) return cached;
   const expression = initializerExpressionSlice(authoredSlice);
   if (expression === void 0) return [];
-  const values = topLevelEntrySlices(expression, "(", ")").map((entry) => {
-    const separator = entry.indexOf(":");
-    return normalizeInitializerSource(
-      separator < 0 ? entry : entry.slice(separator + 1)
-    );
-  });
+  const values = topLevelEntrySlices(expression, "(", ")").map(
+    (entry) => normalizeInitializerSource(
+      entry.replace(/^[A-Za-z_][A-Za-z0-9_]*\s*:\s*/, "")
+    )
+  );
   context.syntax.arguments.set(authoredSlice, values);
   return values;
 }
@@ -167988,6 +168075,17 @@ function inferAnimationChildOverrideLowerEnvironment(context, schemaClass2, expr
     return inherited;
   }
   const parameter4 = schemaClass2.genericParameters[0];
+  const explicitType = expression.typeArguments?.[0];
+  if (parameter4 !== void 0 && explicitType !== void 0) {
+    const childClass = requiredClassByName(
+      context,
+      astTypeNameV4(explicitType)
+    );
+    return new Map(inherited).set(
+      parameter4.id,
+      inferredGenericClassBinding(childClass.id)
+    );
+  }
   const parameterName = requiredConstructorFirstParameterName(
     context,
     schemaClass2
@@ -168043,8 +168141,8 @@ function animationChildOverrideSeedBindings(context, schemaClass2, environment,
     );
   }
   const existingBinding = environmentBinding ? context.members.get(environmentBinding) : void 0;
-  const reservedBindingMemberId = worldAnimationChildOverrideBindingMemberId(classId);
-  const bindingMember = existingBinding?.kind === "class" && existingBinding.classId === classId ? existingBinding : context.members.get(reservedBindingMemberId);
+  const reservedBindingMemberId = isPendingId(classId) ? pendingAnimationChildBindingMemberId(classId) : worldAnimationChildOverrideBindingMemberId(classId);
+  const bindingMember = existingBinding?.kind === "class" && existingBinding.classId === classId && existingBinding.name === WORLD_ANIMATION_CHILD_OVERRIDE_BINDING_MEMBER_NAME ? existingBinding : context.members.get(reservedBindingMemberId);
   if (bindingMember !== void 0) {
     if (bindingMember.kind !== "class" || bindingMember.classId !== classId || bindingMember.name !== WORLD_ANIMATION_CHILD_OVERRIDE_BINDING_MEMBER_NAME) {
       throw new Error(
@@ -170018,7 +170116,7 @@ function lowerDelegateValue(context, member, source, expression, authoredSlice)
   const target = methodGroupTarget(
     context,
     expression,
-    source.ownerClassId,
+    source.variantTargetClassId !== void 0 && context.classesByName.get("NeoAnimationChildOverride")?.schema.Selector === member.id ? source.variantTargetClassId : source.ownerClassId,
     member.arguments.map((argument2) => argument2.type)
   );
   if ("failure" in target) {
@@ -173337,6 +173435,7 @@ var INFERRED_GENERIC_CLASS_PREFIX, MEMBER_KIND_DICTIONARY2, MEMBER_KIND_LIST2, M
 var init_value_sources = __esm({
   "src/project-source/value-sources.ts"() {
     "use strict";
+    init_animation_child_binding_id();
     init_source_diagnostics();
     init_immutable_json3();
     init_lower_support();
@@ -175003,6 +175102,39 @@ function prospectiveInitializerRecordsV4(args) {
       });
     }
   }
+  const missingBindings = /* @__PURE__ */ new Set();
+  for (const record7 of records3.values()) {
+    if (record7.recordKind !== "value") continue;
+    const stamp = getField(record7.data, "genericBindings");
+    if (!isObjectRecord(stamp)) continue;
+    for (const id2 of Object.values(stamp)) {
+      if (typeof id2 === "string" && !records3.has(`member:${id2}`))
+        missingBindings.add(id2);
+    }
+  }
+  if (missingBindings.size > 0) {
+    for (const record7 of records3.values()) {
+      if (record7.recordKind !== "class") continue;
+      const classId = record7.recordId;
+      const id2 = isPendingId(classId) ? pendingAnimationChildBindingMemberId(classId) : worldAnimationChildOverrideBindingMemberId(classId);
+      if (!missingBindings.has(id2)) continue;
+      records3.set(`member:${id2}`, {
+        recordKind: "member",
+        recordId: id2,
+        contentHash: "local-binding",
+        deleted: false,
+        data: {
+          ...worldAnimationChildOverrideBindingMember(
+            args.workspace.config.projectId,
+            classId
+          ),
+          id: id2,
+          createdAt: 0,
+          updatedAt: 0
+        }
+      });
+    }
+  }
   return records3;
 }
 function setSeedValueRecord(records3, data) {
@@ -175081,6 +175213,8 @@ var cleanRetainedCode, pulledStateDocuments;
 var init_local_initializer_materialization = __esm({
   "src/project-source/local-initializer-materialization.ts"() {
     "use strict";
+    init_animation_child_binding_id();
+    init_world_system_classes();
     init_stored_value_placements();
     init_local_project_file_storage();
     init_immutable_json3();
@@ -185864,7 +185998,7 @@ var init_project_document_cache = __esm({
     init_registry();
     init_project_documents();
     PROJECT_SOURCE_BUILD_CACHE_PATH = ".neo/build/project-source-analysis-v4.json";
-    PROJECT_SOURCE_BUILD_CACHE_REVISION = 9;
+    PROJECT_SOURCE_BUILD_CACHE_REVISION = 10;
     analysisCache = /* @__PURE__ */ new Map();
     MAX_CACHED_WORKSPACES = 4;
     parsedWorkspaceDocuments = /* @__PURE__ */ new Map();
@@ -222824,6 +222958,13 @@ function assignPendingIds(changes, authoredValueSeeds, reconstructed3, previousL
   const assign = (pendingId2) => {
     const existing = assigned.get(pendingId2);
     if (existing !== void 0) return existing;
+    const animationClass = pendingAnimationChildBindingClassId(pendingId2);
+    if (animationClass !== null) {
+      const classId = isPendingId(animationClass) ? assign(animationClass) : animationClass;
+      const derived = worldAnimationChildOverrideBindingMemberId(classId);
+      assigned.set(pendingId2, derived);
+      return derived;
+    }
     const genericArgument = pendingGenericArgumentIdentity(pendingId2);
     if (genericArgument !== null) {
       const parent = isPendingId(genericArgument.parentRecordId) ? assign(genericArgument.parentRecordId) : genericArgument.parentRecordId;
@@ -226007,6 +226148,8 @@ var compileNSVoidBody2, compileNSFunction2, compileNSGetter2, compileNSSetter2,
 var init_push = __esm({
   "src/commands/push.ts"() {
     "use strict";
+    init_animation_child_binding_id();
+    init_world_system_classes();
     init_local_project_file_storage();
     init_generic_argument_member_id();
     init_extension_source_preservation();
@@ -241494,7 +241637,7 @@ var releaseWorkspaceLock = () => void 0;
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.command === "--version") {
-    console.log("0.89.9");
+    console.log("0.89.10");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {

package/dist/test-worker.mjs

@@ -38627,6 +38627,16 @@ function readVariantSelection(value, label) {
   }
   return { classId, variantId, rowValueId: rowValueId ?? null };
 }
+function variantConstructorRecord(row, schemaKeys) {
+  const recipe = isLiteralValueContent(row) ? row.constructorArgs : void 0;
+  const result = {};
+  if (recipe == null) return result;
+  for (let index = 0; index < schemaKeys.length; index++) {
+    const argument2 = recipe[`__arg_${index}__`];
+    if (argument2 !== void 0) result[schemaKeys[index]] = argument2;
+  }
+  return result;
+}
 function resolveVariantGraph(selection, ctx) {
   const variantId = selection.variantId;
   if (variantId === null) {
@@ -38664,20 +38674,14 @@ function resolveVariantGraph(selection, ctx) {
     );
   }
   const effectiveRoot = { ...root };
-  const recipe = row.constructorArgs;
-  if (typeof recipe === "object" && recipe !== null) {
-    const settledVariantSlots = [
-      ["Initialize", 0],
-      ["Apply", 1],
-      ["Overrides", 2],
-      ["ChildOverrides", 3]
-    ];
-    for (const [schemaKey, argumentIndex] of settledVariantSlots) {
-      if (effectiveRoot[schemaKey] !== void 0) continue;
-      const argument2 = recipe[`__arg_${argumentIndex}__`];
-      if (argument2 === void 0 || argument2 === null) continue;
-      effectiveRoot[schemaKey] = argument2;
-    }
+  const recipe = variantConstructorRecord(row, [
+    "Initialize",
+    "Apply",
+    "Overrides",
+    "ChildOverrides"
+  ]);
+  for (const [key, value] of Object.entries(recipe)) {
+    if (effectiveRoot[key] === void 0) effectiveRoot[key] = value;
   }
   return {
     variantId,
@@ -38772,7 +38776,7 @@ function invokeVariantClosure(args) {
     [DELEGATE_LEXICAL_THIS]: lexicalThis,
     [DELEGATE_LEXICAL_ROOT]: ctx.rootValue
   };
-  return invokeDelegateValue(bound, parameters, ctx);
+  return invokeDelegateValue(bound, parameters, ctx, void 0, lexicalThis);
 }
 function writeVariantOverrideSlot(target, schemaKey, value, ctx, answeredValueIds) {
   assertStoredReplayMutableValue(target, ctx, "variant override", schemaKey);
@@ -38968,6 +38972,32 @@ function replacesInterfaceSlotRow(member, target, overrideRow, ctx) {
   if (targetRow === null) return false;
   return classIdForValueRow(targetRow, ctx) !== overrideRow.classId;
 }
+function readVariantChildOverrideSlot(entryRow, schemaKey, ctx) {
+  const entry = readRowValue(entryRow, ctx);
+  if (typeof entry !== "object" || entry === null || Array.isArray(entry))
+    return null;
+  const classId = classIdForValueRow(entryRow, ctx);
+  const memberId = classId == null ? null : cachedMergedSchemaMemberId(classId, schemaKey, ctx);
+  const member = memberId === null ? null : evalMemberById(ctx.vm, memberId);
+  if (member === null) {
+    throw new NSGetterRuntimeError(
+      `Child override '${entryRow.id}' has no '${schemaKey}' member.`
+    );
+  }
+  const slot = readClassMember({
+    member,
+    schemaKey,
+    record: entry,
+    expandedRecord: () => variantConstructorRecord(entryRow, ["Selector", "Overrides"]),
+    mode: "runtime"
+  });
+  if (slot.kind === "value") return slot.value;
+  if (slot.kind === "declaration") {
+    const result = readDeclarationDefault(member, ctx);
+    return result.matched ? result.value : null;
+  }
+  return null;
+}
 function applyVariantDeclarativeHalves(instance, graph, ctx, answeredValueIds) {
   applyVariantPartial(
     instance,
@@ -39006,14 +39036,13 @@ function applyVariantDeclarativeHalves(instance, graph, ctx, answeredValueIds) {
         `Variant '${graph.name}' references missing child-override row '${entryId}'.`
       );
     }
-    const entry = entryRow.value;
+    const entry = readRowValue(entryRow, ctx);
     if (typeof entry !== "object" || entry === null || Array.isArray(entry)) {
       continue;
     }
-    const entryRecord = entry;
     const label = `Variant '${graph.name}' child override '${entryId}'`;
     const child = invokeVariantClosure({
-      closureValueId: entryRecord.Selector,
+      closureValueId: readVariantChildOverrideSlot(entryRow, "Selector", ctx),
       ctx,
       label: `${label} Selector`,
       lexicalThis: instance,
@@ -39026,7 +39055,7 @@ function applyVariantDeclarativeHalves(instance, graph, ctx, answeredValueIds) {
     }
     applyVariantPartial(
       child,
-      entryRecord.Overrides,
+      readVariantChildOverrideSlot(entryRow, "Overrides", ctx),
       ctx,
       label,
       answeredValueIds
@@ -39148,7 +39177,7 @@ function collectVariantDeclarativeAnsweredSlots(instance, graph, ctx) {
     }
     const label = `Variant '${graph.name}' child override '${entryId}'`;
     const child = invokeVariantClosure({
-      closureValueId: Reflect.get(entryRow.value, "Selector"),
+      closureValueId: readVariantChildOverrideSlot(entryRow, "Selector", ctx),
       ctx,
       label: `${label} Selector`,
       lexicalThis: instance,
@@ -39161,7 +39190,7 @@ function collectVariantDeclarativeAnsweredSlots(instance, graph, ctx) {
     }
     collectVariantPartialAnsweredSlots(
       child,
-      Reflect.get(entryRow.value, "Overrides"),
+      readVariantChildOverrideSlot(entryRow, "Overrides", ctx),
       ctx,
       label,
       slots
@@ -71707,7 +71736,7 @@ function resolveAnalyzerMember(context, member) {
 }
 
 // ../src/runtime/neoscript/neoscript-language-context-adapter.ts
-var NEOSCRIPT_COMPILER_ADAPTER_REVISION = 7;
+var NEOSCRIPT_COMPILER_ADAPTER_REVISION = 8;
 var UNKNOWN_TYPE = {
   kind: "primitive",
   name: "unknown"

package/package.json

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

package/skills/neocompose-cli/SKILL.md

@@ -9,7 +9,7 @@ description: >-
   `@neocompose/cli` or `node cli/bin/neo.mjs` in the neo-compose repository.
 ---
 
-<!-- reviewed-through-cli: 0.89.9 -->
+<!-- reviewed-through-cli: 0.89.10 -->
 
 # Neo Compose CLI
 

package/skills/neocompose-cli/references/cli-development.md

@@ -143,7 +143,7 @@ The marker near the top of `SKILL.md` must exactly match the package version,
 and this quoted copy is checked too:
 
 ```html
-<!-- reviewed-through-cli: 0.89.9 -->
+<!-- reviewed-through-cli: 0.89.10 -->
 ```
 
 Keep this skill on current behavior. Upgrade steps, rollout prerequisites,

package/skills/neocompose-cli/references/world/variants.md

@@ -25,6 +25,29 @@ NeoVariant<ExampleObject> Down = new(
   written `new { ... }` or `new Partial<T> { ... }`. They never pass
   constructor arguments, even when `T` has a required constructor.
 
+A child override's explicit `NeoAnimationChildOverride<TChild>` argument
+selects the child type and its `Partial<TChild>` payload. The child type may
+extend `NeoObjectBase`; it does not have to equal the list's base type.
+Returning a local variable from the selector preserves that explicit type.
+The selector takes no parameters. Its `this` is the variant target instance,
+so `() => this.SelectFirstSprite()` and `this.SelectFirstSprite` both work
+when that method takes no arguments and returns `TChild`. A search through
+`Children` returns an optional `NeoObjectBase`; narrow it to `TChild` and
+handle the missing-child case before returning it.
+
+```neo
+new NeoAnimationChildOverride<AnimationSpriteObject>(() => {
+  if (this.Children.FirstOrDefault((child) => child.Name == "Sprite")
+      is not AnimationSpriteObject sprite) {
+    throw new NeoError("Expected a sprite child");
+  }
+  return sprite;
+}, new Partial<AnimationSpriteObject> { Sprite = Images.OreVeins.Slice(1) })
+```
+
+VSCode and `neo status` validate selector bodies and constructor delegate
+arguments, including names, parameter counts, return paths, and return types.
+
 A nested class partial changes only named members. A list override replaces
 the whole list; it does not patch entries by index. In particular, overriding
 a clip's `Frames` requires the complete desired list, not just the changed