@neocompose/cli 0.48.3 → 0.49.0

package/dist/neo.mjs

@@ -20094,16 +20094,8 @@ var init_project_source_construction_diagnostics = __esm({
       "parameter-default-type-mismatch": "error",
       /** §2.5 g. An initializer key naming no member of the constructed class. */
       "unknown-initializer-member": "error",
-      /**
-       * §2.5 f. A construction site leaving a required member unsettled.
-       *
-       * Ships as a warning for this release (§5 step 1). A value seed whose
-       * members are supplied by stored value rows rather than by initializer text
-       * reads as unsettled to an analysis that only sees source, so promoting this
-       * to an error would reject the existing corpus. Every other rule below is
-       * decidable from source alone and is already an error.
-       */
-      "unsettled-required-member": "warning",
+      /** §2.5 f. Every construction must settle its required members. */
+      "unsettled-required-member": "error",
       /** §2.4. A declared constructor that is not a complete construction path. */
       "constructor-unsettled-member": "error",
       /** §2.4. An S1 header plus `init` block that is not a complete path. */
@@ -20989,19 +20981,34 @@ function buildNeoConstructionIndex(documents) {
   }
   return { classes, interfaceNames, requiredMemberCache: /* @__PURE__ */ new Map() };
 }
-function requiredMembersForClass(index, className) {
-  const cached = index.requiredMemberCache.get(className);
+function requiredMembersForClass(index, className, typeArguments = []) {
+  const cacheKey = JSON.stringify([className, typeArguments]);
+  const cached = index.requiredMemberCache.get(cacheKey);
   if (cached) return cached;
   const entry = index.classes.get(className);
   if (!entry) return [];
   const required2 = [];
   const seen = /* @__PURE__ */ new Set();
-  for (const hop of baseChain(index, entry).hops) {
+  const hops = baseChain(index, entry, typeArguments).hops;
+  const defaults = /* @__PURE__ */ new Map();
+  for (const hop of hops) {
+    for (const member of hop.entry.declaration.members) {
+      if (member.kind !== "field") continue;
+      const key = member.name.toLowerCase();
+      if (defaults.has(key)) continue;
+      if (member.initializer !== void 0 || member.flowInitializer !== void 0)
+        defaults.set(key, member);
+    }
+  }
+  for (const hop of hops) {
     for (const member of hop.entry.declaration.members) {
       const key = member.name.toLowerCase();
       if (seen.has(key)) continue;
       seen.add(key);
       if (!isRequiredMember(member, hop.bindings)) continue;
+      const declaredDefault = defaults.get(key);
+      if (declaredDefault !== void 0 && declaredDefault.initializer?.text.trim() !== "null")
+        continue;
       required2.push({
         name: member.name,
         declaringClassName: hop.entry.declaration.name,
@@ -21010,16 +21017,16 @@ function requiredMembersForClass(index, className) {
       });
     }
   }
-  index.requiredMemberCache.set(className, required2);
+  index.requiredMemberCache.set(cacheKey, required2);
   return required2;
 }
-function unsettledRequiredMembers(index, className, settledNames) {
+function unsettledRequiredMembers(index, className, settledNames, typeArguments = []) {
   const entry = index.classes.get(className);
   if (!entry) return [];
   const settled = /* @__PURE__ */ new Set();
   for (const name of settledNames) settled.add(name.toLowerCase());
   for (const name of declarationSettledMembers(index, entry)) settled.add(name);
-  return requiredMembersForClass(index, className).filter(
+  return requiredMembersForClass(index, className, typeArguments).filter(
     (member) => !settled.has(member.name.toLowerCase())
   );
 }
@@ -21046,7 +21053,8 @@ function validateNeoConstructionSite(index, call) {
   const unsettled = unsettledRequiredMembers(
     index,
     call.className,
-    call.initializerNames
+    call.initializerNames,
+    call.typeArguments
   );
   if (unsettled.length > 0) {
     diagnostics.push({
@@ -21080,6 +21088,7 @@ function validateBaseConstruction(index, entry, diagnostics) {
   }
   for (const diagnostic of validateNeoConstructionSite(index, {
     className: baseClause.type.name,
+    typeArguments: baseClause.type.typeArguments.map(typeShape),
     argumentNames: (baseClause.arguments ?? []).map(
       (argument2) => argument2.name ?? null
     ),
@@ -21354,11 +21363,16 @@ function stripOuterBraces(text) {
   const trimmed = text.trim();
   return trimmed.startsWith("{") && trimmed.endsWith("}") ? trimmed.slice(1, -1) : text;
 }
-function baseChain(index, start) {
+function baseChain(index, start, typeArguments = []) {
   const hops = [];
   const visited = /* @__PURE__ */ new Set();
   let current = start;
-  let bindings = /* @__PURE__ */ new Map();
+  let bindings = new Map(
+    start.declaration.genericParameters.flatMap((parameter4, position) => {
+      const argument2 = typeArguments[position];
+      return argument2 === void 0 ? [] : [[parameter4.name, argument2]];
+    })
+  );
   let complete2 = true;
   while (current !== void 0 && !visited.has(current.declaration.name)) {
     visited.add(current.declaration.name);
@@ -21412,12 +21426,17 @@ function typeShape(type) {
 }
 function substitute(type, bindings) {
   const bound = bindings.get(type.name);
-  if (bound !== void 0 && type.arguments.length === 0) {
-    return { ...bound, nullable: bound.nullable || type.nullable };
+  if (bound !== void 0 && (type.arguments?.length ?? 0) === 0) {
+    return {
+      ...bound,
+      nullable: bound.nullable === true || type.nullable === true
+    };
   }
   return {
     ...type,
-    arguments: type.arguments.map((argument2) => substitute(argument2, bindings))
+    arguments: (type.arguments ?? []).map(
+      (argument2) => substitute(argument2, bindings)
+    )
   };
 }
 function describeParameterList(className, parameters) {
@@ -23086,6 +23105,7 @@ function validateExpression(expression, expected, scope, environment, uri, range
       environment.construction,
       {
         className: declaration.name,
+        typeArguments: expression.typeArguments?.map(semanticAstType) ?? (expression.className === null ? expected?.arguments : void 0) ?? [],
         argumentNames: variantSite?.argumentNames ?? siteArgumentNames,
         initializerNames: variantSite?.initializerNames ?? siteInitializerNames
       }
@@ -38022,7 +38042,7 @@ function memberToDocumentFields(member, baseData3) {
 }
 function preserveOverrideNulls(fields, member, baseData3) {
   if (member.overrideOf === null || baseData3 === void 0) return;
-  for (const field of CHAIN_RESOLVED_OPTIONAL_MEMBER_FIELDS) {
+  for (const field of NULLABLE_OVERRIDE_MEMBER_FIELDS) {
     if (Object.hasOwn(baseData3, field) && baseData3[field] === null) {
       fields[field] = null;
     }
@@ -38782,7 +38802,7 @@ function invalidDocument(record4, path, message) {
     `${record4.recordKind}:${record4.recordId}.${path} ${message}.`
   );
 }
-var MEMBER_KIND, MEMBER_MODIFIERS, MEMBER_ACCESS, MEMBER_STORAGE, MEMBER_DISTRIBUTION, STRING_FORMAT, MEMBER_SEARCH_BY, MEMBER_SELECTION, FUNCTION_DISPATCH, FUNCTION_BODY, MEMBER_PAYLOAD, DICTIONARY_KEY, LIST_KIND, LIST_INDEX, COLUMN_VISIBILITY, COLUMN_PIN, COLUMN_OVERFLOW, GENERIC_BINDING, TYPE_KIND_BY_MEMBER_KIND, SIMPLE_MEMBER_KIND_BY_KIND, MEMBER_KIND_BY_KIND, TYPE_MEMBER_KIND_BY_KIND, MEMBER_IDENTITY_FIELDS, INHERITED_MEMBER_ORDINAL_FIELDS, CHAIN_RESOLVED_OPTIONAL_MEMBER_FIELDS;
+var MEMBER_KIND, MEMBER_MODIFIERS, MEMBER_ACCESS, MEMBER_STORAGE, MEMBER_DISTRIBUTION, STRING_FORMAT, MEMBER_SEARCH_BY, MEMBER_SELECTION, FUNCTION_DISPATCH, FUNCTION_BODY, MEMBER_PAYLOAD, DICTIONARY_KEY, LIST_KIND, LIST_INDEX, COLUMN_VISIBILITY, COLUMN_PIN, COLUMN_OVERFLOW, GENERIC_BINDING, TYPE_KIND_BY_MEMBER_KIND, SIMPLE_MEMBER_KIND_BY_KIND, MEMBER_KIND_BY_KIND, TYPE_MEMBER_KIND_BY_KIND, MEMBER_IDENTITY_FIELDS, INHERITED_MEMBER_ORDINAL_FIELDS, NULLABLE_OVERRIDE_MEMBER_FIELDS;
 var init_codecs = __esm({
   "src/project-manifest/record-adapters/codecs.ts"() {
     "use strict";
@@ -38925,7 +38945,7 @@ var init_codecs = __esm({
       "dispatch",
       "bodyMode"
     ]);
-    CHAIN_RESOLVED_OPTIONAL_MEMBER_FIELDS = [
+    NULLABLE_OVERRIDE_MEMBER_FIELDS = [
       "defaultValue",
       "storageKey",
       "minValue",
@@ -44162,36 +44182,36 @@ var MemberKind;
 var init_member_kind_enum = __esm({
   "../src/models/members/member-kind-enum.ts"() {
     "use strict";
-    MemberKind = /* @__PURE__ */ ((MemberKind14) => {
-      MemberKind14[MemberKind14["Null"] = 0] = "Null";
-      MemberKind14[MemberKind14["Bool"] = 1] = "Bool";
-      MemberKind14[MemberKind14["Int"] = 2] = "Int";
-      MemberKind14[MemberKind14["String"] = 3] = "String";
-      MemberKind14[MemberKind14["Float"] = 4] = "Float";
-      MemberKind14[MemberKind14["Dictionary"] = 5] = "Dictionary";
-      MemberKind14[MemberKind14["List"] = 6] = "List";
-      MemberKind14[MemberKind14["Class"] = 7] = "Class";
-      MemberKind14[MemberKind14["Enum"] = 8] = "Enum";
-      MemberKind14[MemberKind14["Lookup"] = 9] = "Lookup";
-      MemberKind14[MemberKind14["NSProperty"] = 10] = "NSProperty";
-      MemberKind14[MemberKind14["Sprite"] = 11] = "Sprite";
-      MemberKind14[MemberKind14["Audio"] = 12] = "Audio";
-      MemberKind14[MemberKind14["Function"] = 13] = "Function";
-      MemberKind14[MemberKind14["Vector2"] = 14] = "Vector2";
-      MemberKind14[MemberKind14["Vector2Int"] = 15] = "Vector2Int";
-      MemberKind14[MemberKind14["Vector3"] = 16] = "Vector3";
-      MemberKind14[MemberKind14["Vector3Int"] = 17] = "Vector3Int";
-      MemberKind14[MemberKind14["DialogueLookup"] = 18] = "DialogueLookup";
-      MemberKind14[MemberKind14["Color"] = 19] = "Color";
-      MemberKind14[MemberKind14["Decimal"] = 20] = "Decimal";
-      MemberKind14[MemberKind14["Generic"] = 21] = "Generic";
-      MemberKind14[MemberKind14["Interface"] = 22] = "Interface";
-      MemberKind14[MemberKind14["NSFunction"] = 23] = "NSFunction";
-      MemberKind14[MemberKind14["FunctionRef"] = 24] = "FunctionRef";
-      MemberKind14[MemberKind14["NSDelegate"] = 25] = "NSDelegate";
-      MemberKind14[MemberKind14["NSAction"] = 26] = "NSAction";
-      MemberKind14[MemberKind14["Variant"] = 27] = "Variant";
-      return MemberKind14;
+    MemberKind = /* @__PURE__ */ ((MemberKind15) => {
+      MemberKind15[MemberKind15["Null"] = 0] = "Null";
+      MemberKind15[MemberKind15["Bool"] = 1] = "Bool";
+      MemberKind15[MemberKind15["Int"] = 2] = "Int";
+      MemberKind15[MemberKind15["String"] = 3] = "String";
+      MemberKind15[MemberKind15["Float"] = 4] = "Float";
+      MemberKind15[MemberKind15["Dictionary"] = 5] = "Dictionary";
+      MemberKind15[MemberKind15["List"] = 6] = "List";
+      MemberKind15[MemberKind15["Class"] = 7] = "Class";
+      MemberKind15[MemberKind15["Enum"] = 8] = "Enum";
+      MemberKind15[MemberKind15["Lookup"] = 9] = "Lookup";
+      MemberKind15[MemberKind15["NSProperty"] = 10] = "NSProperty";
+      MemberKind15[MemberKind15["Sprite"] = 11] = "Sprite";
+      MemberKind15[MemberKind15["Audio"] = 12] = "Audio";
+      MemberKind15[MemberKind15["Function"] = 13] = "Function";
+      MemberKind15[MemberKind15["Vector2"] = 14] = "Vector2";
+      MemberKind15[MemberKind15["Vector2Int"] = 15] = "Vector2Int";
+      MemberKind15[MemberKind15["Vector3"] = 16] = "Vector3";
+      MemberKind15[MemberKind15["Vector3Int"] = 17] = "Vector3Int";
+      MemberKind15[MemberKind15["DialogueLookup"] = 18] = "DialogueLookup";
+      MemberKind15[MemberKind15["Color"] = 19] = "Color";
+      MemberKind15[MemberKind15["Decimal"] = 20] = "Decimal";
+      MemberKind15[MemberKind15["Generic"] = 21] = "Generic";
+      MemberKind15[MemberKind15["Interface"] = 22] = "Interface";
+      MemberKind15[MemberKind15["NSFunction"] = 23] = "NSFunction";
+      MemberKind15[MemberKind15["FunctionRef"] = 24] = "FunctionRef";
+      MemberKind15[MemberKind15["NSDelegate"] = 25] = "NSDelegate";
+      MemberKind15[MemberKind15["NSAction"] = 26] = "NSAction";
+      MemberKind15[MemberKind15["Variant"] = 27] = "Variant";
+      return MemberKind15;
     })(MemberKind || {});
   }
 });
@@ -46054,6 +46074,7 @@ function isGenericParamDeclaration(value) {
 function isGenericBinding(value) {
   const v = value;
   if (!v || typeof v !== "object") return false;
+  if (Object.hasOwn(v, "defaultValue")) return false;
   if (v.kind === void 0 || v.kind === 0 /* Generic */) {
     if (typeof v.genericParamId !== "string") return false;
     if (v.genericParamId.length === 0) return false;
@@ -47370,7 +47391,7 @@ function isAnyMember(value) {
 function isAnyMemberAuthoredOrCompiled(value) {
   return isAnyMember(value) || isUncompiledMemberNSFunctionOverride(value);
 }
-var FunctionArgumentReservedNames, NSFunctionArgumentReservedNames, ListKind, CHAIN_RESOLVED_OPTIONAL_MEMBER_FIELDS2, MEMBER_ACCESS_KINDS, DECIMAL_STRING_PATTERN, DECIMAL_MAX_SIGNIFICANT_DIGITS, DECIMAL_MAX_SCALE;
+var FunctionArgumentReservedNames, NSFunctionArgumentReservedNames, ListKind, CHAIN_RESOLVED_OPTIONAL_MEMBER_FIELDS, MEMBER_ACCESS_KINDS, DECIMAL_STRING_PATTERN, DECIMAL_MAX_SIGNIFICANT_DIGITS, DECIMAL_MAX_SCALE;
 var init_member_kinds = __esm({
   "../src/models/members/member-kinds.ts"() {
     "use strict";
@@ -47400,8 +47421,7 @@ var init_member_kinds = __esm({
       ListKind3[ListKind3["Unordered"] = 1] = "Unordered";
       return ListKind3;
     })(ListKind || {});
-    CHAIN_RESOLVED_OPTIONAL_MEMBER_FIELDS2 = [
-      "defaultValue",
+    CHAIN_RESOLVED_OPTIONAL_MEMBER_FIELDS = [
       "storageKey",
       "minValue",
       "maxValue",
@@ -47884,6 +47904,7 @@ function resolveMemberWithIndex(member, memberIndex) {
   for (const link of chain) {
     for (const [key, value] of Object.entries(link)) {
       if (value === void 0) continue;
+      if (key === "defaultValue" && value === null) continue;
       merged[key] = value;
     }
     if (getField(link, "code") === null) {
@@ -47896,7 +47917,7 @@ function resolveMemberWithIndex(member, memberIndex) {
     }
   }
   delete merged.extendsMemberId;
-  for (const field of CHAIN_RESOLVED_OPTIONAL_MEMBER_FIELDS2) {
+  for (const field of CHAIN_RESOLVED_OPTIONAL_MEMBER_FIELDS) {
     if (merged[field] === null) delete merged[field];
   }
   if (member.mutability === void 0) {
@@ -47911,7 +47932,6 @@ function resolveMemberWithIndex(member, memberIndex) {
   }
   if (member.kind === 21 /* Generic */) {
     if (member.requirement === void 0) delete merged.requirement;
-    if (member.defaultValue === void 0) delete merged.defaultValue;
   }
   return Object.freeze(merged);
 }
@@ -50054,8 +50074,10 @@ function substituteMember(member, env, members, preResolvedMember) {
       access: resolved.access,
       system: resolved.system ?? void 0
     };
-    if (resolved.defaultValue !== void 0) {
+    if (resolved.defaultValue != null) {
       substituted.defaultValue = resolved.defaultValue;
+    } else {
+      delete substituted.defaultValue;
     }
     const slotId = getOptionalString(member, "id");
     if (slotId !== void 0) {
@@ -51021,9 +51043,9 @@ function assertReadOnlyMembersValid(document) {
           );
         }
         if (isAbstractMember(member) === true) continue;
-        if (effective.defaultValue === void 0) {
+        if (effective.defaultValue == null) {
           throw new Error(
-            `Read-only member "${member.name}" (${member.id}) requires an explicit defaultValue from every closed Generic binding; ${ownerContext}.`
+            `Read-only member "${member.name}" (${member.id}) requires an explicit field defaultValue in every closed Generic placement; ${ownerContext}.`
           );
         }
         if (isMemberStringBase(effective) && effective.searchBy === 1 /* MemberKey */) {
@@ -51910,6 +51932,403 @@ var init_storage_partitions = __esm({
   }
 });
 
+// ../src/models/constructors/constructors.ts
+function hasRejectedConstructorKey(value) {
+  return REJECTED_CONSTRUCTOR_KEYS.some((key) => value[key] !== void 0);
+}
+function isNamedBaseClauseEntry(value, nameIsValid) {
+  if (typeof value !== "object" || value === null) return false;
+  if (Array.isArray(value)) return false;
+  const candidate = value;
+  if (!Object.keys(candidate).every((key) => key === "name" || key === "code")) {
+    return false;
+  }
+  if (!nameIsValid(candidate.name)) return false;
+  if (typeof candidate.code !== "string") return false;
+  return candidate.code.length > 0;
+}
+function isNeoConstructorBaseArgument(value) {
+  return isNamedBaseClauseEntry(value, isValidCallableArgumentIdentifier);
+}
+function isNeoConstructorBaseInitializerField(value) {
+  return isNamedBaseClauseEntry(value, isValidSchemaMemberIdentifier);
+}
+function isNeoClassConstructorBase(value) {
+  if (typeof value !== "object" || value === null) return false;
+  if (Array.isArray(value)) return false;
+  const v = value;
+  if (hasRejectedConstructorKey(v)) return false;
+  if (!isValidDocsText(v.docsText)) return false;
+  if (typeof v.classId !== "string") return false;
+  if (v.classId.length === 0) return false;
+  if (typeof v.code !== "string" && v.code !== null) return false;
+  if (!Array.isArray(v.argumentTypes)) return false;
+  const parameterNames = /* @__PURE__ */ new Set();
+  const argumentTypes = [];
+  for (const argument2 of v.argumentTypes) {
+    if (!isNSFunctionArgumentTypeInfo(argument2)) return false;
+    if (!isValidCallableArgumentIdentifier(argument2.name)) return false;
+    if (parameterNames.has(argument2.name)) return false;
+    parameterNames.add(argument2.name);
+    argumentTypes.push(argument2);
+  }
+  if (validateParameterDefaults(argumentTypes).length > 0) return false;
+  if (v.baseArguments !== void 0 && v.baseArguments !== null) {
+    if (!Array.isArray(v.baseArguments)) return false;
+    const baseNames = /* @__PURE__ */ new Set();
+    for (const baseArgument of v.baseArguments) {
+      if (!isNeoConstructorBaseArgument(baseArgument)) return false;
+      if (baseNames.has(baseArgument.name)) return false;
+      baseNames.add(baseArgument.name);
+    }
+  }
+  if (v.baseInitializerFields !== void 0 && v.baseInitializerFields !== null) {
+    if (!Array.isArray(v.baseInitializerFields)) return false;
+    const fieldNames = /* @__PURE__ */ new Set();
+    for (const field of v.baseInitializerFields) {
+      if (!isNeoConstructorBaseInitializerField(field)) return false;
+      if (fieldNames.has(field.name)) return false;
+      fieldNames.add(field.name);
+    }
+  }
+  if (v.action !== void 0 && v.action !== null) return false;
+  if (v.compiledBaseArguments !== void 0 && v.compiledBaseArguments !== null) {
+    return false;
+  }
+  return v.compiledBaseInitializerFields === void 0 || v.compiledBaseInitializerFields === null;
+}
+function isUncompiledNeoClassConstructor(value) {
+  if (!isNeoClassConstructorBase(value)) return false;
+  const v = value;
+  if (typeof v.id !== "string" || v.id.length === 0) return false;
+  if (typeof v.projectId !== "string" || v.projectId.length === 0) return false;
+  if (!isEpochMillis(v.createdAt)) return false;
+  return isEpochMillis(v.updatedAt);
+}
+function hasValidConstructorAction(action, argumentTypes) {
+  if (!isNSFunctionWithReturnType(action)) return false;
+  if (action.typeInfo.type !== 0 /* Null */) return false;
+  if (action.typeInfo.required !== true) return false;
+  if (action.parameters.length !== argumentTypes.length + 2) return false;
+  if (action.parameters[0]?.id !== "__this__") return false;
+  if (action.parameters[1]?.id !== "__root__") return false;
+  for (let index = 0; index < argumentTypes.length; index += 1) {
+    const parameter4 = action.parameters[index + 2];
+    if (parameter4?.id !== `__arg_${index}__`) return false;
+    const declared = argumentTypes[index];
+    if (declared === void 0) return false;
+    if (!typeInfosInvariantlyEqual(parameter4.typeInfo, declared)) return false;
+  }
+  return true;
+}
+function compiledBaseClauseGettersAlign(compiled, authored) {
+  const authoredCount = Array.isArray(authored) ? authored.length : 0;
+  if (compiled === void 0 || compiled === null) return authoredCount === 0;
+  if (!Array.isArray(compiled)) return false;
+  if (!compiled.every(isNSGetter)) return false;
+  return compiled.length === authoredCount;
+}
+function isNeoClassConstructorProps(value) {
+  if (typeof value !== "object" || value === null) return false;
+  const v = value;
+  const {
+    action: _action,
+    compiledBaseArguments: _compiledBaseArguments,
+    compiledBaseInitializerFields: _compiledBaseInitializerFields,
+    ...authored
+  } = v;
+  void _action;
+  void _compiledBaseArguments;
+  void _compiledBaseInitializerFields;
+  if (!isNeoClassConstructorBase(authored)) return false;
+  if (typeof v.id !== "string") return false;
+  if (v.id.length === 0) return false;
+  if (typeof v.projectId !== "string") return false;
+  if (!isEpochMillis(v.createdAt)) return false;
+  if (!isEpochMillis(v.updatedAt)) return false;
+  const argumentTypes = v.argumentTypes;
+  if (!hasValidConstructorAction(v.action, argumentTypes)) return false;
+  if (!compiledBaseClauseGettersAlign(v.compiledBaseArguments, v.baseArguments)) {
+    return false;
+  }
+  return compiledBaseClauseGettersAlign(
+    v.compiledBaseInitializerFields,
+    v.baseInitializerFields
+  );
+}
+function isNeoClassConstructor(value) {
+  return isNeoClassConstructorProps(value);
+}
+function constructorActionParameterId(constructor2, index) {
+  const action = "action" in constructor2 ? constructor2.action : void 0;
+  if (action !== null && typeof action === "object") {
+    const parameters = action.parameters;
+    if (Array.isArray(parameters)) {
+      const parameter4 = parameters[index + 2];
+      if (parameter4 !== null && typeof parameter4 === "object" && typeof parameter4.id === "string") {
+        return parameter4.id;
+      }
+    }
+  }
+  return `__arg_${index}__`;
+}
+var REJECTED_CONSTRUCTOR_KEYS;
+var init_constructors = __esm({
+  "../src/models/constructors/constructors.ts"() {
+    "use strict";
+    init_core();
+    init_docs_text2();
+    init_member_kinds();
+    init_schema_identifiers();
+    init_neoscript();
+    REJECTED_CONSTRUCTOR_KEYS = [
+      "bodyMode",
+      "uiAction",
+      "returnTypeInfo",
+      "deferred"
+    ];
+  }
+});
+
+// ../src/models/constructors/index.ts
+var init_constructors2 = __esm({
+  "../src/models/constructors/index.ts"() {
+    "use strict";
+    init_constructors();
+  }
+});
+
+// ../src/models/classes/construction-requirements.ts
+function requiredMembersForConstruction(classId, document, classArguments2) {
+  return unsettledMembers(
+    classId,
+    contextFor(document),
+    classArguments2,
+    /* @__PURE__ */ new Set()
+  );
+}
+function contextFor(document, env = /* @__PURE__ */ new Map()) {
+  return {
+    document,
+    membersById: new Map(document.members.map((member) => [member.id, member])),
+    env
+  };
+}
+function unsettledMembers(classId, context, classArguments2, path) {
+  const previousEnv = context.env;
+  context.env = resolveInstanceEnv(
+    classId,
+    classArguments2,
+    context.document.classes
+  );
+  try {
+    return constructionMembers(classId, context).filter(
+      ({ member }) => isRequiredMember2(member) && !defaultSettlesConstruction(member, context, path)
+    );
+  } finally {
+    context.env = previousEnv;
+  }
+}
+function constructionMembers(classId, context) {
+  const { document, membersById, env } = context;
+  if (firstUnboundParamId(env) !== null) return [];
+  const result = [];
+  for (const entry of mergeStoredInstanceSchema(
+    classId,
+    document.classes,
+    document.members
+  )) {
+    const raw = membersById.get(entry.memberId);
+    if (raw === void 0) continue;
+    const member = {
+      ...raw,
+      ...substituteMember(
+        raw,
+        env,
+        document.members,
+        resolveMember2(raw, document.members)
+      ),
+      id: raw.id
+    };
+    if (isAbstractMember(member)) continue;
+    if (isReadOnlyMember(member)) continue;
+    if (!memberKindOwnsStoredValue(member.kind)) continue;
+    if ("payload" in member && member.payload === 1 /* Partial */)
+      continue;
+    result.push({ schemaKey: entry.schemaKey, member });
+  }
+  return result;
+}
+function storedValueSettlesConstruction(member, sourceValue, document, genericEnv) {
+  return valueSettlesConstruction(
+    member,
+    sourceValue,
+    contextFor(document, genericEnv),
+    /* @__PURE__ */ new Set(),
+    true
+  );
+}
+function defaultSettlesConstruction(member, context, path) {
+  const body = member.defaultValue;
+  if (body == null) return false;
+  return valueSettlesConstruction(member, body, context, path);
+}
+function valueSettlesConstruction(member, body, context, path, storedRow = false) {
+  if (isInitValueContent(body)) return true;
+  const value = body.value;
+  if (value == null) return !isRequiredMember2(member);
+  const isClass = isMemberClassBase(member);
+  const isCollection = isMemberListBase(member) || isMemberDictionaryBase(member);
+  if (!isClass && !isCollection) return true;
+  if (isClass && member.payload === 1 /* Partial */) return true;
+  if (typeof value !== "object") return false;
+  if (path.has(value)) return false;
+  path.add(value);
+  const previousEnv = context.env;
+  try {
+    if (isCollection) {
+      if (body.genericBindings != null)
+        context.env = envFromStamp(body.genericBindings);
+      const entry = context.membersById.get(member.entryMemberId);
+      if (entry === void 0) return false;
+      const resolvedEntry = substituteMember(
+        entry,
+        context.env,
+        context.document.members
+      );
+      const entries = Array.isArray(value) ? value : Object.values(value);
+      return entries.every(
+        (entryValue) => suppliedValueSettlesConstruction(
+          resolvedEntry,
+          entryValue,
+          context,
+          path
+        )
+      );
+    }
+    if (!isClass || Array.isArray(value)) return false;
+    const classId = body.classId ?? member.classId;
+    const constructor2 = typeof body.instanceConstructorId === "string" ? context.document.constructors.find(
+      (record4) => record4.id === body.instanceConstructorId && record4.classId === classId
+    ) : void 0;
+    if (typeof body.instanceConstructorId === "string" && constructor2 === void 0)
+      return false;
+    if (constructor2 !== void 0 && constructor2.argumentTypes.some(
+      (argument2, index) => !parameterHasDefault(argument2) && !Object.hasOwn(
+        body.constructorArgs ?? {},
+        constructorActionParameterId(constructor2, index)
+      )
+    ))
+      return false;
+    const requiredConstructorId2 = context.document.classes.find(
+      (schemaClass2) => schemaClass2.id === classId
+    )?.requiredConstructorId;
+    if (typeof requiredConstructorId2 === "string" && constructor2?.id !== requiredConstructorId2 && !(storedRow && body.instanceConstructorId == null))
+      return false;
+    const classArguments2 = { ...member.classArguments };
+    for (const [parameterId, memberId] of Object.entries(
+      body.genericBindings ?? {}
+    )) {
+      classArguments2[parameterId] = {
+        kind: 1 /* Member */,
+        memberId
+      };
+    }
+    context.env = resolveInstanceEnv(
+      classId,
+      classArguments2,
+      context.document.classes
+    );
+    if (firstUnboundParamId(context.env) !== null) return false;
+    const members = constructionMembers(classId, context);
+    for (const entry of members) {
+      if (Object.hasOwn(value, entry.schemaKey)) {
+        if (!suppliedValueSettlesConstruction(
+          entry.member,
+          Reflect.get(value, entry.schemaKey),
+          context,
+          path
+        ))
+          return false;
+        continue;
+      }
+      if (!isRequiredMember2(entry.member)) continue;
+      if (constructor2 !== void 0 || typeof body.instanceVariantId === "string")
+        continue;
+      if (!defaultSettlesConstruction(entry.member, context, path))
+        return false;
+    }
+    return true;
+  } finally {
+    path.delete(value);
+    context.env = previousEnv;
+  }
+}
+function suppliedValueSettlesConstruction(member, value, context, path) {
+  if (typeof value === "string") {
+    let row;
+    if (context.document.valueById !== void 0) {
+      row = context.document.valueById(value);
+    } else {
+      context.valuesById ??= new Map(
+        context.document.values?.map((entry) => [entry.id, entry]) ?? []
+      );
+      row = context.valuesById.get(value);
+    }
+    if (row !== void 0 && row !== null)
+      return valueSettlesConstruction(member, row, context, path, true);
+    return false;
+  }
+  return valueSettlesConstruction(member, { value }, context, path);
+}
+function resolveConstructionTypeArguments(typeArguments, document) {
+  if (typeArguments === void 0) return void 0;
+  const bindings = {};
+  const projected = /* @__PURE__ */ new Map();
+  for (const [parameterId, typeInfo] of Object.entries(typeArguments)) {
+    let binding;
+    for (const member of document.members) {
+      if (!projected.has(member.id)) {
+        try {
+          projected.set(
+            member.id,
+            genericBindingTypeInfo(member, /* @__PURE__ */ new Map(), document.members)
+          );
+        } catch {
+          projected.set(member.id, null);
+        }
+      }
+      const candidate = projected.get(member.id);
+      if (candidate != null && typeInfosInvariantlyEqual(candidate, typeInfo)) {
+        binding = member;
+        break;
+      }
+    }
+    if (binding === void 0) {
+      throw new Error(
+        `Construction type argument "${parameterId}" has no matching type descriptor in the document.`
+      );
+    }
+    bindings[parameterId] = {
+      kind: 1 /* Member */,
+      memberId: binding.id
+    };
+  }
+  return bindings;
+}
+var init_construction_requirements = __esm({
+  "../src/models/classes/construction-requirements.ts"() {
+    "use strict";
+    init_type_info_compatibility();
+    init_classes();
+    init_inheritance();
+    init_generics();
+    init_constructors2();
+    init_parameter_defaults();
+    init_members();
+  }
+});
+
 // ../src/models/unity/unity-import-settings.ts
 function buildDefaultUnityTexture2DImportSettings() {
   return {
@@ -53113,13 +53532,10 @@ function directScalarDefaultBody(document, member) {
   if (member.kind !== 1 /* Bool */ && member.kind !== 2 /* Int */ && member.kind !== 4 /* Float */ && member.kind !== 3 /* String */ && member.kind !== 20 /* Decimal */ && member.kind !== 8 /* Enum */ && member.kind !== 0 /* Null */) {
     return void 0;
   }
-  if (!isRequiredMember2(member) && (member.defaultValue === void 0 || member.defaultValue === null)) {
-    return void 0;
-  }
-  if (documentHasInitValueContent(document, member.defaultValue)) {
+  if (member.defaultValue == null) return void 0;
+  if (documentHasInitValueContent(document, member.defaultValue))
     return void 0;
-  }
-  const body = member.defaultValue ?? primitiveFallbackValue(document, member);
+  const body = member.defaultValue;
   if (!isLiteralValueContent(body)) return void 0;
   if (body.value !== null && typeof body.value !== "boolean" && typeof body.value !== "number" && typeof body.value !== "string") {
     return void 0;
@@ -53292,6 +53708,11 @@ function buildDefaultMemberValue(args) {
         `Cannot create a value of missing class "${effectiveClassId}".`
       );
     }
+    if (member.payload !== 1 /* Partial */ && typeof effectiveClass.requiredConstructorId === "string" && args.constructorRoot === void 0 && args.authoredRoot === void 0) {
+      throw new Error(
+        `Class "${effectiveClass.name}" declares a required constructor; provide its constructor arguments.`
+      );
+    }
     if (isAbstractClass(effectiveClass)) {
       throw new Error(
         `Cannot create a value of abstract class "${effectiveClass.name}".`
@@ -53373,6 +53794,13 @@ function buildDefaultMemberValue(args) {
       )) {
         continue;
       }
+      if (isRequiredMember2(resolvedChildMember) && resolvedChildMember.defaultValue == null && !(isMemberClassBase(resolvedChildMember) && resolvedChildMember.payload === 1 /* Partial */)) {
+        if (args.constructorRoot?.runsMemberInitializers === true) continue;
+        if (args.constructorRoot?.omitMissingRequired === true) continue;
+        throw new Error(
+          `Class "${effectiveClass.name}" cannot be constructed without required member "${schemaKey}"; supply it or declare a member default.`
+        );
+      }
       if (!shouldMaterializeChildDefaultForRoot(
         args.constructorRoot,
         resolvedChildMember,
@@ -53383,7 +53811,6 @@ function buildDefaultMemberValue(args) {
       )) {
         continue;
       }
-      if (shouldSkipRequiredChildDefault(resolvedChildMember)) continue;
       const childValue = directScalarBody === void 0 ? buildDefaultMemberValue({
         document: args.document,
         projectId: args.projectId,
@@ -53716,15 +54143,43 @@ function cloneDefaultValueForMember(args) {
     );
     return evaluatedRow;
   }
+  if (args.path.size === 0 && !storedValueSettlesConstruction(
+    member,
+    sourceValue,
+    {
+      classes: args.document.classes,
+      members: args.document.members,
+      constructors: args.document.constructors ?? [],
+      values: args.document.values,
+      valueById: args.document.valueById
+    },
+    args.genericEnv
+  )) {
+    throw new Error(
+      `Default value "${args.sourceValueId}" in ${args.referenceLocation} does not satisfy its construction requirements.`
+    );
+  }
   let body;
-  if (isMemberClassBase(member)) {
+  if (isMemberClassBase(member) && sourceValue.value === null) {
+    body = cloneMemberValueBase(sourceValue);
+  } else if (isMemberClassBase(member)) {
     const effectiveClassId = typeof sourceValue.classId === "string" ? sourceValue.classId : member.classId;
-    const childEnv = args.document.instanceEnv?.(effectiveClassId, member.classArguments) ?? resolveInstanceEnv(
+    const classArguments2 = { ...member.classArguments };
+    for (const [parameterId, memberId] of Object.entries(
+      sourceValue.genericBindings ?? {}
+    )) {
+      classArguments2[parameterId] = {
+        kind: 1 /* Member */,
+        memberId
+      };
+    }
+    const childEnv = args.document.instanceEnv?.(effectiveClassId, classArguments2) ?? resolveInstanceEnv(
       effectiveClassId,
-      member.classArguments,
+      classArguments2,
       args.document.classes
     );
     body = {
+      ...cloneMemberValueBase(sourceValue),
       value: cloneDefaultClassRecord({
         document: args.document,
         projectId: args.projectId,
@@ -53738,7 +54193,7 @@ function cloneDefaultValueForMember(args) {
         path: nextPath,
         position: args.position
       }),
-      classId: effectiveClassId !== member.classId ? effectiveClassId : void 0
+      classId: effectiveClassId !== member.classId || sourceValue.constructorArgs != null ? effectiveClassId : void 0
     };
   } else if (isMemberListBase(member)) {
     body = cloneDefaultListRecord({
@@ -53749,7 +54204,7 @@ function cloneDefaultValueForMember(args) {
       createdValues: args.createdValues,
       storageKeyDeclarations: args.storageKeyDeclarations,
       initEvaluator: args.initEvaluator,
-      genericEnv: args.genericEnv,
+      genericEnv: sourceValue.genericBindings == null ? args.genericEnv : envFromStamp(sourceValue.genericBindings),
       path: nextPath,
       position: args.position
     });
@@ -53762,7 +54217,7 @@ function cloneDefaultValueForMember(args) {
       createdValues: args.createdValues,
       storageKeyDeclarations: args.storageKeyDeclarations,
       initEvaluator: args.initEvaluator,
-      genericEnv: args.genericEnv,
+      genericEnv: sourceValue.genericBindings == null ? args.genericEnv : envFromStamp(sourceValue.genericBindings),
       path: nextPath,
       position: args.position
     });
@@ -53779,7 +54234,9 @@ function cloneDefaultValueForMember(args) {
   }
   const value = createDocumentValueRow(args.document, args.projectId, body);
   value.sourceValueId = sourceValue.sourceValueId ?? sourceValue.id;
-  if (isMemberListBase(member) || isMemberDictionaryBase(member)) {
+  if (sourceValue.genericBindings != null) {
+    value.genericBindings = { ...sourceValue.genericBindings };
+  } else if (isMemberListBase(member) || isMemberDictionaryBase(member)) {
     stampGenericBindings(value, member, args);
   }
   args.createdValues.push(value);
@@ -53837,10 +54294,6 @@ function stampGenericBindings(value, member, args) {
   if (stamp === void 0) return;
   value.genericBindings = stamp;
 }
-function shouldSkipRequiredChildDefault(member) {
-  if (member.defaultValue !== void 0) return false;
-  return isMemberAudioBase(member);
-}
 function shouldMaterializeChildDefault(member) {
   if (isMemberClassBase(member) && member.payload === 1 /* Partial */)
     return false;
@@ -53862,7 +54315,7 @@ function skipProvidedConstructorSchemaKey(constructorRoot, schemaKey, member, is
   if (constructorRoot.runsMemberInitializers !== true) {
     return !isInitializer;
   }
-  return member.defaultValue === void 0;
+  return member.defaultValue == null;
 }
 function shouldMaterializeChildDefaultForRoot(constructorRoot, member, isInitializer = isInitValueContent(member.defaultValue)) {
   if (constructorRoot === void 0)
@@ -54118,6 +54571,7 @@ var DECLARATION_DEFAULT_POSITION, SPRITE_FILE_ID_KEY;
 var init_build_default_member_value = __esm({
   "../src/models/members/build-default-member-value.ts"() {
     "use strict";
+    init_construction_requirements();
     init_deep_clone_plain_data();
     init_dist_node();
     init_inheritance();
@@ -65601,172 +66055,6 @@ var init_lower_variants = __esm({
   }
 });
 
-// ../src/models/constructors/constructors.ts
-function hasRejectedConstructorKey(value) {
-  return REJECTED_CONSTRUCTOR_KEYS.some((key) => value[key] !== void 0);
-}
-function isNamedBaseClauseEntry(value, nameIsValid) {
-  if (typeof value !== "object" || value === null) return false;
-  if (Array.isArray(value)) return false;
-  const candidate = value;
-  if (!Object.keys(candidate).every((key) => key === "name" || key === "code")) {
-    return false;
-  }
-  if (!nameIsValid(candidate.name)) return false;
-  if (typeof candidate.code !== "string") return false;
-  return candidate.code.length > 0;
-}
-function isNeoConstructorBaseArgument(value) {
-  return isNamedBaseClauseEntry(value, isValidCallableArgumentIdentifier);
-}
-function isNeoConstructorBaseInitializerField(value) {
-  return isNamedBaseClauseEntry(value, isValidSchemaMemberIdentifier);
-}
-function isNeoClassConstructorBase(value) {
-  if (typeof value !== "object" || value === null) return false;
-  if (Array.isArray(value)) return false;
-  const v = value;
-  if (hasRejectedConstructorKey(v)) return false;
-  if (!isValidDocsText(v.docsText)) return false;
-  if (typeof v.classId !== "string") return false;
-  if (v.classId.length === 0) return false;
-  if (typeof v.code !== "string" && v.code !== null) return false;
-  if (!Array.isArray(v.argumentTypes)) return false;
-  const parameterNames = /* @__PURE__ */ new Set();
-  const argumentTypes = [];
-  for (const argument2 of v.argumentTypes) {
-    if (!isNSFunctionArgumentTypeInfo(argument2)) return false;
-    if (!isValidCallableArgumentIdentifier(argument2.name)) return false;
-    if (parameterNames.has(argument2.name)) return false;
-    parameterNames.add(argument2.name);
-    argumentTypes.push(argument2);
-  }
-  if (validateParameterDefaults(argumentTypes).length > 0) return false;
-  if (v.baseArguments !== void 0 && v.baseArguments !== null) {
-    if (!Array.isArray(v.baseArguments)) return false;
-    const baseNames = /* @__PURE__ */ new Set();
-    for (const baseArgument of v.baseArguments) {
-      if (!isNeoConstructorBaseArgument(baseArgument)) return false;
-      if (baseNames.has(baseArgument.name)) return false;
-      baseNames.add(baseArgument.name);
-    }
-  }
-  if (v.baseInitializerFields !== void 0 && v.baseInitializerFields !== null) {
-    if (!Array.isArray(v.baseInitializerFields)) return false;
-    const fieldNames = /* @__PURE__ */ new Set();
-    for (const field of v.baseInitializerFields) {
-      if (!isNeoConstructorBaseInitializerField(field)) return false;
-      if (fieldNames.has(field.name)) return false;
-      fieldNames.add(field.name);
-    }
-  }
-  if (v.action !== void 0 && v.action !== null) return false;
-  if (v.compiledBaseArguments !== void 0 && v.compiledBaseArguments !== null) {
-    return false;
-  }
-  return v.compiledBaseInitializerFields === void 0 || v.compiledBaseInitializerFields === null;
-}
-function isUncompiledNeoClassConstructor(value) {
-  if (!isNeoClassConstructorBase(value)) return false;
-  const v = value;
-  if (typeof v.id !== "string" || v.id.length === 0) return false;
-  if (typeof v.projectId !== "string" || v.projectId.length === 0) return false;
-  if (!isEpochMillis(v.createdAt)) return false;
-  return isEpochMillis(v.updatedAt);
-}
-function hasValidConstructorAction(action, argumentTypes) {
-  if (!isNSFunctionWithReturnType(action)) return false;
-  if (action.typeInfo.type !== 0 /* Null */) return false;
-  if (action.typeInfo.required !== true) return false;
-  if (action.parameters.length !== argumentTypes.length + 2) return false;
-  if (action.parameters[0]?.id !== "__this__") return false;
-  if (action.parameters[1]?.id !== "__root__") return false;
-  for (let index = 0; index < argumentTypes.length; index += 1) {
-    const parameter4 = action.parameters[index + 2];
-    if (parameter4?.id !== `__arg_${index}__`) return false;
-    const declared = argumentTypes[index];
-    if (declared === void 0) return false;
-    if (!typeInfosInvariantlyEqual(parameter4.typeInfo, declared)) return false;
-  }
-  return true;
-}
-function compiledBaseClauseGettersAlign(compiled, authored) {
-  const authoredCount = Array.isArray(authored) ? authored.length : 0;
-  if (compiled === void 0 || compiled === null) return authoredCount === 0;
-  if (!Array.isArray(compiled)) return false;
-  if (!compiled.every(isNSGetter)) return false;
-  return compiled.length === authoredCount;
-}
-function isNeoClassConstructorProps(value) {
-  if (typeof value !== "object" || value === null) return false;
-  const v = value;
-  const {
-    action: _action,
-    compiledBaseArguments: _compiledBaseArguments,
-    compiledBaseInitializerFields: _compiledBaseInitializerFields,
-    ...authored
-  } = v;
-  void _action;
-  void _compiledBaseArguments;
-  void _compiledBaseInitializerFields;
-  if (!isNeoClassConstructorBase(authored)) return false;
-  if (typeof v.id !== "string") return false;
-  if (v.id.length === 0) return false;
-  if (typeof v.projectId !== "string") return false;
-  if (!isEpochMillis(v.createdAt)) return false;
-  if (!isEpochMillis(v.updatedAt)) return false;
-  const argumentTypes = v.argumentTypes;
-  if (!hasValidConstructorAction(v.action, argumentTypes)) return false;
-  if (!compiledBaseClauseGettersAlign(v.compiledBaseArguments, v.baseArguments)) {
-    return false;
-  }
-  return compiledBaseClauseGettersAlign(
-    v.compiledBaseInitializerFields,
-    v.baseInitializerFields
-  );
-}
-function isNeoClassConstructor(value) {
-  return isNeoClassConstructorProps(value);
-}
-function constructorActionParameterId(constructor2, index) {
-  const action = "action" in constructor2 ? constructor2.action : void 0;
-  if (action !== null && typeof action === "object") {
-    const parameters = action.parameters;
-    if (Array.isArray(parameters)) {
-      const parameter4 = parameters[index + 2];
-      if (parameter4 !== null && typeof parameter4 === "object" && typeof parameter4.id === "string") {
-        return parameter4.id;
-      }
-    }
-  }
-  return `__arg_${index}__`;
-}
-var REJECTED_CONSTRUCTOR_KEYS;
-var init_constructors = __esm({
-  "../src/models/constructors/constructors.ts"() {
-    "use strict";
-    init_core();
-    init_docs_text2();
-    init_member_kinds();
-    init_schema_identifiers();
-    init_neoscript();
-    REJECTED_CONSTRUCTOR_KEYS = [
-      "bodyMode",
-      "uiAction",
-      "returnTypeInfo",
-      "deferred"
-    ];
-  }
-});
-
-// ../src/models/constructors/index.ts
-var init_constructors2 = __esm({
-  "../src/models/constructors/index.ts"() {
-    "use strict";
-    init_constructors();
-  }
-});
-
 // ../src/models/classes/constructor-parameter-settlement.ts
 function createConstructorSettlementResolver(view) {
   const classesById = new Map(
@@ -76750,16 +77038,35 @@ function validateClassConstructorDescriptor(info, ctx, requireEveryRequiredField
     );
   }
   const genericSlot = ctx.__constructionGenericSlots?.toReversed().find((slot) => slot.classId === classId) ?? ctx.__storedConstructionReplaySlot;
-  const classArguments2 = genericSlot?.classId === classId ? genericSlot.classArguments : void 0;
+  const slotArguments = genericSlot?.classId === classId ? genericSlot.classArguments : void 0;
   const descriptorCache = evaluatorResolutionCache(ctx).validatedConstructorDescriptorByInfo;
-  const descriptorCacheKey = `${requireEveryRequiredField}:${ctx.storedConstructionReplay === true}:${JSON.stringify(classArguments2 ?? null)}`;
+  const descriptorCacheKey = `${requireEveryRequiredField}:${ctx.storedConstructionReplay === true}:${JSON.stringify(slotArguments ?? info.schemaClassInfo.typeArguments ?? null)}`;
   const cachedDescriptor = descriptorCache.get(info)?.get(descriptorCacheKey);
   if (cachedDescriptor !== void 0) return cachedDescriptor;
+  const constructionDocument = {
+    classes: ctx.vm.classes,
+    members: ctx.vm.members,
+    constructors: ctx.vm.constructors ?? [],
+    values: ctx.vm.values,
+    valueById: ctx.vm.databaseVM?.valueById
+  };
+  const classArguments2 = slotArguments ?? resolveConstructionTypeArguments(
+    info.schemaClassInfo.typeArguments,
+    constructionDocument
+  );
   const cacheDescriptor = (descriptor) => {
+    const complete2 = {
+      ...descriptor,
+      requiredSchemaKeys: requiredMembersForConstruction(
+        classId,
+        constructionDocument,
+        classArguments2
+      ).map((entry) => entry.schemaKey)
+    };
     const variants = descriptorCache.get(info) ?? /* @__PURE__ */ new Map();
-    variants.set(descriptorCacheKey, descriptor);
+    variants.set(descriptorCacheKey, complete2);
     descriptorCache.set(info, variants);
-    return descriptor;
+    return complete2;
   };
   const instanceEnv = cachedInstanceEnv(classId, classArguments2, ctx);
   if (firstUnboundParamId(instanceEnv) !== null) {
@@ -77375,6 +77682,7 @@ function constructClassValueWithinFrame(descriptor, scope, ctx) {
         project: ctx.vm.project,
         members: ctx.vm.members,
         classes: ctx.vm.classes,
+        constructors: ctx.vm.constructors,
         enums: ctx.vm.enums,
         // Declaration defaults only reference durable rows. Supplying the
         // immutable base plus its indexes avoids copying and linearly scanning
@@ -77461,6 +77769,15 @@ function constructClassValueWithinFrame(descriptor, scope, ctx) {
       `Failed to construct '${schemaClass2.name}': ${error instanceof Error ? error.message : String(error)}`
     );
   }
+  if (ctx.constructionBaselineReplay !== true) {
+    for (const schemaKey of descriptor.requiredSchemaKeys) {
+      if (typeof root.value === "object" && root.value !== null && Reflect.get(root.value, schemaKey) != null)
+        continue;
+      throw new NSGetterRuntimeError(
+        `Class '${schemaClass2.name}' was constructed without settling required member '${schemaKey}'.`
+      );
+    }
+  }
   publishConstructedRows({
     root,
     classId,
@@ -78957,6 +79274,7 @@ function constructDeclaredClassValueWithinFrame(descriptor, record4, info, scope
         project: ctx.vm.project,
         members: ctx.vm.members,
         classes: ctx.vm.classes,
+        constructors: ctx.vm.constructors,
         enums: ctx.vm.enums,
         values: ctx.vm.values,
         memberById: ctx.vm.databaseVM?.memberById,
@@ -79117,6 +79435,15 @@ function constructDeclaredClassValueWithinFrame(descriptor, record4, info, scope
       `Failed to construct '${schemaClass2.name}': ${error instanceof Error ? error.message : String(error)}`
     );
   }
+  if (ctx.constructionBaselineReplay !== true) {
+    for (const schemaKey of descriptor.requiredSchemaKeys) {
+      if (typeof root.value === "object" && root.value !== null && Reflect.get(root.value, schemaKey) != null)
+        continue;
+      throw new NSGetterRuntimeError(
+        `Class '${schemaClass2.name}' was constructed without settling required member '${schemaKey}'.`
+      );
+    }
+  }
   publishConstructedRows({
     root,
     classId,
@@ -80241,6 +80568,7 @@ var DELEGATE_LEXICAL_THIS, DELEGATE_LEXICAL_ROOT, NonCatchableNSGetterRuntimeErr
 var init_evaluateNSGetter = __esm({
   "../src/runtime/neoscript/evaluateNSGetter.ts"() {
     "use strict";
+    init_construction_requirements();
     init_deep_clone_plain_data();
     init_instance_provenance();
     init_NeoScriptScope();
@@ -107077,7 +107405,7 @@ function materializeDeclarationInitializersForAnimationValidation(document) {
         return deferredMember;
       }
       const materialized = materializeInitializerValue2({
-        document: { ...document, members, values: [...valuesById.values()] },
+        document: { ...document, values: [...valuesById.values()] },
         member,
         row: {
           id: `animation-validation-default:${member.id}`,
@@ -107111,7 +107439,7 @@ function materializeDeclarationInitializersForAnimationValidation(document) {
       continue;
     }
     const materialized = materializeInitializerValue2({
-      document: { ...document, members, values: [...valuesById.values()] },
+      document: { ...document, values: [...valuesById.values()] },
       member,
       row
     });
@@ -113289,7 +113617,6 @@ function buildValueEmitContext(records2, manifest) {
     },
     members,
     classes,
-    implicitGenericMembersByClassId: /* @__PURE__ */ new Map(),
     manifestMembers,
     manifestClasses: new Map(
       manifest.classes.map((schemaClass2) => [schemaClass2.id, schemaClass2])
@@ -118954,41 +119281,6 @@ function classValue(context, member, value, visited, targetTyped, outerEnvironme
     );
     overrideKeys.add(key);
   }
-  if (!partial && value.instanceVariantId == null && value.instanceVariantRowValueId == null) {
-    for (const [key, genericMember] of implicitGenericMembers(
-      context,
-      classId
-    )) {
-      if (key in value.value) continue;
-      const parameterId = stringField3(genericMember, "genericParamId");
-      if (!environment.has(parameterId)) continue;
-      const binding = resolveGenericValueMember(
-        context,
-        genericMember,
-        environment
-      );
-      const kind = numberField(binding, "kind");
-      if (!IMPLICIT_GENERIC_DEFAULT_KINDS.has(kind)) continue;
-      if (kind === 3 /* String */ && isLocalizedStringMember(binding))
-        continue;
-      if (binding.payload === 1 /* Partial */) continue;
-      const defaultValue = binding.defaultValue;
-      if (!isObjectRecord2(defaultValue) || !("value" in defaultValue)) continue;
-      const body = defaultValue.value;
-      if (body === null) continue;
-      if (Array.isArray(body) && body.length > 0) continue;
-      if (isObjectRecord2(body) && Object.keys(body).length > 0) continue;
-      const expression = emitValueBody(
-        context,
-        binding,
-        defaultValue,
-        /* @__PURE__ */ new Set(),
-        (defaultValue.classId ?? binding.classId) === binding.classId,
-        environment
-      );
-      fields.push(`${key} = ${expression}`);
-    }
-  }
   if (partial) {
     return fields.length === 0 ? "new { }" : `new {
 ${fields.map((field) => indentNeoSourceNonEmptyLines(field, 2)).join(",\n")}
@@ -119007,33 +119299,6 @@ ${fields.map((field) => indentNeoSourceNonEmptyLines(field, 2)).join(",\n")}
 ${fields.map((field) => indentNeoSourceNonEmptyLines(field, 2)).join(",\n")}
 }`;
 }
-function implicitGenericMembers(context, classId) {
-  const cached = context.implicitGenericMembersByClassId.get(classId);
-  if (cached !== void 0) return cached;
-  const result = /* @__PURE__ */ new Map();
-  const seenKeys = /* @__PURE__ */ new Set();
-  const seenClasses = /* @__PURE__ */ new Set();
-  let current = context.manifestClasses.get(classId);
-  while (current !== void 0 && !seenClasses.has(current.id)) {
-    seenClasses.add(current.id);
-    if (current.requiredConstructorId || current.constructorIds?.length) {
-      result.clear();
-      context.implicitGenericMembersByClassId.set(classId, result);
-      return result;
-    }
-    for (const [key, memberId] of Object.entries(current.schema)) {
-      if (seenKeys.has(key)) continue;
-      seenKeys.add(key);
-      const member = context.members.get(memberId);
-      if (member?.kind === 21 /* Generic */ && !isObjectRecord2(member.init)) {
-        result.set(key, member);
-      }
-    }
-    current = current.extendsClassId === null ? void 0 : context.manifestClasses.get(current.extendsClassId);
-  }
-  context.implicitGenericMembersByClassId.set(classId, result);
-  return result;
-}
 function emitsAsMemberDefaultDerivedAbsence(context, member, valueId) {
   const value = context.values.get(valueId);
   if (value === void 0) return false;
@@ -120031,7 +120296,13 @@ function resolveGenericValueMember(context, member, environment) {
       `Stored Generic member ${String(member.name ?? member.id)} resolves to missing binding member ${bindingMemberId}.`
     );
   }
-  return member.payload === 1 /* Partial */ ? { ...bindingMember, payload: 1 /* Partial */ } : bindingMember;
+  return {
+    ...bindingMember,
+    id: member.id,
+    name: member.name,
+    defaultValue: member.defaultValue,
+    ...member.payload === 1 /* Partial */ ? { payload: 1 /* Partial */ } : {}
+  };
 }
 function declaringClassGenericEnvironment(context, member) {
   const classId = context.ownerClassIds.get(stringField3(member, "id")) ?? memberRecordOwnerClassId(member);
@@ -120103,11 +120374,17 @@ function resolveGenericSchemaMember(context, member, environment) {
       `Stored Generic member ${member.name} resolves to missing binding member ${bindingMemberId}.`
     );
   }
-  if (member.partial !== true) return bindingMember;
-  if (bindingMember.kind === "class" || bindingMember.kind === "generic") {
-    return { ...bindingMember, partial: true };
+  const resolved = {
+    ...bindingMember,
+    id: member.id,
+    name: member.name,
+    defaultValue: member.defaultValue
+  };
+  if (member.partial !== true) return resolved;
+  if (resolved.kind === "class" || resolved.kind === "generic") {
+    return { ...resolved, partial: true };
   }
-  return structuredLeafPartialChild(true, bindingMember);
+  return structuredLeafPartialChild(true, resolved);
 }
 function lowerInstanceGenericEnvironment(context, classId, member, outerEnvironment) {
   const bindings = classGenericBindings(context.classes, classId);
@@ -120569,7 +120846,7 @@ function memberDefaultBody(member) {
   if (!("value" in defaultValue)) return null;
   return defaultValue.value;
 }
-var INFERRED_GENERIC_CLASS_PREFIX, MEMBER_KIND_DICTIONARY2, MEMBER_KIND_LIST2, MEMBER_KIND_CLASS2, IMPLICIT_GENERIC_DEFAULT_KINDS, LEADING_AUTHORED_ROW_ID, CANONICAL_CONSTRUCTOR_INLINE_WIDTH;
+var INFERRED_GENERIC_CLASS_PREFIX, MEMBER_KIND_DICTIONARY2, MEMBER_KIND_LIST2, MEMBER_KIND_CLASS2, LEADING_AUTHORED_ROW_ID, CANONICAL_CONSTRUCTOR_INLINE_WIDTH;
 var init_value_sources = __esm({
   "src/project-source/value-sources.ts"() {
     "use strict";
@@ -120609,16 +120886,6 @@ var init_value_sources = __esm({
     MEMBER_KIND_DICTIONARY2 = 5;
     MEMBER_KIND_LIST2 = 6;
     MEMBER_KIND_CLASS2 = 7;
-    IMPLICIT_GENERIC_DEFAULT_KINDS = /* @__PURE__ */ new Set([
-      1 /* Bool */,
-      2 /* Int */,
-      4 /* Float */,
-      20 /* Decimal */,
-      3 /* String */,
-      7 /* Class */,
-      6 /* List */,
-      5 /* Dictionary */
-    ]);
     LEADING_AUTHORED_ROW_ID = /^@id\(\s*"((?:[^"\\]|\\.)*)"\s*\)/;
     CANONICAL_CONSTRUCTOR_INLINE_WIDTH = 88;
   }
@@ -120831,7 +121098,9 @@ function emitProjectDocumentFilesV4(records2, options = {}) {
     })
   );
   const errors = analysis.diagnostics.filter(
-    (diagnostic) => diagnostic.severity === "error" && !isPullRecoveryDiagnosticCode(diagnostic.code)
+    (diagnostic) => diagnostic.severity === "error" && // Pull must expose incomplete stored objects so source can repair them.
+    // Status, tests, and push still reject these construction errors.
+    diagnostic.code !== "unsettled-required-member" && !isPullRecoveryDiagnosticCode(diagnostic.code)
   );
   if (errors.length > 0) {
     throw new Error(
@@ -131577,7 +131846,7 @@ var init_registry2 = __esm({
   "schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.48.3",
+      cliVersion: "0.49.0",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -138627,7 +138896,7 @@ There is no --keep-current: preserving current semantic state defines flatten.
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.command === "--version") {
-    console.log("0.48.3");
+    console.log("0.49.0");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {