@neocompose/cli 0.84.0 → 0.84.2

package/dist/neo-runtime.mjs

@@ -17587,7 +17587,7 @@ var init_registry = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.84.0",
+      cliVersion: "0.84.2",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -21418,7 +21418,8 @@ var init_executable_parser = __esm({
         }
         if (isIdentifier(t) && t.text === NEOSCRIPT_CONSTRUCTOR_KEYWORD) {
           this.next();
-          const className = isIdentifier(this.peek()) ? this.next().text : null;
+          const classToken = isIdentifier(this.peek()) ? this.next() : null;
+          const className = classToken?.text ?? null;
           const typeArguments = [];
           if (this.eat("operator", "<")) {
             if (className === null) {
@@ -21452,6 +21453,7 @@ var init_executable_parser = __esm({
           return {
             kind: "new",
             className,
+            ...classToken ? { classNamePos: at(classToken) } : {},
             ...typeArguments.length > 0 ? { typeArguments } : {},
             args,
             ...hasArgumentList ? { hasArgumentList: true } : {},
@@ -22865,9 +22867,14 @@ function indexFirstById(values) {
   }
   return result;
 }
+function isDerivedNewValueId(valueId, isStored) {
+  return !isPendingId(valueId) && !isUuidV4Id(valueId) && !isStored(valueId);
+}
 var init_lower_support = __esm({
   "src/project-source/lower-support.ts"() {
     "use strict";
+    init_value_comparison();
+    init_pending_id();
     init_executable_parser();
   }
 });
@@ -31630,6 +31637,22 @@ function neoScriptMemberLookupType(type) {
   }
   return nullable2 && current.nullable !== true ? { ...current, nullable: true } : current;
 }
+function neoScriptMemberReceiverType(type, memberName, project) {
+  const primary = neoScriptMemberLookupType(type);
+  if (primary.kind !== "named" || primary.narrowedInterfaces === void 0)
+    return primary;
+  const declaration = project.typeById.get(primary.typeId);
+  if (declaration?.kind === "class" && (memberName === NEOSCRIPT_CLASS_ID_MEMBER || memberName === "Clone"))
+    return primary;
+  if (declaration?.members.some((member) => member.name === memberName))
+    return primary;
+  for (const bound of Object.values(primary.narrowedInterfaces)) {
+    if (project.typeById.get(bound.typeId)?.members.some((member) => member.name === memberName)) {
+      return { ...bound, nullable: primary.nullable === true };
+    }
+  }
+  return primary;
+}
 function isNeoScriptHandleReferenceTarget(target, isValueType) {
   switch (target.kind) {
     case "list":
@@ -31947,6 +31970,20 @@ function isNeoScriptTypeAssignable(source, target, project) {
   if (isUnknownType(source) || isUnknownType(target)) return false;
   if (isNullType(source)) return isNullableType2(target);
   if (isNullableType2(source) && !isNullableType2(target)) return false;
+  if (target.kind === "named" && target.narrowedInterfaces !== void 0) {
+    for (const bound of Object.values(target.narrowedInterfaces)) {
+      if (!isNeoScriptTypeAssignable(source, bound, project)) return false;
+    }
+  }
+  if (source.kind === "named" && source.narrowedInterfaces !== void 0) {
+    const direct = target.kind === "named" ? source.narrowedInterfaces[target.typeId] : void 0;
+    if (direct !== void 0 && isNeoScriptTypeAssignable(direct, target, project))
+      return true;
+    for (const bound of Object.values(source.narrowedInterfaces)) {
+      if (bound !== direct && isNeoScriptTypeAssignable(bound, target, project))
+        return true;
+    }
+  }
   if (source.kind === "primitive" && target.kind === "primitive") {
     if (source.name === target.name) return true;
     return source.name === "int" && (target.name === "float" || target.name === "decimal");
@@ -32031,9 +32068,40 @@ function isNeoScriptTypeAssignable(source, target, project) {
   }
   return false;
 }
+function withoutNeoScriptInterfaceProofs(type) {
+  if (type.kind !== "named" || type.narrowedInterfaces === void 0)
+    return type;
+  const { narrowedInterfaces: _proofs, ...declared } = type;
+  return declared;
+}
 function commonNeoScriptAssignableType(left, right, project) {
   if (isNeoScriptTypeAssignable(left, right, project)) return right;
   if (isNeoScriptTypeAssignable(right, left, project)) return left;
+  if (left.kind === "named" && right.kind === "named" && (left.narrowedInterfaces !== void 0 || right.narrowedInterfaces !== void 0)) {
+    const declaredLeft = withoutNeoScriptInterfaceProofs(left);
+    const declaredRight = withoutNeoScriptInterfaceProofs(right);
+    const common = commonNeoScriptAssignableType(
+      declaredLeft,
+      declaredRight,
+      project
+    );
+    if (common?.kind !== "named") return null;
+    const proofs = {};
+    for (const [source, other] of [
+      [left, right],
+      [right, left]
+    ]) {
+      for (const [id2, proof] of Object.entries(
+        source.narrowedInterfaces ?? {}
+      )) {
+        if (proofs[id2] !== void 0) continue;
+        const opposite = other.narrowedInterfaces?.[id2] ?? other;
+        if (isNeoScriptTypeAssignable(opposite, proof, project))
+          proofs[id2] = proof;
+      }
+    }
+    return { ...common, narrowedInterfaces: proofs };
+  }
   return null;
 }
 function isNeoVariantTypeId(typeId, project) {
@@ -34297,17 +34365,22 @@ function mergeFactSets(sets) {
     )
   );
 }
-function mergeNarrowingMaps(maps) {
+function mergeNarrowingMaps(maps, project) {
   const first = maps[0];
   if (!first) return /* @__PURE__ */ new Map();
   const result = /* @__PURE__ */ new Map();
   for (const [path, narrowed] of first) {
-    if (maps.slice(1).every((map) => {
-      const candidate = map.get(path);
-      return candidate?.rootEntry === narrowed.rootEntry && typeRefsEqual(candidate.type, narrowed.type);
-    })) {
-      result.set(path, narrowed);
+    let common = narrowed.type;
+    for (let index = 1; index < maps.length; index++) {
+      const candidate = maps[index].get(path);
+      if (candidate?.rootEntry !== narrowed.rootEntry) {
+        common = null;
+        break;
+      }
+      common = commonNeoScriptAssignableType(common, candidate.type, project);
+      if (common === null) break;
     }
+    if (common !== null) result.set(path, { ...narrowed, type: common });
   }
   return result;
 }
@@ -34336,6 +34409,16 @@ function typeRefsEqual(left, right) {
   if (left.kind === "named" && right.kind === "named") {
     const leftArgs = left.typeArguments ?? [];
     const rightArgs = right.typeArguments ?? [];
+    if (left.narrowedInterfaces !== right.narrowedInterfaces) {
+      const leftBounds = Object.entries(left.narrowedInterfaces ?? {});
+      const rightBounds = right.narrowedInterfaces ?? {};
+      if (leftBounds.length !== Object.keys(rightBounds).length) return false;
+      for (const [id2, leftBound] of leftBounds) {
+        const rightBound = rightBounds[id2];
+        if (rightBound === void 0 || !typeRefsEqual(leftBound, rightBound))
+          return false;
+      }
+    }
     return left.typeId === right.typeId && leftArgs.length === rightArgs.length && leftArgs.every((item, index) => {
       const other = rightArgs[index];
       return other !== void 0 && typeRefsEqual(item, other);
@@ -35315,6 +35398,10 @@ function typesOverlap(left, right, project) {
   if (isUnknown(left) || isUnknown(right)) return true;
   if (isNull(left)) return isNullable(right);
   if (isNull(right)) return isNullable(left);
+  left = neoScriptMemberLookupType(left);
+  right = neoScriptMemberLookupType(right);
+  if (left.kind === "typeParameter" || right.kind === "typeParameter")
+    return true;
   if (isNeoScriptTypeAssignable(left, right, project) || isNeoScriptTypeAssignable(right, left, project))
     return true;
   if (left.kind === "named" && right.kind === "named") {
@@ -36684,7 +36771,7 @@ var init_strict_resolver = __esm({
                 statement.init.pos
               );
             }
-            const localType = declared ?? initial.type;
+            const localType = declared ?? withoutNeoScriptInterfaceProofs(initial.type);
             if (declared) {
               this.requireAssignable(
                 initial.type,
@@ -36699,16 +36786,18 @@ var init_strict_resolver = __esm({
               initial.pointer,
               this.project
             );
-            scope.define(
-              scopeVariable(
-                statement.name,
-                local,
-                localType,
-                "local" /* Local */,
-                localOwnership(initial),
-                this.localWriteTargetRoot(initial, scope)
-              )
+            const entry = scopeVariable(
+              statement.name,
+              local,
+              localType,
+              "local" /* Local */,
+              localOwnership(initial),
+              this.localWriteTargetRoot(initial, scope)
             );
+            scope.define(entry);
+            if (inferred && localType !== initial.type) {
+              scope.narrow(statement.name, entry, initial.type);
+            }
             return { type: "variable" /* Variable */, variable: local };
           }
           case "if": {
@@ -36763,7 +36852,8 @@ var init_strict_resolver = __esm({
             mergeBranchInvalidations(scope, branchExitOwnershipScopes);
             if (branchExitNarrowings.length > 0) {
               for (const [path, narrowed] of mergeNarrowingMaps(
-                branchExitNarrowings
+                branchExitNarrowings,
+                this.project
               )) {
                 const rootEntry = scope.lookup(pathRoot(path));
                 if (rootEntry === narrowed.rootEntry) {
@@ -37689,7 +37779,7 @@ var init_strict_resolver = __esm({
       }
       mergeLoopNarrowings(parent, exitPaths) {
         if (exitPaths.length === 0) return;
-        const merged = mergeNarrowingMaps(exitPaths);
+        const merged = mergeNarrowingMaps(exitPaths, this.project);
         for (const [path, narrowed] of parent.effectiveNarrowedPaths()) {
           const common = merged.get(path);
           if (parent.containsEntry(narrowed.rootEntry) && (common?.rootEntry !== narrowed.rootEntry || !typeRefsEqual(common.type, narrowed.type))) {
@@ -39442,8 +39532,13 @@ var init_strict_resolver = __esm({
               expression.receiver,
               scope
             );
-            if (receiverExpression.type.kind !== "named") return null;
-            owner = this.project.typeById.get(receiverExpression.type.typeId);
+            const memberType2 = neoScriptMemberReceiverType(
+              receiverExpression.type,
+              expression.name,
+              this.project
+            );
+            if (memberType2.kind !== "named") return null;
+            owner = this.project.typeById.get(memberType2.typeId);
             symbol = owner?.members.find(
               (candidate) => candidate.name === expression.name && (candidate.kind === "function" || candidate.kind === "method")
             );
@@ -39454,7 +39549,10 @@ var init_strict_resolver = __esm({
                 expression.pos
               );
             }
-            receiver = { kind: "instance", expression: receiverExpression };
+            receiver = {
+              kind: "instance",
+              expression: { ...receiverExpression, type: memberType2 }
+            };
           }
         } else {
           return null;
@@ -39531,9 +39629,13 @@ var init_strict_resolver = __esm({
             if (symbol === void 0 || symbol.static !== true) return null;
           } else {
             const receiver2 = this.resolveExpression(expression.receiver, scope);
-            if (receiver2.type.kind !== "named") return null;
-            receiverType = receiver2.type;
-            owner = this.project.typeById.get(receiver2.type.typeId);
+            receiverType = neoScriptMemberReceiverType(
+              receiver2.type,
+              expression.name,
+              this.project
+            );
+            if (receiverType.kind !== "named") return null;
+            owner = this.project.typeById.get(receiverType.typeId);
             symbol = owner?.members.find(
               (candidate) => candidate.name === expression.name && (candidate.kind === "function" || candidate.kind === "method")
             );
@@ -39611,6 +39713,7 @@ var init_strict_resolver = __esm({
             pos
           );
         }
+        entryType = withoutNeoScriptInterfaceProofs(entryType);
         for (const item of resolved) {
           const common = commonNeoScriptAssignableType(
             entryType,
@@ -39635,7 +39738,7 @@ var init_strict_resolver = __esm({
         }
         const type = {
           kind: "list",
-          elementType: entryType
+          elementType: withoutNeoScriptInterfaceProofs(entryType)
         };
         const wire = toWireType(type, this.project);
         if (wire.type !== 6 /* List */) {
@@ -39701,6 +39804,7 @@ var init_strict_resolver = __esm({
         if (!keyType || !valueType) {
           throw new CompileError("Dictionary literal type inference failed.", pos);
         }
+        valueType = withoutNeoScriptInterfaceProofs(valueType);
         for (const entry of resolved) {
           if (expectedDictionary) {
             this.requireAssignable(
@@ -39727,7 +39831,7 @@ var init_strict_resolver = __esm({
         const type = {
           kind: "dictionary",
           keyType,
-          valueType
+          valueType: withoutNeoScriptInterfaceProofs(valueType)
         };
         const wire = toWireType(type, this.project);
         if (wire.type !== 5 /* Dictionary */) {
@@ -39983,8 +40087,19 @@ var init_strict_resolver = __esm({
             const target = this.resolveType(fact.targetType);
             const targetDefinition = target.kind === "named" ? this.project.typeById.get(target.typeId) : void 0;
             const naturalDefinition = natural.type.kind === "named" ? this.project.typeById.get(natural.type.typeId) : void 0;
-            const retainConcreteClass = !fact.bindingName && naturalDefinition?.kind === "class" && targetDefinition?.kind === "interface";
-            const narrowed = retainConcreteClass ? { ...natural.type, nullable: false } : { ...target, nullable: false };
+            let narrowed = { ...target, nullable: false };
+            if (!fact.bindingName && natural.type.kind === "named" && (naturalDefinition?.kind === "class" || naturalDefinition?.kind === "interface") && target.kind === "named" && targetDefinition?.kind === "interface") {
+              narrowed = { ...natural.type, nullable: false };
+              if (!isNeoScriptTypeAssignable(narrowed, target, this.project)) {
+                narrowed = {
+                  ...narrowed,
+                  narrowedInterfaces: {
+                    ...natural.type.narrowedInterfaces,
+                    [target.typeId]: target
+                  }
+                };
+              }
+            }
             if (mode === "all" && fact.path !== null && rootEntry !== null && place.type.kind !== "reference") {
               targetScope.narrow(fact.path, rootEntry, narrowed);
             }
@@ -40577,7 +40692,11 @@ var init_strict_resolver = __esm({
         if (receiver.dialogues !== void 0) {
           return this.resolveDialogueGroupRead(receiver, name, pos);
         }
-        const memberReceiverType = neoScriptMemberLookupType(receiver.type);
+        const memberReceiverType = neoScriptMemberReceiverType(
+          receiver.type,
+          name,
+          this.project
+        );
         if (memberReceiverType.kind === "named") {
           const type = this.project.typeById.get(memberReceiverType.typeId);
           if (!type) {
@@ -41389,7 +41508,7 @@ var init_strict_resolver = __esm({
         }
         const type = {
           kind: "list",
-          elementType: entryType
+          elementType: withoutNeoScriptInterfaceProofs(entryType)
         };
         const wire = toWireType(type, this.project);
         if (wire.type !== 6 /* List */) {
@@ -41630,7 +41749,11 @@ var init_strict_resolver = __esm({
             pos
           );
         }
-        const memberReceiverType = neoScriptMemberLookupType(receiver.type);
+        const memberReceiverType = neoScriptMemberReceiverType(
+          receiver.type,
+          callee.name,
+          this.project
+        );
         const namedType2 = memberReceiverType.kind === "named" ? this.project.typeById.get(memberReceiverType.typeId) : void 0;
         const member = namedType2?.members.find(
           (candidate) => (candidate.kind === "function" || candidate.kind === "method") && candidate.name === callee.name
@@ -44055,7 +44178,11 @@ var init_strict_resolver = __esm({
         }
         const receiver = receiverValue();
         if (receiver.dialogues !== void 0) return null;
-        const memberReceiverType = neoScriptMemberLookupType(receiver.type);
+        const memberReceiverType = neoScriptMemberReceiverType(
+          receiver.type,
+          memberName,
+          this.project
+        );
         if (memberReceiverType.kind !== "named") return null;
         const type = this.project.typeById.get(memberReceiverType.typeId);
         const symbol = type?.members.find(
@@ -50973,7 +51100,29 @@ function validateExpression(expression, expected, scope, environment, uri, range
       );
       return;
     }
-    if (!declaration) return;
+    if (!declaration) {
+      if (expression.className !== null && !environment.projectIndex.typeByName.has(expression.className) && semanticTypeRef(
+        {
+          name: expression.className,
+          ...expression.typeArguments ? { arguments: expression.typeArguments.map(semanticAstType) } : {}
+        },
+        scope,
+        environment
+      ) === void 0) {
+        pushDiagnostic(
+          diagnostics,
+          uri,
+          anchor ? anchorSpan(
+            anchor,
+            expression.classNamePos ?? expression.pos,
+            expression.className.length
+          ) : range2,
+          "unknown-construction-type",
+          `Unknown class '${expression.className}'.`
+        );
+      }
+      return;
+    }
     if (declaration.modifiers.includes("abstract")) {
       pushDiagnostic(
         diagnostics,
@@ -55336,7 +55485,7 @@ function sourceParameter(parameter4, owner, typeIds, id2, functionTypeParameters
   };
 }
 function substituteInheritedSourceMember(member, baseInfo, resolvedBaseType) {
-  if (baseInfo.declaration.kind !== "class" || resolvedBaseType.kind !== "named") {
+  if (baseInfo.declaration.kind !== "class" && baseInfo.declaration.kind !== "interface" || resolvedBaseType.kind !== "named") {
     return {
       ...member,
       inheritedFrom: member.inheritedFrom ?? {
@@ -96843,6 +96992,356 @@ var init_stored_value_placement_index = __esm({
   }
 });
 
+// ../packages/neoscript-runtime/src/values/initializer-identifiers.ts
+function initializerReferencedIdentifiers(source) {
+  let expression;
+  try {
+    expression = parseExpression(source);
+  } catch {
+    return /* @__PURE__ */ new Set();
+  }
+  const identifiers = /* @__PURE__ */ new Set();
+  const pending = [expression];
+  const visited = /* @__PURE__ */ new Set();
+  while (pending.length > 0) {
+    const value = pending.pop();
+    if (value === null || typeof value !== "object" || visited.has(value)) {
+      continue;
+    }
+    visited.add(value);
+    if (Reflect.get(value, "kind") === "ident") {
+      const name = Reflect.get(value, "name");
+      if (typeof name === "string") identifiers.add(name);
+    }
+    for (const child2 of Object.values(value)) pending.push(child2);
+  }
+  return identifiers;
+}
+function initializerReferencesAnyIdentifier(source, names) {
+  const identifiers = initializerReferencedIdentifiers(source);
+  for (const name of names) {
+    if (identifiers.has(name)) return true;
+  }
+  return false;
+}
+var init_initializer_identifiers = __esm({
+  "../packages/neoscript-runtime/src/values/initializer-identifiers.ts"() {
+    "use strict";
+    init_executable_parser();
+  }
+});
+
+// ../packages/neoscript-runtime/src/initializer-materialization.ts
+function declarationInitializerContext(document) {
+  const key = initializerEvaluatorCacheKey(document);
+  const revision = initializerEvaluatorCacheRevision(document);
+  const cached = declarationInitializerContextByDocument.get(key);
+  if (cached !== void 0 && (revision === void 0 ? cached.members === document.members && cached.values === document.values : cached.revision === revision)) {
+    return cached.context;
+  }
+  const initializerValueIds = new Set(
+    document.values.filter(isInitValueContent).map((value) => value.id)
+  );
+  const valuesById = new Map(
+    document.values.map((value) => [value.id, value])
+  );
+  const rootOwners = /* @__PURE__ */ new Map();
+  resolveOwnerMembersForValues(
+    document,
+    initializerValueIds,
+    void 0,
+    rootOwners
+  );
+  const created = { valuesById, rootOwners };
+  declarationInitializerContextByDocument.set(key, {
+    members: document.members,
+    values: document.values,
+    revision,
+    context: created
+  });
+  return created;
+}
+function evaluateInitializerMaterialization(args) {
+  const createdValues = [];
+  const storageKeyDeclarations = /* @__PURE__ */ new Map();
+  const evaluated = args.evaluateInitializer({
+    genericEnv: args.genericEnv,
+    init: args.init,
+    member: args.member,
+    document: args.document,
+    createdValues,
+    storageKeyDeclarations,
+    ...args.storedConstructionReplay === true ? { storedConstructionReplay: true } : {},
+    ...args.constructionBaselineReplay === true ? { constructionBaselineReplay: true } : {},
+    ...args.argumentValues === void 0 ? {} : { argumentValues: args.argumentValues },
+    sourceValueId: args.sourceValueId ?? null,
+    readTracking: args.readTracking,
+    saveStaticBindings: args.saveStaticBindings,
+    sessionStaticBindings: args.sessionStaticBindings
+  });
+  return { evaluated, createdValues, storageKeyDeclarations };
+}
+function materializeInPlaceFields(document, root, createdValues) {
+  const owners = [root, ...createdValues];
+  for (const owner of owners) {
+    const record7 = owner.value;
+    if (typeof owner.classId !== "string") continue;
+    if (typeof record7 !== "object" || record7 === null) continue;
+    if (Array.isArray(record7)) continue;
+    let memberIds;
+    for (const [schemaKey, value] of Object.entries(record7)) {
+      if (typeof value === "string" || value === null) continue;
+      memberIds ??= new Map(
+        resolvedClassSchema(
+          owner.classId,
+          document.classes,
+          document.members
+        ).surface.map((entry) => [entry.schemaKey, entry.memberId])
+      );
+      const memberId = memberIds.get(schemaKey);
+      if (memberId === void 0) {
+        throw new Error(
+          `Class "${owner.classId}" holds "${schemaKey}" in place, which its schema doesn't declare.`
+        );
+      }
+      const row = {
+        id: virtualValueId(owner.id, memberId),
+        projectId: owner.projectId,
+        createdAt: owner.createdAt,
+        updatedAt: owner.updatedAt,
+        value
+      };
+      createdValues.push(row);
+      record7[schemaKey] = row.id;
+    }
+  }
+}
+function finalizeMaterializedRoot(args) {
+  materializeInPlaceFields(args.document, args.root, args.createdValues);
+  const allCreated = [args.root, ...args.createdValues];
+  for (const created of allCreated) {
+    if (created === args.root) continue;
+    if (created.classId === void 0) delete created.classId;
+  }
+  stampCreatedValuesMapKey(allCreated, args.mapKey);
+  if (args.supersededRootId !== void 0) {
+    args.storageKeyDeclarations.delete(args.supersededRootId);
+  }
+  args.storageKeyDeclarations.delete(args.root.id);
+  applyDeclaredStorageKeyOverrides({
+    createdValues: allCreated,
+    declarationByValueId: args.storageKeyDeclarations,
+    existingParentContextById: /* @__PURE__ */ new Map([
+      [
+        args.root.id,
+        {
+          mapKey: args.mapKey ?? null,
+          classId: args.root.classId ?? void 0
+        }
+      ]
+    ])
+  });
+}
+function materializeInitializerValue(args) {
+  const { evaluated, createdValues, storageKeyDeclarations } = evaluateInitializerMaterialization({
+    evaluateInitializer: args.evaluateInitializer,
+    init: args.row.init,
+    member: args.member,
+    document: args.document,
+    ...args.storedConstructionReplay === true ? { storedConstructionReplay: true } : {},
+    ...args.constructionBaselineReplay === true ? { constructionBaselineReplay: true } : {},
+    ...args.argumentValues === void 0 ? {} : { argumentValues: args.argumentValues },
+    genericEnv: envFromStamp(args.row.genericBindings),
+    sourceValueId: args.row.id,
+    readTracking: args.readTracking,
+    saveStaticBindings: args.saveStaticBindings,
+    sessionStaticBindings: args.sessionStaticBindings
+  });
+  const {
+    init: _init,
+    value: _value,
+    classId: _classId,
+    ...envelope
+  } = args.row;
+  void _init;
+  void _value;
+  void _classId;
+  const root = {
+    ...envelope,
+    value: evaluated.value,
+    ...evaluated.classId === null ? {} : { classId: evaluated.classId },
+    ...evaluated.genericBindings === void 0 ? {} : { genericBindings: { ...evaluated.genericBindings } },
+    ...deepClonePlainData(pickInstanceProvenance(evaluated))
+  };
+  if (evaluated.provisionalRootId !== void 0) {
+    args.document.listenerDefaultCapture?.retarget(
+      evaluated.provisionalRootId,
+      root.id
+    );
+    retargetInitializerRootValueIds(
+      [root, ...createdValues],
+      evaluated.provisionalRootId,
+      root.id
+    );
+  }
+  finalizeMaterializedRoot({
+    document: args.document,
+    root,
+    createdValues,
+    mapKey: args.row.mapKey,
+    storageKeyDeclarations
+  });
+  return {
+    root,
+    createdValues,
+    pinnedRootSchemaKeys: evaluated.pinnedRootSchemaKeys ?? /* @__PURE__ */ new Set(),
+    pinnedSchemaKeysByValueId: evaluated.pinnedSchemaKeysByValueId ?? /* @__PURE__ */ new Map()
+  };
+}
+function materializeMemberDefaultValue(args) {
+  const createdValues = [];
+  const storageKeyDeclarations = /* @__PURE__ */ new Map();
+  const declarationArguments = (member, init, sourceValueId) => {
+    const { valuesById, rootOwners } = declarationInitializerContext(
+      args.document
+    );
+    const ownerClass = typeof sourceValueId === "string" ? initializerOwnerContext(
+      args.document,
+      sourceValueId,
+      rootOwners,
+      valuesById,
+      (id2) => args.readTracking?.valueIds.add(id2)
+    ).ownerClass : typeof Reflect.get(member, "id") === "string" && !isStaticMember(member) ? findSchemaPlacement(
+      String(Reflect.get(member, "id")),
+      args.document.classes
+    )?.ownerClass ?? null : null;
+    if (ownerClass === null) return [];
+    const constructorId = ownerClass.requiredConstructorId;
+    if (typeof constructorId !== "string") return [];
+    const constructor2 = args.document.constructors?.find(
+      (candidate) => candidate.id === constructorId
+    );
+    if (constructor2 === void 0) return [];
+    const parameterNames = new Set(
+      constructor2.argumentTypes.map((argument2) => argument2.name)
+    );
+    return declarationInitializerArgumentValues(
+      constructor2.argumentTypes,
+      `Declaration template on '${ownerClass.name}'`,
+      initializerReferencesAnyIdentifier(init.code, parameterNames)
+    );
+  };
+  let lookups;
+  const evaluatorLookups = () => lookups ??= args.initializerEvaluatorLookups(
+    args.document,
+    args.readTracking
+  );
+  const plans = args.readTracking !== void 0 && args.document.databaseVM === void 0 ? void 0 : args.defaultValuePlans(args.document);
+  const database = args.document.databaseVM;
+  const hostPlan = database?.materializationPlan;
+  const built = buildDefaultMemberValue({
+    document: {
+      ...args.document,
+      // The declaration rows a default clones are reads of this
+      // materialization, like any row its initializers read.
+      valueById: (id2) => {
+        args.readTracking?.valueIds.add(id2);
+        const database2 = evaluatorLookups();
+        return database2.defaultValueById !== void 0 ? database2.defaultValueById(id2) : database2.valueById(id2);
+      },
+      unorderedListEntryIds: (containerId) => {
+        args.readTracking?.containerIds.add(containerId);
+        const entryIds = evaluatorLookups().unorderedListEntryIds?.(containerId);
+        if (entryIds === void 0) {
+          throw new Error(
+            `Initializer lookups resolve no unordered-list membership for container "${containerId}".`
+          );
+        }
+        return entryIds;
+      },
+      // Not `resolvedMember`: its id-keyed cache would answer for the
+      // caller's rewritten copy of a member with the stored original.
+      ...plans === void 0 ? {} : {
+        instanceEnv: plans.instanceEnv,
+        storedInstanceMaterializationPlan: hostPlan === void 0 ? plans.storedInstanceMaterializationPlan : (classId, instanceEnv) => hostPlan.call(database, classId, instanceEnv)
+      },
+      recordPlanReads: (reads) => {
+        for (const id2 of reads.valueIds) args.readTracking?.valueIds.add(id2);
+        for (const id2 of reads.containerIds)
+          args.readTracking?.containerIds.add(id2);
+      }
+    },
+    projectId: args.envelope.projectId,
+    member: args.member,
+    createdValues,
+    storageKeyDeclarations,
+    declarationRoot: args.declarationRoot,
+    ...args.genericEnv === void 0 ? {} : { genericEnv: args.genericEnv },
+    // A declaration default may itself be init-backed one level down (P43 §2),
+    // and those nested initializers must evaluate against the same document.
+    initEvaluator: (member, init, sourceValueId, genericEnv) => args.evaluateInitializer({
+      genericEnv,
+      storageKeyDeclarations,
+      init,
+      member,
+      document: args.document,
+      createdValues,
+      storedConstructionReplay: true,
+      argumentValues: declarationArguments(
+        member,
+        init,
+        sourceValueId ?? null
+      ),
+      sourceValueId: sourceValueId ?? null,
+      readTracking: args.readTracking,
+      saveStaticBindings: args.saveStaticBindings,
+      sessionStaticBindings: args.sessionStaticBindings
+    })
+  });
+  const interior = createdValues.filter((created) => created.id !== built.id);
+  const root = {
+    ...args.envelope,
+    value: built.value,
+    ...built.changeListeners === void 0 ? {} : { changeListeners: built.changeListeners },
+    ...built.changeListenerEndpoints === void 0 ? {} : { changeListenerEndpoints: built.changeListenerEndpoints },
+    ...built.classId === void 0 ? {} : { classId: built.classId },
+    ...built.genericBindings == null ? {} : { genericBindings: { ...built.genericBindings } }
+  };
+  args.document.listenerDefaultCapture?.retarget(built.id, root.id);
+  retargetInitializerRootValueIds([root, ...interior], built.id, root.id);
+  finalizeMaterializedRoot({
+    document: args.document,
+    root,
+    createdValues: interior,
+    mapKey: args.envelope.mapKey,
+    storageKeyDeclarations,
+    supersededRootId: built.id
+  });
+  return {
+    root,
+    createdValues: interior,
+    pinnedRootSchemaKeys: /* @__PURE__ */ new Set(),
+    pinnedSchemaKeysByValueId: /* @__PURE__ */ new Map()
+  };
+}
+var declarationInitializerContextByDocument;
+var init_initializer_materialization = __esm({
+  "../packages/neoscript-runtime/src/initializer-materialization.ts"() {
+    "use strict";
+    init_deep_clone_plain_data();
+    init_members();
+    init_inheritance();
+    init_member_value_id();
+    init_instance_provenance();
+    init_generics();
+    init_evaluateNSGetter();
+    init_initializer_context();
+    init_value_row_owner_members();
+    init_initializer_identifiers();
+    declarationInitializerContextByDocument = /* @__PURE__ */ new WeakMap();
+  }
+});
+
 // ../packages/neoscript-runtime/src/declaration-default-source.ts
 function declarationDefaultSource(id2, stored, resolveGraph) {
   if (stored !== null && !isCollapseStampedInstanceRoot(stored)) return stored;
@@ -96857,6 +97356,37 @@ var init_declaration_default_source = __esm({
   }
 });
 
+// ../packages/neoscript-runtime/src/virtual-value-identity.ts
+function claimVirtualIdentity(args) {
+  if (args.fixedVirtualId !== void 0) {
+    args.claimedVirtualIds.set(args.fixedVirtualId, args.pathKey);
+    return {
+      sourceIdentity: args.rawSourceIdentity,
+      virtualId: args.fixedVirtualId
+    };
+  }
+  const valueId = (sourceIdentity4) => derivedVirtualValueId(args.instanceRootId, sourceIdentity4);
+  const derivedId = valueId(args.rawSourceIdentity);
+  const claimedPath = args.claimedVirtualIds.get(derivedId);
+  if (claimedPath === void 0 || claimedPath === args.pathKey) {
+    args.claimedVirtualIds.set(derivedId, args.pathKey);
+    return { sourceIdentity: args.rawSourceIdentity, virtualId: derivedId };
+  }
+  const sourceIdentity3 = `${args.rawSourceIdentity}:${args.pathKey}`;
+  const virtualId = valueId(sourceIdentity3);
+  args.claimedVirtualIds.set(virtualId, args.pathKey);
+  return { sourceIdentity: sourceIdentity3, virtualId };
+}
+function derivedVirtualValueId(instanceRootId, sourceIdentity3) {
+  return instanceRootId.startsWith("__pending__:") || hasPendingVirtualSourceIdentity(sourceIdentity3) ? pendingVirtualValueId(instanceRootId, sourceIdentity3) : virtualValueId(instanceRootId, sourceIdentity3);
+}
+var init_virtual_value_identity = __esm({
+  "../packages/neoscript-runtime/src/virtual-value-identity.ts"() {
+    "use strict";
+    init_member_value_id();
+  }
+});
+
 // ../packages/neoscript-runtime/src/listener-endpoint-projection.ts
 function projectListenerEndpoint(args) {
   const { descriptor } = args;
@@ -96886,7 +97416,7 @@ function projectListenerEndpoint(args) {
 var init_listener_endpoint_projection = __esm({
   "../packages/neoscript-runtime/src/listener-endpoint-projection.ts"() {
     "use strict";
-    init_virtual_instance_graph();
+    init_virtual_value_identity();
   }
 });
 
@@ -97041,29 +97571,6 @@ function projectNestedListenerEndpoint(id2, descriptor, sourceRoot, targetRoot)
     return derive(targetRoot, positional);
   return void 0;
 }
-function claimVirtualIdentity(args) {
-  if (args.fixedVirtualId !== void 0) {
-    args.claimedVirtualIds.set(args.fixedVirtualId, args.pathKey);
-    return {
-      sourceIdentity: args.rawSourceIdentity,
-      virtualId: args.fixedVirtualId
-    };
-  }
-  const valueId = (sourceIdentity4) => derivedVirtualValueId(args.instanceRootId, sourceIdentity4);
-  const derivedId = valueId(args.rawSourceIdentity);
-  const claimedPath = args.claimedVirtualIds.get(derivedId);
-  if (claimedPath === void 0 || claimedPath === args.pathKey) {
-    args.claimedVirtualIds.set(derivedId, args.pathKey);
-    return { sourceIdentity: args.rawSourceIdentity, virtualId: derivedId };
-  }
-  const sourceIdentity3 = `${args.rawSourceIdentity}:${args.pathKey}`;
-  const virtualId = valueId(sourceIdentity3);
-  args.claimedVirtualIds.set(virtualId, args.pathKey);
-  return { sourceIdentity: sourceIdentity3, virtualId };
-}
-function derivedVirtualValueId(instanceRootId, sourceIdentity3) {
-  return instanceRootId.startsWith("__pending__:") || hasPendingVirtualSourceIdentity(sourceIdentity3) ? pendingVirtualValueId(instanceRootId, sourceIdentity3) : virtualValueId(instanceRootId, sourceIdentity3);
-}
 function materializationReadTracking(recorder) {
   if (recorder === void 0)
     return { readTracking: void 0, trackMaterialization: (m) => m() };
@@ -97207,7 +97714,7 @@ function expandStoredInstance(args) {
       code: `virtual-replay:${args.instanceRoot.id}`
     });
     return trackMaterialization(
-      () => materializeInitializerValue({
+      () => args.materializeInitializerValue({
         evaluateInitializer: args.evaluateInitializer,
         document: args.document,
         member: replayMember,
@@ -97223,7 +97730,7 @@ function expandStoredInstance(args) {
   const replayDeclaredDefault = () => {
     const stampEnv = instanceRoot.genericBindings == null || Object.keys(instanceRoot.genericBindings).length === 0 ? null : envFromStamp(instanceRoot.genericBindings);
     const built = trackMaterialization(
-      () => materializeMemberDefaultValue({
+      () => args.materializeMemberDefaultValue({
         evaluateInitializer: args.evaluateInitializer,
         document: args.document,
         member: replayMember,
@@ -98216,6 +98723,8 @@ function resolveStoredInstanceGraphs(args) {
     if (isMaterializedSpine(resolvedLocations.get(next.root.id))) continue;
     const graph = isClassSlotMember(next.member) ? args.resolveClassGraph?.(next.root, next.member) ?? resolveStoredClassValue({
       evaluateInitializer: args.evaluateInitializer,
+      materializeInitializerValue: args.materializeInitializerValue,
+      materializeMemberDefaultValue: args.materializeMemberDefaultValue,
       document,
       instanceRoot: next.root,
       rootMember: next.member,
@@ -98312,7 +98821,7 @@ function expandStoredClassValue(args) {
     args.readRecorder
   );
   const materialized = trackMaterialization(
-    () => materializeMemberDefaultValue({
+    () => args.materializeMemberDefaultValue({
       ...readTracking === void 0 ? {} : { readTracking },
       saveStaticBindings: args.saveStaticBindings,
       sessionStaticBindings: args.sessionStaticBindings,
@@ -100049,6 +100558,8 @@ function resolveVariantInstanceGraphForDocument(args) {
   materializedById.set(args.priorInstanceRoot.id, args.priorInstanceRoot);
   const priorExpanded = expandStoredInstance({
     evaluateInitializer: args.evaluateInitializer,
+    materializeInitializerValue: args.materializeInitializerValue,
+    materializeMemberDefaultValue: args.materializeMemberDefaultValue,
     document,
     instanceRoot: args.priorInstanceRoot,
     rootMember,
@@ -100122,6 +100633,8 @@ function resolveVariantInstanceGraphForDocument(args) {
   materializedById.set(nextInstanceRoot.id, nextInstanceRoot);
   const nextExpanded = expandStoredInstance({
     evaluateInitializer: args.evaluateInitializer,
+    materializeInitializerValue: args.materializeInitializerValue,
+    materializeMemberDefaultValue: args.materializeMemberDefaultValue,
     document,
     instanceRoot: nextInstanceRoot,
     rootMember,
@@ -101248,6 +101761,8 @@ function createHeadlessVirtualInstanceResolver(args) {
           const replayDocument = evidence === null ? resolverDocumentOnce() : frameDocument(evidence);
           const resolution2 = prepareStoredClassValueResolution({
             evaluateInitializer: args.evaluateInitializer,
+            materializeInitializerValue: args.materializeInitializerValue,
+            materializeMemberDefaultValue: args.materializeMemberDefaultValue,
             document: replayDocument,
             instanceRoot,
             rootMember: member,
@@ -101542,7 +102057,8 @@ var init_virtual_instance_graph = __esm({
     init_immutable_json();
     init_members();
     init_instance_provenance();
-    init_member_value_id();
+    init_virtual_value_identity();
+    init_virtual_value_identity();
     init_stored_value_placement_index();
     init_unordered_list_membership();
     init_neoscript_types();
@@ -101550,7 +102066,6 @@ var init_virtual_instance_graph = __esm({
     init_project_schema_index();
     init_initializer_context();
     init_strict_ir();
-    init_initializer_materialization();
     init_unattributable_reads();
     init_member_body_reads();
     KEPT_ROW_SAMPLE_LIMIT = 12;
@@ -101784,6 +102299,8 @@ function initializerEvaluatorLookups(document, readTracking) {
   const shareFrom = document.evaluatorOverlay === void 0 ? void 0 : sharedHeadlessResolver(document.evaluatorOverlay);
   const headlessVirtualResolver = createHeadlessVirtualInstanceResolver({
     evaluateInitializer: evaluateMemberInitializer,
+    materializeInitializerValue,
+    materializeMemberDefaultValue: materializeMemberDefaultValue2,
     documentMaterializationPlan,
     document,
     resolverLookups: () => lookups,
@@ -101812,6 +102329,8 @@ function initializerEvaluatorLookups(document, readTracking) {
     // nested resolver.
     resolveVariantInstanceGraph: (args) => resolveVariantInstanceGraphForDocument({
       evaluateInitializer: evaluateMemberInitializer,
+      materializeInitializerValue,
+      materializeMemberDefaultValue: materializeMemberDefaultValue2,
       document,
       resolverLookups: lookups,
       readRecorder: headlessVirtualResolver.readRecorder,
@@ -102000,6 +102519,8 @@ function createInitializerMaterializationBatch(authoredDocument, pendingInitiali
       let resolver;
       const virtual = () => resolver ??= createHeadlessVirtualInstanceResolver({
         evaluateInitializer: evaluateMemberInitializer,
+        materializeInitializerValue,
+        materializeMemberDefaultValue: materializeMemberDefaultValue2,
         documentMaterializationPlan,
         document,
         membersById: indexed.membersById,
@@ -102082,6 +102603,8 @@ function createInitializerMaterializationBatch(authoredDocument, pendingInitiali
         virtualInstanceRootIdForValue: (id2) => owningInstanceRootId(virtual().virtualInstanceGraphForValue(id2)),
         resolveVariantInstanceGraph: (args) => resolveVariantInstanceGraphForDocument({
           evaluateInitializer: evaluateMemberInitializer,
+          materializeInitializerValue,
+          materializeMemberDefaultValue: materializeMemberDefaultValue2,
           document,
           resolverLookups: lookups,
           ...args
@@ -102315,10 +102838,18 @@ function storedConstructionReplaySlot(member, sourceRow, document) {
     }
   };
 }
+function materializeMemberDefaultValue2(args) {
+  return materializeMemberDefaultValue({
+    ...args,
+    initializerEvaluatorLookups,
+    defaultValuePlans
+  });
+}
 var evaluatorLookupsByDocument, headlessResolversByLookupKey, indexedEvaluatorLookupsByDocument, defaultValuePlansByDocument;
 var init_evaluateInitializer = __esm({
   "../packages/neoscript-runtime/src/neoscript/evaluateInitializer.ts"() {
     "use strict";
+    init_initializer_materialization();
     init_NSGetterRuntimeError();
     init_declaration_default_source();
     init_member_change_listeners();
@@ -102339,354 +102870,6 @@ var init_evaluateInitializer = __esm({
   }
 });
 
-// ../packages/neoscript-runtime/src/values/initializer-identifiers.ts
-function initializerReferencedIdentifiers(source) {
-  let expression;
-  try {
-    expression = parseExpression(source);
-  } catch {
-    return /* @__PURE__ */ new Set();
-  }
-  const identifiers = /* @__PURE__ */ new Set();
-  const pending = [expression];
-  const visited = /* @__PURE__ */ new Set();
-  while (pending.length > 0) {
-    const value = pending.pop();
-    if (value === null || typeof value !== "object" || visited.has(value)) {
-      continue;
-    }
-    visited.add(value);
-    if (Reflect.get(value, "kind") === "ident") {
-      const name = Reflect.get(value, "name");
-      if (typeof name === "string") identifiers.add(name);
-    }
-    for (const child2 of Object.values(value)) pending.push(child2);
-  }
-  return identifiers;
-}
-function initializerReferencesAnyIdentifier(source, names) {
-  const identifiers = initializerReferencedIdentifiers(source);
-  for (const name of names) {
-    if (identifiers.has(name)) return true;
-  }
-  return false;
-}
-var init_initializer_identifiers = __esm({
-  "../packages/neoscript-runtime/src/values/initializer-identifiers.ts"() {
-    "use strict";
-    init_executable_parser();
-  }
-});
-
-// ../packages/neoscript-runtime/src/initializer-materialization.ts
-function declarationInitializerContext(document) {
-  const key = initializerEvaluatorCacheKey(document);
-  const revision = initializerEvaluatorCacheRevision(document);
-  const cached = declarationInitializerContextByDocument.get(key);
-  if (cached !== void 0 && (revision === void 0 ? cached.members === document.members && cached.values === document.values : cached.revision === revision)) {
-    return cached.context;
-  }
-  const initializerValueIds = new Set(
-    document.values.filter(isInitValueContent).map((value) => value.id)
-  );
-  const valuesById = new Map(
-    document.values.map((value) => [value.id, value])
-  );
-  const rootOwners = /* @__PURE__ */ new Map();
-  resolveOwnerMembersForValues(
-    document,
-    initializerValueIds,
-    void 0,
-    rootOwners
-  );
-  const created = { valuesById, rootOwners };
-  declarationInitializerContextByDocument.set(key, {
-    members: document.members,
-    values: document.values,
-    revision,
-    context: created
-  });
-  return created;
-}
-function evaluateInitializerMaterialization(args) {
-  const createdValues = [];
-  const storageKeyDeclarations = /* @__PURE__ */ new Map();
-  const evaluated = args.evaluateInitializer({
-    genericEnv: args.genericEnv,
-    init: args.init,
-    member: args.member,
-    document: args.document,
-    createdValues,
-    storageKeyDeclarations,
-    ...args.storedConstructionReplay === true ? { storedConstructionReplay: true } : {},
-    ...args.constructionBaselineReplay === true ? { constructionBaselineReplay: true } : {},
-    ...args.argumentValues === void 0 ? {} : { argumentValues: args.argumentValues },
-    sourceValueId: args.sourceValueId ?? null,
-    readTracking: args.readTracking,
-    saveStaticBindings: args.saveStaticBindings,
-    sessionStaticBindings: args.sessionStaticBindings
-  });
-  return { evaluated, createdValues, storageKeyDeclarations };
-}
-function materializeInPlaceFields(document, root, createdValues) {
-  const owners = [root, ...createdValues];
-  for (const owner of owners) {
-    const record7 = owner.value;
-    if (typeof owner.classId !== "string") continue;
-    if (typeof record7 !== "object" || record7 === null) continue;
-    if (Array.isArray(record7)) continue;
-    let memberIds;
-    for (const [schemaKey, value] of Object.entries(record7)) {
-      if (typeof value === "string" || value === null) continue;
-      memberIds ??= new Map(
-        resolvedClassSchema(
-          owner.classId,
-          document.classes,
-          document.members
-        ).surface.map((entry) => [entry.schemaKey, entry.memberId])
-      );
-      const memberId = memberIds.get(schemaKey);
-      if (memberId === void 0) {
-        throw new Error(
-          `Class "${owner.classId}" holds "${schemaKey}" in place, which its schema doesn't declare.`
-        );
-      }
-      const row = {
-        id: virtualValueId(owner.id, memberId),
-        projectId: owner.projectId,
-        createdAt: owner.createdAt,
-        updatedAt: owner.updatedAt,
-        value
-      };
-      createdValues.push(row);
-      record7[schemaKey] = row.id;
-    }
-  }
-}
-function finalizeMaterializedRoot(args) {
-  materializeInPlaceFields(args.document, args.root, args.createdValues);
-  const allCreated = [args.root, ...args.createdValues];
-  for (const created of allCreated) {
-    if (created === args.root) continue;
-    if (created.classId === void 0) delete created.classId;
-  }
-  stampCreatedValuesMapKey(allCreated, args.mapKey);
-  if (args.supersededRootId !== void 0) {
-    args.storageKeyDeclarations.delete(args.supersededRootId);
-  }
-  args.storageKeyDeclarations.delete(args.root.id);
-  applyDeclaredStorageKeyOverrides({
-    createdValues: allCreated,
-    declarationByValueId: args.storageKeyDeclarations,
-    existingParentContextById: /* @__PURE__ */ new Map([
-      [
-        args.root.id,
-        {
-          mapKey: args.mapKey ?? null,
-          classId: args.root.classId ?? void 0
-        }
-      ]
-    ])
-  });
-}
-function materializeInitializerValue(args) {
-  const { evaluated, createdValues, storageKeyDeclarations } = evaluateInitializerMaterialization({
-    evaluateInitializer: args.evaluateInitializer,
-    init: args.row.init,
-    member: args.member,
-    document: args.document,
-    ...args.storedConstructionReplay === true ? { storedConstructionReplay: true } : {},
-    ...args.constructionBaselineReplay === true ? { constructionBaselineReplay: true } : {},
-    ...args.argumentValues === void 0 ? {} : { argumentValues: args.argumentValues },
-    genericEnv: envFromStamp(args.row.genericBindings),
-    sourceValueId: args.row.id,
-    readTracking: args.readTracking,
-    saveStaticBindings: args.saveStaticBindings,
-    sessionStaticBindings: args.sessionStaticBindings
-  });
-  const {
-    init: _init,
-    value: _value,
-    classId: _classId,
-    ...envelope
-  } = args.row;
-  void _init;
-  void _value;
-  void _classId;
-  const root = {
-    ...envelope,
-    value: evaluated.value,
-    ...evaluated.classId === null ? {} : { classId: evaluated.classId },
-    ...evaluated.genericBindings === void 0 ? {} : { genericBindings: { ...evaluated.genericBindings } },
-    ...deepClonePlainData(pickInstanceProvenance(evaluated))
-  };
-  if (evaluated.provisionalRootId !== void 0) {
-    args.document.listenerDefaultCapture?.retarget(
-      evaluated.provisionalRootId,
-      root.id
-    );
-    retargetInitializerRootValueIds(
-      [root, ...createdValues],
-      evaluated.provisionalRootId,
-      root.id
-    );
-  }
-  finalizeMaterializedRoot({
-    document: args.document,
-    root,
-    createdValues,
-    mapKey: args.row.mapKey,
-    storageKeyDeclarations
-  });
-  return {
-    root,
-    createdValues,
-    pinnedRootSchemaKeys: evaluated.pinnedRootSchemaKeys ?? /* @__PURE__ */ new Set(),
-    pinnedSchemaKeysByValueId: evaluated.pinnedSchemaKeysByValueId ?? /* @__PURE__ */ new Map()
-  };
-}
-function materializeMemberDefaultValue(args) {
-  const createdValues = [];
-  const storageKeyDeclarations = /* @__PURE__ */ new Map();
-  const declarationArguments = (member, init, sourceValueId) => {
-    const { valuesById, rootOwners } = declarationInitializerContext(
-      args.document
-    );
-    const ownerClass = typeof sourceValueId === "string" ? initializerOwnerContext(
-      args.document,
-      sourceValueId,
-      rootOwners,
-      valuesById,
-      (id2) => args.readTracking?.valueIds.add(id2)
-    ).ownerClass : typeof Reflect.get(member, "id") === "string" && !isStaticMember(member) ? findSchemaPlacement(
-      String(Reflect.get(member, "id")),
-      args.document.classes
-    )?.ownerClass ?? null : null;
-    if (ownerClass === null) return [];
-    const constructorId = ownerClass.requiredConstructorId;
-    if (typeof constructorId !== "string") return [];
-    const constructor2 = args.document.constructors?.find(
-      (candidate) => candidate.id === constructorId
-    );
-    if (constructor2 === void 0) return [];
-    const parameterNames = new Set(
-      constructor2.argumentTypes.map((argument2) => argument2.name)
-    );
-    return declarationInitializerArgumentValues(
-      constructor2.argumentTypes,
-      `Declaration template on '${ownerClass.name}'`,
-      initializerReferencesAnyIdentifier(init.code, parameterNames)
-    );
-  };
-  let lookups;
-  const evaluatorLookups = () => lookups ??= initializerEvaluatorLookups(args.document, args.readTracking);
-  const plans = args.readTracking !== void 0 && args.document.databaseVM === void 0 ? void 0 : defaultValuePlans(args.document);
-  const database = args.document.databaseVM;
-  const hostPlan = database?.materializationPlan;
-  const built = buildDefaultMemberValue({
-    document: {
-      ...args.document,
-      // The declaration rows a default clones are reads of this
-      // materialization, like any row its initializers read.
-      valueById: (id2) => {
-        args.readTracking?.valueIds.add(id2);
-        const database2 = evaluatorLookups();
-        return database2.defaultValueById !== void 0 ? database2.defaultValueById(id2) : database2.valueById(id2);
-      },
-      unorderedListEntryIds: (containerId) => {
-        args.readTracking?.containerIds.add(containerId);
-        const entryIds = evaluatorLookups().unorderedListEntryIds?.(containerId);
-        if (entryIds === void 0) {
-          throw new Error(
-            `Initializer lookups resolve no unordered-list membership for container "${containerId}".`
-          );
-        }
-        return entryIds;
-      },
-      // Not `resolvedMember`: its id-keyed cache would answer for the
-      // caller's rewritten copy of a member with the stored original.
-      ...plans === void 0 ? {} : {
-        instanceEnv: plans.instanceEnv,
-        storedInstanceMaterializationPlan: hostPlan === void 0 ? plans.storedInstanceMaterializationPlan : (classId, instanceEnv) => hostPlan.call(database, classId, instanceEnv)
-      },
-      recordPlanReads: (reads) => {
-        for (const id2 of reads.valueIds) args.readTracking?.valueIds.add(id2);
-        for (const id2 of reads.containerIds)
-          args.readTracking?.containerIds.add(id2);
-      }
-    },
-    projectId: args.envelope.projectId,
-    member: args.member,
-    createdValues,
-    storageKeyDeclarations,
-    declarationRoot: args.declarationRoot,
-    ...args.genericEnv === void 0 ? {} : { genericEnv: args.genericEnv },
-    // A declaration default may itself be init-backed one level down (P43 §2),
-    // and those nested initializers must evaluate against the same document.
-    initEvaluator: (member, init, sourceValueId, genericEnv) => args.evaluateInitializer({
-      genericEnv,
-      storageKeyDeclarations,
-      init,
-      member,
-      document: args.document,
-      createdValues,
-      storedConstructionReplay: true,
-      argumentValues: declarationArguments(
-        member,
-        init,
-        sourceValueId ?? null
-      ),
-      sourceValueId: sourceValueId ?? null,
-      readTracking: args.readTracking,
-      saveStaticBindings: args.saveStaticBindings,
-      sessionStaticBindings: args.sessionStaticBindings
-    })
-  });
-  const interior = createdValues.filter((created) => created.id !== built.id);
-  const root = {
-    ...args.envelope,
-    value: built.value,
-    ...built.changeListeners === void 0 ? {} : { changeListeners: built.changeListeners },
-    ...built.changeListenerEndpoints === void 0 ? {} : { changeListenerEndpoints: built.changeListenerEndpoints },
-    ...built.classId === void 0 ? {} : { classId: built.classId },
-    ...built.genericBindings == null ? {} : { genericBindings: { ...built.genericBindings } }
-  };
-  args.document.listenerDefaultCapture?.retarget(built.id, root.id);
-  retargetInitializerRootValueIds([root, ...interior], built.id, root.id);
-  finalizeMaterializedRoot({
-    document: args.document,
-    root,
-    createdValues: interior,
-    mapKey: args.envelope.mapKey,
-    storageKeyDeclarations,
-    supersededRootId: built.id
-  });
-  return {
-    root,
-    createdValues: interior,
-    pinnedRootSchemaKeys: /* @__PURE__ */ new Set(),
-    pinnedSchemaKeysByValueId: /* @__PURE__ */ new Map()
-  };
-}
-var declarationInitializerContextByDocument;
-var init_initializer_materialization = __esm({
-  "../packages/neoscript-runtime/src/initializer-materialization.ts"() {
-    "use strict";
-    init_deep_clone_plain_data();
-    init_members();
-    init_inheritance();
-    init_member_value_id();
-    init_instance_provenance();
-    init_generics();
-    init_evaluateInitializer();
-    init_evaluateNSGetter();
-    init_initializer_context();
-    init_value_row_owner_members();
-    init_initializer_identifiers();
-    declarationInitializerContextByDocument = /* @__PURE__ */ new WeakMap();
-  }
-});
-
 // ../packages/neoscript-runtime/src/effective-value-reader.ts
 function rootReadScope(document) {
   const cached = rootReadScopes.get(document);
@@ -103329,7 +103512,7 @@ var init_effective_value_reader = __esm({
           });
           if (slot.kind !== "declaration") continue;
           if (record7 === row.value) record7 = { ...record7 };
-          const materialized = materializeMemberDefaultValue({
+          const materialized = materializeMemberDefaultValue2({
             ...this.context,
             evaluateInitializer: evaluateMemberInitializer,
             document: this.declarationDocument,
@@ -103406,6 +103589,8 @@ var init_effective_value_reader = __esm({
           instanceRoot: root,
           rootMember: placement,
           evaluateInitializer: evaluateMemberInitializer,
+          materializeInitializerValue,
+          materializeMemberDefaultValue: materializeMemberDefaultValue2,
           materializedIndex: this.materializedIndex,
           resolveClassGraph: this.context.readTracking === void 0 && this.context.saveStaticBindings === void 0 && this.context.sessionStaticBindings === void 0 ? (root2, member) => initializerStoredClassGraph(this.readDocument, root2.id, member) : void 0,
           onResolvedListenerDefaults: (ownerId, entry) => {
@@ -103450,7 +103635,7 @@ var init_effective_value_reader = __esm({
         const cached = this.defaultRows.get(memberKey)?.get(envKey);
         if (cached !== void 0) return cached;
         let evaluatedInitializer = false;
-        const result = materializeMemberDefaultValue({
+        const result = materializeMemberDefaultValue2({
           ...this.context,
           evaluateInitializer: (args) => {
             evaluatedInitializer = true;
@@ -103714,31 +103899,40 @@ var init_neoscript2 = __esm({
 function expandStoredInstance2(args) {
   return expandStoredInstance({
     ...args,
-    evaluateInitializer: evaluateMemberInitializer
+    evaluateInitializer: evaluateMemberInitializer,
+    materializeInitializerValue,
+    materializeMemberDefaultValue: materializeMemberDefaultValue2
   });
 }
 function resolveVariantInstanceGraphForDocument2(args) {
   return resolveVariantInstanceGraphForDocument({
     ...args,
-    evaluateInitializer: evaluateMemberInitializer
+    evaluateInitializer: evaluateMemberInitializer,
+    materializeInitializerValue,
+    materializeMemberDefaultValue: materializeMemberDefaultValue2
   });
 }
 function createHeadlessVirtualInstanceResolver2(args) {
   return createHeadlessVirtualInstanceResolver({
     ...args,
     evaluateInitializer: evaluateMemberInitializer,
+    materializeInitializerValue,
+    materializeMemberDefaultValue: materializeMemberDefaultValue2,
     documentMaterializationPlan
   });
 }
 function resolveStoredClassValue2(args) {
   return resolveStoredClassValue({
     ...args,
-    evaluateInitializer: evaluateMemberInitializer
+    evaluateInitializer: evaluateMemberInitializer,
+    materializeInitializerValue,
+    materializeMemberDefaultValue: materializeMemberDefaultValue2
   });
 }
 var init_virtual_instance_values = __esm({
   "../packages/neoscript-runtime/src/virtual-instance-values.ts"() {
     "use strict";
+    init_initializer_materialization();
     init_evaluateInitializer();
     init_virtual_instance_graph();
     init_virtual_instance_graph();
@@ -126823,11 +127017,10 @@ function appendAuthoredOwnedValueCascadeDeletes(args) {
     for (const rootId of survivingConstructionIds) {
       const instanceRoot = compiledReplayRows.get(rootId) ?? postValuesById.get(rootId);
       const rootMember = postPlacements.get(rootId).member;
-      const expanded = expandStoredInstance({
+      const expanded = expandStoredInstance2({
         document: resolverDocument,
         instanceRoot,
-        rootMember,
-        evaluateInitializer: evaluateMemberInitializer
+        rootMember
       });
       const graph = resolveVirtualInstanceGraph({
         document: resolverDocument,
@@ -139703,6 +139896,10 @@ function verifyProjectSourceCommitAgainstStateV4(args) {
       trustedPendingProjectFiles.set(pendingId2, metadata);
     }
   }
+  const derivedSeedRowIds = derivedCandidateSeedRowIds(
+    args.authoredValueSeeds,
+    args.stateRecords
+  );
   const status = computeWorkspaceStatus(workspace, {
     forceRecompile: args.forceRecompile,
     skipProjectBinaryInspection: true,
@@ -139728,7 +139925,8 @@ ${blockingErrors.map((error) => error.message).join("\n")}` : `Trusted source lo
   auditAuthoredSeedRowIdentities(
     status.authoredValueSeeds,
     args.stateRecords,
-    assignments
+    assignments,
+    derivedSeedRowIds
   );
   const usedAssignments = /* @__PURE__ */ new Set();
   const positionless = positionIndependentAssignments(assignments);
@@ -139791,14 +139989,14 @@ function isDerivedOnlyRefresh(change, stateRecords) {
   if (!isObjectRecord(base.data)) return false;
   return canonicalStringify(comparisonData(change.recordKind, change.nextData)) === canonicalStringify(comparisonData(change.recordKind, base.data));
 }
-function auditAuthoredSeedRowIdentities(seeds, stateRecords, assignments) {
+function auditAuthoredSeedRowIdentities(seeds, stateRecords, assignments, derivedRowIds = /* @__PURE__ */ new Set()) {
   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)) {
+      if (!isUuidV4Id(row.id) && !derivedRowIds.has(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.`
         );
@@ -139817,6 +140015,19 @@ function auditAuthoredSeedRowIdentities(seeds, stateRecords, assignments) {
     }
   }
 }
+function derivedCandidateSeedRowIds(seeds, stateRecords) {
+  const derived = /* @__PURE__ */ new Set();
+  for (const seed of seeds) {
+    for (const row of seed.values ?? []) {
+      if (isDerivedNewValueId(
+        row.id,
+        (id2) => stateRecords[`value:${id2}`] !== void 0
+      ))
+        derived.add(row.id);
+    }
+  }
+  return derived;
+}
 function validateAssignments(value) {
   const assignments = /* @__PURE__ */ new Map();
   const assignedIds = /* @__PURE__ */ new Set();
@@ -142269,6 +142480,9 @@ function emitStoredConstructorExpression(context, member, valueId, visited = /*
     targetTyped
   );
   if (constructor2 !== null) return constructor2;
+  if (hasStoredConstruction && value.instanceConstructorId === null) {
+    return targetTyped ? "new()" : `new ${className}`;
+  }
   if (projection === null || projection.arguments.length === 0 && schemaClass2.requiredConstructorId === void 0) {
     throw new Error(
       `Stored materialized value ${valueId} has no constructor arguments.`
@@ -143416,13 +143630,6 @@ function drainValueReferenceObligationsV4(state, manifest, options) {
       ...composeReferenceSitePosition(move.site, options.sourceTextByUri)
     });
   }
-  for (const recorded of options.registry.loweringFailures) {
-    failures.push({
-      message: recorded.message,
-      ...recorded.code === void 0 ? {} : { code: recorded.code },
-      ...composeReferenceSitePosition(recorded.site, options.sourceTextByUri)
-    });
-  }
   for (const obligation of [
     ...collectionValueObligations(manifest),
     ...options.registry.referenceObligations
@@ -143460,7 +143667,17 @@ function drainValueReferenceObligationsV4(state, manifest, options) {
       ...composeReferenceSitePosition(obligation.site, options.sourceTextByUri)
     });
   }
-  return failures;
+  const loweringFailures = options.registry.loweringFailures.map(
+    (recorded) => recorded instanceof SchemaSourceError ? recorded : {
+      message: recorded.message,
+      ...recorded.code === void 0 ? {} : { code: recorded.code },
+      ...composeReferenceSitePosition(
+        recorded.site,
+        options.sourceTextByUri
+      )
+    }
+  );
+  return [...loweringFailures, ...failures];
 }
 function withoutDeletedValues(state, deletedValueIds) {
   if (deletedValueIds.size === 0) return state;
@@ -149817,6 +150034,9 @@ function classValueBody(context, member, value, visited, targetTyped, outerEnvir
       }
       continue;
     }
+    const storedBase = context.storedValueBase;
+    if (storedBase !== void 0 && isDerivedNewValueId(childId, (id2) => storedBase.has(id2)))
+      continue;
     const preservesBinding = context.collectionBindingValueIds.has(childId) || context.localValues?.byValueId.has(childId) === true;
     const baseChildBody = context.storedValueBase?.get(childId)?.value;
     const clearedStoredClassOverrides = isObjectRecord(baseChildBody) && Object.keys(baseChildBody).length > 0;
@@ -151989,7 +152209,9 @@ 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_source_diagnostics();
     init_immutable_json3();
+    init_lower_support();
     init_record_fields();
     init_source_syntax_cache();
     init_lexer();
@@ -153261,8 +153483,7 @@ function materializeInitializersLocallyV4(args) {
   const sourceRoots = initializerSourceRootIds(
     args.changes,
     args.authoredValueSeeds,
-    records3,
-    args.workspace.state.records
+    records3
   );
   const written = [...args.changes];
   for (const seed of args.authoredValueSeeds) {
@@ -153660,28 +153881,23 @@ function initializerCode(records3, valueId) {
   }
   return row.init.code;
 }
-function initializerSourceRootIds(changes, seeds, records3, baseRecords) {
+function initializerSourceRootIds(changes, seeds, records3) {
   const ids = /* @__PURE__ */ new Set();
-  const needsFirstMaterialization = (valueId) => {
-    const base = baseRecords[`value:${valueId}`]?.data;
-    return base === void 0 || isObjectRecord(base) && isObjectRecord(base.init);
-  };
   for (const change of changes) {
     if (change.recordKind !== "value") continue;
     if (!isObjectRecord(change.nextData)) continue;
     if (!isObjectRecord(change.nextData.init)) continue;
-    if (!needsFirstMaterialization(change.recordId)) continue;
     ids.add(change.recordId);
   }
   for (const seed of seeds) {
     const member = records3.get(`member:${seed.memberId}`)?.data;
     const instanceBinding = isObjectRecord(member) && (member.modifier === 3 || member.valueId === seed.valueId);
     if (!instanceBinding) continue;
-    if (seed.nodeType === "initializer" && typeof seed.valueId === "string" && needsFirstMaterialization(seed.valueId)) {
+    if (seed.nodeType === "initializer" && typeof seed.valueId === "string") {
       ids.add(seed.valueId);
     }
     for (const row of seed.values ?? []) {
-      if (row.nodeType === "initializer" && needsFirstMaterialization(row.id)) {
+      if (row.nodeType === "initializer") {
         ids.add(row.id);
       }
     }
@@ -157015,6 +157231,13 @@ function walkValueSegments(walk, startId, segments, path, subject, fail2) {
       return null;
     }
     if (!isObjectRecord(body)) {
+      const initializer = pending !== void 0 ? pending.nodeType === "initializer" : isInitValueContent(walk.state[`value:${cursor}`]?.data);
+      if (initializer) {
+        fail2(
+          `${subject} ${path} stops before segment ${segment}: an init block constructs the row it reaches, so a path cannot name its members yet.`
+        );
+        return null;
+      }
       fail2(
         `${subject} ${path} stops before segment ${segment}: the row it reaches stores no single-valued members.`
       );
@@ -157036,6 +157259,10 @@ function walkValueSegments(walk, startId, segments, path, subject, fail2) {
         const resolved = walk.resolveVirtualPath?.(startId, segments);
         if (resolved != null) return resolved;
       } catch (error) {
+        if (error instanceof SchemaSourceError) {
+          walk.registry.loweringFailures.push(error);
+          return null;
+        }
         fail2(
           `${subject} ${path} could not resolve its construction: ${error instanceof Error ? error.message : String(error)}`
         );
@@ -157110,8 +157337,10 @@ var ROOT_PROJECT_FIELDS2, ROOT_PATH_PENDING_PREFIX;
 var init_root_source = __esm({
   "src/project-source/root-source.ts"() {
     "use strict";
+    init_source_diagnostics();
     init_project_root();
     init_value_comparison();
+    init_members();
     init_value_sources();
     init_source_format();
     init_stored_value_placements();
@@ -160286,30 +160515,47 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
     [...staticValues.records, ...memberDefaults.records, ...rootValues.records],
     staticMemberValueIds
   );
+  const sourceTextByUri = new Map(
+    sourceEntries.map((entry) => [entry.relPath, entry.source])
+  );
   let collectionBindings;
   const resolveVirtualPath = (rootId, segments) => {
-    if (collectionBindings === void 0) {
-      const candidate = /* @__PURE__ */ new Map();
-      for (const [key, record7] of Object.entries(rootPathResolutionState)) {
-        if (record7.file !== void 0 && isSchemaRecordKindV4(record7.recordKind) && !documentsByKey.has(key))
-          continue;
-        candidate.set(key, { ...record7, deleted: false });
-      }
-      for (const row of valueLowerRegistry.pendingValues.values()) {
-        candidate.set(`value:${row.id}`, {
-          recordKind: "value",
-          recordId: row.id,
-          contentHash: "",
-          deleted: false,
-          data: { id: row.id, ...encodeStoredValueRowFields(row) }
-        });
+    if (collectionBindings instanceof SchemaSourceError)
+      throw collectionBindings;
+    try {
+      if (collectionBindings === void 0) {
+        const candidate = /* @__PURE__ */ new Map();
+        for (const [key, record7] of Object.entries(rootPathResolutionState)) {
+          if (record7.file !== void 0 && isSchemaRecordKindV4(record7.recordKind) && !documentsByKey.has(key))
+            continue;
+          candidate.set(key, { ...record7, deleted: false });
+        }
+        for (const row of valueLowerRegistry.pendingValues.values()) {
+          candidate.set(`value:${row.id}`, {
+            recordKind: "value",
+            recordId: row.id,
+            contentHash: "",
+            deleted: false,
+            data: { id: row.id, ...encodeStoredValueRowFields(row) }
+          });
+        }
+        const document = readPulledProjectDocumentV4(candidate);
+        compilePulledProjectDocumentForEvaluationV4(document);
+        collectionBindings = new CollectionBindingMaterializer(document);
       }
-      const document = readPulledProjectDocumentV4(candidate);
-      compilePulledProjectDocumentForEvaluationV4(document);
-      collectionBindings = new CollectionBindingMaterializer(document);
+      const resolved = collectionBindings.resolvePath(rootId, segments);
+      return resolved;
+    } catch (error) {
+      const diagnostic = initializerRuntimeDiagnostic(
+        error,
+        valueLowerRegistry.initializerSites,
+        sourceTextByUri,
+        projectAnalysisV4
+      );
+      if (!hasAuthoredSourceFile(diagnostic.file)) throw error;
+      if (collectionBindings === void 0) collectionBindings = diagnostic;
+      throw diagnostic;
     }
-    const resolved = collectionBindings.resolvePath(rootId, segments);
-    return resolved;
   };
   const resolvedCollectionPaths = resolveRootPathCollectionValuesV4({
     manifest,
@@ -160492,7 +160738,7 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
     unavailableSlots: rootValues.unavailableSlots,
     registry: valueLowerRegistry
   });
-  if (collectionBindings !== void 0) {
+  if (collectionBindings !== void 0 && !(collectionBindings instanceof SchemaSourceError)) {
     const bindings = collectionBindings;
     const templateInitializer = (id2) => {
       const sourceValueId = bindings.rowForValue(id2)?.sourceValueId;
@@ -160732,9 +160978,6 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
     changes.push(recordDeleteChange(recordState, recordFile));
   }
   appendCollectionEntryDeletes(workspace, reconstructed3, changes);
-  const sourceTextByUri = new Map(
-    sourceEntries.map((entry) => [entry.relPath, entry.source])
-  );
   const referenceFailures = drainValueReferenceObligationsV4(
     prospectiveState,
     manifest,
@@ -160757,6 +161000,10 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
     }
   );
   for (const failure of referenceFailures) {
+    if (failure instanceof SchemaSourceError) {
+      parseErrors.push(failure);
+      continue;
+    }
     const message = failure.code === void 0 ? failure.message : `${failure.code}: ${failure.message}`;
     parseErrors.push(
       new SchemaSourceError(
@@ -160770,7 +161017,11 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
   }
   reportPhase("record-diff-references", "Checking packed values\u2026");
   if (referenceFailures.length > 0) {
-    return refusedStatus(conflictedFiles, parseErrors, parseWarnings);
+    return refusedStatus(
+      conflictedFiles,
+      uniqueSourceErrors(parseErrors),
+      parseWarnings
+    );
   }
   if (valueLowerRegistry.initializerKeyPatches.size > 0) {
     authoredValueSeeds = settleInitializerKeyCode({
@@ -167399,9 +167650,10 @@ function completionItemsForResolution(snapshot, resolved, word) {
   }
   const memberType2 = neoScriptMemberLookupType(resolved.type);
   const owner = memberType2.kind === "named" ? snapshot.project.typeById.get(memberType2.typeId) : void 0;
-  return membersForType(snapshot, resolved.type).filter(
-    (symbol) => (resolved.symbol?.name !== "base" || isConcreteBaseMember(symbol)) && (owner === void 0 || isMemberCompletionAccessible(snapshot, owner, symbol))
-  ).map((symbol) => symbolCompletion(symbol, word, snapshot));
+  return membersForType(snapshot, resolved.type).filter((symbol) => {
+    const declaration = symbol.inheritedFrom === void 0 ? owner : snapshot.project.typeById.get(symbol.inheritedFrom.typeId) ?? owner;
+    return (resolved.symbol?.name !== "base" || isConcreteBaseMember(symbol)) && (declaration === void 0 || isMemberCompletionAccessible(snapshot, declaration, symbol));
+  }).map((symbol) => symbolCompletion(symbol, word, snapshot));
 }
 function isConcreteBaseMember(symbol) {
   return !symbol.id.startsWith("builtin:") && symbol.static !== true && symbol.abstract !== true && (symbol.kind === "function" || symbol.kind === "method" || symbol.computed === true);
@@ -167461,6 +167713,22 @@ function membersForType(snapshot, type) {
           } : {}
         };
       });
+    if (type.narrowedInterfaces) {
+      const names = new Set(members.map((member) => member.name));
+      for (const bound of Object.values(type.narrowedInterfaces)) {
+        for (const member of membersForType(snapshot, bound)) {
+          if (names.has(member.name)) continue;
+          names.add(member.name);
+          const owner = snapshot.project.typeById.get(bound.typeId);
+          members.push(
+            owner === void 0 || member.inheritedFrom !== void 0 ? member : {
+              ...member,
+              inheritedFrom: { typeId: owner.id, typeName: owner.name }
+            }
+          );
+        }
+      }
+    }
     if (named.kind === "class") {
       members = members.filter(
         (member) => member.name !== NEOSCRIPT_CLASS_ID_MEMBER
@@ -197351,12 +197619,36 @@ var init_export = __esm({
 
 // src/project-source/evaluation-workspace.ts
 function workspaceForLocalEvaluation(workspace) {
+  const compiled = compilePendingBodies(
+    Object.entries(workspace.state.records),
+    () => {
+      const records3 = /* @__PURE__ */ new Map();
+      for (const [key, record7] of Object.entries(workspace.state.records))
+        records3.set(key, { ...record7, deleted: false });
+      return records3;
+    }
+  );
+  if (compiled === null) return workspace;
+  const refreshed = { ...workspace.state.records };
+  for (const [key, data] of compiled.bodies)
+    refreshed[key] = { ...refreshed[key], data };
+  return { ...workspace, state: { ...workspace.state, records: refreshed } };
+}
+function recordsForLocalEvaluation(records3) {
+  const compiled = compilePendingBodies(records3, () => new Map(records3));
+  if (compiled === null) return records3;
+  for (const [key, data] of compiled.bodies)
+    compiled.records.set(key, { ...records3.get(key), data });
+  return compiled.records;
+}
+function compilePendingBodies(entries, copyRecords) {
   const memberIds = /* @__PURE__ */ new Set();
   const constructorIds = /* @__PURE__ */ new Set();
   const pending = /* @__PURE__ */ new Map();
   const scriptSources = /* @__PURE__ */ new Map();
-  for (const [key, record7] of Object.entries(workspace.state.records)) {
+  for (const [key, record7] of entries) {
     const kind = record7.recordKind;
+    if (record7.deleted === true) continue;
     if (kind !== "member" && kind !== "constructor") continue;
     const stale = firstRejectedNeoScriptCompiledBody(record7.data, null);
     if (stale !== null) {
@@ -197367,34 +197659,27 @@ function workspaceForLocalEvaluation(workspace) {
     } else if (!hasPendingNeoScriptDerivation(kind, record7.data)) continue;
     (kind === "member" ? memberIds : constructorIds).add(record7.recordId);
     scriptSources.set(key, neoScriptRecordSources(record7.data));
-    pending.set(key, {
-      ...record7,
-      deleted: false,
-      data: stripClientDerivedBodies(kind, record7.data)
-    });
+    pending.set(key, stripClientDerivedBodies(kind, record7.data));
   }
-  if (pending.size === 0) return workspace;
-  const records3 = /* @__PURE__ */ new Map();
-  for (const [key, record7] of Object.entries(workspace.state.records))
-    records3.set(key, pending.get(key) ?? { ...record7, deleted: false });
-  const document = readPulledProjectDocumentV4(records3);
+  if (pending.size === 0) return null;
+  const compilable = copyRecords();
+  for (const [key, data] of pending)
+    compilable.set(key, { ...compilable.get(key), data });
+  const document = readPulledProjectDocumentV4(compilable);
   compilePulledProjectDocumentForEvaluationV4(document, void 0, {
     memberIds,
     constructorIds,
     scriptSources
   });
-  const refreshed = { ...workspace.state.records };
+  const bodies = /* @__PURE__ */ new Map();
   for (const member of document.members) {
-    if (!memberIds.has(member.id)) continue;
-    const key = `member:${member.id}`;
-    refreshed[key] = { ...refreshed[key], data: member };
+    if (memberIds.has(member.id)) bodies.set(`member:${member.id}`, member);
   }
   for (const constructor2 of document.constructors ?? []) {
-    if (!constructorIds.has(constructor2.id)) continue;
-    const key = `constructor:${constructor2.id}`;
-    refreshed[key] = { ...refreshed[key], data: constructor2 };
+    if (constructorIds.has(constructor2.id))
+      bodies.set(`constructor:${constructor2.id}`, constructor2);
   }
-  return { ...workspace, state: { ...workspace.state, records: refreshed } };
+  return { records: compilable, bodies };
 }
 var init_evaluation_workspace = __esm({
   "src/project-source/evaluation-workspace.ts"() {
@@ -198710,11 +198995,7 @@ async function prepareLocalPushArtifactsV4(workspace, status, onPhase = () => vo
   } : void 0;
   onPhase("Hashing project source\u2026");
   const source = projectSourceIdentityForStatus(status);
-  const verificationSource = options.fullValidation ? createPendingProjectSourceIdentityV4(
-    workspace,
-    status,
-    status.authoredValueSeeds
-  ) : null;
+  const verificationSource = options.fullValidation ? locatedPendingProjectSourceIdentity(workspace, status) : null;
   onPhase("Assigning pending value identities\u2026");
   const pendingAssignment = assignPendingIds(
     status.changes,
@@ -198846,6 +199127,17 @@ function locatePreparationError(error, status, assigned) {
   if (source === void 0) return error;
   return new Error(`${source.file}:${source.line} \u2014 ${error.message}`);
 }
+function locatedPendingProjectSourceIdentity(workspace, status) {
+  try {
+    return createPendingProjectSourceIdentityV4(
+      workspace,
+      status,
+      status.authoredValueSeeds
+    );
+  } catch (error) {
+    throw locatePreparationError(error, status, /* @__PURE__ */ new Map());
+  }
+}
 async function prepareLocalCandidateV4(workspace, options = {}) {
   const pushOptions = {
     dryRun: options.dryRun ?? true,
@@ -199210,19 +199502,22 @@ function createPendingProjectSourceIdentityV4(workspace, status, authoredValueSe
     }
   }
   materializePendingSourceLocalization(records3, status);
-  const emission = emitProjectDocumentFilesV4(records3, {
-    dialogueGroupSymbols: authoredDialogueGroupSymbols(
-      status.sourceSnapshot?.analysis
-    ),
-    storedValueBase: storedValueRowsByIdV4(
-      Object.values(workspace.state.records)
-    ),
-    recordFiles: projectRecordFilesV4(
-      Object.values(workspace.state.records),
-      status.reconstructed.values()
-    ),
-    localValues: status.localValues
-  });
+  const emission = emitProjectDocumentFilesV4(
+    recordsForLocalEvaluation(records3),
+    {
+      dialogueGroupSymbols: authoredDialogueGroupSymbols(
+        status.sourceSnapshot?.analysis
+      ),
+      storedValueBase: storedValueRowsByIdV4(
+        Object.values(workspace.state.records)
+      ),
+      recordFiles: projectRecordFilesV4(
+        Object.values(workspace.state.records),
+        status.reconstructed.values()
+      ),
+      localValues: status.localValues
+    }
+  );
   const files = emission.files.map((file) => {
     const kind = neoProjectSourceKind(file.path, file.content);
     if (kind === null || !isNeoProjectProductionSourceKind(kind)) {
@@ -202242,7 +202537,7 @@ async function finishFormat4Pull(args) {
   const formatSource = createWorkspaceSourceFormatter(workspace.root);
   const localResult = emitProjectDocumentFilesV4(
     candidateValueRecordsForEmissionV4(
-      localRecords,
+      recordsForLocalEvaluation(localRecords),
       workspace.state.records,
       workspace.config.projectId
     ),
@@ -202725,17 +203020,19 @@ function buildEmitRecordSet(document, plans, side) {
         resolvedRecordKind,
         resolvedRecordId,
         data,
-        serverRecord
+        // A locally created record's derived fields, such as a new
+        // static field's pending valueId, came from this same lowering.
+        serverRecord ?? (plan.conflicted ? void 0 : { data })
       ) : data
     });
   }
   return records3;
 }
-function composeProspectivePullRecord(recordKind, recordId, data, serverRecord) {
+function composeProspectivePullRecord(recordKind, recordId, data, base) {
   if (!isSchemaRecordKindV4(recordKind) || !isObjectRecord(data)) return data;
   let baseRecord = null;
-  if (serverRecord !== void 0) {
-    if (!isObjectRecord(serverRecord.data)) {
+  if (base !== void 0) {
+    if (!isObjectRecord(base.data)) {
       throw new Error(
         `Cannot compose pulled ${recordKind} record ${JSON.stringify(recordId)} because its server payload is not an object.`
       );
@@ -202743,7 +203040,7 @@ function composeProspectivePullRecord(recordKind, recordId, data, serverRecord)
     baseRecord = {
       recordKind,
       recordId,
-      data: serverRecord.data
+      data: base.data
     };
   }
   return composeDocumentRecord(
@@ -202784,6 +203081,7 @@ var init_pull = __esm({
     init_static_member_ownership_recovery();
     init_value_base_desync();
     init_packed_value_parity();
+    init_evaluation_workspace();
     init_compiler_metadata();
   }
 });
@@ -215703,7 +216001,7 @@ var releaseWorkspaceLock = () => void 0;
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.command === "--version") {
-    console.log("0.84.0");
+    console.log("0.84.2");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {