@neocompose/cli 0.46.0 → 0.46.2

package/dist/neo.mjs

@@ -539,6 +539,64 @@ var init_token_store = __esm({
   }
 });
 
+// src/spinner-renderer.ts
+import { writeSync } from "node:fs";
+import { Worker } from "node:worker_threads";
+function startSpinnerRenderer(label, frames, colored) {
+  const state = new Int32Array(new SharedArrayBuffer(4));
+  const open = colored ? "\x1B[36m" : "";
+  const close = colored ? "\x1B[39m" : "";
+  writeSync(1, `\r\x1B[2K${open}${frames[0]}${close} ${label}`);
+  const worker = new Worker(RENDERER, {
+    eval: true,
+    execArgv: [],
+    workerData: { state: state.buffer, frames, label, open, close }
+  });
+  const stop = () => {
+    for (; ; ) {
+      const previous = Atomics.compareExchange(state, 0, 0, 2);
+      if (previous === 2) return;
+      if (previous === 0) break;
+      Atomics.wait(state, 0, 1);
+    }
+    void worker.terminate();
+    writeSync(1, "\r\x1B[2K");
+  };
+  worker.on("error", stop);
+  worker.unref();
+  return {
+    update(next) {
+      if (Atomics.load(state, 0) !== 2) worker.postMessage(next);
+    },
+    stop
+  };
+}
+var RENDERER;
+var init_spinner_renderer = __esm({
+  "src/spinner-renderer.ts"() {
+    "use strict";
+    RENDERER = `
+const { workerData, parentPort } = require("node:worker_threads");
+const { writeSync } = require("node:fs");
+const state = new Int32Array(workerData.state);
+let label = workerData.label;
+let frame = 1;
+function render() {
+  if (Atomics.compareExchange(state, 0, 0, 1) !== 0) return;
+  try {
+    const glyph = workerData.frames[frame++ % workerData.frames.length];
+    writeSync(1, "\\r\\u001b[2K" + workerData.open + glyph + workerData.close + " " + label);
+  } finally {
+    Atomics.store(state, 0, 0);
+    Atomics.notify(state, 0);
+  }
+}
+parentPort.on("message", (next) => { label = next; render(); });
+setInterval(render, 80);
+`;
+  }
+});
+
 // src/ui.ts
 function paint(open, close) {
   if (!colorEnabled) return (text) => text;
@@ -564,42 +622,45 @@ function paintChangeKind(kind) {
   return painter === void 0 ? kind : painter(kind);
 }
 function spinner(text) {
-  if (!colorEnabled) {
+  if (process.stdout.isTTY !== true || process.env.TERM === "dumb") {
     console.log(text);
+    let stopped2 = false;
     return {
       update: () => void 0,
-      succeed: (done) => console.log(done),
-      fail: (done) => console.error(done),
-      stop: () => void 0
+      succeed(done) {
+        if (!stopped2) console.log(done);
+        stopped2 = true;
+      },
+      fail(done) {
+        if (!stopped2) console.error(done);
+        stopped2 = true;
+      },
+      stop() {
+        stopped2 = true;
+      }
     };
   }
-  let frame = 0;
-  let label = text;
-  const render = () => {
-    process.stdout.write(
-      `\r\x1B[2K${color.cyan(SPINNER_FRAMES[frame % SPINNER_FRAMES.length])} ${label}`
-    );
-    frame += 1;
-  };
-  render();
-  const timer = setInterval(render, 80);
+  const renderer = startSpinnerRenderer(text, SPINNER_FRAMES, colorEnabled);
+  let stopped = false;
   const clear = () => {
-    clearInterval(timer);
-    process.stdout.write("\r\x1B[2K");
+    if (stopped) return false;
+    stopped = true;
+    renderer.stop();
+    return true;
   };
   return {
     update(next) {
-      label = next;
+      if (!stopped) renderer.update(next);
     },
     succeed(done) {
-      clear();
-      console.log(`${sym.ok} ${done}`);
+      if (clear()) console.log(`${sym.ok} ${done}`);
     },
     fail(done) {
-      clear();
-      console.error(`${sym.fail} ${done}`);
+      if (clear()) console.error(`${sym.fail} ${done}`);
     },
-    stop: clear
+    stop() {
+      clear();
+    }
   };
 }
 async function promptSelect(args) {
@@ -643,6 +704,7 @@ var colorEnabled, color, sym, CHANGE_KIND_COLOR, SPINNER_FRAMES;
 var init_ui = __esm({
   "src/ui.ts"() {
     "use strict";
+    init_spinner_renderer();
     colorEnabled = process.stdout.isTTY === true && process.env.NO_COLOR === void 0 && process.env.TERM !== "dumb";
     color = {
       bold: paint(1, 22),
@@ -46679,12 +46741,24 @@ function projectSchemaIndexFor(source, revision = EMPTY_REVISION) {
     byMembers = /* @__PURE__ */ new WeakMap();
     projectSchemaIndexes.set(source.classes, byMembers);
   }
-  const cached = byMembers.get(source.members);
+  let byEnums = byMembers.get(source.members);
+  if (byEnums === void 0) {
+    byEnums = /* @__PURE__ */ new WeakMap();
+    byMembers.set(source.members, byEnums);
+  }
+  const enumKey = source.enums ?? ABSENT_COLLECTION;
+  let byConstructors = byEnums.get(enumKey);
+  if (byConstructors === void 0) {
+    byConstructors = /* @__PURE__ */ new WeakMap();
+    byEnums.set(enumKey, byConstructors);
+  }
+  const constructorKey = source.constructors ?? ABSENT_COLLECTION;
+  const cached = byConstructors.get(constructorKey);
   if (cached !== void 0 && isCurrent(cached, source, revision)) {
     return cached.index;
   }
   const index = new ProjectSchemaIndex(source);
-  byMembers.set(source.members, {
+  byConstructors.set(constructorKey, {
     classCount: source.classes.length,
     memberCount: source.members.length,
     enums: source.enums,
@@ -46697,7 +46771,7 @@ function projectSchemaIndexFor(source, revision = EMPTY_REVISION) {
   });
   return index;
 }
-var CircularInheritanceError, ProjectSchemaIndex, EMPTY_STRING_SET, EMPTY_REVISION, projectSchemaIndexEpoch, projectSchemaIndexes;
+var CircularInheritanceError, ProjectSchemaIndex, EMPTY_STRING_SET, EMPTY_REVISION, projectSchemaIndexEpoch, projectSchemaIndexes, ABSENT_COLLECTION;
 var init_project_schema_index = __esm({
   "../src/models/project/project-schema-index.ts"() {
     "use strict";
@@ -46859,6 +46933,7 @@ var init_project_schema_index = __esm({
     EMPTY_REVISION = [];
     projectSchemaIndexEpoch = 0;
     projectSchemaIndexes = /* @__PURE__ */ new WeakMap();
+    ABSENT_COLLECTION = {};
   }
 });
 
@@ -65284,7 +65359,7 @@ var init_project_root_members = __esm({
   }
 });
 
-// ../src/components/projects/member-code/analyzer-types.ts
+// ../src/runtime/neoscript/analyzer-types.ts
 function createAnalyzerSchemaIndex(context) {
   return projectSchemaIndexFor({
     classes: context.vm.classes,
@@ -65313,7 +65388,7 @@ function analyzerMemberById(context, id2) {
 }
 var AnalyzerRootClassId, AnalyzerDialogueContextClassId, activeSchemaIndexByContext;
 var init_analyzer_types = __esm({
-  "../src/components/projects/member-code/analyzer-types.ts"() {
+  "../src/runtime/neoscript/analyzer-types.ts"() {
     "use strict";
     init_project_schema_index();
     AnalyzerRootClassId = "__root__";
@@ -65322,7 +65397,7 @@ var init_analyzer_types = __esm({
   }
 });
 
-// ../src/components/projects/member-code/neoscript-language-context-adapter.ts
+// ../src/runtime/neoscript/neoscript-language-context-adapter.ts
 function createNeoScriptDocumentContext(context, projectOverride) {
   return withAnalyzerSchemaIndex(
     context,
@@ -66713,7 +66788,7 @@ function virtualRootMemberLine(name, memberId) {
 }
 var NEOSCRIPT_COMPILER_ADAPTER_REVISION, UNKNOWN_TYPE2, storageResolverByContext;
 var init_neoscript_language_context_adapter = __esm({
-  "../src/components/projects/member-code/neoscript-language-context-adapter.ts"() {
+  "../src/runtime/neoscript/neoscript-language-context-adapter.ts"() {
     "use strict";
     init_src();
     init_members();
@@ -69170,392 +69245,34 @@ var init_constructor_argument_ownership = __esm({
   }
 });
 
-// ../src/view-models/neoscript-evaluator/NSGetterRuntimeError.ts
-var NSGetterRuntimeError, UncompiledInitializerRuntimeError;
-var init_NSGetterRuntimeError = __esm({
-  "../src/view-models/neoscript-evaluator/NSGetterRuntimeError.ts"() {
-    "use strict";
-    NSGetterRuntimeError = class extends Error {
-      constructor(message) {
-        super(message);
-        this.name = "NSGetterRuntimeError";
-      }
-    };
-    UncompiledInitializerRuntimeError = class extends NSGetterRuntimeError {
-      constructor(memberId, memberName, initializer = null, valueId = null) {
-        super(
-          `Initializer for '${memberName}' has no compiled body; push the project so the server compiles it.`
-        );
-        this.memberId = memberId;
-        this.initializer = initializer;
-        this.valueId = valueId;
-        this.name = "UncompiledInitializerRuntimeError";
-      }
-      memberId;
-      initializer;
-      valueId;
-    };
-  }
-});
-
-// ../src/view-models/neoscript-evaluator/NeoScriptScope.ts
-var NeoScriptScope;
-var init_NeoScriptScope = __esm({
-  "../src/view-models/neoscript-evaluator/NeoScriptScope.ts"() {
-    "use strict";
-    NeoScriptScope = class {
-      constructor(parent = null, initialBindings) {
-        this.parent = parent;
-        this.#bindings = new Map(initialBindings);
-      }
-      parent;
-      #bindings;
-      #readonlyBindingErrors = /* @__PURE__ */ new Map();
-      get localBindingCount() {
-        return this.#bindings.size;
-      }
-      get(bindingId) {
-        if (this.#bindings.has(bindingId)) return this.#bindings.get(bindingId);
-        return this.parent?.get(bindingId);
-      }
-      has(bindingId) {
-        return this.#bindings.has(bindingId) || this.parent?.has(bindingId) === true;
-      }
-      containsLocal(bindingId) {
-        return this.#bindings.has(bindingId);
-      }
-      setLocal(bindingId, value) {
-        this.#bindings.set(bindingId, value);
-      }
-      bindInvocationEntry(bindingId, value) {
-        this.#bindings.set(bindingId, value);
-      }
-      bindInvocationKeyAndEntry(keyBindingId, key, entryBindingId, entry) {
-        this.#bindings.set(keyBindingId, key);
-        this.#bindings.set(entryBindingId, entry);
-      }
-      resetInvocationLocals(parameterCount) {
-        if (this.#bindings.size > parameterCount) this.#bindings.clear();
-        if (this.#readonlyBindingErrors.size > 0) {
-          this.#readonlyBindingErrors.clear();
-        }
-      }
-      *keys() {
-        const inherited = /* @__PURE__ */ new Set();
-        if (this.parent !== null) {
-          for (const bindingId of this.parent.keys()) {
-            inherited.add(bindingId);
-            yield bindingId;
-          }
-        }
-        for (const bindingId of this.#bindings.keys()) {
-          if (!inherited.has(bindingId)) yield bindingId;
-        }
-      }
-      markReadonly(bindingId, errorMessage4) {
-        const errors = this.#readonlyBindingErrors.get(bindingId);
-        if (errors === void 0) {
-          this.#readonlyBindingErrors.set(bindingId, [errorMessage4]);
-          return;
-        }
-        errors.push(errorMessage4);
-      }
-      unmarkReadonly(bindingId) {
-        const errors = this.#readonlyBindingErrors.get(bindingId);
-        if (errors === void 0) return;
-        errors.pop();
-        if (errors.length === 0) this.#readonlyBindingErrors.delete(bindingId);
-      }
-      readonlyError(bindingId) {
-        const errors = this.#readonlyBindingErrors.get(bindingId);
-        if (errors !== void 0 && errors.length > 0) {
-          return errors[errors.length - 1];
-        }
-        return this.parent?.readonlyError(bindingId);
-      }
-    };
-  }
-});
-
-// ../src/models/decimal/decimal-math.ts
-function pow10(exponent) {
-  return TEN ** BigInt(exponent);
-}
-function assertCanonicalInput(value, argName) {
-  const violation = getDecimalStringViolation(value);
-  if (violation !== null) {
-    throw new Error(
-      `Decimal argument "${argName}" (${JSON.stringify(value)}) ${violation}.`
-    );
-  }
-}
-function parseDecimalArg(value, argName) {
-  assertCanonicalInput(value, argName);
-  const negative = value.startsWith("-");
-  const unsigned = negative ? value.slice(1) : value;
-  const pointIndex = unsigned.indexOf(".");
-  const digits = pointIndex === -1 ? unsigned : unsigned.slice(0, pointIndex) + unsigned.slice(pointIndex + 1);
-  const scale = pointIndex === -1 ? 0 : unsigned.length - pointIndex - 1;
-  const magnitude = BigInt(digits);
-  return { coefficient: negative ? -magnitude : magnitude, scale };
-}
-function formatDecimalParts(parts) {
-  const negative = parts.coefficient < 0n;
-  const digits = (negative ? -parts.coefficient : parts.coefficient).toString();
-  let unsigned;
-  if (parts.scale === 0) {
-    unsigned = digits;
-  } else {
-    const padded = digits.padStart(parts.scale + 1, "0");
-    const pointIndex = padded.length - parts.scale;
-    unsigned = `${padded.slice(0, pointIndex)}.${padded.slice(pointIndex)}`;
-  }
-  if (parts.coefficient === 0n) return unsigned;
-  return negative ? `-${unsigned}` : unsigned;
-}
-function significantDigitCount(coefficient) {
-  const magnitude = coefficient < 0n ? -coefficient : coefficient;
-  return magnitude.toString().length;
-}
-function assertWithinEnvelope(parts, operation) {
-  if (significantDigitCount(parts.coefficient) > DECIMAL_MAX_SIGNIFICANT_DIGITS) {
-    throw new DecimalOverflowError(
-      `Decimal overflow in ${operation}: the exact result exceeds ${DECIMAL_MAX_SIGNIFICANT_DIGITS} significant digits. Round explicitly (Round/Divide) to reduce precision.`
-    );
-  }
-  if (parts.scale > DECIMAL_MAX_SCALE) {
-    throw new DecimalOverflowError(
-      `Decimal overflow in ${operation}: the exact result exceeds scale ${DECIMAL_MAX_SCALE}. Round explicitly (Round/Divide) to reduce precision.`
-    );
-  }
-  return parts;
-}
-function alignScales(a, b) {
-  const scale = Math.max(a.scale, b.scale);
-  return {
-    a: a.coefficient * pow10(scale - a.scale),
-    b: b.coefficient * pow10(scale - b.scale),
-    scale
-  };
-}
-function compareDecimalStrings(a, b) {
-  const aligned = alignScales(parseDecimalArg(a, "a"), parseDecimalArg(b, "b"));
-  if (aligned.a < aligned.b) return -1;
-  if (aligned.a > aligned.b) return 1;
-  return 0;
-}
-function minDecimalStrings(a, b) {
-  return compareDecimalStrings(a, b) <= 0 ? a : b;
-}
-function maxDecimalStrings(a, b) {
-  return compareDecimalStrings(a, b) >= 0 ? a : b;
-}
-function clampDecimalStrings(value, min, max) {
-  if (compareDecimalStrings(min, max) > 0) {
-    throw new DecimalClampRangeError(MATH_CLAMP_RANGE_MESSAGE);
-  }
-  if (compareDecimalStrings(value, min) < 0) return min;
-  if (compareDecimalStrings(value, max) > 0) return max;
-  return value;
-}
-function absDecimalString(value) {
-  const parts = parseDecimalArg(value, "value");
-  const magnitude = parts.coefficient < 0n ? -parts.coefficient : parts.coefficient;
-  return formatDecimalParts({ coefficient: magnitude, scale: parts.scale });
-}
-function addDecimalStrings(a, b) {
-  const aligned = alignScales(parseDecimalArg(a, "a"), parseDecimalArg(b, "b"));
-  return formatDecimalParts(
-    assertWithinEnvelope(
-      { coefficient: aligned.a + aligned.b, scale: aligned.scale },
-      "addition"
-    )
-  );
-}
-function subtractDecimalStrings(a, b) {
-  const aligned = alignScales(parseDecimalArg(a, "a"), parseDecimalArg(b, "b"));
-  return formatDecimalParts(
-    assertWithinEnvelope(
-      { coefficient: aligned.a - aligned.b, scale: aligned.scale },
-      "subtraction"
-    )
-  );
-}
-function multiplyDecimalStrings(a, b) {
-  const left = parseDecimalArg(a, "a");
-  const right = parseDecimalArg(b, "b");
-  return formatDecimalParts(
-    assertWithinEnvelope(
-      {
-        coefficient: left.coefficient * right.coefficient,
-        scale: left.scale + right.scale
-      },
-      "multiplication"
-    )
-  );
-}
-function assertDigitsInRange(digits, operation) {
-  if (!Number.isInteger(digits)) {
-    throw new DecimalDigitsRangeError(
-      `Decimal ${operation} digits must be an integer (received ${digits}).`
-    );
-  }
-  if (digits < 0 || digits > DECIMAL_MAX_SCALE) {
-    throw new DecimalDigitsRangeError(
-      `Decimal ${operation} digits must be between 0 and ${DECIMAL_MAX_SCALE} (received ${digits}).`
-    );
-  }
-}
-function roundParts(parts, digits) {
-  if (digits >= parts.scale) return parts;
-  const drop = parts.scale - digits;
-  const divisor = pow10(drop);
-  const negative = parts.coefficient < 0n;
-  const magnitude = negative ? -parts.coefficient : parts.coefficient;
-  let quotient = magnitude / divisor;
-  const remainder = magnitude % divisor;
-  const doubled = remainder * 2n;
-  if (doubled > divisor || doubled === divisor && quotient % 2n === 1n) {
-    quotient += 1n;
-  }
-  return { coefficient: negative ? -quotient : quotient, scale: digits };
-}
-function roundDecimalString(value, digits) {
-  assertDigitsInRange(digits, "round");
-  const rounded = roundParts(parseDecimalArg(value, "value"), digits);
-  return formatDecimalParts(assertWithinEnvelope(rounded, "round"));
-}
-function toIntegralParts(parts, direction) {
-  if (parts.scale === 0) return parts;
-  const divisor = pow10(parts.scale);
-  const quotient = parts.coefficient / divisor;
-  const remainder = parts.coefficient % divisor;
-  if (remainder === 0n) return { coefficient: quotient, scale: 0 };
-  if (direction === "floor" && remainder < 0n) {
-    return { coefficient: quotient - 1n, scale: 0 };
-  }
-  if (direction === "ceiling" && remainder > 0n) {
-    return { coefficient: quotient + 1n, scale: 0 };
-  }
-  return { coefficient: quotient, scale: 0 };
-}
-function floorDecimalString(value) {
-  const parts = toIntegralParts(parseDecimalArg(value, "value"), "floor");
-  return formatDecimalParts(assertWithinEnvelope(parts, "floor"));
-}
-function ceilingDecimalString(value) {
-  const parts = toIntegralParts(parseDecimalArg(value, "value"), "ceiling");
-  return formatDecimalParts(assertWithinEnvelope(parts, "ceiling"));
-}
-function truncateDecimalString(value) {
-  const parts = toIntegralParts(parseDecimalArg(value, "value"), "truncate");
-  return formatDecimalParts(assertWithinEnvelope(parts, "truncate"));
-}
-function divideDecimalStrings(a, b, digits) {
-  assertDigitsInRange(digits, "divide");
-  const dividend = parseDecimalArg(a, "a");
-  const divisor = parseDecimalArg(b, "b");
-  if (divisor.coefficient === 0n) {
-    throw new DecimalDivisionByZeroError(
-      `Decimal division by zero: ${JSON.stringify(a)} / ${JSON.stringify(b)}.`
-    );
-  }
-  const exponent = divisor.scale - dividend.scale + digits;
-  let numerator = dividend.coefficient;
-  let denominator = divisor.coefficient;
-  if (exponent >= 0) {
-    numerator *= pow10(exponent);
-  } else {
-    denominator *= pow10(-exponent);
-  }
-  const negative = numerator < 0n !== denominator < 0n;
-  const absNumerator = numerator < 0n ? -numerator : numerator;
-  const absDenominator = denominator < 0n ? -denominator : denominator;
-  let quotient = absNumerator / absDenominator;
-  const remainder = absNumerator % absDenominator;
-  const doubled = remainder * 2n;
-  if (doubled > absDenominator || doubled === absDenominator && quotient % 2n === 1n) {
-    quotient += 1n;
-  }
-  const parts = {
-    coefficient: negative ? -quotient : quotient,
-    scale: digits
-  };
-  return formatDecimalParts(assertWithinEnvelope(parts, "division"));
-}
-function decimalStringFromFloat(value, digits) {
-  assertDigitsInRange(digits, "float conversion");
-  if (Number.isNaN(value)) {
-    throw new DecimalNonFiniteError("Cannot convert NaN to a decimal.");
-  }
-  if (!Number.isFinite(value)) {
-    throw new DecimalNonFiniteError(
-      `Cannot convert ${value > 0 ? "Infinity" : "-Infinity"} to a decimal.`
-    );
-  }
-  const view = new DataView(new ArrayBuffer(8));
-  view.setFloat64(0, value);
-  const bits = view.getBigUint64(0);
-  const negative = bits >> 63n === 1n;
-  const exponentBits = Number(bits >> 52n & 0x7ffn);
-  const mantissaBits = bits & 0xfffffffffffffn;
-  let mantissa;
-  let exponent;
-  if (exponentBits === 0) {
-    mantissa = mantissaBits;
-    exponent = -1074;
-  } else {
-    mantissa = mantissaBits | 1n << 52n;
-    exponent = exponentBits - 1075;
-  }
-  if (mantissa === 0n) {
-    return "0";
-  }
-  if (negative) mantissa = -mantissa;
-  let parts;
-  if (exponent >= 0) {
-    parts = { coefficient: mantissa * (1n << BigInt(exponent)), scale: 0 };
-  } else {
-    parts = {
-      coefficient: mantissa * 5n ** BigInt(-exponent),
-      scale: -exponent
-    };
-  }
-  while (parts.scale > 0 && parts.coefficient % TEN === 0n) {
-    parts = { coefficient: parts.coefficient / TEN, scale: parts.scale - 1 };
-  }
-  const rounded = roundParts(parts, digits);
-  return formatDecimalParts(assertWithinEnvelope(rounded, "float conversion"));
+// ../src/runtime/neoscript/initializer-context.ts
+function initializerEvaluatorCacheKey(document) {
+  return document.evaluatorCache?.key ?? document;
 }
-function floatFromDecimalString(value) {
-  assertCanonicalInput(value, "value");
-  return Number(value);
+function initializerEvaluatorCacheRevision(document) {
+  return document.evaluatorCache?.revision;
 }
-var DecimalOverflowError, DecimalDivisionByZeroError, DecimalDigitsRangeError, DecimalNonFiniteError, DecimalClampRangeError, MATH_CLAMP_RANGE_MESSAGE, TEN;
-var init_decimal_math = __esm({
-  "../src/models/decimal/decimal-math.ts"() {
+var InitializerReadSet;
+var init_initializer_context = __esm({
+  "../src/runtime/neoscript/initializer-context.ts"() {
     "use strict";
-    init_members();
-    DecimalOverflowError = class extends Error {
-    };
-    DecimalDivisionByZeroError = class extends Error {
-    };
-    DecimalDigitsRangeError = class extends Error {
-    };
-    DecimalNonFiniteError = class extends Error {
-    };
-    DecimalClampRangeError = class extends Error {
+    init_collections();
+    InitializerReadSet = class {
+      valueIds = /* @__PURE__ */ new Set();
+      localizedTextIds = /* @__PURE__ */ new Set();
+      variantIds = /* @__PURE__ */ new Set();
+      containerIds = /* @__PURE__ */ new Set();
+      staticMemberIds = /* @__PURE__ */ new Set();
+      hasValuePlacementRead = false;
+      hasUnattributableValueRead = false;
+      recordUnattributableValueRead = (_reason) => {
+        void _reason;
+        this.hasUnattributableValueRead = true;
+      };
+      recordValuePlacementRead = () => {
+        this.hasValuePlacementRead = true;
+      };
     };
-    MATH_CLAMP_RANGE_MESSAGE = "Math.Clamp requires min <= max.";
-    TEN = 10n;
-  }
-});
-
-// ../src/models/decimal/index.ts
-var init_decimal = __esm({
-  "../src/models/decimal/index.ts"() {
-    "use strict";
-    init_decimal_math();
   }
 });
 
@@ -70347,7 +70064,396 @@ var init_project2 = __esm({
   }
 });
 
-// ../src/view-models/neoscript-evaluator/evaluateNSGetter.ts
+// ../src/runtime/neoscript/NeoScriptScope.ts
+var NeoScriptScope;
+var init_NeoScriptScope = __esm({
+  "../src/runtime/neoscript/NeoScriptScope.ts"() {
+    "use strict";
+    NeoScriptScope = class {
+      constructor(parent = null, initialBindings) {
+        this.parent = parent;
+        this.#bindings = new Map(initialBindings);
+      }
+      parent;
+      #bindings;
+      #readonlyBindingErrors = /* @__PURE__ */ new Map();
+      get localBindingCount() {
+        return this.#bindings.size;
+      }
+      get(bindingId) {
+        if (this.#bindings.has(bindingId)) return this.#bindings.get(bindingId);
+        return this.parent?.get(bindingId);
+      }
+      has(bindingId) {
+        return this.#bindings.has(bindingId) || this.parent?.has(bindingId) === true;
+      }
+      containsLocal(bindingId) {
+        return this.#bindings.has(bindingId);
+      }
+      setLocal(bindingId, value) {
+        this.#bindings.set(bindingId, value);
+      }
+      bindInvocationEntry(bindingId, value) {
+        this.#bindings.set(bindingId, value);
+      }
+      bindInvocationKeyAndEntry(keyBindingId, key, entryBindingId, entry) {
+        this.#bindings.set(keyBindingId, key);
+        this.#bindings.set(entryBindingId, entry);
+      }
+      resetInvocationLocals(parameterCount) {
+        if (this.#bindings.size > parameterCount) this.#bindings.clear();
+        if (this.#readonlyBindingErrors.size > 0) {
+          this.#readonlyBindingErrors.clear();
+        }
+      }
+      *keys() {
+        const inherited = /* @__PURE__ */ new Set();
+        if (this.parent !== null) {
+          for (const bindingId of this.parent.keys()) {
+            inherited.add(bindingId);
+            yield bindingId;
+          }
+        }
+        for (const bindingId of this.#bindings.keys()) {
+          if (!inherited.has(bindingId)) yield bindingId;
+        }
+      }
+      markReadonly(bindingId, errorMessage4) {
+        const errors = this.#readonlyBindingErrors.get(bindingId);
+        if (errors === void 0) {
+          this.#readonlyBindingErrors.set(bindingId, [errorMessage4]);
+          return;
+        }
+        errors.push(errorMessage4);
+      }
+      unmarkReadonly(bindingId) {
+        const errors = this.#readonlyBindingErrors.get(bindingId);
+        if (errors === void 0) return;
+        errors.pop();
+        if (errors.length === 0) this.#readonlyBindingErrors.delete(bindingId);
+      }
+      readonlyError(bindingId) {
+        const errors = this.#readonlyBindingErrors.get(bindingId);
+        if (errors !== void 0 && errors.length > 0) {
+          return errors[errors.length - 1];
+        }
+        return this.parent?.readonlyError(bindingId);
+      }
+    };
+  }
+});
+
+// ../src/runtime/neoscript/NSGetterRuntimeError.ts
+var NSGetterRuntimeError, UncompiledInitializerRuntimeError;
+var init_NSGetterRuntimeError = __esm({
+  "../src/runtime/neoscript/NSGetterRuntimeError.ts"() {
+    "use strict";
+    NSGetterRuntimeError = class extends Error {
+      constructor(message) {
+        super(message);
+        this.name = "NSGetterRuntimeError";
+      }
+    };
+    UncompiledInitializerRuntimeError = class extends NSGetterRuntimeError {
+      constructor(memberId, memberName, initializer = null, valueId = null) {
+        super(
+          `Initializer for '${memberName}' has no compiled body; push the project so the server compiles it.`
+        );
+        this.memberId = memberId;
+        this.initializer = initializer;
+        this.valueId = valueId;
+        this.name = "UncompiledInitializerRuntimeError";
+      }
+      memberId;
+      initializer;
+      valueId;
+    };
+  }
+});
+
+// ../src/models/decimal/decimal-math.ts
+function pow10(exponent) {
+  return TEN ** BigInt(exponent);
+}
+function assertCanonicalInput(value, argName) {
+  const violation = getDecimalStringViolation(value);
+  if (violation !== null) {
+    throw new Error(
+      `Decimal argument "${argName}" (${JSON.stringify(value)}) ${violation}.`
+    );
+  }
+}
+function parseDecimalArg(value, argName) {
+  assertCanonicalInput(value, argName);
+  const negative = value.startsWith("-");
+  const unsigned = negative ? value.slice(1) : value;
+  const pointIndex = unsigned.indexOf(".");
+  const digits = pointIndex === -1 ? unsigned : unsigned.slice(0, pointIndex) + unsigned.slice(pointIndex + 1);
+  const scale = pointIndex === -1 ? 0 : unsigned.length - pointIndex - 1;
+  const magnitude = BigInt(digits);
+  return { coefficient: negative ? -magnitude : magnitude, scale };
+}
+function formatDecimalParts(parts) {
+  const negative = parts.coefficient < 0n;
+  const digits = (negative ? -parts.coefficient : parts.coefficient).toString();
+  let unsigned;
+  if (parts.scale === 0) {
+    unsigned = digits;
+  } else {
+    const padded = digits.padStart(parts.scale + 1, "0");
+    const pointIndex = padded.length - parts.scale;
+    unsigned = `${padded.slice(0, pointIndex)}.${padded.slice(pointIndex)}`;
+  }
+  if (parts.coefficient === 0n) return unsigned;
+  return negative ? `-${unsigned}` : unsigned;
+}
+function significantDigitCount(coefficient) {
+  const magnitude = coefficient < 0n ? -coefficient : coefficient;
+  return magnitude.toString().length;
+}
+function assertWithinEnvelope(parts, operation) {
+  if (significantDigitCount(parts.coefficient) > DECIMAL_MAX_SIGNIFICANT_DIGITS) {
+    throw new DecimalOverflowError(
+      `Decimal overflow in ${operation}: the exact result exceeds ${DECIMAL_MAX_SIGNIFICANT_DIGITS} significant digits. Round explicitly (Round/Divide) to reduce precision.`
+    );
+  }
+  if (parts.scale > DECIMAL_MAX_SCALE) {
+    throw new DecimalOverflowError(
+      `Decimal overflow in ${operation}: the exact result exceeds scale ${DECIMAL_MAX_SCALE}. Round explicitly (Round/Divide) to reduce precision.`
+    );
+  }
+  return parts;
+}
+function alignScales(a, b) {
+  const scale = Math.max(a.scale, b.scale);
+  return {
+    a: a.coefficient * pow10(scale - a.scale),
+    b: b.coefficient * pow10(scale - b.scale),
+    scale
+  };
+}
+function compareDecimalStrings(a, b) {
+  const aligned = alignScales(parseDecimalArg(a, "a"), parseDecimalArg(b, "b"));
+  if (aligned.a < aligned.b) return -1;
+  if (aligned.a > aligned.b) return 1;
+  return 0;
+}
+function minDecimalStrings(a, b) {
+  return compareDecimalStrings(a, b) <= 0 ? a : b;
+}
+function maxDecimalStrings(a, b) {
+  return compareDecimalStrings(a, b) >= 0 ? a : b;
+}
+function clampDecimalStrings(value, min, max) {
+  if (compareDecimalStrings(min, max) > 0) {
+    throw new DecimalClampRangeError(MATH_CLAMP_RANGE_MESSAGE);
+  }
+  if (compareDecimalStrings(value, min) < 0) return min;
+  if (compareDecimalStrings(value, max) > 0) return max;
+  return value;
+}
+function absDecimalString(value) {
+  const parts = parseDecimalArg(value, "value");
+  const magnitude = parts.coefficient < 0n ? -parts.coefficient : parts.coefficient;
+  return formatDecimalParts({ coefficient: magnitude, scale: parts.scale });
+}
+function addDecimalStrings(a, b) {
+  const aligned = alignScales(parseDecimalArg(a, "a"), parseDecimalArg(b, "b"));
+  return formatDecimalParts(
+    assertWithinEnvelope(
+      { coefficient: aligned.a + aligned.b, scale: aligned.scale },
+      "addition"
+    )
+  );
+}
+function subtractDecimalStrings(a, b) {
+  const aligned = alignScales(parseDecimalArg(a, "a"), parseDecimalArg(b, "b"));
+  return formatDecimalParts(
+    assertWithinEnvelope(
+      { coefficient: aligned.a - aligned.b, scale: aligned.scale },
+      "subtraction"
+    )
+  );
+}
+function multiplyDecimalStrings(a, b) {
+  const left = parseDecimalArg(a, "a");
+  const right = parseDecimalArg(b, "b");
+  return formatDecimalParts(
+    assertWithinEnvelope(
+      {
+        coefficient: left.coefficient * right.coefficient,
+        scale: left.scale + right.scale
+      },
+      "multiplication"
+    )
+  );
+}
+function assertDigitsInRange(digits, operation) {
+  if (!Number.isInteger(digits)) {
+    throw new DecimalDigitsRangeError(
+      `Decimal ${operation} digits must be an integer (received ${digits}).`
+    );
+  }
+  if (digits < 0 || digits > DECIMAL_MAX_SCALE) {
+    throw new DecimalDigitsRangeError(
+      `Decimal ${operation} digits must be between 0 and ${DECIMAL_MAX_SCALE} (received ${digits}).`
+    );
+  }
+}
+function roundParts(parts, digits) {
+  if (digits >= parts.scale) return parts;
+  const drop = parts.scale - digits;
+  const divisor = pow10(drop);
+  const negative = parts.coefficient < 0n;
+  const magnitude = negative ? -parts.coefficient : parts.coefficient;
+  let quotient = magnitude / divisor;
+  const remainder = magnitude % divisor;
+  const doubled = remainder * 2n;
+  if (doubled > divisor || doubled === divisor && quotient % 2n === 1n) {
+    quotient += 1n;
+  }
+  return { coefficient: negative ? -quotient : quotient, scale: digits };
+}
+function roundDecimalString(value, digits) {
+  assertDigitsInRange(digits, "round");
+  const rounded = roundParts(parseDecimalArg(value, "value"), digits);
+  return formatDecimalParts(assertWithinEnvelope(rounded, "round"));
+}
+function toIntegralParts(parts, direction) {
+  if (parts.scale === 0) return parts;
+  const divisor = pow10(parts.scale);
+  const quotient = parts.coefficient / divisor;
+  const remainder = parts.coefficient % divisor;
+  if (remainder === 0n) return { coefficient: quotient, scale: 0 };
+  if (direction === "floor" && remainder < 0n) {
+    return { coefficient: quotient - 1n, scale: 0 };
+  }
+  if (direction === "ceiling" && remainder > 0n) {
+    return { coefficient: quotient + 1n, scale: 0 };
+  }
+  return { coefficient: quotient, scale: 0 };
+}
+function floorDecimalString(value) {
+  const parts = toIntegralParts(parseDecimalArg(value, "value"), "floor");
+  return formatDecimalParts(assertWithinEnvelope(parts, "floor"));
+}
+function ceilingDecimalString(value) {
+  const parts = toIntegralParts(parseDecimalArg(value, "value"), "ceiling");
+  return formatDecimalParts(assertWithinEnvelope(parts, "ceiling"));
+}
+function truncateDecimalString(value) {
+  const parts = toIntegralParts(parseDecimalArg(value, "value"), "truncate");
+  return formatDecimalParts(assertWithinEnvelope(parts, "truncate"));
+}
+function divideDecimalStrings(a, b, digits) {
+  assertDigitsInRange(digits, "divide");
+  const dividend = parseDecimalArg(a, "a");
+  const divisor = parseDecimalArg(b, "b");
+  if (divisor.coefficient === 0n) {
+    throw new DecimalDivisionByZeroError(
+      `Decimal division by zero: ${JSON.stringify(a)} / ${JSON.stringify(b)}.`
+    );
+  }
+  const exponent = divisor.scale - dividend.scale + digits;
+  let numerator = dividend.coefficient;
+  let denominator = divisor.coefficient;
+  if (exponent >= 0) {
+    numerator *= pow10(exponent);
+  } else {
+    denominator *= pow10(-exponent);
+  }
+  const negative = numerator < 0n !== denominator < 0n;
+  const absNumerator = numerator < 0n ? -numerator : numerator;
+  const absDenominator = denominator < 0n ? -denominator : denominator;
+  let quotient = absNumerator / absDenominator;
+  const remainder = absNumerator % absDenominator;
+  const doubled = remainder * 2n;
+  if (doubled > absDenominator || doubled === absDenominator && quotient % 2n === 1n) {
+    quotient += 1n;
+  }
+  const parts = {
+    coefficient: negative ? -quotient : quotient,
+    scale: digits
+  };
+  return formatDecimalParts(assertWithinEnvelope(parts, "division"));
+}
+function decimalStringFromFloat(value, digits) {
+  assertDigitsInRange(digits, "float conversion");
+  if (Number.isNaN(value)) {
+    throw new DecimalNonFiniteError("Cannot convert NaN to a decimal.");
+  }
+  if (!Number.isFinite(value)) {
+    throw new DecimalNonFiniteError(
+      `Cannot convert ${value > 0 ? "Infinity" : "-Infinity"} to a decimal.`
+    );
+  }
+  const view = new DataView(new ArrayBuffer(8));
+  view.setFloat64(0, value);
+  const bits = view.getBigUint64(0);
+  const negative = bits >> 63n === 1n;
+  const exponentBits = Number(bits >> 52n & 0x7ffn);
+  const mantissaBits = bits & 0xfffffffffffffn;
+  let mantissa;
+  let exponent;
+  if (exponentBits === 0) {
+    mantissa = mantissaBits;
+    exponent = -1074;
+  } else {
+    mantissa = mantissaBits | 1n << 52n;
+    exponent = exponentBits - 1075;
+  }
+  if (mantissa === 0n) {
+    return "0";
+  }
+  if (negative) mantissa = -mantissa;
+  let parts;
+  if (exponent >= 0) {
+    parts = { coefficient: mantissa * (1n << BigInt(exponent)), scale: 0 };
+  } else {
+    parts = {
+      coefficient: mantissa * 5n ** BigInt(-exponent),
+      scale: -exponent
+    };
+  }
+  while (parts.scale > 0 && parts.coefficient % TEN === 0n) {
+    parts = { coefficient: parts.coefficient / TEN, scale: parts.scale - 1 };
+  }
+  const rounded = roundParts(parts, digits);
+  return formatDecimalParts(assertWithinEnvelope(rounded, "float conversion"));
+}
+function floatFromDecimalString(value) {
+  assertCanonicalInput(value, "value");
+  return Number(value);
+}
+var DecimalOverflowError, DecimalDivisionByZeroError, DecimalDigitsRangeError, DecimalNonFiniteError, DecimalClampRangeError, MATH_CLAMP_RANGE_MESSAGE, TEN;
+var init_decimal_math = __esm({
+  "../src/models/decimal/decimal-math.ts"() {
+    "use strict";
+    init_members();
+    DecimalOverflowError = class extends Error {
+    };
+    DecimalDivisionByZeroError = class extends Error {
+    };
+    DecimalDigitsRangeError = class extends Error {
+    };
+    DecimalNonFiniteError = class extends Error {
+    };
+    DecimalClampRangeError = class extends Error {
+    };
+    MATH_CLAMP_RANGE_MESSAGE = "Math.Clamp requires min <= max.";
+    TEN = 10n;
+  }
+});
+
+// ../src/models/decimal/index.ts
+var init_decimal = __esm({
+  "../src/models/decimal/index.ts"() {
+    "use strict";
+    init_decimal_math();
+  }
+});
+
+// ../src/runtime/neoscript/evaluateNSGetter.ts
 function isCatchableNeoScriptRuntimeError(error) {
   return error instanceof NSGetterRuntimeError && !(error instanceof UncompiledInitializerRuntimeError) && !(error instanceof NonCatchableNSGetterRuntimeError);
 }
@@ -70831,9 +70937,9 @@ function evaluatorOwnershipDistances(rowId, indexes) {
   if (cached !== void 0) return cached;
   const distances = /* @__PURE__ */ new Map([[rowId, 0]]);
   const pending = [rowId];
-  while (pending.length > 0) {
-    const currentId = pending.shift();
-    if (currentId === void 0) break;
+  for (let cursor = 0; cursor < pending.length; cursor += 1) {
+    const currentId = pending[cursor];
+    if (currentId === void 0) continue;
     const currentDistance = distances.get(currentId);
     if (currentDistance === void 0) continue;
     for (const parent of evaluatorParentLinks(indexes, currentId)) {
@@ -71451,6 +71557,19 @@ function finalizeConstructorAllocations(ctx, returnValue, ownsInvocationState, r
   }
   const escapedRoots = /* @__PURE__ */ new Set();
   const scannedRows = /* @__PURE__ */ new Set();
+  let rowsByContainerId;
+  const containerEntryIds = (containerId) => {
+    if (rowsByContainerId === void 0) {
+      rowsByContainerId = /* @__PURE__ */ new Map();
+      for (const candidate of evaluatorValues(ctx)) {
+        if (typeof candidate.containerId !== "string") continue;
+        const entries = rowsByContainerId.get(candidate.containerId) ?? [];
+        entries.push(candidate.id);
+        rowsByContainerId.set(candidate.containerId, entries);
+      }
+    }
+    return rowsByContainerId.get(containerId) ?? [];
+  };
   const markConstructorGroupEscaped = (rootId) => {
     if (escapedRoots.has(rootId)) return;
     escapedRoots.add(rootId);
@@ -71500,13 +71619,11 @@ function finalizeConstructorAllocations(ctx, returnValue, ownsInvocationState, r
         ctx.onUnattributableValueRead?.(
           `constructor-argument-list:${argumentId}`
         );
-        for (const candidate of evaluatorValues(ctx)) {
-          if (candidate.containerId === argumentId) {
-            scanCreationDataRow({
-              id: candidate.id,
-              typeInfo: typeInfo.entryTypeInfo
-            });
-          }
+        for (const childId of containerEntryIds(argumentId)) {
+          scanCreationDataRow({
+            id: childId,
+            typeInfo: typeInfo.entryTypeInfo
+          });
         }
         return;
       }
@@ -71526,9 +71643,11 @@ function finalizeConstructorAllocations(ctx, returnValue, ownsInvocationState, r
     }
     const rawMember = hintedMember ?? activeStaticBindingRoot(valueId, ctx)?.member ?? memberForValueRow(row, ctx);
     let member = rawMember;
+    let resolvedMemberForSubstitution;
     if (rawMember !== null) {
       try {
-        member = resolveMember2(rawMember, ctx.vm.members);
+        member = cachedResolvedMember(rawMember, ctx);
+        resolvedMemberForSubstitution = member;
       } catch {
         member = rawMember;
       }
@@ -71538,7 +71657,8 @@ function finalizeConstructorAllocations(ctx, returnValue, ownsInvocationState, r
         member = substituteMember(
           member,
           envFromStamp(row.genericBindings),
-          ctx.vm.members
+          ctx.vm.members,
+          resolvedMemberForSubstitution
         );
       } catch {
       }
@@ -71558,10 +71678,8 @@ function finalizeConstructorAllocations(ctx, returnValue, ownsInvocationState, r
       const entryMember = evalMemberById(ctx.vm, member.entryMemberId);
       if (listKindOf(member) === 1 /* Unordered */) {
         ctx.onUnattributableValueRead?.(`constructed-unordered-list:${row.id}`);
-        for (const candidate of evaluatorValues(ctx)) {
-          if (candidate.containerId === row.id) {
-            scanOwnedRow(candidate.id, entryMember);
-          }
+        for (const childId of containerEntryIds(row.id)) {
+          scanOwnedRow(childId, entryMember);
         }
         return;
       }
@@ -79196,7 +79314,7 @@ function iterateCollection(c, ctx, callback) {
 }
 var DELEGATE_LEXICAL_THIS, DELEGATE_LEXICAL_ROOT, NonCatchableNSGetterRuntimeError, NativeFunctionDelegateUnavailableError, CorruptNeoScriptIRError, NeoScriptResourceLimitError, NeoScriptWallClockTimeoutError, DEFAULT_NEO_SCRIPT_EXECUTION_BUDGET_LIMITS, liveListIndexesByProject, evaluatorOwnershipCachesByBase, MAX_CONSTRUCTION_DEPTH, MAX_LOOP_ITERATIONS, resolutionCacheByMembers, NO_SCHEMA_REVISION, LazyValueOverlay, READONLY_FOREACH_BINDING_ERROR, READONLY_CATCH_BINDING_ERROR, NS_MATH_OP_NAMES, DOUBLE_INTEGRAL_MAGNITUDE, EMPTY_SUPPLIED_CONSTRUCTOR_FIELDS;
 var init_evaluateNSGetter = __esm({
-  "../src/view-models/neoscript-evaluator/evaluateNSGetter.ts"() {
+  "../src/runtime/neoscript/evaluateNSGetter.ts"() {
     "use strict";
     init_deep_clone_plain_data();
     init_instance_provenance();
@@ -79575,7 +79693,229 @@ var init_stored_value_placement_index = __esm({
   }
 });
 
-// ../src/database/virtual-instance-values.ts
+// ../src/runtime/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({
+    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 finalizeMaterializedRoot(args) {
+  for (const created of args.allCreated) {
+    if (created === args.root) continue;
+    if (created.classId === void 0) delete created.classId;
+  }
+  stampCreatedValuesMapKey(args.allCreated, args.mapKey);
+  if (args.supersededRootId !== void 0) {
+    args.storageKeyDeclarations.delete(args.supersededRootId);
+  }
+  args.storageKeyDeclarations.delete(args.root.id);
+  applyDeclaredStorageKeyOverrides({
+    createdValues: args.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 },
+    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 } },
+    ...evaluated.constructorArgs === void 0 ? {} : { constructorArgs: deepClonePlainData(evaluated.constructorArgs) },
+    ...evaluated.instanceConstructorId === void 0 ? {} : { instanceConstructorId: evaluated.instanceConstructorId },
+    ...evaluated.instanceVariantId === void 0 ? {} : { instanceVariantId: evaluated.instanceVariantId },
+    ...evaluated.instanceVariantRowValueId === void 0 ? {} : {
+      instanceVariantRowValueId: evaluated.instanceVariantRowValueId
+    }
+  };
+  const allCreated = [root, ...createdValues];
+  if (evaluated.provisionalRootId !== void 0) {
+    retargetDelegateReceiverValueIds(
+      allCreated,
+      evaluated.provisionalRootId,
+      root.id
+    );
+  }
+  finalizeMaterializedRoot({
+    root,
+    allCreated,
+    mapKey: args.row.mapKey,
+    storageKeyDeclarations
+  });
+  return {
+    root,
+    createdValues,
+    pinnedRootSchemaKeys: evaluated.pinnedRootSchemaKeys ?? /* @__PURE__ */ new Set()
+  };
+}
+function materializeMemberDefaultValue(args) {
+  const createdValues = [];
+  const storageKeyDeclarations = /* @__PURE__ */ new Map();
+  args.readTracking?.recordUnattributableValueRead(
+    `declaration-owner-resolution:${args.envelope.id}`
+  );
+  const { valuesById, rootOwners } = declarationInitializerContext(
+    args.document
+  );
+  const declarationArguments = (member, init, sourceValueId) => {
+    const ownerClass = typeof sourceValueId === "string" ? initializerOwnerContext(
+      args.document,
+      sourceValueId,
+      rootOwners,
+      valuesById
+    ).ownerClass : typeof Reflect.get(member, "id") === "string" ? 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)
+    );
+  };
+  const built = buildDefaultMemberValue({
+    document: args.document,
+    projectId: args.envelope.projectId,
+    member: args.member,
+    createdValues,
+    storageKeyDeclarations,
+    ...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) => args.evaluateInitializer({
+      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.classId === void 0 ? {} : { classId: built.classId },
+    ...built.genericBindings == null ? {} : { genericBindings: { ...built.genericBindings } }
+  };
+  const allCreated = [root, ...interior];
+  retargetDelegateReceiverValueIds(allCreated, built.id, root.id);
+  finalizeMaterializedRoot({
+    root,
+    allCreated,
+    mapKey: args.envelope.mapKey,
+    storageKeyDeclarations,
+    supersededRootId: built.id
+  });
+  return { root, createdValues: interior, pinnedRootSchemaKeys: /* @__PURE__ */ new Set() };
+}
+var declarationInitializerContextByDocument;
+var init_initializer_materialization = __esm({
+  "../src/runtime/initializer-materialization.ts"() {
+    "use strict";
+    init_deep_clone_plain_data();
+    init_members();
+    init_inheritance();
+    init_evaluateNSGetter();
+    init_initializer_context();
+    init_value_row_owner_members();
+    init_compile_ns_property();
+    declarationInitializerContextByDocument = /* @__PURE__ */ new WeakMap();
+  }
+});
+
+// ../src/runtime/virtual-instance-graph.ts
 function buildVirtualInstanceMaterializedIndex(args) {
   const rowsById = new Map(
     (args.materializedRows ?? args.document.values).map((row) => [row.id, row])
@@ -79821,6 +80161,7 @@ function expandStoredInstance(args) {
     };
     return trackMaterialization(
       () => materializeInitializerValue({
+        evaluateInitializer: args.evaluateInitializer,
         document: args.document,
         member: replayMember,
         row: { ...envelope, init },
@@ -79836,6 +80177,7 @@ function expandStoredInstance(args) {
     const stampEnv = instanceRoot.genericBindings == null || Object.keys(instanceRoot.genericBindings).length === 0 ? null : envFromStamp(instanceRoot.genericBindings);
     const built = trackMaterialization(
       () => materializeMemberDefaultValue({
+        evaluateInitializer: args.evaluateInitializer,
         document: args.document,
         member: replayMember,
         envelope,
@@ -80213,6 +80555,7 @@ function resolvedStoredInstanceRows(args) {
     if (next === void 0 || resolvedRootIds.has(next.root.id)) continue;
     resolvedRootIds.add(next.root.id);
     const expanded = expandStoredInstance({
+      evaluateInitializer: args.evaluateInitializer,
       document,
       instanceRoot: next.root,
       rootMember: next.member
@@ -81558,6 +81901,7 @@ function resolveVariantInstanceGraphForDocument(args) {
   for (const row of args.localRows) materializedById.set(row.id, row);
   materializedById.set(args.priorInstanceRoot.id, args.priorInstanceRoot);
   const priorExpanded = expandStoredInstance({
+    evaluateInitializer: args.evaluateInitializer,
     document,
     instanceRoot: args.priorInstanceRoot,
     rootMember,
@@ -81596,6 +81940,7 @@ function resolveVariantInstanceGraphForDocument(args) {
   }
   materializedById.set(args.nextInstanceRoot.id, args.nextInstanceRoot);
   const nextExpanded = expandStoredInstance({
+    evaluateInitializer: args.evaluateInitializer,
     document,
     instanceRoot: args.nextInstanceRoot,
     rootMember,
@@ -81681,6 +82026,7 @@ function createHeadlessVirtualInstanceResolver(args) {
         materializedRows: document.values
       });
       const expanded = expandStoredInstance({
+        evaluateInitializer: args.evaluateInitializer,
         document: resolverDocument,
         instanceRoot,
         rootMember: member,
@@ -81740,8 +82086,8 @@ function createHeadlessVirtualInstanceResolver(args) {
   };
 }
 var KEPT_ROW_SAMPLE_LIMIT, CORPUS_SCANNING_MEMBER_KINDS, VirtualExpansionUnsupportedError, ROOT_PATH, SYNTHETIC_LINEAGE_PREFIXES, resolverDocumentsByDocument;
-var init_virtual_instance_values = __esm({
-  "../src/database/virtual-instance-values.ts"() {
+var init_virtual_instance_graph = __esm({
+  "../src/runtime/virtual-instance-graph.ts"() {
     "use strict";
     init_deep_clone_plain_data();
     init_inheritance();
@@ -81755,8 +82101,8 @@ var init_virtual_instance_values = __esm({
     init_instance_provenance();
     init_unordered_list_membership();
     init_neoscript();
-    init_evaluateInitializer();
-    init_init_backed_value_materialization();
+    init_initializer_context();
+    init_initializer_materialization();
     init_constructor_argument_ownership();
     init_constructors2();
     init_src();
@@ -81777,13 +82123,7 @@ var init_virtual_instance_values = __esm({
   }
 });
 
-// ../src/view-models/neoscript-evaluator/evaluateInitializer.ts
-function initializerEvaluatorCacheKey(document) {
-  return document.evaluatorCache?.key ?? document;
-}
-function initializerEvaluatorCacheRevision(document) {
-  return document.evaluatorCache?.revision;
-}
+// ../src/runtime/neoscript/evaluateInitializer.ts
 function initializerEvaluatorLookups(document, readTracking) {
   const trackedHeadless = readTracking !== void 0 && document.databaseVM === void 0;
   const indexKey = initializerEvaluatorCacheKey(document);
@@ -81843,6 +82183,7 @@ function initializerEvaluatorLookups(document, readTracking) {
     revision
   );
   const headlessVirtualResolver = document.databaseVM === void 0 ? createHeadlessVirtualInstanceResolver({
+    evaluateInitializer: evaluateMemberInitializer,
     document,
     resolverLookups: () => lookups,
     ...readTracking === void 0 ? {} : { readRecorder: virtualReadRecorder(readTracking) }
@@ -81861,6 +82202,7 @@ function initializerEvaluatorLookups(document, readTracking) {
       // resolves against the plain document, with these lookups as the
       // nested resolver.
       resolveVariantInstanceGraph: (args) => resolveVariantInstanceGraphForDocument({
+        evaluateInitializer: evaluateMemberInitializer,
         document,
         resolverLookups: lookups,
         ...readTracking === void 0 ? {} : { readRecorder: virtualReadRecorder(readTracking) },
@@ -82094,279 +82436,86 @@ function evaluateMemberInitializer(args) {
     }
   };
 }
-var evaluatorLookupsByDocument, indexedEvaluatorLookupsByDocument, InitializerReadSet;
+var evaluatorLookupsByDocument, indexedEvaluatorLookupsByDocument;
 var init_evaluateInitializer = __esm({
-  "../src/view-models/neoscript-evaluator/evaluateInitializer.ts"() {
+  "../src/runtime/neoscript/evaluateInitializer.ts"() {
     "use strict";
+    init_initializer_context();
     init_deep_clone_plain_data();
-    init_collections();
     init_instance_provenance();
     init_members();
     init_project2();
     init_evaluateNSGetter();
-    init_virtual_instance_values();
+    init_virtual_instance_graph();
     evaluatorLookupsByDocument = /* @__PURE__ */ new WeakMap();
     indexedEvaluatorLookupsByDocument = /* @__PURE__ */ new WeakMap();
-    InitializerReadSet = class {
-      valueIds = /* @__PURE__ */ new Set();
-      localizedTextIds = /* @__PURE__ */ new Set();
-      variantIds = /* @__PURE__ */ new Set();
-      containerIds = /* @__PURE__ */ new Set();
-      staticMemberIds = /* @__PURE__ */ new Set();
-      hasValuePlacementRead = false;
-      hasUnattributableValueRead = false;
-      recordUnattributableValueRead = (_reason) => {
-        void _reason;
-        this.hasUnattributableValueRead = true;
-      };
-      recordValuePlacementRead = () => {
-        this.hasValuePlacementRead = true;
-      };
-    };
   }
 });
 
-// ../src/view-models/neoscript-evaluator/index.ts
-var init_neoscript_evaluator = __esm({
-  "../src/view-models/neoscript-evaluator/index.ts"() {
+// ../src/runtime/materialize-values.ts
+function materializeInitializerValue2(args) {
+  return materializeInitializerValue({
+    ...args,
+    evaluateInitializer: evaluateMemberInitializer
+  });
+}
+var init_materialize_values = __esm({
+  "../src/runtime/materialize-values.ts"() {
     "use strict";
-    init_NSGetterRuntimeError();
-    init_evaluateNSGetter();
     init_evaluateInitializer();
+    init_initializer_materialization();
   }
 });
 
-// ../src/database/init-backed-value-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 = evaluateMemberInitializer({
-    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
+// ../src/runtime/virtual-instance-values.ts
+function expandStoredInstance2(args) {
+  return expandStoredInstance({
+    ...args,
+    evaluateInitializer: evaluateMemberInitializer
   });
-  return { evaluated, createdValues, storageKeyDeclarations };
 }
-function finalizeMaterializedRoot(args) {
-  for (const created of args.allCreated) {
-    if (created === args.root) continue;
-    if (created.classId === void 0) delete created.classId;
-  }
-  stampCreatedValuesMapKey(args.allCreated, args.mapKey);
-  if (args.supersededRootId !== void 0) {
-    args.storageKeyDeclarations.delete(args.supersededRootId);
-  }
-  args.storageKeyDeclarations.delete(args.root.id);
-  applyDeclaredStorageKeyOverrides({
-    createdValues: args.allCreated,
-    declarationByValueId: args.storageKeyDeclarations,
-    existingParentContextById: /* @__PURE__ */ new Map([
-      [
-        args.root.id,
-        {
-          mapKey: args.mapKey ?? null,
-          classId: args.root.classId ?? void 0
-        }
-      ]
-    ])
+function resolvedStoredInstanceRows2(args) {
+  return resolvedStoredInstanceRows({
+    ...args,
+    evaluateInitializer: evaluateMemberInitializer
   });
 }
-function materializeInitializerValue(args) {
-  const { evaluated, createdValues, storageKeyDeclarations } = evaluateInitializerMaterialization({
-    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 },
-    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 } },
-    ...evaluated.constructorArgs === void 0 ? {} : { constructorArgs: deepClonePlainData(evaluated.constructorArgs) },
-    ...evaluated.instanceConstructorId === void 0 ? {} : { instanceConstructorId: evaluated.instanceConstructorId },
-    ...evaluated.instanceVariantId === void 0 ? {} : { instanceVariantId: evaluated.instanceVariantId },
-    ...evaluated.instanceVariantRowValueId === void 0 ? {} : {
-      instanceVariantRowValueId: evaluated.instanceVariantRowValueId
-    }
-  };
-  const allCreated = [root, ...createdValues];
-  if (evaluated.provisionalRootId !== void 0) {
-    retargetDelegateReceiverValueIds(
-      allCreated,
-      evaluated.provisionalRootId,
-      root.id
-    );
-  }
-  finalizeMaterializedRoot({
-    root,
-    allCreated,
-    mapKey: args.row.mapKey,
-    storageKeyDeclarations
+function resolveVariantInstanceGraphForDocument2(args) {
+  return resolveVariantInstanceGraphForDocument({
+    ...args,
+    evaluateInitializer: evaluateMemberInitializer
   });
-  return {
-    root,
-    createdValues,
-    pinnedRootSchemaKeys: evaluated.pinnedRootSchemaKeys ?? /* @__PURE__ */ new Set()
-  };
 }
-function materializeMemberDefaultValue(args) {
-  const createdValues = [];
-  const storageKeyDeclarations = /* @__PURE__ */ new Map();
-  args.readTracking?.recordUnattributableValueRead(
-    `declaration-owner-resolution:${args.envelope.id}`
-  );
-  const { valuesById, rootOwners } = declarationInitializerContext(
-    args.document
-  );
-  const declarationArguments = (member, init, sourceValueId) => {
-    const ownerClass = typeof sourceValueId === "string" ? initializerOwnerContext(
-      args.document,
-      sourceValueId,
-      rootOwners,
-      valuesById
-    ).ownerClass : typeof Reflect.get(member, "id") === "string" ? 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)
-    );
-  };
-  const built = buildDefaultMemberValue({
-    document: args.document,
-    projectId: args.envelope.projectId,
-    member: args.member,
-    createdValues,
-    storageKeyDeclarations,
-    ...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) => evaluateMemberInitializer({
-      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.classId === void 0 ? {} : { classId: built.classId },
-    ...built.genericBindings == null ? {} : { genericBindings: { ...built.genericBindings } }
-  };
-  const allCreated = [root, ...interior];
-  retargetDelegateReceiverValueIds(allCreated, built.id, root.id);
-  finalizeMaterializedRoot({
-    root,
-    allCreated,
-    mapKey: args.envelope.mapKey,
-    storageKeyDeclarations,
-    supersededRootId: built.id
+function createHeadlessVirtualInstanceResolver2(args) {
+  return createHeadlessVirtualInstanceResolver({
+    ...args,
+    evaluateInitializer: evaluateMemberInitializer
   });
-  return { root, createdValues: interior, pinnedRootSchemaKeys: /* @__PURE__ */ new Set() };
 }
-var declarationInitializerContextByDocument;
-var init_init_backed_value_materialization = __esm({
-  "../src/database/init-backed-value-materialization.ts"() {
+var init_virtual_instance_values = __esm({
+  "../src/runtime/virtual-instance-values.ts"() {
     "use strict";
-    init_deep_clone_plain_data();
-    init_members();
-    init_inheritance();
-    init_neoscript_evaluator();
-    init_evaluateNSGetter();
     init_evaluateInitializer();
-    init_value_row_owner_members();
-    init_compile_ns_property();
-    declarationInitializerContextByDocument = /* @__PURE__ */ new WeakMap();
+    init_virtual_instance_graph();
+    init_virtual_instance_graph();
   }
 });
 
 // ../convex/projectDocumentDialogueMaterialization.ts
 function materializeDialogues(dialogueRecords, dialogueNodes) {
+  const nodesByDialogue = /* @__PURE__ */ new Map();
+  for (const node of dialogueNodes) {
+    const dialogueId = getDialogueNodeDialogueId(node);
+    if (dialogueId === null) continue;
+    const nodes = nodesByDialogue.get(dialogueId) ?? [];
+    nodes.push(node);
+    nodesByDialogue.set(dialogueId, nodes);
+  }
   return dialogueRecords.map((dialogue) => {
     if (!isRecordWithStringId(dialogue)) return dialogue;
     const { triggerNodeId: _triggerNodeId, ...dialoguePayload } = dialogue;
     void _triggerNodeId;
-    const nodes = dialogueNodes.filter(
-      (node) => getDialogueNodeDialogueId(node) === dialogue.id
-    );
+    const nodes = nodesByDialogue.get(dialogue.id) ?? [];
     const triggerNode = findDialogueTriggerNode(dialogue, nodes);
     const bodyNodes = Object.fromEntries(
       nodes.flatMap((node) => {
@@ -82540,7 +82689,6 @@ __export(project_document_read_exports, {
   readProjectDocumentContentHashHeads: () => readProjectDocumentContentHashHeads,
   readProjectDocumentManifestPage: () => readProjectDocumentManifestPage,
   readProjectDocumentManifestPageRecords: () => readProjectDocumentManifestPageRecords,
-  readProjectDocumentManifestRecords: () => readProjectDocumentManifestRecords,
   readProjectDocumentRevisionMarker: () => readProjectDocumentRevisionMarker,
   withStoredValueBase: () => withStoredValueBase
 });
@@ -82781,7 +82929,10 @@ async function fetchProjectDocumentSnapshots(fetchBatch, snapshotIds) {
       }
     }
   });
-  await Promise.all(workers);
+  const outcomes = await Promise.allSettled(workers);
+  for (const outcome of outcomes) {
+    if (outcome.status === "rejected") throw outcome.reason;
+  }
   return snapshotsById;
 }
 function readProjectDocumentSnapshotBatch(value, requestedIds) {
@@ -89476,6 +89627,17 @@ var init_packed_value_parity = __esm({
   }
 });
 
+// ../src/runtime/neoscript/index.ts
+var init_neoscript2 = __esm({
+  "../src/runtime/neoscript/index.ts"() {
+    "use strict";
+    init_NSGetterRuntimeError();
+    init_evaluateNSGetter();
+    init_evaluateInitializer();
+    init_initializer_context();
+  }
+});
+
 // ../src/database/headless-virtual-instance-lookups.ts
 function headlessVirtualInstanceLookups(document, options = {}) {
   const members = document.members;
@@ -89493,7 +89655,7 @@ function headlessVirtualInstanceLookups(document, options = {}) {
       }
     } : {}
   );
-  const virtual = createHeadlessVirtualInstanceResolver({
+  const virtual = createHeadlessVirtualInstanceResolver2({
     document: {
       ...expandedDocument,
       ...options.initializerCompiler === void 0 ? {} : { initializerCompiler: options.initializerCompiler }
@@ -89511,7 +89673,7 @@ function headlessVirtualInstanceLookups(document, options = {}) {
     virtualInstanceRowsForValue: (receiverValueId) => virtual.virtualInstanceRowsForValue(receiverValueId),
     // Stored-construction replay evaluates `ToVariant`, and production's
     // variant-constructed placements collapse through exactly this path.
-    resolveVariantInstanceGraph: (args) => resolveVariantInstanceGraphForDocument({
+    resolveVariantInstanceGraph: (args) => resolveVariantInstanceGraphForDocument2({
       document,
       resolverLookups: lookups,
       ...args
@@ -89528,7 +89690,7 @@ var init_headless_virtual_instance_lookups = __esm({
     "use strict";
     init_virtual_instance_values();
     init_packed_value_encoding();
-    init_neoscript_evaluator();
+    init_neoscript2();
   }
 });
 
@@ -90884,7 +91046,7 @@ function materializedInitializerReconciliationFailuresV4(args) {
     let effectiveCurrentRows = currentRows;
     if (currentRoot !== void 0) {
       try {
-        effectiveCurrentRows = resolvedStoredInstanceRows({
+        effectiveCurrentRows = resolvedStoredInstanceRows2({
           // The replay immediately above compiled the constructor records
           // that turn this pulled document into an evaluator document.
           document,
@@ -96104,7 +96266,7 @@ var init_project_migration_runner = __esm({
   "../src/database/project-migration-runner.ts"() {
     "use strict";
     init_compiler_adapter();
-    init_neoscript_evaluator();
+    init_neoscript2();
     init_members();
     init_packed_value_encoding();
     init_project_root_members();
@@ -97921,7 +98083,7 @@ function provenVirtualValueIds(args) {
     return /* @__PURE__ */ new Set();
   }
   const document = args.merged.document;
-  const expanded = expandStoredInstance({
+  const expanded = expandStoredInstance2({
     document,
     instanceRoot: root,
     rootMember
@@ -99345,7 +99507,7 @@ function materializePreparedInstanceInitializers(args) {
         `Value "${valueId}" carries an initializer but no ownership path resolves its declared member.`
       );
     }
-    const materialized = materializeInitializerValue({
+    const materialized = materializeInitializerValue2({
       // Every site that survives the declaration-default guard is source for
       // a persisted instance construction. The trusted replay mode both
       // admits Immutable storage and installs the concrete generic slot; the
@@ -99376,7 +99538,7 @@ function materializePreparedInstanceInitializers(args) {
       replayOnlyIndexes.push(site.index);
       continue;
     }
-    const baseline = materializeInitializerValue({
+    const baseline = materializeInitializerValue2({
       document: materializationScope.document,
       member,
       row: {
@@ -99597,7 +99759,7 @@ function reconcileInitializerMaterializationTransport(args) {
   }
 }
 function constructorArgumentsSemanticallyEqual(args) {
-  const currentRows = resolvedStoredInstanceRows({
+  const currentRows = resolvedStoredInstanceRows2({
     document: args.currentDocument,
     instanceRoot: args.currentRoot,
     rootMember: args.rootMember
@@ -102789,7 +102951,7 @@ var init_project_version_schema_commit = __esm({
     init_compiler_adapter();
     init_project_fingerprint();
     init_project_migration_runner();
-    init_neoscript_evaluator();
+    init_neoscript2();
     init_project_version_intents();
     init_general_function_call_ir_source_recompile();
     init_projectDocumentDialogueMaterialization();
@@ -102798,7 +102960,7 @@ var init_project_version_schema_commit = __esm({
     init_project_version_static_value_writes();
     init_localizable_member_value_writes();
     init_value_row_owner_members();
-    init_init_backed_value_materialization();
+    init_materialize_values();
     init_packed_value_write_fold();
     init_constructor_argument_ownership();
     init_constructors2();
@@ -103638,7 +103800,7 @@ function materializeDeclarationInitializersForAnimationValidation(document) {
         delete deferredMember.valueId;
         return deferredMember;
       }
-      const materialized = materializeInitializerValue({
+      const materialized = materializeInitializerValue2({
         document: { ...document, members, values: [...valuesById.values()] },
         member,
         row: {
@@ -103672,7 +103834,7 @@ function materializeDeclarationInitializersForAnimationValidation(document) {
       deferred.add(row.id);
       continue;
     }
-    const materialized = materializeInitializerValue({
+    const materialized = materializeInitializerValue2({
       document: { ...document, members, values: [...valuesById.values()] },
       member,
       row
@@ -104549,7 +104711,7 @@ var init_project_version_whole_graph_validation = __esm({
     init_inheritance();
     init_neoscript();
     init_constructor_argument_ownership();
-    init_init_backed_value_materialization();
+    init_materialize_values();
     init_world_system_classes();
     init_project_world_reference_graph();
     init_project_record_semantics();
@@ -104671,10 +104833,12 @@ function compareWorkspacePaths(left, right) {
 }
 function computeWorkspaceStatus(workspace, options) {
   let phaseStarted = performance.now();
-  const reportPhase = (phase) => {
+  options.onPhase?.("Reading project schema\u2026");
+  const reportPhase = (phase, nextLabel) => {
     const finished = performance.now();
     options.reportPhase?.(phase, finished - phaseStarted);
     phaseStarted = finished;
+    if (nextLabel !== void 0) options.onPhase?.(nextLabel);
   };
   const conflictedFiles = [];
   const parseErrors = [];
@@ -104837,7 +105001,7 @@ function computeWorkspaceStatus(workspace, options) {
       analysis,
       compilationSources
     );
-    reportPhase("analysis-schema-defaults");
+    reportPhase("analysis-schema-defaults", "Reading stored values\u2026");
   } catch (error) {
     parseErrors.push(
       error instanceof SchemaSourceError ? error : new SchemaSourceError(
@@ -104912,7 +105076,7 @@ function computeWorkspaceStatus(workspace, options) {
     manifest,
     { registry: valueLowerRegistry }
   );
-  reportPhase("documents-static-root");
+  reportPhase("documents-static-root", "Reading variants and dialogues\u2026");
   authoredValueSeeds = new Map([...authoredValueSeeds, ...rootValues.seeds]);
   const rootPathResolutionState = overlayProspectiveSourceRecords(
     loweringRecords,
@@ -105070,7 +105234,7 @@ function computeWorkspaceStatus(workspace, options) {
     prospectiveState,
     projectAnalysisV4
   );
-  reportPhase("supplemental-dialogue");
+  reportPhase("supplemental-dialogue", "Comparing records\u2026");
   records2.push(
     ...staticValues.records,
     ...memberDefaults.records,
@@ -105193,7 +105357,7 @@ function computeWorkspaceStatus(workspace, options) {
       )
     );
   }
-  reportPhase("record-diff-references");
+  reportPhase("record-diff-references", "Checking packed values\u2026");
   if (referenceFailures.length > 0) {
     return {
       changes: [],
@@ -105274,7 +105438,7 @@ function computeWorkspaceStatus(workspace, options) {
     reconstructed: reconstructed3,
     changes
   });
-  reportPhase("packed-value-fold");
+  reportPhase("packed-value-fold", "Checking initializers\u2026");
   for (const change of changes) {
     if (change.recordKind !== "value" || change.kind !== "update") continue;
     const refusal = valueDematerializationRefusal({
@@ -105318,7 +105482,7 @@ function computeWorkspaceStatus(workspace, options) {
       )
     );
   }
-  reportPhase("initializer-reconciliation");
+  reportPhase("initializer-reconciliation", "Checking project files\u2026");
   for (const fileId of options.trustedPendingProjectFiles?.keys() ?? []) {
     const key = `project-file:${fileId}`;
     const base = workspace.state.records[key];
@@ -105355,7 +105519,7 @@ function computeWorkspaceStatus(workspace, options) {
   binaryChanges = binaryFiles.filter(
     (binary) => binary.action !== "unchanged" && binary.action !== "converged"
   );
-  reportPhase("binary-inspection");
+  reportPhase("binary-inspection", "Validating animation changes\u2026");
   const invalidatedFileIds = /* @__PURE__ */ new Set();
   for (const binary of binaryFiles) {
     if (binary.action === "create" || binary.action === "upload") {
@@ -105404,7 +105568,7 @@ function computeWorkspaceStatus(workspace, options) {
       );
     }
   }
-  reportPhase("animation-clip-validation");
+  reportPhase("animation-clip-validation", "Preparing new values\u2026");
   for (const binary of binaryChanges) {
     if (binary.action !== "missing-local") continue;
     parseErrors.push(
@@ -105541,7 +105705,7 @@ function replayAnimationDeclarationInitializersV4(records2, document, fallbackDo
     if (owner === void 0) continue;
     const declaredClassId = typeof row.classId === "string" ? row.classId : Reflect.get(owner, "classId");
     if (typeof declaredClassId !== "string") continue;
-    if (!classBelongsToAnimationFamily(document.classes, declaredClassId)) {
+    if (!classBelongsToAnimationFamily(document.classesById, declaredClassId)) {
       continue;
     }
     const fallback = fallbackValues.get(row.id);
@@ -105620,10 +105784,7 @@ function animationRecordsFromState(records2) {
     return isObjectRecord2(data) ? [{ recordKind: record4.recordKind, data }] : [];
   });
 }
-function classBelongsToAnimationFamily(classes, classId) {
-  const classesById = new Map(
-    classes.map((schemaClass2) => [schemaClass2.id, schemaClass2])
-  );
+function classBelongsToAnimationFamily(classesById, classId) {
   const visited = /* @__PURE__ */ new Set();
   let currentId = classId;
   while (currentId !== null && !visited.has(currentId)) {
@@ -105689,6 +105850,9 @@ function prospectiveAnimationDocumentV4(records2) {
     }
   }
   if (project === void 0) return null;
+  const classesById = new Map(
+    classes.map((schemaClass2) => [schemaClass2.id, schemaClass2])
+  );
   const classIdByName = new Map(classes.map((value) => [value.name, value.id]));
   const validationValues = expandPackedValueRows(values).map((value) => {
     if (typeof value.classId === "string") return value;
@@ -105713,10 +105877,12 @@ function prospectiveAnimationDocumentV4(records2) {
   return {
     project,
     classes,
+    classesById,
     members,
     values: expandProspectiveAnimationInstances({
       project,
       classes,
+      classesById,
       constructors,
       members,
       values: validationValues
@@ -105725,7 +105891,7 @@ function prospectiveAnimationDocumentV4(records2) {
 }
 function expandProspectiveAnimationInstances(document) {
   const animationRoots = document.values.filter(
-    (row) => isLiteralValueContent(row) && isVirtualInstanceRootShape(row) && typeof row.classId === "string" && classBelongsToAnimationFamily(document.classes, row.classId)
+    (row) => isLiteralValueContent(row) && isVirtualInstanceRootShape(row) && typeof row.classId === "string" && classBelongsToAnimationFamily(document.classesById, row.classId)
   );
   if (animationRoots.length === 0) return [...document.values];
   const lookups = cliEvaluatorLookups({
@@ -107119,8 +107285,7 @@ var init_commit_preparation_scope_planner = __esm({
           "source-only-rows",
           "whole-graph-validation-members",
           "world-value-ranges"
-        ],
-        mutatesDocument: []
+        ]
       },
       "authored-value-seeds": {
         order: 2,
@@ -107142,10 +107307,7 @@ var init_commit_preparation_scope_planner = __esm({
           "every-variant-root",
           "localizable-reference-candidates",
           "world-value-ranges"
-        ],
-        // `materializeStaticSeedBindingMembers` pushes the binding member it mints
-        // into the document the rest of this pass reads, not only into `prepared`.
-        mutatesDocument: ["members"]
+        ]
       },
       "variant-child-override-binding-members": {
         order: 3,
@@ -107161,10 +107323,7 @@ var init_commit_preparation_scope_planner = __esm({
           "every-variant-root",
           "stamp-edge-candidates",
           "world-value-ranges"
-        ],
-        // The minted binding member is pushed straight into the document the
-        // later passes read, not only into `prepared`.
-        mutatesDocument: ["members"]
+        ]
       },
       "prepared-instance-initializers": {
         order: 4,
@@ -107177,8 +107336,7 @@ var init_commit_preparation_scope_planner = __esm({
           "full-content-dimension",
           "member-default-value-closure",
           "world-value-ranges"
-        ],
-        mutatesDocument: []
+        ]
       },
       "delegate-value-bodies": {
         order: 5,
@@ -107194,8 +107352,7 @@ var init_commit_preparation_scope_planner = __esm({
           "every-variant-root",
           "source-only-rows",
           "world-value-ranges"
-        ],
-        mutatesDocument: []
+        ]
       },
       "variant-constructor-args": {
         order: 6,
@@ -107208,8 +107365,7 @@ var init_commit_preparation_scope_planner = __esm({
           "touched-variant-schema-key-children",
           "member-default-value-closure",
           "world-value-ranges"
-        ],
-        mutatesDocument: []
+        ]
       }
     };
   }
@@ -108922,6 +109078,12 @@ var init_server_preparation_preflight = __esm({
 function isPulledInitializerCompilationDocumentV4(document) {
   return typeof Reflect.get(document, "project") === "object" && Reflect.get(document, "project") !== null && Array.isArray(Reflect.get(document, "projectFiles")) && Array.isArray(Reflect.get(document, "members")) && Array.isArray(Reflect.get(document, "classes")) && Array.isArray(Reflect.get(document, "enums")) && Array.isArray(Reflect.get(document, "interfaces")) && Array.isArray(Reflect.get(document, "constructors")) && Array.isArray(Reflect.get(document, "values"));
 }
+function createPulledConstructionReplayContext(args) {
+  return {
+    document: args.document,
+    constructorsValidated: false
+  };
+}
 function pulledInitializerCompilerStateV4(document, compilationProject) {
   const existing = pulledInitializerCompilerStates.get(document);
   if (existing !== void 0) {
@@ -108997,6 +109159,14 @@ function describePulledProjectBodyCompileError(error) {
 }
 function replayStoredConstructionV4(args) {
   const document = args.document ?? readPulledProjectDocumentV4(args.records);
+  if (args.replayContext !== void 0 && args.replayContext.document !== document) {
+    throw new Error(
+      "Construction replay context belongs to a different document."
+    );
+  }
+  if (args.compileDocumentBodies === true && args.replayContext !== void 0) {
+    args.replayContext.constructorsValidated = false;
+  }
   const compilationProject = args.compilationProject ?? (args.compileDocumentBodies === true ? createNeoScriptCompilationProject({
     project: document.project,
     projectFiles: document.projectFiles,
@@ -109081,9 +109251,13 @@ function replayStoredConstructionV4(args) {
     ...candidate,
     init: withoutInitializerConstructionFields(candidate.init)
   } : candidate;
-  compilePulledUncompiledConstructorsV4(document, compilationProject);
-  assertPulledConstructorsCompiled(document);
-  const materialized = materializeInitializerValue({
+  compilePulledUncompiledConstructorsV4(
+    document,
+    compilationProject,
+    args.replayContext
+  );
+  assertPulledConstructorsCompiled(document, args.replayContext);
+  const materialized = materializeInitializerValue2({
     document: {
       ...document,
       // Replays need distinct compiler closures but read one immutable
@@ -109110,11 +109284,15 @@ function replayStoredConstructionV4(args) {
     ])
   );
 }
-function compilePulledUncompiledConstructorsV4(document, compilationProject) {
+function compilePulledUncompiledConstructorsV4(document, compilationProject, replayContext) {
+  if (replayContext?.constructorsValidated === true) return;
   const uncompiled = (document.constructors ?? []).filter(
     (constructor2) => !isNeoClassConstructor(constructor2)
   );
-  if (uncompiled.length === 0) return;
+  if (uncompiled.length === 0) {
+    if (replayContext !== void 0) replayContext.constructorsValidated = true;
+    return;
+  }
   const project = compilationProject ?? createNeoScriptCompilationProject({
     project: document.project,
     projectFiles: document.projectFiles,
@@ -109137,6 +109315,7 @@ function compilePulledUncompiledConstructorsV4(document, compilationProject) {
   for (const constructor2 of uncompiled) {
     compileConstructorRecord({ ...compileArgs, constructor: constructor2 });
   }
+  assertPulledConstructorsCompiled(document, replayContext);
 }
 function valueInitializerCompilationSites(document) {
   const cached = pulledValueInitializerCompilationSites.get(document);
@@ -109244,7 +109423,13 @@ function compilePulledProjectDocumentForEvaluationV4(document, compilationProjec
     }
   }
 }
-function assertPulledConstructorsCompiled(document) {
+function assertPulledConstructorsCompiled(document, replayContext) {
+  if (replayContext !== void 0 && replayContext.document !== document) {
+    throw new Error(
+      "Constructor validation context belongs to a different document."
+    );
+  }
+  if (replayContext?.constructorsValidated === true) return;
   const uncompiled = (document.constructors ?? []).find(
     (constructor2) => !isNeoClassConstructor(constructor2)
   );
@@ -109253,6 +109438,7 @@ function assertPulledConstructorsCompiled(document) {
       `Constructor "${uncompiled.id}" was read from authored source but was not compiled before evaluation.`
     );
   }
+  if (replayContext !== void 0) replayContext.constructorsValidated = true;
 }
 function compilePulledMemberInitializerBodyV4(document, memberId, compilationProject) {
   const compileArgs = {
@@ -109398,7 +109584,7 @@ var init_initializer_replay = __esm({
     "use strict";
     init_members();
     init_compile_ns_property();
-    init_init_backed_value_materialization();
+    init_materialize_values();
     init_virtual_instance_values();
     init_value_row_owner_members();
     init_project_document_read();
@@ -109451,11 +109637,16 @@ function buildValueEmitContext(records2, manifest) {
   const readDocument = () => document ??= readPulledProjectDocumentV4(records2);
   let compilationProject;
   const readCompilationProject = () => compilationProject ??= createNeoScriptCompilationProject(readDocument());
+  let replayContext;
+  const readReplayContext = () => replayContext ??= createPulledConstructionReplayContext({
+    document: readDocument()
+  });
   let materializedGraph;
   return {
     records: records2,
     readDocument,
     readCompilationProject,
+    readReplayContext,
     readMaterializedGraph: () => {
       if (materializedGraph !== void 0) return materializedGraph;
       materializedGraph = new MaterializedValueGraphContext(
@@ -109497,6 +109688,7 @@ function buildValueEmitContext(records2, manifest) {
     fileSymbols: projectFileSymbols(records2),
     localizedTextIds: /* @__PURE__ */ new Set(),
     constructionReplays: /* @__PURE__ */ new Map(),
+    constructorBodySchemaKeys: /* @__PURE__ */ new WeakMap(),
     materializedConstructors: /* @__PURE__ */ new Map(),
     materializedConstructorOverrideKeys: /* @__PURE__ */ new Map()
   };
@@ -110400,6 +110592,9 @@ function variantReconstructedFields(context, row) {
 }
 function mergedOverStoredRow(base, lowered) {
   const merged = { ...valueFileFields(base), ...lowered };
+  if (lowered.classId === null && base.classId === void 0) {
+    delete merged.classId;
+  }
   const storedArgs = isObjectRecord2(base.constructorArgs) ? base.constructorArgs : null;
   const loweredArgs = isObjectRecord2(merged.constructorArgs) ? merged.constructorArgs : null;
   if (storedArgs !== null && loweredArgs !== null) {
@@ -115074,7 +115269,8 @@ function storedConstructionReplayRows(context, valueId, code, member) {
     valueId,
     code,
     member,
-    compilationProject: context.readCompilationProject()
+    compilationProject: context.readCompilationProject(),
+    replayContext: context.readReplayContext()
   });
   context.constructionReplays.set(valueId, replay);
   return replay;
@@ -115216,7 +115412,11 @@ function storedConstructorCallSource(context, schemaClass2, value, className, en
         // re-declared that external graph under the construction, and the
         // emitter then refused the whole pull with a containment cycle on the
         // re-declared row's own children.
-        constructorArgumentBodySchemaKey(value, constructorArgs[key]) !== void 0
+        constructorArgumentBodySchemaKey(
+          context,
+          value,
+          constructorArgs[key]
+        ) !== void 0
       )}`
     ];
   });
@@ -115228,7 +115428,11 @@ function storedConstructorCallSource(context, schemaClass2, value, className, en
 function settledMemberForConstructorArgument(context, schemaClass2, value, argument2, argumentName) {
   if (typeof argument2 !== "string") return void 0;
   const schema = isObjectRecord2(schemaClass2.schema) ? schemaClass2.schema : {};
-  const bodySchemaKey = constructorArgumentBodySchemaKey(value, argument2);
+  const bodySchemaKey = constructorArgumentBodySchemaKey(
+    context,
+    value,
+    argument2
+  );
   if (bodySchemaKey !== void 0) {
     return memberForSchemaKey(context, schema, bodySchemaKey);
   }
@@ -115245,11 +115449,22 @@ function settledMemberForConstructorArgument(context, schemaClass2, value, argum
   const namedSchemaKey = schemaKeyForParameterName(schema, argumentName);
   return namedSchemaKey === void 0 ? void 0 : memberForSchemaKey(context, schema, namedSchemaKey);
 }
-function constructorArgumentBodySchemaKey(value, argument2) {
+function constructorArgumentBodySchemaKey(context, value, argument2) {
   if (typeof argument2 !== "string") return void 0;
   const body = value.value;
   if (!isObjectRecord2(body)) return void 0;
-  return Object.entries(body).find(([, rowId]) => rowId === argument2)?.[0];
+  let keysByArgument = context.constructorBodySchemaKeys.get(value);
+  if (keysByArgument === void 0) {
+    const created = /* @__PURE__ */ new Map();
+    for (const [schemaKey, rowId] of Object.entries(body)) {
+      if (typeof rowId === "string" && !created.has(rowId)) {
+        created.set(rowId, schemaKey);
+      }
+    }
+    keysByArgument = created;
+    context.constructorBodySchemaKeys.set(value, keysByArgument);
+  }
+  return keysByArgument.get(argument2);
 }
 function memberForSchemaKey(context, schema, schemaKey) {
   const memberId = schema[schemaKey];
@@ -117715,6 +117930,7 @@ function listProjectTestFilesV1(root) {
   return listNeoWorkspaceFilesV1(root).specs;
 }
 function computeWorkspaceStatus2(workspace, options = {}) {
+  options.onPhase?.("Reading project sources\u2026");
   const virtualSourceFiles = options.virtualSourceFiles ?? listProjectSourceFilesV4(workspace.root).map((path) => ({
     path: relative3(workspace.root, path).split(sep3).join("/"),
     content: readFileSync7(path, "utf8")
@@ -119333,12 +119549,11 @@ import {
   readFileSync as readFileSync9
 } from "node:fs";
 import { dirname as dirname8 } from "node:path";
-async function runPull(workspace, options) {
+async function runPull(workspace, options, progress = spinner("Checking local workspace\u2026")) {
   if (options.reset) {
-    await runResetPull(workspace);
+    await runResetPull(workspace, progress);
     return;
   }
-  const progress = spinner("Checking local workspace\u2026");
   try {
     await runNormalPull(workspace, options, progress);
   } catch (error) {
@@ -119353,32 +119568,6 @@ async function runNormalPull(workspace, options, progress) {
   if (acceptSourceEquivalentConflictBases(workspace, mainLocale) > 0) {
     writeWorkspaceState(workspace.root, workspace.state);
   }
-  let localByKey = /* @__PURE__ */ new Map();
-  let localStatus = null;
-  if (hasBaseline && !destructive) {
-    const status = computeWorkspaceStatus2(workspace);
-    localStatus = status;
-    if (status.conflictedFiles.length > 0) {
-      throw new Error(
-        `Resolve conflict markers before pulling: ${status.conflictedFiles.join(", ")}`
-      );
-    }
-    const blockingErrors = status.parseErrors.filter(
-      isBlockingSchemaSourceError
-    );
-    if (blockingErrors.length > 0) {
-      throw new Error(
-        `Fix parse errors before pulling:
-${blockingErrors.map((error) => `  ${error.message}`).join("\n")}`
-      );
-    }
-    localByKey = new Map(
-      [...status.reconstructed.entries()].map(([key, record4]) => [
-        key,
-        record4.fullData
-      ])
-    );
-  }
   let changedRecordKeys = null;
   let nextCursor = null;
   let observedHeadTransactionHash;
@@ -119433,6 +119622,35 @@ ${blockingErrors.map((error) => `  ${error.message}`).join("\n")}`
     document = await fetchProjectDocument(workspace);
     nextCursor = document.revision === void 0 ? null : cursorFromRevision(document.revision);
   }
+  let localByKey = /* @__PURE__ */ new Map();
+  let localStatus = null;
+  if (hasBaseline && !destructive) {
+    const status = computeWorkspaceStatus2(workspace, {
+      onPhase: (label) => progress.update(label)
+    });
+    localStatus = status;
+    if (status.conflictedFiles.length > 0) {
+      throw new Error(
+        `Resolve conflict markers before pulling: ${status.conflictedFiles.join(", ")}`
+      );
+    }
+    const blockingErrors = status.parseErrors.filter(
+      isBlockingSchemaSourceError
+    );
+    if (blockingErrors.length > 0) {
+      throw new Error(
+        `Fix parse errors before pulling:
+${blockingErrors.map((error) => `  ${error.message}`).join("\n")}`
+      );
+    }
+    localByKey = new Map(
+      [...status.reconstructed.entries()].map(([key, record4]) => [
+        key,
+        record4.fullData
+      ])
+    );
+  }
+  progress.update("Merging remote changes\u2026");
   const plans = /* @__PURE__ */ new Map();
   let mergedCount = 0;
   let conflictCount = 0;
@@ -119564,8 +119782,8 @@ ${blockingErrors.map((error) => `  ${error.message}`).join("\n")}`
     progress
   });
 }
-async function runResetPull(workspace) {
-  const progress = spinner("Pulling project snapshot\u2026");
+async function runResetPull(workspace, progress) {
+  progress.update("Pulling project snapshot\u2026");
   try {
     const document = await fetchProjectDocument(workspace);
     progress.update("Downloading project files\u2026");
@@ -123404,7 +123622,7 @@ var init_script = __esm({
     init_game_save_record_read2();
     init_projection();
     init_compiler_adapter();
-    init_neoscript_evaluator();
+    init_neoscript2();
     init_evaluator_lookups();
     init_project_root_members();
     init_save_overlay_resolution();
@@ -125033,6 +125251,7 @@ async function downloadProjectVersionTransactionResult(args) {
 async function preparePushStatus(workspace, options, onPhase = () => void 0) {
   onPhase("Analyzing working copy\u2026");
   const status = computeWorkspaceStatus2(workspace, {
+    onPhase,
     forceRecompile: options.forceRecompile
   });
   if (status.conflictedFiles.length > 0) {
@@ -127422,7 +127641,7 @@ var init_registry2 = __esm({
   "schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.46.0",
+      cliVersion: "0.46.2",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -130478,7 +130697,7 @@ var init_test = __esm({
     "use strict";
     init_src();
     init_members();
-    init_neoscript_evaluator();
+    init_neoscript2();
     init_evaluator_lookups();
     init_neoscript_language_adapter();
     init_workspace_status();
@@ -132219,7 +132438,7 @@ var init_migrate = __esm({
     init_source_diagnostics();
     init_compiler_adapter();
     init_push_body_diagnostics();
-    init_neoscript_evaluator();
+    init_neoscript2();
     init_evaluator_lookups();
     init_virtual_instance_values();
     init_script();
@@ -133864,7 +134083,7 @@ var init_dialogue_dryrun = __esm({
     "use strict";
     init_document();
     init_projection();
-    init_neoscript_evaluator();
+    init_neoscript2();
     init_evaluator_lookups();
     init_project_root_members();
     init_members();
@@ -134241,6 +134460,17 @@ var init_resolve = __esm({
 
 // src/main.ts
 var main_exports = {};
+function computeCommandWorkspaceStatus(args) {
+  const progress = !boolFlag(args, "json") && process.stdout.isTTY === true ? spinner("Reading local workspace\u2026") : null;
+  try {
+    const workspace = loadWorkspaceForCommand(args);
+    return computeWorkspaceStatus2(workspace, {
+      onPhase: (label) => progress?.update(label)
+    });
+  } finally {
+    progress?.stop();
+  }
+}
 function profileFlag(args) {
   const value = stringFlag(args, "profile");
   if (value === null) return null;
@@ -134435,7 +134665,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.46.0");
+    console.log("0.46.2");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {
@@ -134510,13 +134740,25 @@ async function main() {
         args,
         /* @__PURE__ */ new Set(["api", "force", "reset", "regenerate-source-names"])
       );
-      const workspace = loadWorkspaceForCommand(args);
-      const { runPull: runPull2 } = await Promise.resolve().then(() => (init_pull(), pull_exports));
-      await runPull2(workspace, {
-        force: boolFlag(args, "force"),
-        reset: boolFlag(args, "reset"),
-        regenerateSourceNames: boolFlag(args, "regenerate-source-names")
-      });
+      const progress = spinner("Reading local workspace\u2026");
+      try {
+        const workspace = loadWorkspaceForCommand(args);
+        const { runPull: runPull2 } = await Promise.resolve().then(() => (init_pull(), pull_exports));
+        await runPull2(
+          workspace,
+          {
+            force: boolFlag(args, "force"),
+            reset: boolFlag(args, "reset"),
+            regenerateSourceNames: boolFlag(args, "regenerate-source-names")
+          },
+          progress
+        );
+      } catch (error) {
+        progress.fail("Pull failed.");
+        throw error;
+      } finally {
+        progress.stop();
+      }
       return;
     }
     case "doctor": {
@@ -134724,7 +134966,6 @@ async function main() {
       return;
     }
     case "test": {
-      const workspace = loadWorkspaceForCommand(args);
       const reporterValue = stringFlag(args, "reporter") ?? "default";
       if (reporterValue !== "default" && reporterValue !== "json") {
         throw new NeoCliUsageError('--reporter must be "default" or "json".');
@@ -134746,8 +134987,9 @@ async function main() {
           "--testTimeout must be a positive number of milliseconds."
         );
       }
-      const progress = reporterValue === "default" && process.stdout.isTTY === true ? spinner("Preparing test project\u2026") : null;
+      const progress = reporterValue === "default" && process.stdout.isTTY === true ? spinner("Reading local workspace\u2026") : null;
       try {
+        const workspace = loadWorkspaceForCommand(args);
         const { runTest: runTest2 } = await Promise.resolve().then(() => (init_test(), test_exports));
         await runTest2(
           workspace,
@@ -134764,6 +135006,8 @@ async function main() {
       } catch (error) {
         progress?.fail("Test run failed.");
         throw error;
+      } finally {
+        progress?.stop();
       }
       return;
     }
@@ -134849,8 +135093,7 @@ async function main() {
       return;
     }
     case "status": {
-      const workspace = loadWorkspaceForCommand(args);
-      const status = computeWorkspaceStatus2(workspace);
+      const status = computeCommandWorkspaceStatus(args);
       if (boolFlag(args, "json")) {
         console.log(
           JSON.stringify(
@@ -134894,8 +135137,7 @@ async function main() {
       return;
     }
     case "diff": {
-      const workspace = loadWorkspaceForCommand(args);
-      const status = computeWorkspaceStatus2(workspace);
+      const status = computeCommandWorkspaceStatus(args);
       if (boolFlag(args, "json")) {
         console.log(
           JSON.stringify(