@neocompose/cli 0.70.2 → 0.70.4

package/dist/neo.mjs

@@ -4658,6 +4658,11 @@ var init_executable_parser = __esm({
           this.expect("operator", "<");
           if (t.text === "Dictionary") {
             const key = this.parseType();
+            if (this.peek().text === ">")
+              throw new CompileError(
+                "Dictionary requires a key type and a value type, for example Dictionary<string, int>.",
+                at(this.peek())
+              );
             this.expect("punctuation", ",");
             const value = this.parseType();
             this.expect("operator", ">");
@@ -5244,8 +5249,16 @@ var init_executable_parser = __esm({
       parseObjectInitializer() {
         this.expect("punctuation", "{");
         const entries = [];
+        const names = /* @__PURE__ */ new Set();
         while (!(this.peek().kind === "punctuation" && this.peek().text === "}")) {
           const name = this.expectMemberName();
+          if (names.has(name.text)) {
+            throw new CompileError(
+              `Initializer assigns '${name.text}' more than once. Remove the duplicate assignment.`,
+              at(name)
+            );
+          }
+          names.add(name.text);
           this.expect("operator", "=");
           entries.push({
             name: name.text,
@@ -5599,6 +5612,8 @@ var init_project_local_values = __esm({
       "LocalizationStatus",
       "ImageRegistry",
       "AudioClipRegistry",
+      "NeoImage",
+      "NeoAudioClip",
       "PriorityGroup",
       "DialogueGroup",
       "Migration"
@@ -9578,11 +9593,13 @@ function collectGlobalChildEntries(sourceText, declaration) {
     if ((token.kind === "type" || token.kind === "identifier") && isProjectNameToken(name) && isValidNeoProjectMemberIdentifier(name.text) && tokens[index + 2]?.text === "=" && tokens[index + 3]?.text !== "=" && // A pending annotation or statement boundary precedes a declaration;
     // `key: value` fields and expression member accesses never do.
     tokens[index - 1]?.text !== "." && tokens[index - 1]?.text !== ":") {
+      const value = tokens[index + 3];
       entries.push({
         typeName: token.text,
         name: name.text,
         nameRange: name.range,
-        annotations: pendingAnnotations
+        annotations: pendingAnnotations,
+        ...value?.kind === "identifier" && tokens[index + 4]?.text === ";" ? { reference: value.text } : {}
       });
       pendingAnnotations = [];
       index += 2;
@@ -9907,9 +9924,9 @@ function requiredFirstConstructorParameters(parameters) {
     ...parameters.filter((parameter4) => !parameter4.required)
   ];
 }
-function buildNeoScriptConstructorParameterDescriptors(classId, sources) {
+function buildNeoScriptConstructorParameterDescriptors(classId, sources2) {
   return requiredFirstConstructorParameters(
-    sources.flatMap((source) => {
+    sources2.flatMap((source) => {
       const name = generatedCSharpMemberNameForSchemaKey(source.schemaKey);
       if (!isGeneratedCSharpIdentifier(name)) return [];
       return [
@@ -9930,7 +9947,7 @@ function buildNeoScriptConstructorParameterDescriptors(classId, sources) {
   );
 }
 function buildNeoScriptConstructorSignature(classId, members, memberDescriptor) {
-  const sources = members.flatMap((member) => {
+  const sources2 = members.flatMap((member) => {
     if (member.static === true || member.computed === true) return [];
     if (member.kind === "function" || member.kind === "method") return [];
     const descriptor = memberDescriptor(member.id);
@@ -9949,7 +9966,7 @@ function buildNeoScriptConstructorSignature(classId, members, memberDescriptor)
   });
   const parameters = buildNeoScriptConstructorParameterDescriptors(
     classId,
-    sources
+    sources2
   ).map((parameter4) => ({
     id: parameter4.id,
     name: parameter4.name,
@@ -10126,6 +10143,52 @@ var init_project = __esm({
   }
 });
 
+// ../packages/neoscript-language/src/runtime-source.ts
+function registerRuntimeSource(node, source) {
+  if (!sources.has(node)) sources.set(node, source);
+}
+function runtimeSource(node) {
+  let current = node;
+  while (current !== void 0) {
+    const source = sources.get(current);
+    if (source !== void 0) return source;
+    current = origins.get(current);
+  }
+  return void 0;
+}
+function cloneWithRuntimeSources(value) {
+  const clone = structuredClone(value);
+  copyRuntimeSources(value, clone);
+  return clone;
+}
+function copyRuntimeSources(original, copied) {
+  const pending = [[original, copied]];
+  const seen = /* @__PURE__ */ new WeakSet();
+  while (pending.length > 0) {
+    const [sourceNode, targetNode] = pending.pop();
+    if (typeof sourceNode !== "object" || sourceNode === null || typeof targetNode !== "object" || targetNode === null)
+      continue;
+    if (seen.has(sourceNode)) continue;
+    seen.add(sourceNode);
+    const source = runtimeSource(sourceNode);
+    if (source !== void 0) sources.set(targetNode, source);
+    else if (sourceNode !== targetNode) origins.set(targetNode, sourceNode);
+    for (const key of Object.keys(sourceNode))
+      pending.push([
+        Reflect.get(sourceNode, key),
+        Reflect.get(targetNode, key)
+      ]);
+  }
+}
+var sources, origins;
+var init_runtime_source = __esm({
+  "../packages/neoscript-language/src/runtime-source.ts"() {
+    "use strict";
+    sources = /* @__PURE__ */ new WeakMap();
+    origins = /* @__PURE__ */ new WeakMap();
+  }
+});
+
 // ../packages/neoscript-language/src/type-substitution.ts
 function substituteTypeParameters(member, receiver, declaring) {
   const parameters = declaring.typeParameters ?? [];
@@ -12518,6 +12581,7 @@ var CONSTRUCTING_FUNCTION_KINDS, VARIANT_INITIALIZE_NAME, VARIANT_APPLY_NAME, MA
 var init_strict_resolver = __esm({
   "../packages/neoscript-language/src/strict-resolver.ts"() {
     "use strict";
+    init_runtime_source();
     init_listener_annotation();
     init_type_substitution();
     init_cell_pattern();
@@ -12665,8 +12729,9 @@ var init_strict_resolver = __esm({
       valueId;
     };
     StrictNeoScriptResolver = class _StrictNeoScriptResolver {
-      constructor(context, projectIndex, syntax) {
+      constructor(context, projectIndex, syntax, sourceUri) {
         this.context = context;
+        this.sourceUri = sourceUri;
         this.project = projectIndex ?? createProjectIndex(context.project);
         this.listenerParameters = createListenerAnnotationProvider(
           this.project,
@@ -12710,6 +12775,7 @@ var init_strict_resolver = __esm({
         );
       }
       context;
+      sourceUri;
       project;
       listenerParameters;
       thisVariable;
@@ -13055,6 +13121,20 @@ var init_strict_resolver = __esm({
         }
       }
       resolveStatement(statement, scope) {
+        const instruction = this.resolveStatementCore(statement, scope);
+        if (this.source !== void 0) {
+          const source = {
+            ...statement.pos,
+            text: this.source,
+            uri: this.sourceUri
+          };
+          registerRuntimeSource(instruction, source);
+          if (instruction.type === "functionCall" /* FunctionCall */)
+            registerRuntimeSource(instruction.call, source);
+        }
+        return instruction;
+      }
+      resolveStatementCore(statement, scope) {
         switch (statement.kind) {
           case "varDecl": {
             if (this.valueVariable && statement.name === "value") {
@@ -13706,7 +13786,12 @@ var init_strict_resolver = __esm({
                 statement.pos
               );
             }
-            this.requireAssignable(value.type, expected, statement.pos, "return");
+            this.requireAssignable(
+              value.type,
+              expected,
+              statement.expr.pos,
+              "return"
+            );
             return {
               type: "return" /* Return */,
               pointer: value.pointer
@@ -14647,6 +14732,16 @@ var init_strict_resolver = __esm({
         }
       }
       resolveExpression(expression, scope, expected) {
+        const resolved = this.resolveExpressionCore(expression, scope, expected);
+        if (this.source !== void 0)
+          registerRuntimeSource(resolved.pointer, {
+            ...expression.pos,
+            text: this.source,
+            uri: this.sourceUri
+          });
+        return resolved;
+      }
+      resolveExpressionCore(expression, scope, expected) {
         if (expected?.kind === "delegate") {
           if (expression.kind === "lambda") {
             return this.resolveDelegateLambda(expression, expected, scope);
@@ -14858,13 +14953,13 @@ var init_strict_resolver = __esm({
             }
             if (expression.typeArguments) {
               throw new CompileError(
-                "Generic intrinsic calls require a declaration-aware project source context.",
+                "Type arguments are not supported for this call. Remove the explicit type arguments.",
                 expression.pos
               );
             }
             if (expression.argumentNames) {
               throw new CompileError(
-                "Named arguments require a declaration-aware project source call context.",
+                "Named arguments are not supported for this call. Pass arguments in declaration order, without names.",
                 expression.pos
               );
             }
@@ -18195,7 +18290,7 @@ var init_strict_resolver = __esm({
             this.requireAssignable(
               resolved.type,
               expected,
-              pos,
+              argument2.pos,
               `argument ${index + 1}`
             );
           }
@@ -23918,6 +24013,9 @@ function annotationContextForDeclaration(declaration) {
   if (declaration.kind === "global" && isNeoVariantTypeName(declaration.type.name)) {
     return { kind: "variantGlobal", declaration };
   }
+  if (declaration.kind === "global" && (declaration.type.name === "NeoImage" || declaration.type.name === "NeoAudioClip")) {
+    return { kind: "projectFile", typeName: declaration.type.name };
+  }
   return { kind: "schema" };
 }
 function contextualAnnotationFields(document, position) {
@@ -24697,7 +24795,7 @@ function validateAnnotations(uri, annotations, context, environment, diagnostics
 }
 function fieldsForAnnotation(name, context, environment) {
   if (name === "id") {
-    return context.kind === "class" || context.kind === "schema" || context.kind === "member" || context.kind === "variantGlobal" || context.kind === "flowMember" || context.kind === "flowBinding" || context.kind === "flowGraph" ? [{ name: "id", type: "string" }] : null;
+    return context.kind === "class" || context.kind === "schema" || context.kind === "member" || context.kind === "variantGlobal" || context.kind === "projectFile" || context.kind === "flowMember" || context.kind === "flowBinding" || context.kind === "flowGraph" ? [{ name: "id", type: "string" }] : null;
   }
   if (name === "primary") return context.kind === "flowBinding" ? [] : null;
   if (name === "incomplete") {
@@ -24735,6 +24833,15 @@ function settingsFields(context) {
       }
     ];
   }
+  if (context.kind === "projectFile") {
+    return [
+      {
+        name: "template",
+        type: context.typeName === "NeoImage" ? "TextureTemplate" : "AudioTemplate"
+      },
+      { name: "name", type: "string" }
+    ];
+  }
   if (context.kind === "class") {
     if (context.declaration.baseTypes.some((type2) => type2.name === "Dialogue")) {
       return [
@@ -25285,7 +25392,7 @@ function validateExpression(expression, expected, scope, environment, uri, range
       pushDiagnostic(
         diagnostics,
         uri,
-        range2,
+        anchor ? anchorSpan(anchor, expression.pos, 1) : range2,
         "project-expression-type-mismatch",
         `Expected ${describeType(expected)} but received ${describeType(actual)}.`
       );
@@ -26499,6 +26606,7 @@ function findTypeAnnotation(type, position) {
 function describeAnnotationContext(context) {
   if (context.kind === "member" || context.kind === "type" || context.kind === "flowBinding" || context.kind === "flowMember")
     return `${context.type.name} ${context.kind}`;
+  if (context.kind === "projectFile") return `${context.typeName} declaration`;
   return context.kind;
 }
 function lowerFirst2(value) {
@@ -26706,7 +26814,8 @@ function compileNeoScriptStrict(document, context, options = {}) {
     const emitted = new StrictNeoScriptResolver(
       resolverContext,
       projectIndex,
-      syntax.lexed
+      syntax.lexed,
+      document.uri
     ).compile(ast);
     const ir = attachDependencyManifest(
       emitted,
@@ -27942,6 +28051,13 @@ function innerBodyRange(source, range2) {
 }
 function collectRegistryMembers(documents) {
   const byRegistryType = /* @__PURE__ */ new Map();
+  const fileDeclarations = /* @__PURE__ */ new Map();
+  for (const document of documents.values()) {
+    for (const declaration of document.declarations) {
+      if (declaration.kind === "global" && neoScriptRegistryReferenceType(declaration.type.name) !== null)
+        fileDeclarations.set(declaration.name, declaration);
+    }
+  }
   for (const [uri, document] of documents) {
     for (const declaration of document.declarations) {
       if (declaration.kind !== "global") continue;
@@ -27955,9 +28071,10 @@ function collectRegistryMembers(documents) {
         declaration
       )) {
         if (entry.typeName !== registry.entryType) continue;
+        const listed = entry.reference === void 0 ? void 0 : fileDeclarations.get(entry.reference);
         members.push({
           id: sourceIdentity2(
-            entry.annotations,
+            listed?.type.name === registry.entryType ? listed.annotations : entry.annotations,
             `${declaration.type.name}:${uri}:${entry.name}`
           ),
           name: entry.name,
@@ -30825,6 +30942,7 @@ function compileNeoProjectSources(inputs) {
   const schemaEnums = [];
   const configuration = [];
   const files = [];
+  const fileDeclarations = [];
   const values = [];
   const dialogueGroups = [];
   const variants = [];
@@ -30863,6 +30981,8 @@ function compileNeoProjectSources(inputs) {
           configuration.push(global);
         } else if (FILE_REGISTRY_TYPES.has(declaration.type.name)) {
           files.push(global);
+        } else if (FILE_DECLARATION_TYPES.has(declaration.type.name)) {
+          fileDeclarations.push(global);
         } else if (GROUP_TYPES.has(declaration.type.name)) {
           dialogueGroups.push(global);
         } else if (isNeoVariantFamilyTypeName(declaration.type.name)) {
@@ -30885,7 +31005,7 @@ function compileNeoProjectSources(inputs) {
     },
     relations: { globals: relations },
     configuration: { globals: configuration },
-    files: { registries: files },
+    files: { registries: files, declarations: fileDeclarations },
     values: { globals: values },
     dialogueGroups: { globals: dialogueGroups },
     variants: { globals: variants },
@@ -31013,6 +31133,7 @@ function memberManifest(uri, member) {
 function globalManifest(uri, declaration) {
   return {
     ...identity(uri, declaration.range, declaration.annotations),
+    initializerSource: { uri, range: declaration.initializer.range },
     name: declaration.name,
     type: manifestType(declaration.type),
     annotations: manifestAnnotations(declaration.annotations),
@@ -31191,12 +31312,13 @@ function assertProjectSourceAnalysisV4(value) {
     "globals",
     assertGlobal
   );
-  assertArrayEnvelope(
-    analysis.files,
-    "analysis.files",
-    "registries",
-    assertGlobal
-  );
+  const files = record(analysis.files, "analysis.files");
+  exactKeys(files, "analysis.files", ["registries", "declarations"]);
+  for (const field of ["registries", "declarations"]) {
+    array(files[field], `analysis.files.${field}`).forEach(
+      (entry, index) => assertGlobal(entry, `analysis.files.${field}[${index}]`)
+    );
+  }
   assertArrayEnvelope(
     analysis.values,
     "analysis.values",
@@ -31492,16 +31614,15 @@ function assertEnum(value, path) {
 }
 function assertGlobal(value, path) {
   const global = record(value, path);
-  exactKeys(global, path, [
-    "id",
-    "state",
-    "source",
-    "name",
-    "type",
-    "annotations",
-    "initializer"
-  ]);
+  exactKeysWithOptional(
+    global,
+    path,
+    ["id", "state", "source", "name", "type", "annotations", "initializer"],
+    ["initializerSource"]
+  );
   assertIdentity(global, path);
+  if (global.initializerSource !== void 0)
+    assertLocation(global.initializerSource, `${path}.initializerSource`);
   string(global.name, `${path}.name`);
   assertType(global.type, `${path}.type`);
   array(global.annotations, `${path}.annotations`).forEach(
@@ -31783,7 +31904,7 @@ function string(value, path) {
   }
   return value;
 }
-var CONFIGURATION_TYPES, FILE_REGISTRY_TYPES, GROUP_TYPES, MIGRATION_TYPES;
+var CONFIGURATION_TYPES, FILE_REGISTRY_TYPES, FILE_DECLARATION_TYPES, GROUP_TYPES, MIGRATION_TYPES;
 var init_project_source_manifest = __esm({
   "../packages/neoscript-language/src/project-source-manifest.ts"() {
     "use strict";
@@ -31800,6 +31921,7 @@ var init_project_source_manifest = __esm({
       "LocalizationStatus"
     ]);
     FILE_REGISTRY_TYPES = /* @__PURE__ */ new Set(["ImageRegistry", "AudioClipRegistry"]);
+    FILE_DECLARATION_TYPES = /* @__PURE__ */ new Set(["NeoImage", "NeoAudioClip"]);
     GROUP_TYPES = /* @__PURE__ */ new Set(["PriorityGroup", "DialogueGroup"]);
     MIGRATION_TYPES = /* @__PURE__ */ new Set(["Migration"]);
   }
@@ -31811,7 +31933,7 @@ var init_registry = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.70.2",
+      cliVersion: "0.70.4",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -54583,10 +54705,10 @@ ${schemaClass2.genericParameters.map((parameter4) => {
     return { member, source };
   });
   const constructorIds = schemaClass2.constructorIds ?? [];
-  const sources = rendered.map((entry) => entry.source);
+  const sources2 = rendered.map((entry) => entry.source);
   for (const memberId of memberIds)
     for (const statement of listenerStatementsByMember?.get(memberId) ?? [])
-      sources.push(indentNeoSourceNonEmptyLines(statement, 2));
+      sources2.push(indentNeoSourceNonEmptyLines(statement, 2));
   const spliced = [
     ...constructorIds.map(
       (constructorId) => emitConstructor(
@@ -54600,7 +54722,7 @@ ${schemaClass2.genericParameters.map((parameter4) => {
   if (spliced.length === 0) {
     return `${emitDocsText(schemaClass2.docsText)}${annotations.join("\n")}
 ${header}
-${sources.join("\n\n")}
+${sources2.join("\n\n")}
 }
 `;
   }
@@ -54609,9 +54731,9 @@ ${sources.join("\n\n")}
     -1
   );
   const members = [
-    ...sources.slice(0, lastValueMemberIndex + 1),
+    ...sources2.slice(0, lastValueMemberIndex + 1),
     ...spliced.map((source) => indentNeoSourceNonEmptyLines(source, 2)),
-    ...sources.slice(lastValueMemberIndex + 1)
+    ...sources2.slice(lastValueMemberIndex + 1)
   ];
   return `${emitDocsText(schemaClass2.docsText)}${annotations.join("\n")}
 ${header}
@@ -60587,8 +60709,9 @@ function validateProjectFileDeclarationSymbolsV4(declarations) {
   for (const declaration of declarations) {
     const expected = expectedSymbols.get(declaration.recordId);
     if (expected === void 0 || declaration.symbol === expected) continue;
-    throw new Error(
-      `Project file ${declaration.symbol} must use registry symbol ${expected}, derived from its persisted name ${JSON.stringify(declaration.persistedName)}. Rename the declaration, or set @settings(name: ...) to a file name ending in ${JSON.stringify(sourceExtension(declaration.persistedName))} that derives ${declaration.symbol}.`
+    throw projectFileSourceError(
+      `Project file ${declaration.symbol} must use registry symbol ${expected}, derived from its persisted name ${JSON.stringify(declaration.persistedName)}. Rename the declaration, or set @settings(name: ...) to a file name ending in ${JSON.stringify(sourceExtension(declaration.persistedName))} that derives ${declaration.symbol}.`,
+      declaration
     );
   }
 }
@@ -60606,7 +60729,24 @@ function projectFileUnityImportSettingsV4(kind, templateId) {
     values: {}
   };
 }
-function emitProjectFileRegistrySourcesV4(records2, binaryPaths = /* @__PURE__ */ new Map()) {
+function projectFileSourceError(error, declaration) {
+  if (error instanceof SchemaSourceError) return error;
+  return new SchemaSourceError(
+    error instanceof Error ? error.message : String(error),
+    declaration.sourceFile,
+    declaration.sourceLine,
+    declaration.sourceColumn ?? 1
+  );
+}
+function emitProjectFileRegistrySourcesV4(records2, binaryPaths = /* @__PURE__ */ new Map(), placements = []) {
+  const listed = /* @__PURE__ */ new Map();
+  for (const placement of placements) {
+    const fileId = placement.valueIds[0];
+    if (placement.type !== "NeoImage" && placement.type !== "NeoAudioClip")
+      continue;
+    if (fileId !== void 0) listed.set(fileId, placement);
+  }
+  const declarationFiles = [];
   const liveFiles = [...records2.values()].filter((record6) => record6.recordKind === "project-file" && !record6.deleted).map((record6) => ({ record: record6, data: requireFileData(record6) }));
   assertUniqueProjectBinaryPaths(liveFiles);
   const symbols = assignDeterministicFileSymbols(
@@ -60617,10 +60757,11 @@ function emitProjectFileRegistrySourcesV4(records2, binaryPaths = /* @__PURE__ *
   );
   const textureTemplates = templateNames(records2, "unity-texture-template");
   const audioTemplates = templateNames(records2, "unity-audio-clip-template");
-  return ["image", "audio"].map((kind) => {
+  const registries2 = ["image", "audio"].map((kind) => {
     const registryType = kind === "image" ? "ImageRegistry" : "AudioClipRegistry";
     const registryName = kind === "image" ? "Images" : "AudioClips";
     const valueType = kind === "image" ? "NeoImage" : "NeoAudioClip";
+    const registryKeys = [];
     const entries = liveFiles.filter(({ data }) => data.fileType === kind).sort((left, right) => {
       const leftSymbol = symbols.get(left.record.recordId) ?? "";
       const rightSymbol = symbols.get(right.record.recordId) ?? "";
@@ -60645,10 +60786,22 @@ function emitProjectFileRegistrySourcesV4(records2, binaryPaths = /* @__PURE__ *
         ...templateName ? [`template: ${templateName}`] : [],
         ...data.name === sourceBasename(path) ? [] : [`name: ${JSON.stringify(data.name)}`]
       ];
-      const annotation2 = options.length === 0 ? "" : `  @settings(${options.join(", ")})
-`;
-      return `  @id(${JSON.stringify(record6.recordId)})
-${annotation2}  ${valueType} ${symbol} = new(${JSON.stringify(path)});`;
+      const declare = (name, indent2) => `${indent2}@id(${JSON.stringify(record6.recordId)})
+${options.length === 0 ? "" : `${indent2}@settings(${options.join(", ")})
+`}${indent2}${valueType} ${name} = new(${JSON.stringify(path)});`;
+      const key = `project-file:${record6.recordId}`;
+      const placement = listed.get(record6.recordId);
+      if (placement?.type === valueType) {
+        declarationFiles.push({
+          path: placement.file,
+          content: `${declare(placement.name, "")}
+`,
+          recordKeys: [key]
+        });
+        return `  ${valueType} ${symbol} = ${placement.name};`;
+      }
+      registryKeys.push(key);
+      return declare(symbol, "  ");
     });
     return {
       path: `Files/${registryName}.neo`,
@@ -60657,14 +60810,42 @@ ${entries.join("\n\n")}
 `}
 }
 `,
-      recordKeys: liveFiles.filter(({ data }) => data.fileType === kind).map(({ record: record6 }) => `project-file:${record6.recordId}`)
+      recordKeys: registryKeys
     };
   });
+  return [...registries2, ...declarationFiles];
 }
 function projectFileDeclarationsV4(analysis) {
   const templateIds = fileTemplateIdsByName(analysis);
-  return analysis.files.registries.flatMap(
-    (registry) => parseRegistry(registry, templateIds)
+  const globals = new Map(
+    analysis.files.declarations.map((global) => [global.name, global])
+  );
+  const listed = /* @__PURE__ */ new Set();
+  const declarations = analysis.files.registries.flatMap(
+    (registry) => parseRegistry(registry, templateIds, globals, listed)
+  );
+  for (const global of globals.values()) {
+    if (listed.has(global.name)) continue;
+    const registry = global.type.name === "NeoImage" ? "Images" : "AudioClips";
+    throw new SchemaSourceError(
+      `${global.type.name} ${global.name} in ${global.source.uri} is not listed in ${registry}. Add "${global.type.name} <Symbol> = ${global.name};" to Files/${registry}.neo.`,
+      global.source.uri,
+      global.source.range.start.line + 1,
+      global.source.range.start.character + 1
+    );
+  }
+  return declarations;
+}
+function projectFilePlacementsV4(analysis) {
+  return projectFileDeclarationsV4(analysis).flatMap(
+    (declaration) => declaration.global === void 0 ? [] : [
+      {
+        name: declaration.global,
+        type: declaration.kind === "image" ? "NeoImage" : "NeoAudioClip",
+        file: declaration.sourceFile,
+        valueIds: [declaration.recordId]
+      }
+    ]
   );
 }
 function lowerTrustedProjectFileRegistrySourcesV4(state, analysis, trustedPendingFiles = /* @__PURE__ */ new Map()) {
@@ -60673,73 +60854,77 @@ function lowerTrustedProjectFileRegistrySourcesV4(state, analysis, trustedPendin
   const seenPaths = /* @__PURE__ */ new Map();
   const seenSymbols = /* @__PURE__ */ new Map();
   return declarations.map((declaration) => {
-    const normalizedPath = normalizeTrustedProjectBinaryPath(
-      declaration.path,
-      declaration.kind
-    );
-    const pathKey = normalizedPath.toLowerCase();
-    const previousPath = seenPaths.get(pathKey);
-    if (previousPath) {
-      throw new Error(
-        `Project binary path ${JSON.stringify(normalizedPath)} is declared by both ${previousPath.symbol} and ${declaration.symbol}.`
-      );
-    }
-    seenPaths.set(pathKey, declaration);
-    const symbolKey = `${declaration.kind}:${declaration.symbol.toLowerCase()}`;
-    if (seenSymbols.has(symbolKey)) {
-      throw new Error(
-        `Project file symbol ${declaration.symbol} is declared more than once.`
-      );
-    }
-    seenSymbols.set(symbolKey, declaration);
-    const baseState = state[`project-file:${declaration.recordId}`];
-    const base = isObjectRecord2(baseState?.data) ? baseState.data : null;
-    const trustedPending = trustedPendingFiles.get(declaration.recordId);
-    if (base === null && trustedPending === void 0) {
-      throw new Error(
-        `Pending project file ${declaration.symbol} has no server-verified staged bytes.`
-      );
-    }
-    const now = Date.now();
-    const settingsField = declaration.kind === "image" ? "unityTextureSettings" : "unityAudioClipSettings";
-    const otherSettingsField = declaration.kind === "image" ? "unityAudioClipSettings" : "unityTextureSettings";
-    const baseSettings = base !== null && isObjectRecord2(base[settingsField]) ? base[settingsField] : null;
-    const importSettingsChanged = base === null || base.fileType !== declaration.kind || optionalString(baseSettings?.templateId) !== declaration.templateId;
-    const next = {
-      ...base ?? {},
-      id: declaration.recordId,
-      name: declaration.persistedName,
-      fileType: declaration.kind,
-      ...base === null && trustedPending !== void 0 ? {
-        mimeType: trustedPending.mimeType,
-        byteLength: trustedPending.byteLength,
-        contentSha256: trustedPending.sha256
-      } : {},
-      [otherSettingsField]: null
-    };
-    if (base === null) {
-      Object.assign(next, {
-        projectId: "",
-        status: "pending-upload",
-        storageKey: "",
-        storageETag: null,
-        createdAt: now,
-        updatedAt: now
-      });
-    }
-    if (importSettingsChanged) {
-      next[settingsField] = projectFileUnityImportSettingsV4(
-        declaration.kind,
-        declaration.templateId
+    try {
+      const normalizedPath = normalizeTrustedProjectBinaryPath(
+        declaration.path,
+        declaration.kind
       );
+      const pathKey = normalizedPath.toLowerCase();
+      const previousPath = seenPaths.get(pathKey);
+      if (previousPath) {
+        throw new Error(
+          `Project binary path ${JSON.stringify(normalizedPath)} is declared by both ${previousPath.symbol} and ${declaration.symbol}.`
+        );
+      }
+      seenPaths.set(pathKey, declaration);
+      const symbolKey = `${declaration.kind}:${declaration.symbol.toLowerCase()}`;
+      if (seenSymbols.has(symbolKey)) {
+        throw new Error(
+          `Project file symbol ${declaration.symbol} is declared more than once.`
+        );
+      }
+      seenSymbols.set(symbolKey, declaration);
+      const baseState = state[`project-file:${declaration.recordId}`];
+      const base = isObjectRecord2(baseState?.data) ? baseState.data : null;
+      const trustedPending = trustedPendingFiles.get(declaration.recordId);
+      if (base === null && trustedPending === void 0) {
+        throw new Error(
+          `Pending project file ${declaration.symbol} has no server-verified staged bytes.`
+        );
+      }
+      const now = Date.now();
+      const settingsField = declaration.kind === "image" ? "unityTextureSettings" : "unityAudioClipSettings";
+      const otherSettingsField = declaration.kind === "image" ? "unityAudioClipSettings" : "unityTextureSettings";
+      const baseSettings = base !== null && isObjectRecord2(base[settingsField]) ? base[settingsField] : null;
+      const importSettingsChanged = base === null || base.fileType !== declaration.kind || optionalString(baseSettings?.templateId) !== declaration.templateId;
+      const next = {
+        ...base ?? {},
+        id: declaration.recordId,
+        name: declaration.persistedName,
+        fileType: declaration.kind,
+        ...base === null && trustedPending !== void 0 ? {
+          mimeType: trustedPending.mimeType,
+          byteLength: trustedPending.byteLength,
+          contentSha256: trustedPending.sha256
+        } : {},
+        [otherSettingsField]: null
+      };
+      if (base === null) {
+        Object.assign(next, {
+          projectId: "",
+          status: "pending-upload",
+          storageKey: "",
+          storageETag: null,
+          createdAt: now,
+          updatedAt: now
+        });
+      }
+      if (importSettingsChanged) {
+        next[settingsField] = projectFileUnityImportSettingsV4(
+          declaration.kind,
+          declaration.templateId
+        );
+      }
+      return {
+        recordKind: "project-file",
+        recordId: declaration.recordId,
+        fileFields: next,
+        file: declaration.sourceFile,
+        line: declaration.sourceLine
+      };
+    } catch (error) {
+      throw projectFileSourceError(error, declaration);
     }
-    return {
-      recordKind: "project-file",
-      recordId: declaration.recordId,
-      fileFields: next,
-      file: declaration.sourceFile,
-      line: declaration.sourceLine
-    };
   });
 }
 function validateFinalizedFileAssignmentsV4(records2, options = {}) {
@@ -60862,7 +61047,7 @@ function fileTemplateIdsByName(analysis) {
   }
   return templateIds;
 }
-function parseRegistry(registry, templateIds) {
+function parseRegistry(registry, templateIds, globals, listed) {
   const kind = registry.type.name === "ImageRegistry" ? "image" : registry.type.name === "AudioClipRegistry" ? "audio" : null;
   if (kind === null) {
     throw new Error(
@@ -60875,53 +61060,150 @@ function parseRegistry(registry, templateIds) {
       `${registry.type.name} must use the canonical global name ${expectedName}.`
     );
   }
-  const body = objectInitializerBody(registry.initializer, registry.type.name);
-  const result = [];
-  let cursor = 0;
-  while (cursor < body.length) {
-    const whitespace = /^(?:\s|\/\/[^\n]*(?:\n|$)|\/\*[\s\S]*?\*\/)+/.exec(
-      body.slice(cursor)
-    );
-    if (whitespace) cursor += whitespace[0].length;
-    if (cursor >= body.length) break;
-    REGISTRY_ENTRY.lastIndex = cursor;
-    const match = REGISTRY_ENTRY.exec(body);
-    if (!match) {
-      throw new Error(
-        `${registry.type.name} ${registry.name} contains an invalid file declaration near ${JSON.stringify(body.slice(cursor, cursor + 80))}.`
-      );
-    }
-    const entryType = match[3];
-    if (kind === "image" && entryType !== "NeoImage" || kind === "audio" && entryType !== "NeoAudioClip") {
-      throw new Error(
-        `${registry.type.name} cannot contain ${entryType} declarations.`
-      );
-    }
-    const settings = parseFileSettings(match[2], templateIds);
-    const path = JSON.parse(match[5]);
-    const recordId = match[1] ? JSON.parse(match[1]) : `__pending__:project-file:${encodeURIComponent(registry.source.uri)}:${registry.source.range.start.line}:${encodeURIComponent(match[4])}`;
-    const fileName2 = sourceBasename(path);
-    if (settings.name !== null) {
-      const extension = sourceExtension(fileName2);
-      if (!settings.name.toLowerCase().endsWith(extension.toLowerCase())) {
+  const source = lex(registry.initializer).source;
+  const origin = registry.initializerSource?.range.start ?? registry.source.range.start;
+  let errorOffset = 0;
+  let declarationSource;
+  const positioned = (offset) => {
+    const point = source.positionAt(offset);
+    return {
+      sourceFile: registry.source.uri,
+      sourceLine: origin.line + point.line + 1,
+      sourceColumn: point.character + 1 + (point.line === 0 ? origin.character : 0)
+    };
+  };
+  try {
+    const body = objectInitializerBody(
+      registry.initializer,
+      registry.type.name
+    );
+    const result = [];
+    let cursor = 0;
+    while (cursor < body.length) {
+      const whitespace = /^(?:\s|\/\/[^\n]*(?:\n|$)|\/\*[\s\S]*?\*\/)+/.exec(
+        body.slice(cursor)
+      );
+      if (whitespace) cursor += whitespace[0].length;
+      if (cursor >= body.length) break;
+      declarationSource = void 0;
+      errorOffset = registry.initializer.indexOf("{") + 1 + cursor;
+      REGISTRY_ENTRY.lastIndex = cursor;
+      const match = REGISTRY_ENTRY.exec(body);
+      if (!match) {
         throw new Error(
-          `Project file ${match[4]} @settings(name: ${JSON.stringify(settings.name)}) must end with ${JSON.stringify(extension)}, the extension of ${JSON.stringify(path)}.`
+          `${registry.type.name} ${registry.name} contains an invalid file declaration near ${JSON.stringify(body.slice(cursor, cursor + 80))}.`
         );
       }
+      const bodyOffset = registry.initializer.indexOf("{") + 1;
+      const entryOffset = bodyOffset + (match.indices?.[3]?.[0] ?? cursor);
+      errorOffset = entryOffset;
+      const entryType = match[3];
+      if (kind === "image" && entryType !== "NeoImage" || kind === "audio" && entryType !== "NeoAudioClip") {
+        throw new Error(
+          `${registry.type.name} cannot contain ${entryType} declarations.`
+        );
+      }
+      errorOffset = bodyOffset + (match.indices?.[2]?.[0] ?? match.indices?.[3]?.[0] ?? cursor);
+      const entry = match[6] === void 0 ? {
+        id: match[1] === void 0 ? null : JSON.parse(match[1]),
+        settings: match[2],
+        pathLiteral: match[5],
+        name: match[4],
+        source: registry.source
+      } : listedFileDeclaration(match, entryType, globals, listed);
+      if (match[6] !== void 0) declarationSource = entry.source;
+      const settings = parseFileSettings(entry.settings, templateIds);
+      const path = JSON.parse(entry.pathLiteral);
+      const recordId = entry.id ?? `__pending__:project-file:${encodeURIComponent(entry.source.uri)}:${entry.source.range.start.line}:${encodeURIComponent(entry.name)}`;
+      const fileName2 = sourceBasename(path);
+      if (settings.name !== null) {
+        const extension = sourceExtension(fileName2);
+        if (!settings.name.toLowerCase().endsWith(extension.toLowerCase())) {
+          throw new Error(
+            `Project file ${match[4]} @settings(name: ${JSON.stringify(settings.name)}) must end with ${JSON.stringify(extension)}, the extension of ${JSON.stringify(path)}.`
+          );
+        }
+      }
+      result.push({
+        recordId,
+        symbol: match[4],
+        path,
+        kind,
+        templateId: settings.templateId,
+        persistedName: settings.name ?? fileName2,
+        ...match[6] === void 0 ? positioned(entryOffset) : {
+          sourceFile: entry.source.uri,
+          sourceLine: entry.source.range.start.line + 1,
+          sourceColumn: entry.source.range.start.character + 1,
+          global: match[6]
+        }
+      });
+      cursor = REGISTRY_ENTRY.lastIndex;
     }
-    result.push({
-      recordId,
-      symbol: match[4],
-      path,
-      kind,
-      templateId: settings.templateId,
-      persistedName: settings.name ?? fileName2,
-      sourceFile: registry.source.uri,
-      sourceLine: registry.source.range.start.line + 1
-    });
-    cursor = REGISTRY_ENTRY.lastIndex;
+    return result;
+  } catch (error) {
+    throw projectFileSourceError(
+      error,
+      declarationSource === void 0 ? positioned(errorOffset) : {
+        sourceFile: declarationSource.uri,
+        sourceLine: declarationSource.range.start.line + 1,
+        sourceColumn: declarationSource.range.start.character + 1
+      }
+    );
   }
-  return result;
+}
+function listedFileDeclaration(match, entryType, globals, listed) {
+  const symbol = match[4];
+  const name = match[6];
+  if (match[1] !== void 0) {
+    throw new Error(
+      `Project file ${symbol} lists ${name}, so its @id belongs on the ${name} declaration.`
+    );
+  }
+  if (match[2] !== void 0) {
+    throw new Error(
+      `Project file ${symbol} lists ${name}, so its @settings belong on the ${name} declaration.`
+    );
+  }
+  const global = globals.get(name);
+  if (global === void 0) {
+    throw new Error(
+      `Project file ${symbol} lists ${name}, which is not a top-level NeoImage or NeoAudioClip declaration.`
+    );
+  }
+  if (global.type.name !== entryType) {
+    throw new Error(
+      `Project file ${symbol} is a ${entryType}, but ${name} is a ${global.type.name}.`
+    );
+  }
+  if (listed.has(name)) {
+    throw new Error(`${global.type.name} ${name} is listed more than once.`);
+  }
+  listed.add(name);
+  const initializer = FILE_DECLARATION_INITIALIZER.exec(
+    global.initializer.trim()
+  );
+  if (initializer === null) {
+    const source = global.initializerSource ?? global.source;
+    throw new SchemaSourceError(
+      `${global.type.name} ${name} must be initialized with new("<path>").`,
+      source.uri,
+      source.range.start.line + 1,
+      source.range.start.character + 1
+    );
+  }
+  const settings = global.annotations.find(
+    (annotation2) => annotation2.name === "settings"
+  );
+  return {
+    id: global.id,
+    settings: settings?.arguments.map(
+      (argument2) => argument2.name === void 0 ? argument2.expression : `${argument2.name}: ${argument2.expression}`
+    ).join(", "),
+    pathLiteral: initializer[1],
+    name,
+    source: global.source
+  };
 }
 function parseFileSettings(source, templateIds) {
   if (!source) return { templateId: null, name: null };
@@ -61028,7 +61310,7 @@ function normalizeTrustedProjectBinaryPath(path, kind) {
     throw new Error("Project file path contains a null byte.");
   if (normalized.split("/").some((part) => part === ".." || part === "." || part === "")) {
     throw new Error(
-      `Project file path ${JSON.stringify(path)} contains an invalid path segment.`
+      `Project file path ${JSON.stringify(path)} contains an invalid path segment. Use a path relative to neo.json without '..', '.', or empty segments.`
     );
   }
   if (neoProjectPathHasIgnoredDirectory(normalized)) {
@@ -61045,10 +61327,12 @@ function normalizeTrustedProjectBinaryPath(path, kind) {
   }
   return normalized;
 }
-var REGISTRY_ENTRY, assignDeterministicFileSymbols;
+var REGISTRY_ENTRY, FILE_DECLARATION_INITIALIZER, assignDeterministicFileSymbols;
 var init_project_file_source = __esm({
   "src/project-source/project-file-source.ts"() {
     "use strict";
+    init_lexer();
+    init_source_diagnostics();
     init_executable_parser();
     init_language_spec();
     init_value_comparison();
@@ -61056,7 +61340,8 @@ var init_project_file_source = __esm({
     init_project_file_registry();
     init_members();
     init_unity_import_settings();
-    REGISTRY_ENTRY = /(?:@id\(\s*("(?:[^"\\]|\\.)*")\s*\)\s*)?(?:@settings\(([\s\S]*?)\)\s*)?(NeoImage|NeoAudioClip)\s+([A-Za-z_][A-Za-z0-9_]*)\s*=\s*new\(\s*("(?:[^"\\]|\\.)*")\s*\)\s*;/gy;
+    REGISTRY_ENTRY = /(?:@id\(\s*("(?:[^"\\]|\\.)*")\s*\)\s*)?(?:@settings\(([\s\S]*?)\)\s*)?(NeoImage|NeoAudioClip)\s+([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(?:new\(\s*("(?:[^"\\]|\\.)*")\s*\)|([A-Za-z_][A-Za-z0-9_]*))\s*;/dgy;
+    FILE_DECLARATION_INITIALIZER = /^new\(\s*("(?:[^"\\]|\\.)*")\s*\)$/;
     assignDeterministicFileSymbols = assignDeterministicProjectFileSymbols;
   }
 });
@@ -61078,7 +61363,13 @@ function emitSupplementalProjectSourcesV4(records2, binaryPaths, options = {}) {
       options.manifest?.members.map((entry) => [entry.id, entry])
     )
   };
-  files.push(...emitProjectFileRegistrySourcesV4(records2, binaryPaths));
+  files.push(
+    ...emitProjectFileRegistrySourcesV4(
+      records2,
+      binaryPaths,
+      options.localValues
+    )
+  );
   const project = live.find((record6) => record6.recordKind === "project");
   if (project) {
     const data = recordData(project);
@@ -61487,8 +61778,12 @@ function lowerDialogueGroup(baseValue, global, priorityIds, dialogueIds, uiLogic
     const path = `${collection.receiver.name}.${collection.name}`;
     collectionMemberId = resolveQualifiedMemberId(memberContext, path);
     if (collectionMemberId === null) {
-      throw new Error(
-        `Lookup dialogue group ${global.name} names unknown collection ${path}.`
+      const origin = global.initializerSource ?? global.source;
+      throw new SchemaSourceError(
+        `Lookup dialogue group ${global.name} names unknown collection ${path}. Use an existing collection member.`,
+        origin.uri,
+        origin.range.start.line + collection.pos.line,
+        collection.pos.column + (collection.pos.line === 1 ? origin.range.start.character : 0)
       );
     }
   } else {
@@ -62078,6 +62373,7 @@ var PRIORITY_OPTION_PATTERN;
 var init_supplemental_records = __esm({
   "src/project-source/supplemental-records.ts"() {
     "use strict";
+    init_source_diagnostics();
     init_project_source_identifiers();
     init_lexer();
     init_executable_parser();
@@ -65952,14 +66248,14 @@ function createNeoScriptProjectInScope(context) {
   if (context.dialogueContext) {
     languageTypes.push(createDialogueContextType(context));
   }
-  const registries = projectFileRegistryProjection(
+  const registries2 = projectFileRegistryProjection(
     context.vm.projectFiles ?? []
   );
-  languageTypes.push(...registries.types);
+  languageTypes.push(...registries2.types);
   return {
     version: projectLanguageVersion(context),
     types: languageTypes,
-    globals: registries.globals,
+    globals: registries2.globals,
     roots: [
       {
         id: "neoscript:root",
@@ -67313,10 +67609,33 @@ var NSGetterRuntimeError, UncompiledInitializerRuntimeError;
 var init_NSGetterRuntimeError = __esm({
   "../src/runtime/neoscript/NSGetterRuntimeError.ts"() {
     "use strict";
+    init_runtime_source();
     NSGetterRuntimeError = class extends Error {
+      /** Keep catch-visible runtime messages stable; add guidance for diagnostic hosts. */
+      get diagnosticMessage() {
+        if (this.message === "Division by zero")
+          return `${this.message}. Check that the divisor is nonzero before dividing.`;
+        if (this.message === "Modulo by zero")
+          return `${this.message}. Check that the divisor is nonzero before taking the remainder.`;
+        return this.message;
+      }
+      at(node) {
+        if (this.node === void 0) {
+          this.node = node;
+          this.source = runtimeSource(node);
+        }
+        return this;
+      }
       constructor(message, options) {
         super(message, options);
         this.name = "NSGetterRuntimeError";
+        Object.defineProperties(this, {
+          source: { writable: true, value: void 0 },
+          node: { writable: true, value: void 0 },
+          callerNode: { writable: true, value: void 0 },
+          initializerValueId: { writable: true, value: void 0 },
+          sourceOwnerId: { writable: true, value: void 0 }
+        });
       }
     };
     UncompiledInitializerRuntimeError = class extends NSGetterRuntimeError {
@@ -67353,9 +67672,13 @@ function materializeInitializerDependencies(pending, materialize) {
         if (!(error instanceof PendingInitializerDependency)) throw error;
         if (!pending.has(error.valueId)) throw error;
         if (active.has(error.valueId)) {
-          throw new Error(
-            `Initializer dependency cycle: ${[...stack, error.valueId].join(" -> ")}.`
+          const cycle = new NSGetterRuntimeError(
+            `Initializer dependency cycle: ${[...stack, error.valueId].join(" -> ")}. Remove a dependency so these values can be initialized in order.`
           );
+          cycle.initializerValueId = valueId;
+          cycle.node = error.node;
+          cycle.source = error.source;
+          throw cycle;
         }
         active.add(error.valueId);
         stack.push(error.valueId);
@@ -73750,326 +74073,351 @@ function validateTryInstruction(instruction) {
 }
 function evalInstructions(instructions, scope, ctx, options) {
   for (const ins of instructions) {
-    consumeBudget(ctx, "workUnits", 1, "work unit");
-    switch (ins.type) {
-      case "variable" /* variable */: {
-        let value = evalPointer(ins.variable.pointer, scope, ctx);
-        if (ins.variable.typeInfo.type === 20 /* Decimal */ && typeof value === "number") {
-          value = coerceDecimalOperand(value, "variable initialization");
-        }
-        scope.setLocal(ins.variable.id, value);
-        break;
-      }
-      case "if" /* if */: {
-        let matched = false;
-        for (const branch of ins.branches) {
-          if (evalBooleanExpression(branch.expression, scope, ctx)) {
-            matched = true;
-            const r = evalInstructions(
-              branch.instructions,
-              scope,
-              ctx,
-              options
-            );
-            if (r.kind !== "fallthrough") return r;
-            break;
+    try {
+      consumeBudget(ctx, "workUnits", 1, "work unit");
+      switch (ins.type) {
+        case "variable" /* variable */: {
+          let value = evalPointer(ins.variable.pointer, scope, ctx);
+          if (ins.variable.typeInfo.type === 20 /* Decimal */ && typeof value === "number") {
+            value = coerceDecimalOperand(value, "variable initialization");
           }
+          scope.setLocal(ins.variable.id, value);
+          break;
         }
-        if (!matched && ins.else) {
-          const r = evalInstructions(ins.else, scope, ctx, options);
-          if (r.kind !== "fallthrough") return r;
+        case "if" /* if */: {
+          let matched = false;
+          for (const branch of ins.branches) {
+            if (evalBooleanExpression(branch.expression, scope, ctx)) {
+              matched = true;
+              const r = evalInstructions(
+                branch.instructions,
+                scope,
+                ctx,
+                options
+              );
+              if (r.kind !== "fallthrough") return r;
+              break;
+            }
+          }
+          if (!matched && ins.else) {
+            const r = evalInstructions(ins.else, scope, ctx, options);
+            if (r.kind !== "fallthrough") return r;
+          }
+          break;
         }
-        break;
-      }
-      case "return" /* return */: {
-        const value = ins.pointer === null ? null : evalPointer(ins.pointer, scope, ctx);
-        return { kind: "return", value };
-      }
-      case "throw" /* throw */: {
-        const message = evalPointer(ins.pointer, scope, ctx);
-        throw new NSGetterRuntimeError(String(message));
-      }
-      case "assign" /* assign */: {
-        let value = evalPointer(ins.pointer, scope, ctx);
-        if (ins.target.typeInfo.type === 20 /* Decimal */ && typeof value === "number") {
-          value = coerceDecimalOperand(value, "assignment");
+        case "return" /* return */: {
+          const value = ins.pointer === null ? null : evalPointer(ins.pointer, scope, ctx);
+          return { kind: "return", value };
         }
-        if (ins.target.pointer.type === "variable" /* variable */) {
-          assertVariableBindingWritable(scope, ins.target.pointer.variableId);
-          scope.setLocal(ins.target.pointer.variableId, value);
-          break;
+        case "throw" /* throw */: {
+          const message = evalPointer(ins.pointer, scope, ctx);
+          throw new NSGetterRuntimeError(String(message));
         }
-        if (ins.target.writability === "setter" /* Setter */) {
-          dispatchNSSetter(
+        case "assign" /* assign */: {
+          let value = evalPointer(ins.pointer, scope, ctx);
+          if (ins.target.typeInfo.type === 20 /* Decimal */ && typeof value === "number") {
+            value = coerceDecimalOperand(value, "assignment");
+          }
+          if (ins.target.pointer.type === "variable" /* variable */) {
+            assertVariableBindingWritable(scope, ins.target.pointer.variableId);
+            scope.setLocal(ins.target.pointer.variableId, value);
+            break;
+          }
+          if (ins.target.writability === "setter" /* Setter */) {
+            dispatchNSSetter(
+              ins.target.pointer,
+              value,
+              scope,
+              ctx,
+              options.writes
+            );
+            break;
+          }
+          const destination = validateAssignmentTarget(
             ins.target.pointer,
-            value,
             scope,
-            ctx,
-            options.writes
+            ctx
           );
-          break;
-        }
-        const destination = validateAssignmentTarget(
-          ins.target.pointer,
-          scope,
-          ctx
-        );
-        const member = assignmentTargetMember(
-          ins.target.pointer,
-          scope,
-          ctx,
-          destination
-        );
-        const lookupAssignment = member !== null && isMemberLookupBase(member);
-        if (lookupAssignment) {
-          value = encodeLookupInitializerSelection(member, value, [], ctx);
-        }
-        let targetTypeInfo = ins.target.typeInfo;
-        if (lookupAssignment && targetTypeInfo.type !== 9 /* Lookup */ && targetTypeInfo.type !== 18 /* DialogueLookup */) {
-          targetTypeInfo = {
-            type: 9 /* Lookup */,
-            required: targetTypeInfo.required,
-            entryTypeInfo: targetTypeInfo,
-            collectionMemberId: member.collectionMemberId,
-            collectionValueId: member.collectionValueId
-          };
-        }
-        const assignedReferenceValueId = targetTypeInfo.type === 7 /* Class */ || targetTypeInfo.type === 6 /* List */ || targetTypeInfo.type === 5 /* Dictionary */ ? findKnownRowIdByValueReference(value, ctx) : null;
-        applyOverlayAssignment(
-          ins.target.pointer,
-          targetTypeInfo,
-          value,
-          scope,
-          ctx,
-          destination
-        );
-        const unorderedReplacement = assignedReferenceValueId === null && member !== null && isMemberListBase(member) && listKindOf(member) === 1 /* Unordered */ && Array.isArray(value) ? unorderedReplacementProjection(
-          ins.target.pointer,
-          destination,
-          scope,
-          ctx
-        ) : null;
-        options.writes.push({
-          kind: "assign",
-          target: targetTypeInfo === ins.target.typeInfo ? ins.target : { ...ins.target, typeInfo: targetTypeInfo },
-          value: unorderedReplacement ?? value,
-          ...targetTypeInfo.type === 7 /* Class */ || targetTypeInfo.type === 6 /* List */ || targetTypeInfo.type === 5 /* Dictionary */ ? {
-            valueId: value === null || value === void 0 ? void 0 : assignedReferenceValueId ?? void 0
-          } : {},
-          ...resolvedDestinationFieldsForAssign(
+          const member = assignmentTargetMember(
             ins.target.pointer,
             scope,
             ctx,
             destination
-          )
-        });
-        break;
-      }
-      case "addActionListener" /* addActionListener */:
-      case "removeActionListener" /* removeActionListener */: {
-        evalActionListenerInstruction(ins, scope, ctx, options);
-        break;
-      }
-      case "addChangeListener" /* addChangeListener */:
-      case "removeChangeListener" /* removeChangeListener */: {
-        evalChangeListenerInstruction(ins, scope, ctx, options);
-        break;
-      }
-      case "collectionCall" /* collectionCall */: {
-        evalCollectionMutationInstruction(ins, scope, ctx, options);
-        break;
-      }
-      case "functionCall" /* functionCall */: {
-        evalPointer(ins.call, scope, ctx, "discarded");
-        break;
-      }
-      case "while" /* while */:
-      case "doWhile" /* doWhile */: {
-        let firstIteration = ins.type === "doWhile" /* doWhile */;
-        while (firstIteration || evalBooleanExpression(ins.condition, scope, ctx)) {
-          firstIteration = false;
-          consumeLoopIteration(ctx);
-          const result = evalInstructionsInChildScope(
-            ins.instructions,
+          );
+          const lookupAssignment = member !== null && isMemberLookupBase(member);
+          if (lookupAssignment) {
+            value = encodeLookupInitializerSelection(member, value, [], ctx);
+          }
+          let targetTypeInfo = ins.target.typeInfo;
+          if (lookupAssignment && targetTypeInfo.type !== 9 /* Lookup */ && targetTypeInfo.type !== 18 /* DialogueLookup */) {
+            targetTypeInfo = {
+              type: 9 /* Lookup */,
+              required: targetTypeInfo.required,
+              entryTypeInfo: targetTypeInfo,
+              collectionMemberId: member.collectionMemberId,
+              collectionValueId: member.collectionValueId
+            };
+          }
+          const assignedReferenceValueId = targetTypeInfo.type === 7 /* Class */ || targetTypeInfo.type === 6 /* List */ || targetTypeInfo.type === 5 /* Dictionary */ ? findKnownRowIdByValueReference(value, ctx) : null;
+          applyOverlayAssignment(
+            ins.target.pointer,
+            targetTypeInfo,
+            value,
             scope,
             ctx,
-            options
-          );
-          if (result.kind === "return") return result;
-          if (result.kind === "break") break;
-        }
-        break;
-      }
-      case "for" /* for */: {
-        const parentBindingIds = [...scope.keys()];
-        const loopScope = createChildScope(scope);
-        try {
-          const initialValue = coerceAssignmentValue(
-            evalPointer(ins.initializer.pointer, loopScope, ctx),
-            ins.initializer.typeInfo,
-            "variable initialization"
+            destination
           );
-          loopScope.setLocal(ins.initializer.id, initialValue);
-          while (evalBooleanExpression(ins.condition, loopScope, ctx)) {
-            consumeLoopIteration(ctx);
-            const result = evalInstructionsInChildScope(
-              ins.instructions,
-              loopScope,
+          const unorderedReplacement = assignedReferenceValueId === null && member !== null && isMemberListBase(member) && listKindOf(member) === 1 /* Unordered */ && Array.isArray(value) ? unorderedReplacementProjection(
+            ins.target.pointer,
+            destination,
+            scope,
+            ctx
+          ) : null;
+          options.writes.push({
+            kind: "assign",
+            target: targetTypeInfo === ins.target.typeInfo ? ins.target : { ...ins.target, typeInfo: targetTypeInfo },
+            value: unorderedReplacement ?? value,
+            ...targetTypeInfo.type === 7 /* Class */ || targetTypeInfo.type === 6 /* List */ || targetTypeInfo.type === 5 /* Dictionary */ ? {
+              valueId: value === null || value === void 0 ? void 0 : assignedReferenceValueId ?? void 0
+            } : {},
+            ...resolvedDestinationFieldsForAssign(
+              ins.target.pointer,
+              scope,
               ctx,
-              options
-            );
-            if (result.kind === "return") return result;
-            if (result.kind === "break") break;
-            evalInstructions([ins.iterator], loopScope, ctx, options);
-          }
-        } finally {
-          synchronizeExistingBindings(scope, loopScope, parentBindingIds);
+              destination
+            )
+          });
+          break;
         }
-        break;
-      }
-      case "forEach" /* forEach */: {
-        const collection = evalPointer(ins.collectionPointer, scope, ctx);
-        const membership = snapshotCollectionMembership(collection, ctx);
-        const parentBindingIds = [...scope.keys()];
-        const loopScope = createChildScope(scope);
-        markReadonlyBinding(
-          loopScope,
-          ins.binding.id,
-          READONLY_FOREACH_BINDING_ERROR
-        );
-        try {
-          for (const rawEntry of membership) {
+        case "addActionListener" /* addActionListener */:
+        case "removeActionListener" /* removeActionListener */: {
+          evalActionListenerInstruction(ins, scope, ctx, options);
+          break;
+        }
+        case "addChangeListener" /* addChangeListener */:
+        case "removeChangeListener" /* removeChangeListener */: {
+          evalChangeListenerInstruction(ins, scope, ctx, options);
+          break;
+        }
+        case "collectionCall" /* collectionCall */: {
+          evalCollectionMutationInstruction(ins, scope, ctx, options);
+          break;
+        }
+        case "functionCall" /* functionCall */: {
+          evalPointer(ins.call, scope, ctx, "discarded");
+          break;
+        }
+        case "while" /* while */:
+        case "doWhile" /* doWhile */: {
+          let firstIteration = ins.type === "doWhile" /* doWhile */;
+          while (firstIteration || evalBooleanExpression(ins.condition, scope, ctx)) {
+            firstIteration = false;
             consumeLoopIteration(ctx);
-            loopScope.setLocal(
-              ins.binding.id,
-              coerceAssignmentValue(
-                rawEntry.resolveAsReference ? resolveValueIfId(rawEntry.raw, ctx) : rawEntry.raw,
-                ins.binding.typeInfo,
-                "foreach binding"
-              )
-            );
             const result = evalInstructionsInChildScope(
               ins.instructions,
-              loopScope,
+              scope,
               ctx,
               options
             );
             if (result.kind === "return") return result;
             if (result.kind === "break") break;
           }
-        } finally {
-          synchronizeExistingBindings(scope, loopScope, parentBindingIds);
-        }
-        break;
-      }
-      case "switch" /* switch */: {
-        validateSwitchInstruction(ins);
-        const selector = evalPointer(ins.selector, scope, ctx);
-        assertSwitchSelectorValue(selector, ins.selectorTypeInfo, ctx);
-        const matchedSection = ins.sections.find(
-          (section) => section.labels.some((label) => jsEqual(selector, label.value))
-        );
-        const selectedInstructions = matchedSection?.instructions ?? ins.defaultInstructions;
-        if (selectedInstructions === void 0 || selectedInstructions === null) {
           break;
         }
-        const parentBindingIds = [...scope.keys()];
-        const sectionScope = createChildScope(scope);
-        const result = (() => {
+        case "for" /* for */: {
+          const parentBindingIds = [...scope.keys()];
+          const loopScope = createChildScope(scope);
           try {
-            return evalInstructions(
-              selectedInstructions,
-              sectionScope,
-              ctx,
-              options
+            const initialValue = coerceAssignmentValue(
+              evalPointer(ins.initializer.pointer, loopScope, ctx),
+              ins.initializer.typeInfo,
+              "variable initialization"
             );
+            loopScope.setLocal(ins.initializer.id, initialValue);
+            while (evalBooleanExpression(ins.condition, loopScope, ctx)) {
+              consumeLoopIteration(ctx);
+              const result = evalInstructionsInChildScope(
+                ins.instructions,
+                loopScope,
+                ctx,
+                options
+              );
+              if (result.kind === "return") return result;
+              if (result.kind === "break") break;
+              evalInstructions([ins.iterator], loopScope, ctx, options);
+            }
           } finally {
-            synchronizeExistingBindings(scope, sectionScope, parentBindingIds);
+            synchronizeExistingBindings(scope, loopScope, parentBindingIds);
           }
-        })();
-        if (result.kind === "break") break;
-        if (result.kind === "fallthrough") {
-          throw new CorruptNeoScriptIRError(
-            "Corrupt NeoScript switch IR: selected section reached its end."
-          );
+          break;
         }
-        return result;
-      }
-      case "try" /* try */: {
-        validateTryInstruction(ins);
-        const parentBindingIds = [...scope.keys()];
-        const tryScope = createChildScope(scope);
-        let tryResult;
-        try {
+        case "forEach" /* forEach */: {
+          const collection = evalPointer(ins.collectionPointer, scope, ctx);
+          const membership = snapshotCollectionMembership(collection, ctx);
+          const parentBindingIds = [...scope.keys()];
+          const loopScope = createChildScope(scope);
+          markReadonlyBinding(
+            loopScope,
+            ins.binding.id,
+            READONLY_FOREACH_BINDING_ERROR
+          );
           try {
-            tryResult = evalInstructions(
-              ins.instructions,
-              tryScope,
-              ctx,
-              options
-            );
+            for (const rawEntry of membership) {
+              consumeLoopIteration(ctx);
+              loopScope.setLocal(
+                ins.binding.id,
+                coerceAssignmentValue(
+                  rawEntry.resolveAsReference ? resolveValueIfId(rawEntry.raw, ctx) : rawEntry.raw,
+                  ins.binding.typeInfo,
+                  "foreach binding"
+                )
+              );
+              const result = evalInstructionsInChildScope(
+                ins.instructions,
+                loopScope,
+                ctx,
+                options
+              );
+              if (result.kind === "return") return result;
+              if (result.kind === "break") break;
+            }
           } finally {
-            synchronizeExistingBindings(scope, tryScope, parentBindingIds);
+            synchronizeExistingBindings(scope, loopScope, parentBindingIds);
           }
-        } catch (error) {
-          if (!isCatchableNeoScriptRuntimeError(error)) throw error;
-          let matched = false;
-          for (const clause of ins.catches) {
-            const catchScope = createChildScope(scope);
-            catchScope.setLocal(clause.binding.id, error.message);
-            markReadonlyBinding(
-              catchScope,
-              clause.binding.id,
-              READONLY_CATCH_BINDING_ERROR
-            );
-            const filter = clause.filter;
-            let filterMatches = filter === null || filter === void 0;
-            if (filter !== null && filter !== void 0) {
-              try {
-                filterMatches = evalBooleanExpression(filter, catchScope, ctx);
-              } catch (filterError) {
-                if (!isCatchableNeoScriptRuntimeError(filterError)) {
-                  synchronizeExistingBindings(
-                    scope,
-                    catchScope,
-                    parentBindingIds
-                  );
-                  throw filterError;
-                }
-                filterMatches = false;
-              }
-            }
-            if (!filterMatches) {
-              synchronizeExistingBindings(scope, catchScope, parentBindingIds);
-              continue;
+          break;
+        }
+        case "switch" /* switch */: {
+          validateSwitchInstruction(ins);
+          const selector = evalPointer(ins.selector, scope, ctx);
+          assertSwitchSelectorValue(selector, ins.selectorTypeInfo, ctx);
+          const matchedSection = ins.sections.find(
+            (section) => section.labels.some((label) => jsEqual(selector, label.value))
+          );
+          const selectedInstructions = matchedSection?.instructions ?? ins.defaultInstructions;
+          if (selectedInstructions === void 0 || selectedInstructions === null) {
+            break;
+          }
+          const parentBindingIds = [...scope.keys()];
+          const sectionScope = createChildScope(scope);
+          const result = (() => {
+            try {
+              return evalInstructions(
+                selectedInstructions,
+                sectionScope,
+                ctx,
+                options
+              );
+            } finally {
+              synchronizeExistingBindings(
+                scope,
+                sectionScope,
+                parentBindingIds
+              );
             }
-            matched = true;
-            let catchResult;
+          })();
+          if (result.kind === "break") break;
+          if (result.kind === "fallthrough") {
+            throw new CorruptNeoScriptIRError(
+              "Corrupt NeoScript switch IR: selected section reached its end."
+            );
+          }
+          return result;
+        }
+        case "try" /* try */: {
+          validateTryInstruction(ins);
+          const parentBindingIds = [...scope.keys()];
+          const tryScope = createChildScope(scope);
+          let tryResult;
+          try {
             try {
-              catchResult = evalInstructions(
-                clause.instructions,
-                catchScope,
+              tryResult = evalInstructions(
+                ins.instructions,
+                tryScope,
                 ctx,
                 options
               );
             } finally {
-              synchronizeExistingBindings(scope, catchScope, parentBindingIds);
+              synchronizeExistingBindings(scope, tryScope, parentBindingIds);
             }
-            if (catchResult.kind !== "fallthrough") return catchResult;
+          } catch (error) {
+            if (!isCatchableNeoScriptRuntimeError(error)) throw error;
+            let matched = false;
+            for (const clause of ins.catches) {
+              const catchScope = createChildScope(scope);
+              catchScope.setLocal(clause.binding.id, error.message);
+              markReadonlyBinding(
+                catchScope,
+                clause.binding.id,
+                READONLY_CATCH_BINDING_ERROR
+              );
+              const filter = clause.filter;
+              let filterMatches = filter === null || filter === void 0;
+              if (filter !== null && filter !== void 0) {
+                try {
+                  filterMatches = evalBooleanExpression(
+                    filter,
+                    catchScope,
+                    ctx
+                  );
+                } catch (filterError) {
+                  if (!isCatchableNeoScriptRuntimeError(filterError)) {
+                    synchronizeExistingBindings(
+                      scope,
+                      catchScope,
+                      parentBindingIds
+                    );
+                    throw filterError;
+                  }
+                  filterMatches = false;
+                }
+              }
+              if (!filterMatches) {
+                synchronizeExistingBindings(
+                  scope,
+                  catchScope,
+                  parentBindingIds
+                );
+                continue;
+              }
+              matched = true;
+              let catchResult;
+              try {
+                catchResult = evalInstructions(
+                  clause.instructions,
+                  catchScope,
+                  ctx,
+                  options
+                );
+              } finally {
+                synchronizeExistingBindings(
+                  scope,
+                  catchScope,
+                  parentBindingIds
+                );
+              }
+              if (catchResult.kind !== "fallthrough") return catchResult;
+              break;
+            }
+            if (!matched) throw error;
             break;
           }
-          if (!matched) throw error;
+          if (tryResult.kind !== "fallthrough") return tryResult;
           break;
         }
-        if (tryResult.kind !== "fallthrough") return tryResult;
-        break;
+        case "break" /* break */:
+          return { kind: "break" };
+        case "continue" /* continue */:
+          return { kind: "continue" };
+      }
+      void touchUnknown(ins);
+    } catch (error) {
+      if (error instanceof NSGetterRuntimeError) {
+        error.at(ins);
+        if (ins.type === "assign" /* assign */ && ins.target.writability === "setter" /* Setter */)
+          error.callerNode = ins;
       }
-      case "break" /* break */:
-        return { kind: "break" };
-      case "continue" /* continue */:
-        return { kind: "continue" };
+      throw error;
     }
-    void touchUnknown(ins);
   }
   return { kind: "fallthrough" };
 }
@@ -74538,7 +74886,7 @@ function validateAssignmentTarget(target, scope, ctx, destination) {
       );
     }
     if (index < 0 || index >= receiver.length) {
-      throw new NSGetterRuntimeError(`List index out of bounds: ${index}`);
+      throw new NSGetterRuntimeError(listIndexError(index, receiver.length));
     }
   }
   return resolved;
@@ -74644,15 +74992,21 @@ function dispatchNSSetter(target, value, scope, ctx, writes) {
   }
   const innerStack = new Set(stack);
   innerStack.add(memberId);
-  evaluateNSSetter(
-    setter,
-    {
-      ...bindThisValue(ctx, receiver),
-      __setterCallStack: innerStack
-    },
-    value,
-    writes
-  );
+  try {
+    evaluateNSSetter(
+      setter,
+      {
+        ...bindThisValue(ctx, receiver),
+        __setterCallStack: innerStack
+      },
+      value,
+      writes
+    );
+  } catch (error) {
+    if (error instanceof NSGetterRuntimeError)
+      error.sourceOwnerId ??= compiledBodyOwnerId(memberId, setter, ctx);
+    throw error;
+  }
 }
 function resolveEffectiveNSPropertyMemberId(staticMemberId, receiver, ctx) {
   const schemaKey = cachedSchemaKeyForMember(staticMemberId, ctx);
@@ -74966,7 +75320,7 @@ function applyLocalCollectionMutation(targetValue, mutation, args, ctx, unique =
       const list = listArg(targetValue, "RemoveAt target");
       const index = numberArg(args[0], "RemoveAt index");
       if (index < 0 || index >= list.length) {
-        throw new NSGetterRuntimeError(`List index out of bounds: ${index}`);
+        throw new NSGetterRuntimeError(listIndexError(index, list.length));
       }
       list.splice(index, 1);
       return index;
@@ -75036,7 +75390,7 @@ function validateCollectionMutation(targetValue, mutation, args) {
       );
     if (index < 0 || index > list.length) {
       throw new NSGetterRuntimeError(
-        `List insertion index out of bounds: ${index}`
+        `List insertion index out of bounds: ${index}; use an index from 0 to ${list.length}.`
       );
     }
     return;
@@ -75045,7 +75399,7 @@ function validateCollectionMutation(targetValue, mutation, args) {
     const list = listArg(targetValue, "RemoveAt target");
     const index = numberArg(args[0], "RemoveAt index");
     if (index < 0 || index >= list.length) {
-      throw new NSGetterRuntimeError(`List index out of bounds: ${index}`);
+      throw new NSGetterRuntimeError(listIndexError(index, list.length));
     }
     return;
   }
@@ -75069,6 +75423,11 @@ function validateCollectionMutation(targetValue, mutation, args) {
   }
   listArg(targetValue, `${mutation} target`);
 }
+function listIndexError(index, length) {
+  if (length === 0)
+    return `List index out of bounds: ${String(index)}; the list is empty. Add an entry before indexing it.`;
+  return `List index out of bounds: ${String(index)}; list length is ${length}. Use an index from 0 to ${length - 1}.`;
+}
 function listArg(value, name) {
   if (Array.isArray(value)) return value;
   throw new NSGetterRuntimeError(`${name} must be a list`);
@@ -75165,6 +75524,17 @@ function evalStaticMember(memberId, ctx) {
   return shouldUnwrapSingleLookupValue(member) ? unwrapSingleLookupValue(readRowValue(row, ctx), ctx) : resolveLocalizedRowValueForMember(row, member, ctx);
 }
 function evalPointer(pointer, scope, ctx, resultUsage = "value") {
+  try {
+    return evalPointerCore(pointer, scope, ctx, resultUsage);
+  } catch (error) {
+    if (error instanceof NSGetterRuntimeError) {
+      error.at(pointer);
+      error.callerNode = pointer;
+    }
+    throw error;
+  }
+}
+function evalPointerCore(pointer, scope, ctx, resultUsage = "value") {
   switch (pointer.type) {
     case "value" /* value */: {
       const value = pointer.value.value;
@@ -75262,7 +75632,7 @@ function evalPointer(pointer, scope, ctx, resultUsage = "value") {
       const v = evalPointer(pointer.pointer, scope, ctx);
       if (v === null || v === void 0) {
         throw new NSGetterRuntimeError(
-          "Unexpectedly found null while force-unwrapping a value"
+          "Cannot unwrap null with '!'. Check for null first or provide a fallback with '??'."
         );
       }
       return v;
@@ -75416,6 +75786,10 @@ function evalPointer(pointer, scope, ctx, resultUsage = "value") {
           runtimeSignature.returnTypeInfo.type === NS_TYPE_VOID,
           runtimeSignature
         );
+      } catch (error) {
+        if (error instanceof NSGetterRuntimeError)
+          error.sourceOwnerId ??= compiledBodyOwnerId(member.id, action, ctx);
+        throw error;
       } finally {
         state.functionStack.pop();
       }
@@ -75701,13 +76075,19 @@ function invokeDelegateValue(value, args, ctx, callSiteId, ownerReceiver, result
           );
         }
         const runtimeSignature = receiver === null ? signature : substituteCallableSignatureForReceiver(signature, receiver, ctx);
-        return executeCompiledFunction(
-          action,
-          bindThisValue(ctx, receiver),
-          args,
-          runtimeSignature.returnTypeInfo.type === NS_TYPE_VOID,
-          runtimeSignature
-        );
+        try {
+          return executeCompiledFunction(
+            action,
+            bindThisValue(ctx, receiver),
+            args,
+            runtimeSignature.returnTypeInfo.type === NS_TYPE_VOID,
+            runtimeSignature
+          );
+        } catch (error) {
+          if (error instanceof NSGetterRuntimeError)
+            error.sourceOwnerId ??= compiledBodyOwnerId(member.id, action, ctx);
+          throw error;
+        }
       }
       if (member.kind === 25 /* NSDelegate */) {
         let nested;
@@ -76285,6 +76665,14 @@ function runtimeTypeInfoForMember(rawMember, env, ctx, seen) {
     required: member.kind === 0 /* Null */ ? false : isRequiredMember2(member)
   };
 }
+function compiledBodyOwnerId(memberId, body, ctx) {
+  return walkExtendsMemberChain(
+    memberId,
+    ctx.vm.members,
+    (member) => getField(member, "action") === body || getField(member, "getter") === body || getField(member, "setter") === body ? member.id : void 0,
+    { memberById: (id2) => evalMemberById(ctx.vm, id2) }
+  ) ?? memberId;
+}
 function resolveCompiledNSFunction(memberId, ctx) {
   const cache = evaluatorResolutionCache(ctx).compiledFunctionByMemberId;
   if (cache.has(memberId)) return cache.get(memberId) ?? null;
@@ -76421,15 +76809,21 @@ function dispatchNSGetterById(memberId, receiver, ctx) {
   }
   const innerStack = new Set(stack);
   innerStack.add(memberId);
-  return evaluateNSGetterWithEffects(
-    getter,
-    {
-      ...bindThisValue(ctx, receiver),
-      __getterCallStack: innerStack
-    },
-    [],
-    { sessionValueExport: "defer" }
-  ).value;
+  try {
+    return evaluateNSGetterWithEffects(
+      getter,
+      {
+        ...bindThisValue(ctx, receiver),
+        __getterCallStack: innerStack
+      },
+      [],
+      { sessionValueExport: "defer" }
+    ).value;
+  } catch (error) {
+    if (error instanceof NSGetterRuntimeError)
+      error.sourceOwnerId ??= compiledBodyOwnerId(memberId, getter, ctx);
+    throw error;
+  }
 }
 function resolveCompiledGetter(memberId, ctx) {
   const cache = evaluatorResolutionCache(ctx).compiledGetterByMemberId;
@@ -76648,10 +77042,12 @@ function evalKeyOf(keyOf, scope, ctx, optional2 = false, memberId, onDestination
       );
     }
     const idx = typeof key === "number" ? key : NaN;
-    if (!Number.isInteger(idx) || idx < 0 || idx >= receiver.length) {
+    if (!Number.isInteger(idx))
       throw new NSGetterRuntimeError(
-        `List index out of bounds: ${String(key)}`
+        `List index must be an integer; received ${String(key)}.`
       );
+    if (idx < 0 || idx >= receiver.length) {
+      throw new NSGetterRuntimeError(listIndexError(key, receiver.length));
     }
     return resolveCollectionEntry(receiver, receiver[idx], idx, ctx);
   }
@@ -76682,7 +77078,9 @@ function evalKeyOf(keyOf, scope, ctx, optional2 = false, memberId, onDestination
     if (expanded !== null && Object.prototype.hasOwnProperty.call(expanded, k)) {
       return resolveValueIfId(expanded[k], ctx);
     }
-    throw new NSGetterRuntimeError(`Missing key '${k}' on object`);
+    throw new NSGetterRuntimeError(
+      `Missing key '${k}' on object. Check that the key exists before reading it.`
+    );
   }
   throw new NSGetterRuntimeError(
     `Cannot index into ${typeof receiver} with key '${String(key)}'`
@@ -78535,7 +78933,7 @@ function evalFunction(fn, scope, ctx) {
       if (found !== sentinel) return found;
       if (fn.type === "first" /* first */) {
         throw new NSGetterRuntimeError(
-          innerFn ? "First() found no matching entry" : "First() called on an empty collection"
+          innerFn ? "First() found no matching entry. Use FirstOrDefault() and handle null if no match is expected." : "First() called on an empty collection. Check that it has entries, or use FirstOrDefault() and handle null."
         );
       }
       return null;
@@ -79596,12 +79994,18 @@ function runDeclaredConstructorChain(args) {
     });
   }
   args.applyBaseInitializerBlock(record6, args.argumentValues, args.thisValue);
-  executeCompiledFunction(
-    record6.action,
-    bindThisValue(ctx, args.thisValue),
-    args.argumentValues,
-    true
-  );
+  try {
+    executeCompiledFunction(
+      record6.action,
+      bindThisValue(ctx, args.thisValue),
+      args.argumentValues,
+      true
+    );
+  } catch (error) {
+    if (error instanceof NSGetterRuntimeError)
+      error.sourceOwnerId ??= record6.id;
+    throw error;
+  }
 }
 function evaluateBaseInitializerFields(args) {
   const { record: record6, ctx } = args;
@@ -83055,15 +83459,27 @@ function evaluateMemberInitializer(args) {
     __constructedFieldSchemaKeysByValue: /* @__PURE__ */ new WeakMap(),
     __createdStorageKeyDeclarations: args.storageKeyDeclarations ?? /* @__PURE__ */ new Map()
   };
-  const result = evaluateNSGetterWithEffects(
-    compiled,
-    ctx,
-    args.argumentValues ?? [],
-    {
-      exportInitializerValues: true,
-      initializerResult: { member: args.member, genericEnv: args.genericEnv }
+  const result = (() => {
+    try {
+      return evaluateNSGetterWithEffects(
+        compiled,
+        ctx,
+        args.argumentValues ?? [],
+        {
+          exportInitializerValues: true,
+          initializerResult: {
+            member: args.member,
+            genericEnv: args.genericEnv
+          }
+        }
+      );
+    } catch (error) {
+      if (error instanceof NSGetterRuntimeError) {
+        error.initializerValueId ??= args.sourceValueId ?? void 0;
+      }
+      throw error;
     }
-  );
+  })();
   const created = result.createdSessionValues ?? [];
   if (isMemberLookupBase(args.member)) {
     return encodeLookupInitializerResult(
@@ -83106,6 +83522,7 @@ var evaluatorLookupsByDocument, headlessResolversByLookupKey, indexedEvaluatorLo
 var init_evaluateInitializer = __esm({
   "../src/runtime/neoscript/evaluateInitializer.ts"() {
     "use strict";
+    init_NSGetterRuntimeError();
     init_declaration_default_source();
     init_member_change_listeners();
     init_initializer_dependencies();
@@ -87352,7 +87769,7 @@ function compileStrict(code, context) {
   if (cached !== void 0) {
     neoScriptBodyCompileCache.delete(cacheKey);
     neoScriptBodyCompileCache.set(cacheKey, cached);
-    return structuredClone(cached);
+    return cloneWithRuntimeSources(cached);
   }
   const compiled = assertNeoScriptCompiles(
     {
@@ -87369,7 +87786,7 @@ function compileStrict(code, context) {
       "A standalone NeoScript compiler entry point returned property units."
     );
   }
-  neoScriptBodyCompileCache.set(cacheKey, structuredClone(compiled));
+  neoScriptBodyCompileCache.set(cacheKey, cloneWithRuntimeSources(compiled));
   while (neoScriptBodyCompileCache.size > NEOSCRIPT_BODY_COMPILE_CACHE_LIMIT) {
     const oldest = neoScriptBodyCompileCache.keys().next().value;
     if (typeof oldest !== "string") break;
@@ -87422,6 +87839,7 @@ var NEOSCRIPT_BODY_COMPILE_CACHE_LIMIT, neoScriptBodyCompileCache, neoScriptProj
 var init_compile = __esm({
   "../src/database/neoscript/compile.ts"() {
     "use strict";
+    init_runtime_source();
     init_compiler();
     init_strict_compile_error();
     init_project();
@@ -90561,9 +90979,9 @@ var init_project_record_migrations = __esm({
 });
 
 // ../src/database/member-default-reference-ids.ts
-function collectCandidateValueIds(sources) {
+function collectCandidateValueIds(sources2) {
   const candidates = [];
-  for (const source of sources) {
+  for (const source of sources2) {
     if (typeof source !== "object" || source === null || !("value" in source))
       continue;
     const value = source.value;
@@ -112447,6 +112865,22 @@ function createGenerationContext(exportData, diagnostics, docs = EMPTY_UNITY_COD
     `${exportData.project.name}Neo`,
     "NeoProject"
   );
+  const enums = Object.values(exportData.enums);
+  const enumNames = buildEnumNameMap(enums, diagnostics);
+  const typeNames = buildNameMap(
+    Object.values(exportData.classes),
+    "Type",
+    diagnostics
+  );
+  const interfaceNames = buildNameMap(
+    Object.values(exportData.interfaces),
+    "Interface",
+    diagnostics
+  );
+  const dialogueGroupClassNames = buildDialogueGroupClassNameMap(
+    dialogueGroups,
+    diagnostics
+  );
   return {
     exportData,
     docs,
@@ -112454,22 +112888,23 @@ function createGenerationContext(exportData, diagnostics, docs = EMPTY_UNITY_COD
     classes: Object.values(exportData.classes),
     interfaces: Object.values(exportData.interfaces),
     diagnostics,
-    enumNames: buildEnumNameMap(Object.values(exportData.enums), diagnostics),
-    enumOptionFieldNames: /* @__PURE__ */ new Map(),
-    typeNames: buildNameMap(
-      Object.values(exportData.classes),
-      "Type",
-      diagnostics
-    ),
-    interfaceNames: buildNameMap(
-      Object.values(exportData.interfaces),
-      "Interface",
-      diagnostics
-    ),
-    dialogueGroupClassNames: buildDialogueGroupClassNameMap(
-      dialogueGroups,
+    enumNames,
+    enumOptionsNames: buildEnumOptionsNameMap(
+      enums,
+      enumNames,
+      [
+        projectClassName,
+        ...enumNames.values(),
+        ...typeNames.values(),
+        ...interfaceNames.values(),
+        ...dialogueGroupClassNames.values()
+      ],
       diagnostics
     ),
+    enumOptionFieldNames: /* @__PURE__ */ new Map(),
+    typeNames,
+    interfaceNames,
+    dialogueGroupClassNames,
     dialogueGroupPropertyNames: buildDialogueGroupPropertyNameMap(
       dialogueGroups,
       diagnostics
@@ -112550,6 +112985,29 @@ function buildEnumNameMap(enums, diagnostics) {
   }
   return names;
 }
+function buildEnumOptionsNameMap(enums, enumNames, typeNames, diagnostics) {
+  const taken = new Set(typeNames);
+  const names = /* @__PURE__ */ new Map();
+  for (const enumDef of enums) {
+    const enumName = enumNames.get(enumDef.id);
+    if (enumName === void 0) continue;
+    const baseName = `${enumName}Options`;
+    if (sdkRuntimeEnumBinding(enumDef.id) !== void 0 || !taken.has(baseName)) {
+      taken.add(baseName);
+      names.set(enumDef.id, baseName);
+      continue;
+    }
+    const uniqueName = `${baseName}_${shortId(enumDef.id)}`;
+    diagnostics.push({
+      severity: "warning",
+      message: `Generated C# options class "${baseName}" for enum "${enumDef.name}" collides with another generated type; using "${uniqueName}".`,
+      path: `enums.${enumDef.id}.name`
+    });
+    taken.add(uniqueName);
+    names.set(enumDef.id, uniqueName);
+  }
+  return names;
+}
 function buildDialogueGroupClassNameMap(groups, diagnostics) {
   const baseNames = buildNameMap(groups, "DialogueGroup", diagnostics);
   const used = /* @__PURE__ */ new Map();
@@ -116860,9 +117318,9 @@ function liveReferenceSourcesByTarget(records2) {
       record6.recordKind,
       record6.data
     )) {
-      const sources = sourcesByTarget.get(target);
-      if (sources === void 0) sourcesByTarget.set(target, [key]);
-      else sources.push(key);
+      const sources2 = sourcesByTarget.get(target);
+      if (sources2 === void 0) sourcesByTarget.set(target, [key]);
+      else sources2.push(key);
     }
   }
   return sourcesByTarget;
@@ -117255,6 +117713,116 @@ var init_schema_source_validation = __esm({
   }
 });
 
+// src/project-source/runtime-diagnostic.ts
+function initializerRuntimeDiagnostic(error, sites, texts, analysis) {
+  if (error instanceof SchemaSourceError) return error;
+  const valueId = error instanceof NSGetterRuntimeError ? error.initializerValueId : error instanceof StoredClosureCaptureError ? error.valueId : void 0;
+  const site = valueId === void 0 ? void 0 : sites.get(valueId);
+  let position = site === void 0 ? void 0 : composeReferenceSitePosition(site, texts);
+  if (error instanceof NSGetterRuntimeError && error.source !== void 0) {
+    const source = error.source;
+    if (source.uri !== void 0 && texts.get(source.uri) === source.text) {
+      position = { file: source.uri, line: source.line, column: source.column };
+    } else {
+      const bodyLex = lex(source.text);
+      let tokens = bodyLex.tokens.filter(
+        (token) => token.kind !== "comment" && token.kind !== "eof"
+      );
+      const targetOffset = bodyLex.source.offsetAt({
+        line: source.line - 1,
+        character: source.column - 1
+      });
+      if (tokens[0]?.text === "return" && tokens.at(-1)?.text === ";")
+        tokens = tokens.slice(1, -1);
+      const target = tokens.findIndex((token) => token.end > targetOffset);
+      const matches = [];
+      if (tokens.length > 0 && target >= 0) {
+        const prefix = new Array(tokens.length).fill(0);
+        for (let i2 = 1, j = 0; i2 < tokens.length; i2++) {
+          while (j > 0 && tokens[i2].text !== tokens[j].text)
+            j = prefix[j - 1];
+          if (tokens[i2].text === tokens[j].text) j++;
+          prefix[i2] = j;
+        }
+        for (const [file, text] of texts) {
+          const fileLex = lex(text);
+          const candidates = fileLex.tokens.filter(
+            (token) => token.kind !== "comment" && token.kind !== "eof"
+          );
+          for (let i2 = 0, j = 0; i2 < candidates.length; i2++) {
+            while (j > 0 && candidates[i2].text !== tokens[j].text)
+              j = prefix[j - 1];
+            if (candidates[i2].text === tokens[j].text) j++;
+            if (j !== tokens.length) continue;
+            const matched = candidates[i2 - j + 1 + target];
+            const point = fileLex.source.positionAt(
+              matched.start + Math.max(0, targetOffset - tokens[target].start)
+            );
+            matches.push({
+              file,
+              line: point.line + 1,
+              column: point.character + 1
+            });
+            j = prefix[j - 1];
+          }
+        }
+      }
+      const owner = sourceOwnerLocation(analysis, error.sourceOwnerId);
+      const scoped = owner === void 0 ? matches : matches.filter((match) => {
+        if (match.file !== owner.uri) return false;
+        const line = match.line - 1;
+        const column = match.column - 1;
+        return (line > owner.range.start.line || line === owner.range.start.line && column >= owner.range.start.character) && (line < owner.range.end.line || line === owner.range.end.line && column < owner.range.end.character);
+      });
+      if (scoped.length === 1) position = scoped[0];
+      else if (matches.length === 1) position = matches[0];
+    }
+  }
+  let message = String(error);
+  if (error instanceof NSGetterRuntimeError) message = error.diagnosticMessage;
+  else if (error instanceof Error) message = error.message;
+  return new SchemaSourceError(
+    position === void 0 && valueId !== void 0 ? `Initializer for value "${valueId}": ${message}` : message,
+    position?.file ?? "<initializer-materialization>",
+    position?.line ?? 1,
+    position?.column ?? 1
+  );
+}
+function sourceOwnerLocation(analysis, id2) {
+  if (analysis === null || analysis === void 0 || id2 === void 0)
+    return void 0;
+  for (const declaration of analysis.schema.classes) {
+    for (const member of declaration.members) {
+      if (materializedId(
+        member,
+        "member",
+        `${declaration.name}.${member.name}`
+      ) === id2)
+        return member.source;
+    }
+    for (const constructor2 of declaration.constructors) {
+      if (declaredConstructorId2(declaration, constructor2) === id2)
+        return constructor2.source;
+    }
+  }
+  const body = analysis.compiledBodies.find(
+    (candidate) => candidate.memberId === id2
+  );
+  return body === void 0 ? void 0 : { uri: body.uri, range: body.range };
+}
+var init_runtime_diagnostic = __esm({
+  "src/project-source/runtime-diagnostic.ts"() {
+    "use strict";
+    init_lower_support();
+    init_lower_constructors();
+    init_NSGetterRuntimeError();
+    init_lexer();
+    init_source_diagnostics();
+    init_value_sources();
+    init_stored_closure_captures();
+  }
+});
+
 // src/project-source/listener-lowering.ts
 function lowerListenerBindings(args) {
   const failures = [];
@@ -123668,21 +124236,40 @@ function materializedInitializerReconciliationFailuresV4(args) {
       );
     }
     const replayRows = /* @__PURE__ */ new Map();
-    for (const [id2, row] of replayStoredConstructionV4({
-      records: records2,
-      document: replayDocument,
-      replayContext,
-      valueId: reconciliation.valueId,
-      code: reconciliation.code,
-      member: owner,
-      ...compilationProject === void 0 ? {} : { compilationProject }
-    })) {
-      if (!isMemberValue(row)) {
-        throw new Error(
-          `Construction replay produced invalid value row "${id2}".`
-        );
+    try {
+      for (const [id2, row] of replayStoredConstructionV4({
+        records: records2,
+        document: replayDocument,
+        replayContext,
+        valueId: reconciliation.valueId,
+        code: reconciliation.code,
+        member: owner,
+        ...compilationProject === void 0 ? {} : { compilationProject }
+      })) {
+        if (!isMemberValue(row)) {
+          throw new Error(
+            `Construction replay produced invalid value row "${id2}".`
+          );
+        }
+        replayRows.set(id2, row);
+      }
+    } catch (error) {
+      if (error instanceof NSGetterRuntimeError && error.source === void 0 && args.forceRecompile !== true) {
+        return materializedInitializerReconciliationFailuresV4({
+          ...args,
+          forceRecompile: true,
+          useBuildCaches: false
+        });
       }
-      replayRows.set(id2, row);
+      failures.push(
+        initializerRuntimeDiagnostic(
+          error,
+          /* @__PURE__ */ new Map([[reconciliation.valueId, reconciliation.site]]),
+          args.sourceTextByUri,
+          args.analysis
+        )
+      );
+      continue;
     }
     assertPulledConstructorsCompiled(replayDocument, replayContext);
     currentRows ??= new Map(currentDocument.values.map((row) => [row.id, row]));
@@ -124086,6 +124673,8 @@ function variantOwnershipRootRecords(records2) {
 var init_local_initializer_materialization = __esm({
   "src/project-source/local-initializer-materialization.ts"() {
     "use strict";
+    init_NSGetterRuntimeError();
+    init_runtime_diagnostic();
     init_evaluateInitializer();
     init_stored_closure_captures();
     init_initializer_dependencies();
@@ -124408,6 +124997,11 @@ function computeWorkspaceStatus(workspace, options) {
       if (positioned.severity === "error") parseErrors.push(positioned);
       else parseWarnings.push(positioned);
     }
+    if (analysis.diagnostics.some(
+      (diagnostic2) => diagnostic2.code === "duplicate-project-id" && diagnostic2.severity === "error"
+    )) {
+      return refusedStatus(conflictedFiles, parseErrors, parseWarnings);
+    }
     const rootDeclaration = analysis.configuration.globals.find(
       (global) => global.type.name === "Root"
     );
@@ -124808,11 +125402,21 @@ function computeWorkspaceStatus(workspace, options) {
     variantValueBindingsV4(manifest, projectAnalysisV4),
     { analysis: projectAnalysisV4, registry: valueLowerRegistry }
   );
-  const supplementalRecords = options.lowerSupplementalRecords(
-    loweringRecords,
-    projectAnalysisV4,
-    options.trustedPendingProjectFiles
-  );
+  let supplementalRecords;
+  try {
+    supplementalRecords = options.lowerSupplementalRecords(
+      loweringRecords,
+      projectAnalysisV4,
+      options.trustedPendingProjectFiles
+    );
+  } catch (error) {
+    parseErrors.push(sourceDiagnosticMapper(projectAnalysisV4)(error));
+    return refusedStatus(
+      conflictedFiles,
+      uniqueSourceErrors(parseErrors),
+      parseWarnings
+    );
+  }
   resolveRootPathDialogueGroupCollectionValuesV4({
     records: supplementalRecords,
     manifest,
@@ -125258,6 +125862,7 @@ function computeWorkspaceStatus(workspace, options) {
         authoredValueSeeds,
         reconciliations: valueLowerRegistry.initializerReconciliations,
         manifest,
+        analysis: projectAnalysisV4,
         forceRecompile: options.forceRecompile,
         useBuildCaches: options.useBuildCaches,
         sourceTextByUri: new Map(
@@ -125373,7 +125978,7 @@ function computeWorkspaceStatus(workspace, options) {
       )
     );
   }
-  if (options.skipInitializerMaterialization !== true) {
+  if (options.skipInitializerMaterialization !== true && !parseErrors.some(isBlockingSchemaSourceError)) {
     try {
       materializeWorkspaceStatusInitializers(
         workspace,
@@ -125381,14 +125986,23 @@ function computeWorkspaceStatus(workspace, options) {
         options.forceRecompile
       );
     } catch (error) {
-      const site = error instanceof StoredClosureCaptureError ? valueLowerRegistry.initializerSites.get(error.valueId) : void 0;
-      const position = site === void 0 ? { file: "<initializer-materialization>", line: 1, column: 1 } : composeReferenceSitePosition(site, sourceTextByUri);
+      if (error instanceof NSGetterRuntimeError && error.source === void 0 && options.forceRecompile !== true) {
+        try {
+          materializeWorkspaceStatusInitializers(
+            workspace,
+            { changes, authoredValueSeeds },
+            true
+          );
+        } catch (replayedError) {
+          error = replayedError;
+        }
+      }
       parseErrors.push(
-        new SchemaSourceError(
-          error instanceof Error ? error.message : String(error),
-          position.file,
-          position.line,
-          position.column
+        initializerRuntimeDiagnostic(
+          error,
+          valueLowerRegistry.initializerSites,
+          sourceTextByUri,
+          projectAnalysisV4
         )
       );
     }
@@ -125409,7 +126023,10 @@ function computeWorkspaceStatus(workspace, options) {
         analysis: projectAnalysisV4
       }
     },
-    localValues: valueLowerRegistry.localValues?.placements(),
+    localValues: [
+      ...valueLowerRegistry.localValues?.placements() ?? [],
+      ...projectFilePlacementsV4(projectAnalysisV4)
+    ],
     changes,
     conflictedFiles,
     parseErrors: uniqueSourceErrors(positionedErrors),
@@ -126461,12 +127078,13 @@ var ANIMATION_DOCUMENT_RECORD_KINDS, ANIMATION_REPLAY_RECORD_KINDS, PROSPECTIVE_
 var init_workspace_status_core = __esm({
   "src/project-source/workspace-status-core.ts"() {
     "use strict";
+    init_runtime_diagnostic();
+    init_NSGetterRuntimeError();
     init_lower_support();
     init_listener_lowering();
     init_inheritance_flags_validation();
     init_schema_source_validation();
     init_members();
-    init_stored_closure_captures();
     init_collection_binding_materialization();
     init_localizable_member_value_writes();
     init_localized_instance_override_writes();
@@ -128877,14 +129495,14 @@ function indexInitializerAuthoredRowIds(analysis, declaredConstructors2, classes
         continue;
       }
       const label = `${sourceClass.name}.${declaration.name}`;
-      const sources = initializerSourcesRequiringEvaluation(
+      const sources2 = initializerSourcesRequiringEvaluation(
         declaration.initializer,
         declaration.type,
         declaredConstructors2,
         classesByName,
         sourceClass.name
       );
-      for (const source of sources) indexAuthoredRowIds(index, source, label);
+      for (const source of sources2) indexAuthoredRowIds(index, source, label);
     }
   }
   return index;
@@ -136509,7 +137127,11 @@ function emitProjectDocumentSourcesV4(records2, options = {}) {
   const supplementalFiles = emitSupplementalProjectSourcesV4(
     records2,
     options.binaryPaths,
-    { manifest, collectionValuePaths: indexes3.rootPathsByValueId }
+    {
+      manifest,
+      collectionValuePaths: indexes3.rootPathsByValueId,
+      localValues: options.localValues
+    }
   );
   const materializedConstructors = new Map(
     staticValues.materializedConstructors
@@ -136665,14 +137287,14 @@ var init_project_documents = __esm({
 import { mkdirSync as mkdirSync6, readFileSync as readFileSync6, renameSync as renameSync5, writeFileSync as writeFileSync6 } from "node:fs";
 import { createHash as createHash6 } from "node:crypto";
 import { dirname as dirname6, join as join5 } from "node:path";
-function readProjectSourceAnalysisBuildCacheV4(root, sources) {
+function readProjectSourceAnalysisBuildCacheV4(root, sources2) {
   try {
     const parsed = JSON.parse(
       readFileSync6(join5(root, PROJECT_SOURCE_BUILD_CACHE_PATH), "utf8")
     );
     if (parsed === null || typeof parsed !== "object") return null;
     const cache = parsed;
-    if (cache.revision !== PROJECT_SOURCE_BUILD_CACHE_REVISION || cache.fingerprint !== projectSourceFingerprint(sources)) {
+    if (cache.revision !== PROJECT_SOURCE_BUILD_CACHE_REVISION || cache.fingerprint !== projectSourceFingerprint(sources2)) {
       return null;
     }
     assertProjectSourceAnalysisV4(cache.analysis);
@@ -136681,12 +137303,12 @@ function readProjectSourceAnalysisBuildCacheV4(root, sources) {
     return null;
   }
 }
-function writeProjectSourceAnalysisCacheV4(root, analysis, sources) {
+function writeProjectSourceAnalysisCacheV4(root, analysis, sources2) {
   const file = join5(root, PROJECT_SOURCE_ANALYSIS_V4_CACHE_PATH);
   mkdirSync6(dirname6(file), { recursive: true });
   writeFileSync6(file, `${JSON.stringify(analysis, null, 2)}
 `, "utf8");
-  if (sources === void 0) return;
+  if (sources2 === void 0) return;
   const buildFile = join5(root, PROJECT_SOURCE_BUILD_CACHE_PATH);
   mkdirSync6(dirname6(buildFile), { recursive: true });
   const temporary = `${buildFile}.${process.pid}.tmp`;
@@ -136694,7 +137316,7 @@ function writeProjectSourceAnalysisCacheV4(root, analysis, sources) {
     temporary,
     `${JSON.stringify({
       revision: PROJECT_SOURCE_BUILD_CACHE_REVISION,
-      fingerprint: projectSourceFingerprint(sources),
+      fingerprint: projectSourceFingerprint(sources2),
       analysis
     })}
 `,
@@ -136702,14 +137324,14 @@ function writeProjectSourceAnalysisCacheV4(root, analysis, sources) {
   );
   renameSync5(temporary, buildFile);
 }
-function projectSourceFingerprint(sources) {
+function projectSourceFingerprint(sources2) {
   const hash = createHash6("sha256");
   hash.update(String(PROJECT_SOURCE_BUILD_CACHE_REVISION));
   hash.update("\0");
   hash.update(String(NEOSCRIPT_COMPILER_REVISION));
   hash.update("\0");
   hash.update(PROJECT_SCHEMA_CONTRACT.cliVersion);
-  for (const source of sources) {
+  for (const source of sources2) {
     hash.update("\0");
     hash.update(source.kind);
     hash.update("\0");
@@ -136728,7 +137350,7 @@ var init_project_document_cache = __esm({
     init_registry();
     init_project_documents();
     PROJECT_SOURCE_BUILD_CACHE_PATH = ".neo/build/project-source-analysis-v4.json";
-    PROJECT_SOURCE_BUILD_CACHE_REVISION = 4;
+    PROJECT_SOURCE_BUILD_CACHE_REVISION = 6;
   }
 });
 
@@ -136750,84 +137372,88 @@ function lowerProjectFileRegistrySourcesV4(root, state, analysis, options = {})
   const seenPaths = /* @__PURE__ */ new Map();
   const seenSymbols = /* @__PURE__ */ new Map();
   return declarations.map((declaration) => {
-    const normalizedPath = normalizeTrustedProjectBinaryPath(
-      declaration.path,
-      declaration.kind
-    );
-    const pathKey = normalizedPath.toLowerCase();
-    const previousPath = seenPaths.get(pathKey);
-    if (previousPath) {
-      throw new Error(
-        `Project binary path ${JSON.stringify(normalizedPath)} is declared by both ${previousPath.symbol} and ${declaration.symbol}.`
-      );
-    }
-    seenPaths.set(pathKey, declaration);
-    const symbolKey = `${declaration.kind}:${declaration.symbol.toLowerCase()}`;
-    const previousSymbol = seenSymbols.get(symbolKey);
-    if (previousSymbol) {
-      throw new Error(
-        `Project file symbol ${declaration.symbol} is declared more than once.`
-      );
-    }
-    seenSymbols.set(symbolKey, declaration);
-    const baseState = state[`project-file:${declaration.recordId}`];
-    const base = isObjectRecord2(baseState?.data) ? baseState.data : null;
-    const absolute = createWorkspaceSourcePathResolver(root)(normalizedPath);
-    const trustedPending = options.trustedPendingFiles?.get(
-      declaration.recordId
-    );
-    if (base === null && !existsSync5(absolute) && trustedPending === void 0) {
-      throw new Error(
-        `Pending project file ${declaration.symbol} is missing bytes at ${normalizedPath}.`
+    try {
+      const normalizedPath = normalizeTrustedProjectBinaryPath(
+        declaration.path,
+        declaration.kind
       );
-    }
-    const binary = existsSync5(absolute) ? inspectBinaryFile(absolute, normalizedPath) : trustedPending === void 0 ? null : {
-      path: normalizedPath,
-      kind: declaration.kind,
-      mimeType: trustedPending.mimeType,
-      byteLength: trustedPending.byteLength,
-      sha256: trustedPending.sha256
-    };
-    const now = Date.now();
-    const settingsField = declaration.kind === "image" ? "unityTextureSettings" : "unityAudioClipSettings";
-    const otherSettingsField = declaration.kind === "image" ? "unityAudioClipSettings" : "unityTextureSettings";
-    const baseSettings = base !== null && isObjectRecord2(base[settingsField]) ? base[settingsField] : null;
-    const importSettingsChanged = base === null || base.fileType !== declaration.kind || optionalString3(baseSettings?.templateId) !== declaration.templateId;
-    const next = {
-      ...base ?? {},
-      id: declaration.recordId,
-      name: declaration.persistedName,
-      fileType: declaration.kind,
-      ...base === null && binary ? {
-        mimeType: binary.mimeType,
-        byteLength: binary.byteLength,
-        contentSha256: binary.sha256
-      } : {},
-      [otherSettingsField]: null
-    };
-    if (base === null) {
-      Object.assign(next, {
-        projectId: "",
-        status: "pending-upload",
-        storageKey: "",
-        storageETag: null,
-        createdAt: now,
-        updatedAt: now
-      });
-    }
-    if (importSettingsChanged) {
-      next[settingsField] = projectFileUnityImportSettingsV4(
-        declaration.kind,
-        declaration.templateId
+      const pathKey = normalizedPath.toLowerCase();
+      const previousPath = seenPaths.get(pathKey);
+      if (previousPath) {
+        throw new Error(
+          `Project binary path ${JSON.stringify(normalizedPath)} is declared by both ${previousPath.symbol} and ${declaration.symbol}.`
+        );
+      }
+      seenPaths.set(pathKey, declaration);
+      const symbolKey = `${declaration.kind}:${declaration.symbol.toLowerCase()}`;
+      const previousSymbol = seenSymbols.get(symbolKey);
+      if (previousSymbol) {
+        throw new Error(
+          `Project file symbol ${declaration.symbol} is declared more than once.`
+        );
+      }
+      seenSymbols.set(symbolKey, declaration);
+      const baseState = state[`project-file:${declaration.recordId}`];
+      const base = isObjectRecord2(baseState?.data) ? baseState.data : null;
+      const absolute = createWorkspaceSourcePathResolver(root)(normalizedPath);
+      const trustedPending = options.trustedPendingFiles?.get(
+        declaration.recordId
       );
+      if (base === null && !existsSync5(absolute) && trustedPending === void 0) {
+        throw new Error(
+          `Pending project file ${declaration.symbol} is missing bytes at ${normalizedPath}. Add the file there or correct the declaration path.`
+        );
+      }
+      const binary = existsSync5(absolute) ? inspectBinaryFile(absolute, normalizedPath) : trustedPending === void 0 ? null : {
+        path: normalizedPath,
+        kind: declaration.kind,
+        mimeType: trustedPending.mimeType,
+        byteLength: trustedPending.byteLength,
+        sha256: trustedPending.sha256
+      };
+      const now = Date.now();
+      const settingsField = declaration.kind === "image" ? "unityTextureSettings" : "unityAudioClipSettings";
+      const otherSettingsField = declaration.kind === "image" ? "unityAudioClipSettings" : "unityTextureSettings";
+      const baseSettings = base !== null && isObjectRecord2(base[settingsField]) ? base[settingsField] : null;
+      const importSettingsChanged = base === null || base.fileType !== declaration.kind || optionalString3(baseSettings?.templateId) !== declaration.templateId;
+      const next = {
+        ...base ?? {},
+        id: declaration.recordId,
+        name: declaration.persistedName,
+        fileType: declaration.kind,
+        ...base === null && binary ? {
+          mimeType: binary.mimeType,
+          byteLength: binary.byteLength,
+          contentSha256: binary.sha256
+        } : {},
+        [otherSettingsField]: null
+      };
+      if (base === null) {
+        Object.assign(next, {
+          projectId: "",
+          status: "pending-upload",
+          storageKey: "",
+          storageETag: null,
+          createdAt: now,
+          updatedAt: now
+        });
+      }
+      if (importSettingsChanged) {
+        next[settingsField] = projectFileUnityImportSettingsV4(
+          declaration.kind,
+          declaration.templateId
+        );
+      }
+      return {
+        recordKind: "project-file",
+        recordId: declaration.recordId,
+        fileFields: next,
+        file: declaration.sourceFile,
+        line: declaration.sourceLine
+      };
+    } catch (error) {
+      throw projectFileSourceError(error, declaration);
     }
-    return {
-      recordKind: "project-file",
-      recordId: declaration.recordId,
-      fileFields: next,
-      file: declaration.sourceFile,
-      line: declaration.sourceLine
-    };
   });
 }
 function lowerDiscoveredProjectBinariesV4(root, state, analysis) {
@@ -136839,7 +137465,7 @@ function lowerDiscoveredProjectBinariesV4(root, state, analysis) {
   return discoverProjectBinariesV4(
     root,
     explicit,
-    trackedProjectBinaryPaths(state)
+    trackedProjectBinaryPaths(state, explicit)
   ).map((binary) => {
     const recordId = pendingDiscoveredFileId(binary.path);
     const templateId = binary.kind === "image" ? optionalString3(projectData.defaultTextureTemplateId) : optionalString3(projectData.defaultAudioClipTemplateId);
@@ -136908,7 +137534,7 @@ function inspectProjectBinaryStatusV4(root, state, analysis) {
   for (const binary of discoverProjectBinariesV4(
     root,
     explicit,
-    trackedProjectBinaryPaths(state)
+    trackedProjectBinaryPaths(state, explicit)
   )) {
     result.push({
       fileId: pendingDiscoveredFileId(binary.path),
@@ -137027,9 +137653,10 @@ function normalizeSha256V4(value, owner) {
   }
   return value.toLowerCase();
 }
-function trackedProjectBinaryPaths(state) {
+function trackedProjectBinaryPaths(state, explicit) {
+  const declared = new Set(explicit.map((entry) => entry.recordId));
   return Object.values(state).flatMap(
-    (entry) => entry.recordKind === "project-file" && entry.projectBinary ? [entry.projectBinary.path] : []
+    (entry) => entry.recordKind === "project-file" && entry.projectBinary && !declared.has(entry.recordId) ? [entry.projectBinary.path] : []
   );
 }
 function inspectBinaryFile(absolute, path) {
@@ -138060,6 +138687,218 @@ var init_status_output = __esm({
   }
 });
 
+// src/project-source/project-file-source-preservation.ts
+function applySourceEdits(source, edits, start = 0, end = source.length) {
+  const chunks = [];
+  let cursor = start;
+  for (const edit of edits) {
+    chunks.push(source.slice(cursor, edit.start), edit.text);
+    cursor = edit.end;
+  }
+  chunks.push(source.slice(cursor, end));
+  return chunks.join("");
+}
+function entryIdentity(entry) {
+  if (entry.reference !== void 0) return `reference:${entry.reference}`;
+  return entry.id === null ? null : `id:${entry.id}`;
+}
+function preserveProjectFileRegistrySource(existing, emitted, records2 = /* @__PURE__ */ new Map()) {
+  if (!/\b(?:ImageRegistry|AudioClipRegistry)\b/.test(existing) || !/\b(?:ImageRegistry|AudioClipRegistry)\b/.test(emitted))
+    return emitted;
+  const templateIds = /* @__PURE__ */ new Map();
+  for (const record6 of records2.values()) {
+    if (!record6.deleted && (record6.recordKind === "unity-texture-template" || record6.recordKind === "unity-audio-clip-template") && isObjectRecord2(record6.data) && typeof record6.data.name === "string")
+      templateIds.set(record6.data.name, record6.recordId);
+  }
+  const authoredDocument = parseNeoProjectSource(existing, "definition");
+  const emittedDocument = parseNeoProjectSource(emitted, "definition");
+  const authored = registries(authoredDocument, existing, templateIds);
+  if (authored.length === 0) return emitted;
+  const canonicalRegistries = registries(emittedDocument, emitted, templateIds);
+  const authoredByName = new Map(
+    authored.map((registry) => [registry.name, registry])
+  );
+  const canonicalNames = new Set(
+    canonicalRegistries.map((registry) => registry.name)
+  );
+  const registryOnly = authoredDocument.declarations.length === authored.length && emittedDocument.declarations.length === canonicalRegistries.length && authored.every((registry) => canonicalNames.has(registry.name));
+  const replacements = [];
+  for (const canonical of canonicalRegistries) {
+    const prior = authoredByName.get(canonical.name);
+    if (prior === void 0) {
+      if (registryOnly)
+        replacements.push({
+          start: existing.length,
+          end: existing.length,
+          text: "\n" + emitted.slice(canonical.start, canonical.end) + "\n"
+        });
+      continue;
+    }
+    const live = new Map(
+      canonical.entries.map((entry) => [entryIdentity(entry), entry])
+    );
+    const bySymbol = new Map(
+      canonical.entries.map((entry) => [entry.symbol, entry])
+    );
+    const edits = [];
+    for (const entry of prior.entries) {
+      const next = entryIdentity(entry) === null ? bySymbol.get(entry.symbol) : live.get(entryIdentity(entry));
+      if (next !== void 0) live.delete(entryIdentity(next));
+      if (next?.signature === entry.signature) {
+        if (entry.id === null && next.id !== null) {
+          const lineStart = existing.lastIndexOf("\n", entry.start - 1) + 1;
+          const indentation = existing.slice(lineStart, entry.start).match(/^\s*/)?.[0] ?? "";
+          const newline = existing.includes("\r\n") ? "\r\n" : "\n";
+          edits.push({
+            start: entry.start,
+            end: entry.start,
+            text: `@id(${JSON.stringify(next.id)})${newline}${indentation}`
+          });
+        }
+        continue;
+      }
+      edits.push({
+        start: entry.start,
+        end: entry.end,
+        text: next === void 0 ? "" : emitted.slice(next.start, next.end)
+      });
+    }
+    if (live.size > 0) {
+      const newline = existing.includes("\r\n") ? "\r\n" : "\n";
+      const additions = [...live.values()].map(
+        (entry) => emitted.slice(entry.start, entry.end).replace(/\r?\n/g, newline)
+      ).join(newline + newline + "  ");
+      edits.push({
+        start: prior.close,
+        end: prior.close,
+        text: `  ${additions}${newline}`
+      });
+    }
+    const content = applySourceEdits(existing, edits, prior.start, prior.end);
+    replacements.push({
+      start: registryOnly ? prior.start : canonical.start,
+      end: registryOnly ? prior.end : canonical.end,
+      text: content
+    });
+  }
+  if (registryOnly) emitted = existing;
+  return applySourceEdits(
+    emitted,
+    replacements.sort((a, b) => a.start - b.start)
+  );
+}
+function registries(document, source, templateIds) {
+  if (document.diagnostics.some((diagnostic) => diagnostic.severity === "error"))
+    return [];
+  const result = [];
+  for (const declaration of document.declarations) {
+    if (declaration.kind !== "global" || !["ImageRegistry", "AudioClipRegistry"].includes(declaration.type.name))
+      continue;
+    const start = document.syntax.source.offsetAt(declaration.range.start);
+    const end = document.syntax.source.offsetAt(declaration.range.end);
+    const tokens = lex(source.slice(start, end)).tokens.filter(
+      (token) => token.kind !== "comment" && token.kind !== "eof"
+    );
+    const open = tokens.findIndex((token) => token.text === "{");
+    const close = tokens.findLast((token) => token.text === "}");
+    if (open < 0 || close === void 0) continue;
+    const entries = [];
+    let first = open + 1;
+    for (let index = first; index < tokens.length && tokens[index].start < close.start; index++) {
+      if (tokens[index].text !== ";") continue;
+      const entry = readEntry(
+        tokens.slice(first, index + 1),
+        start,
+        templateIds
+      );
+      if (entry === null) return [];
+      entries.push(entry);
+      first = index + 1;
+    }
+    result.push({
+      name: declaration.name,
+      start,
+      end,
+      close: start + close.start,
+      entries
+    });
+  }
+  return result;
+}
+function readEntry(tokens, offset, templateIds) {
+  const declaration = tokens.findIndex(
+    (token) => token.text === "NeoImage" || token.text === "NeoAudioClip"
+  );
+  if (declaration < 0) return null;
+  const idIndex = tokens.findIndex(
+    (token, index) => token.text === "id" && tokens[index - 1]?.text === "@"
+  );
+  const id2 = idIndex < 0 ? null : tokens[idIndex + 2]?.value;
+  if (id2 === void 0) return null;
+  const initializer = tokens[declaration + 3];
+  if (initializer !== void 0 && initializer.text !== "new") {
+    if (tokens[declaration + 4]?.text !== ";") return null;
+    return {
+      id: null,
+      reference: initializer.text,
+      symbol: tokens[declaration + 1].text,
+      start: offset + tokens[0].start,
+      end: offset + tokens.at(-1).end,
+      signature: JSON.stringify(
+        tokens.slice(declaration).map((token) => token.text)
+      )
+    };
+  }
+  const path = tokens[declaration + 5]?.value;
+  if (path === void 0) return null;
+  let name = path.slice(path.lastIndexOf("/") + 1);
+  let template = "null";
+  const settingsIndex = tokens.findIndex(
+    (token, index) => token.text === "settings" && tokens[index - 1]?.text === "@"
+  );
+  if (settingsIndex >= 0) {
+    const settings = tokens.slice(settingsIndex + 1, declaration).map((token) => token.raw).join(" ");
+    const expression = parseExpression(`new${settings}`);
+    if (expression.kind !== "new") return null;
+    for (let index = 0; index < expression.args.length; index++) {
+      const argument2 = expression.args[index];
+      if (expression.argumentNames?.[index] === "name" && argument2.kind === "litString")
+        name = argument2.value;
+      if (expression.argumentNames?.[index] === "template") {
+        if (argument2.kind === "ident")
+          template = templateIds.get(argument2.name) ?? argument2.name;
+        else if (argument2.kind === "call" && argument2.callee.kind === "ident" && argument2.callee.name === "Reference") {
+          const idArgument = argument2.args[argument2.argumentNames?.indexOf("id") ?? 0];
+          if (idArgument?.kind !== "litString") return null;
+          template = idArgument.value;
+        } else if (argument2.kind !== "litNull") return null;
+      }
+    }
+  }
+  return {
+    id: id2,
+    symbol: tokens[declaration + 1].text,
+    start: offset + tokens[0].start,
+    end: offset + tokens.at(-1).end,
+    signature: JSON.stringify([
+      tokens[declaration].text,
+      tokens[declaration + 1].text,
+      path,
+      name,
+      template
+    ])
+  };
+}
+var init_project_file_source_preservation = __esm({
+  "src/project-source/project-file-source-preservation.ts"() {
+    "use strict";
+    init_value_comparison();
+    init_project_source_parser();
+    init_lexer();
+    init_executable_parser();
+  }
+});
+
 // src/project-source/source-layout.ts
 import { readFileSync as readFileSync10 } from "node:fs";
 import { relative as relative4, sep as sep4 } from "node:path";
@@ -138158,12 +138997,18 @@ function readWorkspaceLayoutStatusV4(workspace, document) {
       const content = readFileSync10(path, "utf8");
       if (neoProjectSourceKind(path, content) !== "definition") continue;
       const document2 = parseNeoProjectSource(content, "definition", path);
-      if (document2.declarations.some(
-        (declaration) => declaration.kind === "global" && isLocalValueGlobal(declaration)
-      )) {
-        throw new Error(
-          `Cannot recover local initializer placement before reset: ${error instanceof Error ? error.message : String(error)}`
-        );
+      for (const declaration of document2.declarations) {
+        if (declaration.kind !== "global") continue;
+        if (isLocalValueGlobal(declaration)) {
+          throw new Error(
+            `Cannot recover local initializer placement before reset: ${error instanceof Error ? error.message : String(error)}`
+          );
+        }
+        if (neoScriptRegistryReferenceType(declaration.type.name) !== null) {
+          throw new Error(
+            `Cannot recover project file declaration placement before reset: ${error instanceof Error ? error.message : String(error)}`
+          );
+        }
       }
     }
     return null;
@@ -145867,8 +146712,13 @@ function staticDelegate(target, parameters) {
   const list = parameters.join(", ");
   return `static (${list}) => ${target}(${list})`;
 }
-function enumParser(enumName) {
-  return staticDelegate(`${enumName}.FromOptionId`, ["factoryOptionId"]);
+function enumOptionsName(ctx, enumId) {
+  return ctx.enumOptionsNames.get(enumId) ?? "NeoEnumOptions";
+}
+function enumParser(ctx, enumId) {
+  return staticDelegate(`${enumOptionsName(ctx, enumId)}.FromOptionId`, [
+    "factoryOptionId"
+  ]);
 }
 function immediateInvocationArguments(receiver, argumentNames) {
   const values = argumentNames.length === 1 ? [`(object?)(${argumentNames[0]})`] : argumentNames.length <= 4 ? argumentNames : [`new object?[] { ${argumentNames.join(", ")} }`];
@@ -145882,10 +146732,7 @@ function enumOptionFieldName(ctx, enumId, optionId) {
     const enumDef = ctx.exportData.enums[enumId];
     if (enumDef !== void 0) {
       const enumName = ctx.enumNames.get(enumId) ?? toCSharpTypeName(enumDef.name, "NeoEnum");
-      const taken = /* @__PURE__ */ new Set([
-        enumName,
-        ...GENERATED_ENUM_CLASS_MEMBER_NAMES
-      ]);
+      const taken = /* @__PURE__ */ new Set(["value__"]);
       for (const key of getEnumOptionKeyOrder(enumDef)) {
         const option = enumDef.options[key];
         if (option === void 0) continue;
@@ -145898,7 +146745,7 @@ function enumOptionFieldName(ctx, enumId, optionId) {
           unique = `${preferred}_${ordinal}`;
           ctx.diagnostics.push({
             severity: "warning",
-            message: `Enum option "${option.name}" collides with a member the generated C# enum class "${enumName}" declares; using "${unique}".`,
+            message: `Enum option "${option.name}" collides with another member of the generated C# enum "${enumName}"; using "${unique}".`,
             path: `enums.${enumId}.options.${key}`
           });
         }
@@ -145909,118 +146756,141 @@ function enumOptionFieldName(ctx, enumId, optionId) {
   }
   return names.get(optionId) ?? null;
 }
+function enumMemberValue(optionId) {
+  let hash = 2166136261;
+  for (let index = 0; index < optionId.length; index++) {
+    hash = Math.imul(hash ^ optionId.charCodeAt(index), 16777619);
+  }
+  return (hash >>> 0) % 2147483647 + 1;
+}
 function generateEnumClass(ctx, enumId) {
   const enumDef = ctx.exportData.enums[enumId];
   if (enumDef === void 0) return [];
   if (sdkRuntimeEnumBinding(enumId) !== void 0) return [];
   const enumName = ctx.enumNames.get(enumId) ?? toCSharpTypeName(enumDef.name, "NeoEnum");
-  const optionKeyOrder = getEnumOptionKeyOrder(enumDef);
+  const optionsName = enumOptionsName(ctx, enumId);
+  const optionsByValue = /* @__PURE__ */ new Map();
+  const options = getEnumOptionKeyOrder(enumDef).flatMap((optionId) => {
+    const option = enumDef.options[optionId];
+    if (option === void 0) {
+      throw new Error(
+        `Enum ${enumId} option order references missing option ${optionId}.`
+      );
+    }
+    const fieldName = enumOptionFieldName(ctx, enumId, optionId);
+    if (fieldName === null) {
+      ctx.diagnostics.push({
+        severity: "error",
+        message: `Enum option name "${option.name}" is not a valid C# identifier.`,
+        path: `enums.${enumId}.options.${optionId}`
+      });
+      return [];
+    }
+    const value = enumMemberValue(optionId);
+    const clash = optionsByValue.get(value);
+    if (clash !== void 0) {
+      ctx.diagnostics.push({
+        severity: "error",
+        message: `Enum options "${clash}" and "${option.name}" generate the same C# enum value; recreate one of them to give it a new option id.`,
+        path: `enums.${enumId}.options.${optionId}`
+      });
+      return [];
+    }
+    optionsByValue.set(value, option.name);
+    return [
+      {
+        optionId,
+        value,
+        id: `"${escapeCSharpString(optionId)}"`,
+        member: `${enumName}.${fieldName}`,
+        fieldName,
+        text: `"${escapeCSharpString(option.text)}"`
+      }
+    ];
+  });
+  const switchBody = (subject, arms, fallback) => [
+    `return ${subject} switch`,
+    "{",
+    ...indent([...arms, `_ => ${fallback},`]),
+    "};"
+  ];
+  const method2 = (signature, body) => [
+    signature,
+    "{",
+    ...indent(body),
+    "}"
+  ];
   return [
     ...xmlSummary(ctx.docs.enums[enumId]),
-    `public sealed class ${enumName} : IEquatable<${enumName}>, global::NeoCompose.Runtime.INeoEnumOption`,
+    `[NeoEnum(typeof(${optionsName}))]`,
+    `public enum ${enumName}`,
+    "{",
+    ...indent(
+      options.flatMap((option) => [
+        ...xmlSummary(ctx.docs.enumOptions[option.optionId]),
+        `${option.fieldName} = ${option.value},`
+      ])
+    ),
+    "}",
+    "",
+    "/// <summary>",
+    `/// Converts <see cref="${enumName}"/> to and from the option ids Neo stores.`,
+    "/// </summary>",
+    `public static class ${optionsName}`,
     "{",
     ...indent([
-      `private static readonly Dictionary<string, ${enumName}> values = new Dictionary<string, ${enumName}>();`,
-      "public string optionId { get; }",
-      "public string Text => TextForOptionId(optionId);",
-      "public string TextId => TextIdForOptionId(optionId);",
-      "",
-      `private ${enumName}(string optionId)`,
-      "{",
-      ...indent(["this.optionId = optionId;"]),
-      "}",
-      "",
-      ...optionKeyOrder.flatMap((optionId) => {
-        const option = enumDef.options[optionId];
-        if (option === void 0) {
-          throw new Error(
-            `Enum ${enumId} option order references missing option ${optionId}.`
-          );
-        }
-        const optionName = option.name;
-        const fieldName = enumOptionFieldName(ctx, enumId, optionId);
-        if (fieldName === null) {
-          ctx.diagnostics.push({
-            severity: "error",
-            message: `Enum option name "${optionName}" is not a valid C# identifier.`,
-            path: `enums.${enumId}.options.${optionId}`
-          });
-          return [`// Skipped invalid option id: ${optionId}`];
-        }
-        return [
-          ...xmlSummary(ctx.docs.enumOptions[optionId]),
-          `public static readonly ${enumName} ${fieldName} = FromOptionId("${escapeCSharpString(optionId)}");`
-        ];
-      }),
-      "",
-      `public static ${enumName} FromOptionId(string optionId)`,
-      "{",
-      ...indent([
-        "if (values.TryGetValue(optionId, out var known)) return known;",
-        `var created = new ${enumName}(optionId);`,
-        "values[optionId] = created;",
-        "return created;"
-      ]),
-      "}",
+      ...method2(
+        `public static ${enumName} FromOptionId(string optionId)`,
+        switchBody(
+          "optionId",
+          options.map((option) => `${option.id} => ${option.member},`),
+          `NeoUndeclaredEnumOptions<${enumName}>.FromOptionId(optionId)`
+        )
+      ),
       "",
-      `public static string[] ToOptionIds(IEnumerable<${enumName}>? options)`,
-      "{",
-      ...indent([
-        "if (options is null) return Array.Empty<string>();",
-        "var ids = new List<string>();",
-        "foreach (var option in options) ids.Add(option.optionId);",
-        "return ids.ToArray();"
-      ]),
-      "}",
+      ...method2(
+        `public static string OptionId(this ${enumName} value)`,
+        switchBody(
+          "value",
+          options.map((option) => `${option.member} => ${option.id},`),
+          `NeoUndeclaredEnumOptions<${enumName}>.OptionId(value)`
+        )
+      ),
       "",
-      "public static bool IsKnown(string id)",
-      "{",
-      ...indent([
-        "return id switch",
-        "{",
-        ...indent([
-          ...optionKeyOrder.map(
-            (optionId) => `"${escapeCSharpString(optionId)}" => true,`
-          ),
-          "_ => false,"
-        ]),
-        "};"
-      ]),
-      "}",
+      ...method2(
+        `public static string[] ToOptionIds(IEnumerable<${enumName}>? options)`,
+        [
+          "if (options is null) return Array.Empty<string>();",
+          "var ids = new List<string>();",
+          "foreach (var option in options) ids.Add(option.OptionId());",
+          "return ids.ToArray();"
+        ]
+      ),
       "",
-      "public static string TextIdForOptionId(string optionId)",
-      "{",
-      ...indent([
-        "return optionId switch",
-        "{",
-        ...indent([
-          ...optionKeyOrder.flatMap((optionId) => {
-            const option = enumDef.options[optionId];
-            return [
-              `"${escapeCSharpString(optionId)}" => "${escapeCSharpString(option.text)}",`
-            ];
-          }),
-          "_ => optionId,"
-        ]),
-        "};"
-      ]),
-      "}",
+      ...method2(
+        "public static bool IsKnown(string optionId)",
+        switchBody(
+          "optionId",
+          options.map((option) => `${option.id} => true,`),
+          "false"
+        )
+      ),
       "",
-      "public static string TextForOptionId(string optionId, NeoClient? client = null)",
-      "{",
-      ...indent([
-        ctx.singleton ? `return (client ?? ${ctx.projectClassName}.RequireInstance().Client).Localization.ResolveText(TextIdForOptionId(optionId));` : "return client is null ? TextIdForOptionId(optionId) : client.Localization.ResolveText(TextIdForOptionId(optionId));"
-      ]),
-      "}",
+      ...method2(
+        `public static string TextId(this ${enumName} value)`,
+        switchBody(
+          "value",
+          options.map((option) => `${option.member} => ${option.text},`),
+          "value.OptionId()"
+        )
+      ),
       "",
-      `public static implicit operator string(${enumName} value) => value.optionId;`,
-      `public static implicit operator ${enumName}(string optionId) => FromOptionId(optionId);`,
-      "public override string ToString() => optionId;",
-      `public bool Equals(${enumName}? other) => other is not null && optionId == other.optionId;`,
-      `public override bool Equals(object? obj) => Equals(obj as ${enumName});`,
-      "public override int GetHashCode() => optionId.GetHashCode();",
-      `public static bool operator ==(${enumName}? left, ${enumName}? right) => ReferenceEquals(left, right) || (left is not null && left.Equals(right));`,
-      `public static bool operator !=(${enumName}? left, ${enumName}? right) => !(left == right);`
+      ...method2(
+        `public static string Text(this ${enumName} value, NeoClient? client = null)`,
+        [
+          ctx.singleton ? `return (client ?? ${ctx.projectClassName}.RequireInstance().Client).Localization.ResolveText(value.TextId());` : "return client is null ? value.TextId() : client.Localization.ResolveText(value.TextId());"
+        ]
+      )
     ]),
     "}"
   ];
@@ -146250,7 +147120,7 @@ function generateIndexedListWrappers(ctx, ownerClass, schemaKey, memberId, env)
         {
           definition: definition2,
           keyType: enumName,
-          codecs: enumKeyCodecArguments(indexedMember.enumId, enumName)
+          codecs: enumKeyCodecArguments(ctx, indexedMember.enumId)
         }
       ];
     }
@@ -147520,7 +148390,7 @@ function generateExplicitInterfaceMember(ctx, schemaKey, memberId, interfaceName
     genericEnv,
     ownerClassId
   );
-  const setter = isMemberNSPropertyBase(member) && typeof member.setterCode === "string" && !suppressesInheritedSetter(interfaceContract) ? nsPropertyWriteExpression(schemaKey) : null;
+  const setter = isMemberNSPropertyBase(member) && typeof member.setterCode === "string" && !suppressesInheritedSetter(interfaceContract) ? nsPropertyWriteExpression(ctx, member, schemaKey) : null;
   return [
     `${interfaceType2} ${interfaceName}.${memberName}`,
     "{",
@@ -148274,7 +149144,7 @@ function planWorldObjectEmission(ctx, classDef, worldKind) {
         // conversion runs through the wrapper's implicit operator, which is
         // where the required-member throw now lives.
         `Sprite ${SPRITE_OBJECT_VALUE_INTERFACE}.${schemaKeyToMemberName(SPRITE_OBJECT_SPRITE_SCHEMA_KEY)} => ${schemaKeyToMemberName(SPRITE_OBJECT_SPRITE_SCHEMA_KEY)};`,
-        `string ${SPRITE_OBJECT_VALUE_INTERFACE}.${schemaKeyToMemberName(SPRITE_OBJECT_MASK_INTERACTION_SCHEMA_KEY)} => ${schemaKeyToMemberName(SPRITE_OBJECT_MASK_INTERACTION_SCHEMA_KEY)}.optionId;`
+        `string ${SPRITE_OBJECT_VALUE_INTERFACE}.${schemaKeyToMemberName(SPRITE_OBJECT_MASK_INTERACTION_SCHEMA_KEY)} => ${schemaKeyToMemberName(SPRITE_OBJECT_MASK_INTERACTION_SCHEMA_KEY)}.OptionId();`
       ],
       shadowedSchemaKeys: /* @__PURE__ */ new Set([
         SPRITE_OBJECT_SPRITE_SCHEMA_KEY,
@@ -148296,7 +149166,7 @@ function planSmartTileEmission(ctx, classDef) {
     return planValidatedContractEmission(ctx, classDef, worldKind, () => ({
       runtimeInterfaces: [SMART_TILE_INTERFACE],
       classMembers: [
-        `string ${SMART_TILE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_DEFAULT_COLLIDER_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_DEFAULT_COLLIDER_SCHEMA_KEY)}.optionId;`,
+        `string ${SMART_TILE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_DEFAULT_COLLIDER_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_DEFAULT_COLLIDER_SCHEMA_KEY)}.OptionId();`,
         `IReadOnlyList<${SMART_TILE_RULE_INTERFACE}> ${SMART_TILE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULES_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULES_SCHEMA_KEY)};`
       ],
       shadowedSchemaKeys: /* @__PURE__ */ new Set([
@@ -148311,9 +149181,9 @@ function planSmartTileEmission(ctx, classDef) {
       classMembers: [
         `IReadOnlyList<${SMART_TILE_NEIGHBOR_INTERFACE}> ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_NEIGHBORS_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_NEIGHBORS_SCHEMA_KEY)};`,
         `IReadOnlyList<Sprite> ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_SPRITES_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_SPRITES_SCHEMA_KEY)};`,
-        `string ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_OUTPUT_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_OUTPUT_SCHEMA_KEY)}.optionId;`,
-        `string ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_COLLIDER_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_COLLIDER_SCHEMA_KEY)}.optionId;`,
-        `string ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_TRANSFORM_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_TRANSFORM_SCHEMA_KEY)}.optionId;`,
+        `string ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_OUTPUT_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_OUTPUT_SCHEMA_KEY)}.OptionId();`,
+        `string ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_COLLIDER_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_COLLIDER_SCHEMA_KEY)}.OptionId();`,
+        `string ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_TRANSFORM_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_TRANSFORM_SCHEMA_KEY)}.OptionId();`,
         `float ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_MIN_ANIMATION_SPEED_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_MIN_ANIMATION_SPEED_SCHEMA_KEY)};`,
         `float ${SMART_TILE_RULE_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_MAX_ANIMATION_SPEED_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_RULE_MAX_ANIMATION_SPEED_SCHEMA_KEY)};`
       ],
@@ -148333,7 +149203,7 @@ function planSmartTileEmission(ctx, classDef) {
       runtimeInterfaces: [SMART_TILE_NEIGHBOR_INTERFACE],
       classMembers: [
         `Vector2Int ${SMART_TILE_NEIGHBOR_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_NEIGHBOR_CELL_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_NEIGHBOR_CELL_SCHEMA_KEY)}.Value;`,
-        `string ${SMART_TILE_NEIGHBOR_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_NEIGHBOR_CONDITION_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_NEIGHBOR_CONDITION_SCHEMA_KEY)}.optionId;`,
+        `string ${SMART_TILE_NEIGHBOR_INTERFACE}.${schemaKeyToMemberName(WORLD_SMART_TILE_NEIGHBOR_CONDITION_SCHEMA_KEY)} => ${schemaKeyToMemberName(WORLD_SMART_TILE_NEIGHBOR_CONDITION_SCHEMA_KEY)}.OptionId();`,
         `string? ${SMART_TILE_NEIGHBOR_INTERFACE}.TileClassId => ${SMART_TILE_NEIGHBOR_TILE_RELATION_EXPRESSION};`
       ],
       shadowedSchemaKeys: /* @__PURE__ */ new Set([
@@ -149557,37 +150427,16 @@ function declaredConstructorParameters(ctx, classId, declared, genericEnv) {
     }
     identifiers.add(identifier2);
     const baseType = csharpFunctionTypeInfoValueType(ctx, argument2, true, genericEnv) ?? "object?";
-    const rendered = renderCSharpParameterDefault(
-      ctx,
-      argument2,
-      `constructors.${declared.id}.argumentTypes`
-    );
-    if (rendered === null) {
-      parameters.push({
-        declaredName: argument2.name,
-        identifier: identifier2,
-        csharpType: baseType,
-        defaultLiteral: null,
-        enumFallback: null
-      });
-      continue;
-    }
-    if (rendered.enumFallback === null) {
-      parameters.push({
-        declaredName: argument2.name,
-        identifier: identifier2,
-        csharpType: baseType,
-        defaultLiteral: rendered.literal,
-        enumFallback: null
-      });
-      continue;
-    }
     parameters.push({
       declaredName: argument2.name,
       identifier: identifier2,
-      csharpType: baseType.endsWith("?") ? baseType : `${baseType}?`,
-      defaultLiteral: rendered.literal,
-      enumFallback: rendered.enumFallback
+      csharpType: baseType,
+      defaultLiteral: renderCSharpParameterDefault(
+        ctx,
+        argument2,
+        `constructors.${declared.id}.argumentTypes`
+      ),
+      scriptArgument: scriptValueExpression(ctx, argument2, identifier2)
     });
   }
   return parameters;
@@ -149661,10 +150510,9 @@ function generateDeclaredConstructor(ctx, classId, className, constructorId, par
   );
   const signatureParameters = [...declaredParameters, ...appendedParameters];
   const parameterText = ctx.singleton ? signatureParameters.join(", ") : [`${ctx.projectClassName} project`, ...signatureParameters].join(", ");
-  const argumentEntries = parameters.map((parameter4) => {
-    const valueExpression = parameter4.enumFallback === null ? parameter4.identifier : `${parameter4.identifier} ?? ${parameter4.enumFallback}`;
-    return `new global::NeoCompose.Runtime.NeoDeclaredConstructorArgument("${escapeCSharpString(parameter4.declaredName)}", ${valueExpression})`;
-  }).join(", ");
+  const argumentEntries = parameters.map(
+    (parameter4) => `new global::NeoCompose.Runtime.NeoDeclaredConstructorArgument("${escapeCSharpString(parameter4.declaredName)}", ${parameter4.scriptArgument})`
+  ).join(", ");
   const argumentArray = argumentEntries.length === 0 ? "new global::NeoCompose.Runtime.NeoDeclaredConstructorArgument[] { }" : `new global::NeoCompose.Runtime.NeoDeclaredConstructorArgument[] { ${argumentEntries} }`;
   const suppliedValues = appendedMembers.map(
     (member) => `new global::NeoCompose.Runtime.NeoGeneratedConstructorValue("${escapeCSharpString(member.schemaKey)}", "${escapeCSharpString(member.memberId)}", ${member.identifier})`
@@ -149781,21 +150629,18 @@ function generateStaticFunctionMethod(ctx, ownerClass, member, genericEnv) {
     `members.${member.id}.argumentTypes`
   );
   const parameters = parameterList.map((parameter4) => parameter4.declaration).join(", ");
-  const coalesceStatements = parameterList.flatMap(
-    (parameter4) => parameter4.coalesceStatement === null ? [] : [parameter4.coalesceStatement]
+  const argumentNames = parameterList.map((parameter4) => parameter4.identifier);
+  const scriptArguments = parameterList.map(
+    (parameter4) => parameter4.scriptArgument
   );
-  const argumentNames = parameterList.map(
-    (parameter4) => parameter4.valueExpression
-  );
-  const args = argumentNames.length === 0 ? "{ }" : `{ ${argumentNames.join(", ")} }`;
+  const args = scriptArguments.length === 0 ? "{ }" : `{ ${scriptArguments.join(", ")} }`;
   const asyncModifier = member.kind === 23 /* NSFunction */ && callableIsDeferred(member) ? "async " : "";
   const declaration = `${memberAccessKeyword(member)} static ${asyncModifier}${returnType} ${functionMethodName(member.name)}(${parameters})`;
   const docs = xmlSummary(ctx.docs.members[member.id]);
   const stamp = memberMethodStamp(member);
   if (member.kind === 23 /* NSFunction */) {
-    const invocation = callableIsDeferred(member) ? `await node.InvokeStaticAsync(new object?[] ${args})` : `node.InvokeStatic(${immediateInvocationArguments(null, argumentNames)})`;
+    const invocation = callableIsDeferred(member) ? `await node.InvokeStaticAsync(new object?[] ${args})` : `node.InvokeStatic(${immediateInvocationArguments(null, scriptArguments)})`;
     const body = [
-      ...coalesceStatements,
       `var client = ${ctx.projectClassName}.RequireInstance().Client;`,
       `var node = NeoMemberNSFunction.GetOrCreateStatic(client, "${escapeCSharpString(member.id)}");`,
       ...isFunctionVoidTypeInfo(member.returnTypeInfo) ? [`${invocation};`] : [
@@ -149832,7 +150677,6 @@ function generateStaticFunctionMethod(ctx, ownerClass, member, genericEnv) {
     declaration,
     "{",
     ...indent([
-      ...coalesceStatements,
       `if (${handler} is null)`,
       "{",
       ...indent([
@@ -150065,7 +150909,7 @@ function generateStaticNSProperty(ctx, member, memberName, memberId, genericEnv)
   ];
   const setter = typeof member.setterCode === "string" ? [
     ...prelude,
-    "var result = node.Set(value);",
+    `var result = node.Set(${scriptValueExpression(ctx, member.returnTypeInfo, "value")});`,
     'if (!result.ok) throw new InvalidOperationException(result.error ?? "Static NSProperty setter failed.");'
   ] : null;
   return [
@@ -150235,7 +151079,7 @@ function generateMember(ctx, schemaKey, memberId, saved, modifier, emitBody, own
     genericEnv,
     ownerClassId
   );
-  const declaredPropertySetter = isMemberNSPropertyBase(member) && typeof member.setterCode === "string" ? nsPropertyWriteExpression(schemaKey) : null;
+  const declaredPropertySetter = isMemberNSPropertyBase(member) && typeof member.setterCode === "string" ? nsPropertyWriteExpression(ctx, member, schemaKey) : null;
   const propertySetter = suppressesInheritedSetter(inheritedContract) ? null : declaredPropertySetter;
   const emitsStoredSetter = bindingContract === null ? memberSaved : bindingContract.hasSetter;
   const storedSetterBody = suppressesInheritedSetter(inheritedContract) || !emitsStoredSetter ? null : writeExpression(ctx, member, schemaKey, ownerClassName, ownerClassId);
@@ -150588,10 +151432,10 @@ function descendsFromWorldObject(ctx, classId) {
   }
   return false;
 }
-function nsPropertyWriteExpression(schemaKey) {
+function nsPropertyWriteExpression(ctx, member, schemaKey) {
   const getNode = `writableNode.Get<NeoMemberNSProperty>("${escapeCSharpString(schemaKey)}")`;
   return [
-    `var result = ${getNode}.Set(valueId!, value);`,
+    `var result = ${getNode}.Set(valueId!, ${scriptValueExpression(ctx, member.returnTypeInfo, "value")});`,
     'if (!result.ok) throw new InvalidOperationException(result.error ?? "NSProperty setter failed.");'
   ];
 }
@@ -150661,49 +151505,37 @@ function renderCSharpParameterDefault(ctx, argument2, path) {
     case 1 /* Bool */: {
       const defaultValue = argument2.defaultValue;
       if (defaultValue === void 0) return null;
-      if (defaultValue.value === null)
-        return { literal: "null", enumFallback: null };
-      return {
-        literal: defaultValue.value ? "true" : "false",
-        enumFallback: null
-      };
+      if (defaultValue.value === null) return "null";
+      return defaultValue.value ? "true" : "false";
     }
     case 2 /* Int */: {
       const defaultValue = argument2.defaultValue;
       if (defaultValue === void 0) return null;
-      if (defaultValue.value === null)
-        return { literal: "null", enumFallback: null };
-      return { literal: String(defaultValue.value), enumFallback: null };
+      if (defaultValue.value === null) return "null";
+      return String(defaultValue.value);
     }
     case 4 /* Float */: {
       const defaultValue = argument2.defaultValue;
       if (defaultValue === void 0) return null;
-      if (defaultValue.value === null)
-        return { literal: "null", enumFallback: null };
-      return { literal: `${String(defaultValue.value)}f`, enumFallback: null };
+      if (defaultValue.value === null) return "null";
+      return `${String(defaultValue.value)}f`;
     }
     case 20 /* Decimal */: {
       const defaultValue = argument2.defaultValue;
       if (defaultValue === void 0) return null;
-      if (defaultValue.value === null)
-        return { literal: "null", enumFallback: null };
-      return { literal: `${defaultValue.value}m`, enumFallback: null };
+      if (defaultValue.value === null) return "null";
+      return `${defaultValue.value}m`;
     }
     case 3 /* String */: {
       const defaultValue = argument2.defaultValue;
       if (defaultValue === void 0) return null;
-      if (defaultValue.value === null)
-        return { literal: "null", enumFallback: null };
-      return {
-        literal: `"${escapeCSharpString(defaultValue.value)}"`,
-        enumFallback: null
-      };
+      if (defaultValue.value === null) return "null";
+      return `"${escapeCSharpString(defaultValue.value)}"`;
     }
     case 8 /* Enum */: {
       const defaultValue = argument2.defaultValue;
       if (defaultValue === void 0) return null;
-      if (defaultValue.value === null)
-        return { literal: "null", enumFallback: null };
+      if (defaultValue.value === null) return "null";
       const enumDef = ctx.exportData.enums[argument2.enumId];
       if (enumDef === void 0) {
         ctx.diagnostics.push({
@@ -150745,22 +151577,22 @@ function renderCSharpParameterDefault(ctx, argument2, path) {
         return null;
       }
       if (argument2.enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID)
-        return {
-          literal: `NeoCompose.Runtime.NeoCellPatternExcluding.${schemaKeyToMemberName(option.name)}`,
-          enumFallback: null
-        };
-      return { literal: "null", enumFallback: `${enumName}.${accessor}` };
+        return `NeoCompose.Runtime.NeoCellPatternExcluding.${schemaKeyToMemberName(option.name)}`;
+      return `${enumName}.${accessor}`;
     }
     default: {
       if (argument2.defaultValue === void 0) return null;
-      return { literal: "null", enumFallback: null };
+      return "null";
     }
   }
 }
+function scriptValueExpression(ctx, typeInfo, expression) {
+  return typeInfo.type === 8 /* Enum */ && typeInfo.enumId !== NEO_CELL_PATTERN_EXCLUDING_ENUM_ID && ctx.enumNames.has(typeInfo.enumId) ? `${expression}${typeInfo.required ? "" : "?"}.OptionId()` : expression;
+}
 function renderFunctionParameters(ctx, member, genericBindingSaved, genericEnv, path) {
   return member.argumentTypes.map((argument2, index) => {
     const identifier2 = functionParameterName(argument2.name, index);
-    const baseType = csharpFunctionTypeInfoValueType(
+    const type = csharpFunctionTypeInfoValueType(
       ctx,
       argument2,
       genericBindingSaved,
@@ -150768,10 +151600,9 @@ function renderFunctionParameters(ctx, member, genericBindingSaved, genericEnv,
     ) ?? "object?";
     const bare = {
       identifier: identifier2,
-      type: baseType,
-      declaration: `${baseType} ${identifier2}`,
-      valueExpression: identifier2,
-      coalesceStatement: null
+      type,
+      declaration: `${type} ${identifier2}`,
+      scriptArgument: scriptValueExpression(ctx, argument2, identifier2)
     };
     if (callableIsDeferred(member) && parameterHasDefault(argument2)) {
       ctx.diagnostics.push({
@@ -150781,26 +151612,8 @@ function renderFunctionParameters(ctx, member, genericBindingSaved, genericEnv,
       });
       return bare;
     }
-    const rendered = renderCSharpParameterDefault(ctx, argument2, path);
-    if (rendered === null) return bare;
-    if (rendered.enumFallback === null) {
-      return {
-        identifier: identifier2,
-        type: baseType,
-        declaration: `${baseType} ${identifier2} = ${rendered.literal}`,
-        valueExpression: identifier2,
-        coalesceStatement: null
-      };
-    }
-    const nullableType = baseType.endsWith("?") ? baseType : `${baseType}?`;
-    const coalescedLocal = `${identifier2}Value`;
-    return {
-      identifier: identifier2,
-      type: nullableType,
-      declaration: `${nullableType} ${identifier2} = null`,
-      valueExpression: coalescedLocal,
-      coalesceStatement: `var ${coalescedLocal} = ${identifier2} ?? ${rendered.enumFallback};`
-    };
+    const literal3 = renderCSharpParameterDefault(ctx, argument2, path);
+    return literal3 === null ? bare : { ...bare, declaration: `${type} ${identifier2} = ${literal3}` };
   });
 }
 function functionSignature(ctx, member, genericEnv) {
@@ -150868,12 +151681,12 @@ function generateFunctionMethod(ctx, member, schemaKey, modifier = "", emitBody
   ];
   if (!emitBody) return [...docs, `${declaration};`];
   const stamp = memberMethodStamp(member);
-  const coalesceStatements = parameterList.flatMap(
-    (parameter4) => parameter4.coalesceStatement === null ? [] : [parameter4.coalesceStatement]
-  );
-  const argumentList = parameterList.map((parameter4) => parameter4.valueExpression).join(", ");
+  const argumentList = parameterList.map((parameter4) => parameter4.identifier).join(", ");
   const call = `FunctionHandler.${methodName}(${argumentList})`;
-  const deferredArgs = member.argumentTypes.length === 0 ? "{ }" : `{ ${argumentList} }`;
+  const scriptArguments = parameterList.map(
+    (parameter4) => parameter4.scriptArgument
+  );
+  const deferredArgs = scriptArguments.length === 0 ? "{ }" : `{ ${scriptArguments.join(", ")} }`;
   const deferredCall = isFunctionVoidTypeInfo(member.returnTypeInfo) ? `return client.InvokeDeferredNativeFunction("${escapeCSharpString(member.id)}", this, new object?[] ${deferredArgs});` : `return client.InvokeDeferredNativeFunction<${csharpFunctionReturnType(ctx, member.returnTypeInfo, genericEnv, true)}>("${escapeCSharpString(member.id)}", this, new object?[] ${deferredArgs});`;
   if (member.id === NEO_TILE_CONVERT_MEMBER_ID) {
     return [
@@ -150881,10 +151694,7 @@ function generateFunctionMethod(ctx, member, schemaKey, modifier = "", emitBody
       ...stamp,
       declaration,
       "{",
-      ...indent([
-        ...coalesceStatements,
-        `return base.TryConvert(${argumentList});`
-      ]),
+      ...indent([`return base.TryConvert(${argumentList});`]),
       "}"
     ];
   }
@@ -150895,7 +151705,6 @@ function generateFunctionMethod(ctx, member, schemaKey, modifier = "", emitBody
       declaration,
       "{",
       ...indent([
-        ...coalesceStatements,
         `var result = client.ScriptGridQueries.Invoke("${member.id}", this, new object?[] ${deferredArgs});`,
         ...nsGetterResultReturnExpression(
           ctx,
@@ -150911,11 +151720,10 @@ function generateFunctionMethod(ctx, member, schemaKey, modifier = "", emitBody
   if (isNSFunction2) {
     const invocation = callableIsDeferred(member) ? `writableNode.Get<NeoMemberNSFunction>("${escapeCSharpString(schemaKey)}").InvokeAsync(valueId!, new object?[] ${deferredArgs})` : `InvokeFunction(${immediateInvocationArguments(
       `"${escapeCSharpString(schemaKey)}"`,
-      parameterList.map((parameter4) => parameter4.valueExpression)
+      scriptArguments
     )})`;
     const resultStatement = callableIsDeferred(member) ? `var result = await ${invocation};` : `var result = ${invocation};`;
     const body = [
-      ...coalesceStatements,
       ...callableIsDeferred(member) ? [
         `if (valueId is null) throw new InvalidOperationException("Cannot invoke NSFunction '${escapeCSharpString(member.name)}' without a backing receiver value id.");`
       ] : [],
@@ -150940,7 +151748,6 @@ function generateFunctionMethod(ctx, member, schemaKey, modifier = "", emitBody
     declaration,
     "{",
     ...indent([
-      ...coalesceStatements,
       ...callableIsDeferred(member) ? [deferredCall] : [
         "if (FunctionHandler is null)",
         "{",
@@ -151013,8 +151820,8 @@ function nativeFunctionArgExpression(ctx, typeInfo, valueExpression, argumentNam
     case 8 /* Enum */: {
       if (typeInfo.enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID)
         return `NeoCellPatternStorage.${required2 ? "ReadExcluding" : "ReadOptionalExcluding"}(${valueExpression})`;
-      const enumName = ctx.enumNames.get(typeInfo.enumId) ?? "string";
-      return required2 ? `NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${enumParser(enumName)}) ?? throw new InvalidOperationException("Required enum argument '${escapeCSharpString(argumentName)}' could not be resolved.")` : `NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${enumParser(enumName)})`;
+      const parser = enumParser(ctx, typeInfo.enumId);
+      return required2 ? `NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${parser}) ?? throw new InvalidOperationException("Required enum argument '${escapeCSharpString(argumentName)}' could not be resolved.")` : `NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${parser})`;
     }
     case 18 /* DialogueLookup */: {
       const dialogueIds = `NeoGeneratedTypesSupport.ToStringArray(${valueExpression})`;
@@ -151053,8 +151860,7 @@ function nativeFunctionArgExpression(ctx, typeInfo, valueExpression, argumentNam
       if (isMemberEnumBase(binding) && isMultiSelectionMember(binding)) {
         if (binding.enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID)
           return `NeoCellPatternStorage.ReadExcludingList(${valueExpression})`;
-        const enumName = ctx.enumNames.get(binding.enumId) ?? "string";
-        return `NeoGeneratedTypesSupport.ReadEnumList(${valueExpression}, ${enumParser(enumName)})`;
+        return `NeoGeneratedTypesSupport.ReadEnumList(${valueExpression}, ${enumParser(ctx, binding.enumId)})`;
       }
       if (isMemberClassBase(binding)) {
         const typeName = ctx.typeNames.get(binding.classId);
@@ -151298,10 +152104,9 @@ function nsGetterResultReturnExpression(ctx, returnTypeInfo, valueExpression, sa
           ...prefix,
           `return NeoCellPatternStorage.${optional2 ? "ReadOptionalExcluding" : "ReadExcluding"}(${valueExpression});`
         ];
-      const enumName = ctx.enumNames.get(returnTypeInfo.enumId) ?? "string";
       return [
         ...prefix,
-        `var selected = NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${enumParser(enumName)});`,
+        `var selected = NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${enumParser(ctx, returnTypeInfo.enumId)});`,
         optional2 ? "return selected;" : 'return selected ?? throw new InvalidOperationException("NSProperty returned null for a required enum value.");'
       ];
     }
@@ -151417,11 +152222,11 @@ function nsGetterGenericResultExpression(ctx, typeInfo, valueExpression, saved,
   if (isMemberEnumBase(binding)) {
     if (binding.enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID)
       return `NeoCellPatternStorage.${isMultiSelectionMember(binding) ? "ReadExcludingList" : required2 ? "ReadExcluding" : "ReadOptionalExcluding"}(${valueExpression})`;
-    const enumName = ctx.enumNames.get(binding.enumId) ?? "string";
+    const parser = enumParser(ctx, binding.enumId);
     if (isMultiSelectionMember(binding)) {
-      return `NeoGeneratedTypesSupport.ReadEnumList(${valueExpression}, ${enumParser(enumName)})`;
+      return `NeoGeneratedTypesSupport.ReadEnumList(${valueExpression}, ${parser})`;
     }
-    const read = `NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${enumParser(enumName)})`;
+    const read = `NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${parser})`;
     return required2 ? `${read} ?? throw new InvalidOperationException("Required generic enum result was null.")` : read;
   }
   if (isMemberClassBase(binding)) {
@@ -151487,7 +152292,7 @@ function detachedReadExpression(ctx, member, schemaKey, saved, writeGuardMemberN
       "entryMemberId"
     );
     if (entryMember === null) return [];
-    const readEntry = detachedValueExpression(
+    const readEntry2 = detachedValueExpression(
       ctx,
       entryMember,
       "entry",
@@ -151496,14 +152301,14 @@ function detachedReadExpression(ctx, member, schemaKey, saved, writeGuardMemberN
       genericEnv
     );
     const entryType = csharpValueType(ctx, entryMember, saved, genericEnv);
-    if (readEntry === null || entryType === null) return [];
+    if (readEntry2 === null || entryType === null) return [];
     const guardArguments = writeGuardMemberName == null ? "" : `, () => ThrowIfReadOnly("${escapeCSharpString(writeGuardMemberName)}"), () => IsReadOnly`;
     const [viewType, view] = saved ? [
       `NeoList<${entryType}>`,
-      `DetachedList<${entryType}>("${key}", entry => ${readEntry}, (client, child) => ${childConverter(ctx, entryMember, true, writeGuardMemberName != null, genericEnv)}, item => ${serializeItemExpression(ctx, entryMember, "item")}${guardArguments})`
+      `DetachedList<${entryType}>("${key}", entry => ${readEntry2}, (client, child) => ${childConverter(ctx, entryMember, true, writeGuardMemberName != null, genericEnv)}, item => ${serializeItemExpression(ctx, entryMember, "item")}${guardArguments})`
     ] : [
       `NeoReadOnlyList<${entryType}>`,
-      `DetachedReadOnlyList<${entryType}>("${key}", entry => ${readEntry}, (client, child) => ${childConverter(ctx, entryMember, false, false, genericEnv)})`
+      `DetachedReadOnlyList<${entryType}>("${key}", entry => ${readEntry2}, (client, child) => ${childConverter(ctx, entryMember, false, false, genericEnv)})`
     ];
     return [
       `if (TryReadDetached("${key}", out _))`,
@@ -151571,11 +152376,11 @@ function detachedValueExpression(ctx, member, value, required2, saved, genericEn
   if (isMemberEnumBase(member)) {
     if (member.enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID)
       return `NeoCellPatternStorage.${isMultiSelectionMember(member) ? "ReadExcludingList" : required2 ? "ReadExcluding" : "ReadOptionalExcluding"}(${value})`;
-    const enumName = ctx.enumNames.get(member.enumId);
-    if (enumName === void 0) return null;
+    if (!ctx.enumNames.has(member.enumId)) return null;
+    const parser = enumParser(ctx, member.enumId);
     if (isMultiSelectionMember(member))
-      return `NeoGeneratedTypesSupport.ReadEnumList(${value}, ${enumParser(enumName)})`;
-    const read = `NeoGeneratedTypesSupport.ReadEnumSingle(${value}, ${enumParser(enumName)})`;
+      return `NeoGeneratedTypesSupport.ReadEnumList(${value}, ${parser})`;
+    const read = `NeoGeneratedTypesSupport.ReadEnumSingle(${value}, ${parser})`;
     return required2 ? `${read} ?? throw new InvalidOperationException("Required enum '${escapeCSharpString(member.name)}' has no selected option.")` : `${value} is null ? null : ${read}`;
   }
   if (isMemberClassBase(member) && member.classArguments == null) {
@@ -151744,15 +152549,15 @@ function storedReadExpression(ctx, member, schemaKey, nodeType, saved, ownerClas
       return [
         `return NeoCellPatternStorage.${isMultiSelectionMember(member) ? "ReadExcludingList" : isRequiredMember2(member) ? "ReadExcluding" : "ReadOptionalExcluding"}(${getNode}.Selected());`
       ];
-    const enumName = ctx.enumNames.get(member.enumId) ?? "string";
+    const optionsName = enumOptionsName(ctx, member.enumId);
     return isMultiSelectionMember(member) ? [
-      `return NeoGeneratedTypesSupport.ReadEnumList(${getNode}.Selected(), ${enumParser(enumName)});`
+      `return NeoGeneratedTypesSupport.ReadEnumList(${getNode}.Selected(), ${enumParser(ctx, member.enumId)});`
     ] : isRequiredMember2(member) ? [
       `var selected = NeoGeneratedTypesSupport.ReadSingleSelected(${getNode});`,
-      `return selected is null ? throw new InvalidOperationException("Required enum '${escapeCSharpString(schemaKey)}' has no selected option.") : ${enumName}.FromOptionId(selected);`
+      `return selected is null ? throw new InvalidOperationException("Required enum '${escapeCSharpString(schemaKey)}' has no selected option.") : ${optionsName}.FromOptionId(selected);`
     ] : [
       `var selected = NeoGeneratedTypesSupport.ReadSingleSelected(${getNode});`,
-      `return selected is null ? null : ${enumName}.FromOptionId(selected);`
+      `return selected is null ? null : ${optionsName}.FromOptionId(selected);`
     ];
   }
   if (isMemberLookupBase(member)) {
@@ -151909,13 +152714,12 @@ function writeExpression(ctx, member, schemaKey, ownerClassName, ownerClassId) {
       return [
         `NeoGeneratedTypesSupport.SetValue(writableNode, "${key}", NeoGeneratedTypesSupport.Value(NeoCellPatternStorage.${isMultiSelectionMember(member) ? "ExcludingListIds" : "OptionalExcludingIds"}(value)));`
       ];
-    const enumName = ctx.enumNames.get(member.enumId) ?? "string";
     return isMultiSelectionMember(member) ? [
-      `NeoGeneratedTypesSupport.SetValue(writableNode, "${key}", NeoGeneratedTypesSupport.Value(${enumName}.ToOptionIds(value)));`
+      `NeoGeneratedTypesSupport.SetValue(writableNode, "${key}", NeoGeneratedTypesSupport.Value(${enumOptionsName(ctx, member.enumId)}.ToOptionIds(value)));`
     ] : isRequiredMember2(member) ? [
-      `NeoGeneratedTypesSupport.SetValue(writableNode, "${key}", NeoGeneratedTypesSupport.Value(new[] { value.optionId }));`
+      `NeoGeneratedTypesSupport.SetValue(writableNode, "${key}", NeoGeneratedTypesSupport.Value(new[] { value.OptionId() }));`
     ] : [
-      `NeoGeneratedTypesSupport.SetValue(writableNode, "${key}", NeoGeneratedTypesSupport.Value(value is null ? null : new[] { value.optionId }));`
+      `NeoGeneratedTypesSupport.SetValue(writableNode, "${key}", NeoGeneratedTypesSupport.Value(value is null ? null : new[] { value.Value.OptionId() }));`
     ];
   }
   if (isMemberLookupBase(member)) {
@@ -152030,14 +152834,13 @@ function collectionReadExpression(ctx, member, getNode, schemaKey, entryMember,
     `new ${collectionType}(client, memberNode, (client, child) => ${childConverter(ctx, entryMember, false, false, genericEnv)}${keyCodecArguments})`
   );
 }
-function enumKeyCodecArguments(enumId, enumName) {
-  return enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID ? ", id => NeoCellPatternStorage.ReadExcluding(new[] { id }), key => NeoCellPatternStorage.ExcludingIds(key)[0]" : `, ${enumParser(enumName)}, key => key.optionId`;
+function enumKeyCodecArguments(ctx, enumId) {
+  return enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID ? ", id => NeoCellPatternStorage.ReadExcluding(new[] { id }), key => NeoCellPatternStorage.ExcludingIds(key)[0]" : `, ${enumParser(ctx, enumId)}, key => key.OptionId()`;
 }
 function dictionaryKeyCodecArguments(ctx, member) {
   if (!isEnumKeyedDictionaryMember(member)) return "";
-  const keyEnumName = ctx.enumNames.get(member.keyEnumId);
-  if (keyEnumName === void 0) return "";
-  return enumKeyCodecArguments(member.keyEnumId, keyEnumName);
+  if (!ctx.enumNames.has(member.keyEnumId)) return "";
+  return enumKeyCodecArguments(ctx, member.keyEnumId);
 }
 function serializeItemExpression(ctx, member, valueExpression) {
   if (member === null) return valueExpression;
@@ -152046,7 +152849,7 @@ function serializeItemExpression(ctx, member, valueExpression) {
   if (isMemberEnumBase(member)) {
     if (member.enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID)
       return `NeoGeneratedTypesSupport.Value(NeoCellPatternStorage.${isMultiSelectionMember(member) ? "ExcludingListIds" : "OptionalExcludingIds"}(${valueExpression}))`;
-    const rawExpression = isMultiSelectionMember(member) ? `${ctx.enumNames.get(member.enumId) ?? "NeoEnum"}.ToOptionIds(${valueExpression})` : `${valueExpression} is null ? null : new[] { ${valueExpression}.optionId }`;
+    const rawExpression = isMultiSelectionMember(member) ? `${enumOptionsName(ctx, member.enumId)}.ToOptionIds(${valueExpression})` : `${valueExpression} is ${ctx.enumNames.get(member.enumId) ?? "NeoEnum"} enumOption ? new[] { enumOption.OptionId() } : null`;
     return `NeoGeneratedTypesSupport.Value(${rawExpression})`;
   }
   if (isMemberLookupBase(member)) {
@@ -152235,8 +153038,8 @@ function childConverter(ctx, member, saved = false, branchOnReadOnly = false, ge
   if (isMemberEnumBase(member)) {
     if (member.enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID)
       return `NeoCellPatternStorage.${isMultiSelectionMember(member) ? "ReadExcludingList" : isRequiredMember2(member) ? "ReadExcluding" : "ReadOptionalExcluding"}(((NeoMemberEnum)child).Selected())`;
-    const enumName = ctx.enumNames.get(member.enumId) ?? "string";
-    return isMultiSelectionMember(member) ? `NeoGeneratedTypesSupport.ReadEnumList(((NeoMemberEnum)child).Selected(), ${enumParser(enumName)})` : isRequiredMember2(member) ? `NeoGeneratedTypesSupport.ReadEnumSingle(((NeoMemberEnum)child).Selected(), ${enumParser(enumName)}) ?? throw new InvalidOperationException("Required enum '${escapeCSharpString(member.name)}' has no selected option.")` : `NeoGeneratedTypesSupport.ReadEnumSingle(((NeoMemberEnum)child).Selected(), ${enumParser(enumName)})`;
+    const parser = enumParser(ctx, member.enumId);
+    return isMultiSelectionMember(member) ? `NeoGeneratedTypesSupport.ReadEnumList(((NeoMemberEnum)child).Selected(), ${parser})` : isRequiredMember2(member) ? `NeoGeneratedTypesSupport.ReadEnumSingle(((NeoMemberEnum)child).Selected(), ${parser}) ?? throw new InvalidOperationException("Required enum '${escapeCSharpString(member.name)}' has no selected option.")` : `NeoGeneratedTypesSupport.ReadEnumSingle(((NeoMemberEnum)child).Selected(), ${parser})`;
   }
   if (isMemberLookupBase(member)) return "((NeoMemberLookup)child).Selected()";
   if (isMemberDialogueLookupBase(member))
@@ -152290,8 +153093,8 @@ function nsGetterChildConverter(ctx, returnTypeInfo, saved, genericEnv) {
     case 8 /* Enum */: {
       if (returnTypeInfo.enumId === NEO_CELL_PATTERN_EXCLUDING_ENUM_ID)
         return `NeoCellPatternStorage.${returnTypeInfo.required ? "ReadExcluding" : "ReadOptionalExcluding"}(${valueExpression})`;
-      const enumName = ctx.enumNames.get(returnTypeInfo.enumId) ?? "string";
-      return `NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${enumParser(enumName)})`;
+      const readExpression2 = `NeoGeneratedTypesSupport.ReadEnumSingle(${valueExpression}, ${enumParser(ctx, returnTypeInfo.enumId)})`;
+      return returnTypeInfo.required ? `${readExpression2} ?? throw new InvalidOperationException("NSProperty returned null for a required enum value.")` : readExpression2;
     }
     case 18 /* DialogueLookup */: {
       const dialogueIds = `NeoGeneratedTypesSupport.ToStringArray(${valueExpression})`;
@@ -152358,7 +153161,7 @@ function escapeCSharpString(value) {
     (character) => CSHARP_STRING_ESCAPES.get(character) ?? `\\u${character.charCodeAt(0).toString(16).padStart(4, "0")}`
   );
 }
-var NEO_MEMORY_SCHEMA_KEYS, NEO_MEMORY_CLASS_NAMES, GENERATED_ENUM_CLASS_MEMBER_NAMES, CHILDREN_SCHEMA_KEY, TILE_LAYER_LINK_INTERFACE, OBJECT_LAYER_LINK_INTERFACE, OBJECT_SPAWN_HOOKS_INTERFACE, TILE_LAYER_RENDER_TARGET_PROVIDER_INTERFACE, SMART_TILE_SOURCE_INTERFACE, SMART_TILE_INTERFACE, SMART_TILE_RULE_INTERFACE, SMART_TILE_NEIGHBOR_INTERFACE, WORLD_OBJECT_VALUE_INTERFACE, OBJECT_COMPOSITION_SOURCE_INTERFACE, COLLIDER_SOURCE_INTERFACE, SORTING_GROUP_SOURCE_INTERFACE, COLLIDER_INTERFACE, SORTING_GROUP_INTERFACE, SPRITE_OBJECT_VALUE_INTERFACE, SORTING_GROUP_SOURCE_MEMBER_NAME, OBJECT_BASE_NAME_SCHEMA_KEY, OBJECT_BASE_POSITION_SCHEMA_KEY, OBJECT_BASE_SIZE_SCHEMA_KEY, SPRITE_OBJECT_SPRITE_SCHEMA_KEY, SPRITE_OBJECT_FLIP_X_SCHEMA_KEY, SPRITE_OBJECT_FLIP_Y_SCHEMA_KEY, SPRITE_OBJECT_MASK_INTERACTION_SCHEMA_KEY, SPRITE_OBJECT_SORTING_ORDER_SCHEMA_KEY, TILE_CELL_SCHEMA_KEY, EMPTY_RUNTIME_CONTRACT_PLAN, SMART_TILE_CONTRACT_WORLD_KINDS, WORLD_OBJECT_CONTRACT_WORLD_KINDS, SMART_TILE_NEIGHBOR_TILE_RELATION_EXPRESSION, REQUIRED_STRING_CONTRACT_FIELD, REQUIRED_BOOL_CONTRACT_FIELD, OPTIONAL_BOOL_CONTRACT_FIELD, OPTIONAL_INT_CONTRACT_FIELD, REQUIRED_FLOAT_CONTRACT_FIELD, REQUIRED_SPRITE_CONTRACT_FIELD, REQUIRED_VECTOR2_CONTRACT_FIELD, OPTIONAL_VECTOR2_CONTRACT_FIELD, REQUIRED_VECTOR2_INT_CONTRACT_FIELD, REQUIRED_VECTOR3_CONTRACT_FIELD, VARIANTS_SCOPE_NAME, BASE_VARIANT_NAME, VARIANT_APPLY_METHOD_NAME, VARIANT_FOLDER_SEPARATOR, CSHARP_STRING_ESCAPES, UNRESOLVED_VARIANT_TARGET;
+var NEO_MEMORY_SCHEMA_KEYS, NEO_MEMORY_CLASS_NAMES, CHILDREN_SCHEMA_KEY, TILE_LAYER_LINK_INTERFACE, OBJECT_LAYER_LINK_INTERFACE, OBJECT_SPAWN_HOOKS_INTERFACE, TILE_LAYER_RENDER_TARGET_PROVIDER_INTERFACE, SMART_TILE_SOURCE_INTERFACE, SMART_TILE_INTERFACE, SMART_TILE_RULE_INTERFACE, SMART_TILE_NEIGHBOR_INTERFACE, WORLD_OBJECT_VALUE_INTERFACE, OBJECT_COMPOSITION_SOURCE_INTERFACE, COLLIDER_SOURCE_INTERFACE, SORTING_GROUP_SOURCE_INTERFACE, COLLIDER_INTERFACE, SORTING_GROUP_INTERFACE, SPRITE_OBJECT_VALUE_INTERFACE, SORTING_GROUP_SOURCE_MEMBER_NAME, OBJECT_BASE_NAME_SCHEMA_KEY, OBJECT_BASE_POSITION_SCHEMA_KEY, OBJECT_BASE_SIZE_SCHEMA_KEY, SPRITE_OBJECT_SPRITE_SCHEMA_KEY, SPRITE_OBJECT_FLIP_X_SCHEMA_KEY, SPRITE_OBJECT_FLIP_Y_SCHEMA_KEY, SPRITE_OBJECT_MASK_INTERACTION_SCHEMA_KEY, SPRITE_OBJECT_SORTING_ORDER_SCHEMA_KEY, TILE_CELL_SCHEMA_KEY, EMPTY_RUNTIME_CONTRACT_PLAN, SMART_TILE_CONTRACT_WORLD_KINDS, WORLD_OBJECT_CONTRACT_WORLD_KINDS, SMART_TILE_NEIGHBOR_TILE_RELATION_EXPRESSION, REQUIRED_STRING_CONTRACT_FIELD, REQUIRED_BOOL_CONTRACT_FIELD, OPTIONAL_BOOL_CONTRACT_FIELD, OPTIONAL_INT_CONTRACT_FIELD, REQUIRED_FLOAT_CONTRACT_FIELD, REQUIRED_SPRITE_CONTRACT_FIELD, REQUIRED_VECTOR2_CONTRACT_FIELD, OPTIONAL_VECTOR2_CONTRACT_FIELD, REQUIRED_VECTOR2_INT_CONTRACT_FIELD, REQUIRED_VECTOR3_CONTRACT_FIELD, VARIANTS_SCOPE_NAME, BASE_VARIANT_NAME, VARIANT_APPLY_METHOD_NAME, VARIANT_FOLDER_SEPARATOR, CSHARP_STRING_ESCAPES, UNRESOLVED_VARIANT_TARGET;
 var init_generate_unity_classes = __esm({
   "../src/models/exports/unity-codegen/generate-unity-classes.ts"() {
     "use strict";
@@ -152404,24 +153207,6 @@ var init_generate_unity_classes = __esm({
       textNodeMemory: "NeoTextNodeMemory",
       choiceLog: "NeoChoiceLog"
     };
-    GENERATED_ENUM_CLASS_MEMBER_NAMES = /* @__PURE__ */ new Set([
-      "values",
-      "optionId",
-      "Text",
-      "TextId",
-      "FromOptionId",
-      "ToOptionIds",
-      "IsKnown",
-      "TextIdForOptionId",
-      "TextForOptionId",
-      "ToString",
-      "Equals",
-      "GetHashCode",
-      "GetType",
-      "ReferenceEquals",
-      "MemberwiseClone",
-      "Finalize"
-    ]);
     CHILDREN_SCHEMA_KEY = "Children";
     TILE_LAYER_LINK_INTERFACE = "INeoTileLayerLinkValue";
     OBJECT_LAYER_LINK_INTERFACE = "INeoObjectLayerLinkValue";
@@ -155679,7 +156464,7 @@ var UNITY_CODEGEN_REVISION;
 var init_unity_codegen_revision = __esm({
   "../src/models/exports/unity-codegen-revision.ts"() {
     "use strict";
-    UNITY_CODEGEN_REVISION = "03bfbde6bcc46538292d7c03998e5a684d7a0a0bff8959f9aeaa8a38d18753f5";
+    UNITY_CODEGEN_REVISION = "30d96d89e3d179ccf291e522834281f90dbd44b464cf51eea76aae87eed97e7e";
   }
 });
 
@@ -156312,15 +157097,19 @@ async function readExportSource(workspace, identityLedger, onPhase) {
     onPhase
   });
   const prepared = candidate.preparedLocal;
+  const { status } = candidate;
+  const declaredPaths = new Map(
+    (status.binaryFiles ?? []).map((binary) => [binary.fileId, binary.path])
+  );
   if (prepared === null) {
     return {
       records: workspace.state.records,
       localChanges: null,
       localFiles: {},
+      declaredPaths,
       identityLedger: {}
     };
   }
-  const { status } = candidate;
   const downloads = (status.binaryChanges ?? []).filter(
     (binary) => binary.action === "download"
   );
@@ -156371,6 +157160,7 @@ async function readExportSource(workspace, identityLedger, onPhase) {
     records: records2,
     localChanges: status.changes.length + status.authoredValueSeeds.size,
     localFiles,
+    declaredPaths,
     identityLedger: ledger
   };
 }
@@ -156403,7 +157193,8 @@ async function exportUnityProject(args) {
   const files = exportFiles(
     workspace,
     Object.keys(unityExport.files),
-    source.localFiles
+    source.localFiles,
+    source.declaredPaths
   );
   const recordHashes = {};
   for (const [key, record6] of Object.entries(records2)) {
@@ -156540,7 +157331,7 @@ function sortedRecords(records2) {
 function compareOrdinal(left, right) {
   return left < right ? -1 : left > right ? 1 : 0;
 }
-function exportFiles(workspace, fileIds, localFiles) {
+function exportFiles(workspace, fileIds, localFiles, declaredPaths) {
   const resolvePath = createWorkspaceSourcePathResolver(workspace.root);
   const files = {};
   const failures = [];
@@ -156555,20 +157346,21 @@ function exportFiles(workspace, fileIds, localFiles) {
       failures.push(`${fileId}: the pull recorded no bytes for it`);
       continue;
     }
+    const relativePath = declaredPaths.get(fileId) ?? binary.path;
     if (binary.sha256 === null) {
-      failures.push(`${binary.path}: the pull recorded no hash for it`);
+      failures.push(`${relativePath}: the pull recorded no hash for it`);
       continue;
     }
-    const path = resolvePath(binary.path);
+    const path = resolvePath(relativePath);
     if (!existsSync13(path)) {
-      failures.push(`${binary.path}: missing`);
+      failures.push(`${relativePath}: missing`);
       continue;
     }
     if (sha256File(path) !== binary.sha256) {
-      failures.push(`${binary.path}: its bytes differ from the pulled file`);
+      failures.push(`${relativePath}: its bytes differ from the pulled file`);
       continue;
     }
-    files[fileId] = { path: binary.path, sha256: binary.sha256 };
+    files[fileId] = { path: relativePath, sha256: binary.sha256 };
   }
   if (failures.length > 0) {
     throw new Error(
@@ -159111,15 +159903,20 @@ function rewriteFilesFromState(workspace, records2 = new Map(
     workspace.root,
     result.formAlternates
   );
+  const authoredSources = new Map(
+    sourceSnapshot?.inputs.map((input) => [input.uri, input.text])
+  );
   const files = result.files.map((file) => {
     const preserved = preservedSourceFiles.get(file.path);
     if (preserved !== void 0 && preservedFileMatchesEmission(preserved, file.content)) {
       return { ...file, content: preserved };
     }
+    const path = join17(workspace.root, file.path);
+    const authored = preserved ?? authoredSources.get(file.path) ?? (existsSync15(path) ? readFileSync19(path, "utf8") : void 0);
     return {
       ...file,
       content: restoreAuthoredMemberForms(
-        file.content,
+        authored === void 0 ? file.content : preserveProjectFileRegistrySource(authored, file.content, records2),
         authoredForms.get(file.path) ?? []
       )
     };
@@ -160005,6 +160802,7 @@ var compileNSVoidBody2, compileNSFunction2, compileNSGetter2, compileNSSetter2,
 var init_push = __esm({
   "src/commands/push.ts"() {
     "use strict";
+    init_project_file_source_preservation();
     init_packed_value_parity();
     init_member_kinds();
     init_stored_value_placements();
@@ -160167,7 +160965,7 @@ async function fetchProjectDocument(workspace) {
       deleted: head.deleted
     });
   }
-  const sources = [
+  const sources2 = [
     {
       recordKind: ProjectRecordKind.Project,
       entries: readRawSingleton(raw, "project"),
@@ -160299,7 +161097,7 @@ async function fetchProjectDocument(workspace) {
     }
   ];
   const records2 = /* @__PURE__ */ new Map();
-  for (const source of sources) {
+  for (const source of sources2) {
     for (const entry of source.entries) {
       if (!source.guard(entry)) {
         throw new Error(
@@ -161423,8 +162221,11 @@ async function finishFormat4Pull(args) {
   const serverByPath = new Map(
     (serverResult?.files ?? []).map((file) => [file.path, file])
   );
-  const localRecordFiles = declaringSourcePathsV4(localResult);
-  const serverRecordFiles = serverResult === null ? /* @__PURE__ */ new Map() : declaringSourcePathsV4(serverResult);
+  const registryPaths = localResult.analysis.files.registries.map(
+    (registry) => registry.source.uri
+  );
+  const localRecordFiles = declaringSourcePathsV4(localResult, registryPaths);
+  const serverRecordFiles = serverResult === null ? /* @__PURE__ */ new Map() : declaringSourcePathsV4(serverResult, registryPaths);
   const conflictPaths = /* @__PURE__ */ new Set();
   const conflictPathsByKey = /* @__PURE__ */ new Map();
   const authoredLocalConflictKeysByPath = /* @__PURE__ */ new Map();
@@ -161455,6 +162256,7 @@ async function finishFormat4Pull(args) {
     plans,
     localRecordFiles,
     serverRecordFiles,
+    registryPaths,
     previousRecords: workspace.state.records,
     emittedPaths,
     mainLocale: workspaceMainLocale(workspace.state.records)
@@ -161475,7 +162277,14 @@ async function finishFormat4Pull(args) {
         )}: its prior source file ${JSON.stringify(path)} no longer exists.`
       );
     }
-    const local = unprojectedConflictKeys.length > 0 ? existing ?? void 0 : localByPath.get(path)?.content;
+    const local = unprojectedConflictKeys.length > 0 ? existing ?? void 0 : (() => {
+      const emitted = localByPath.get(path)?.content;
+      return existing !== null && emitted !== void 0 ? preserveProjectFileRegistrySource(
+        existing,
+        emitted,
+        localRecords
+      ) : emitted;
+    })();
     const server = serverByPath.get(path)?.content;
     const content = conflictPaths.has(path) ? renderConflictFileV4({
       localContent: local,
@@ -161754,7 +162563,7 @@ function cursorsEqual(left, right) {
     (transactionId, index) => transactionId === right.transactionIds[index]
   );
 }
-function declaringSourcePathsV4(emission) {
+function declaringSourcePathsV4(emission, registryPaths) {
   const paths = /* @__PURE__ */ new Map();
   const add = (key, path) => {
     const existing = paths.get(key);
@@ -161768,6 +162577,12 @@ function declaringSourcePathsV4(emission) {
     for (const key of file.recordKeys) add(key, file.path);
   }
   for (const [key, path] of emission.recordFiles) add(key, path);
+  for (const [key, declaring] of paths) {
+    if (!key.startsWith("project-file:")) continue;
+    for (const path of registryPaths) {
+      if (!declaring.includes(path)) declaring.push(path);
+    }
+  }
   return paths;
 }
 function projectSourcePathsRequiringRewriteV4(args) {
@@ -161790,10 +162605,13 @@ function projectSourcePathsRequiringRewriteV4(args) {
     }
   }
   for (const [key, previous] of Object.entries(args.previousRecords)) {
-    if (previous.file === void 0) continue;
-    if (!args.emittedPaths.has(previous.file)) continue;
     if (args.localRecordFiles.has(key)) continue;
     if (!args.localStatus.reconstructed.has(key)) continue;
+    if (previous.recordKind === "project-file") {
+      for (const path of args.registryPaths) result.add(path);
+    }
+    if (previous.file === void 0) continue;
+    if (!args.emittedPaths.has(previous.file)) continue;
     result.add(previous.file);
   }
   return result;
@@ -161860,6 +162678,7 @@ function composeProspectivePullRecord(recordKind, recordId, data, serverRecord)
 var init_pull = __esm({
   "src/commands/pull.ts"() {
     "use strict";
+    init_project_file_source_preservation();
     init_push();
     init_source_layout();
     init_project_read_base();
@@ -170786,19 +171605,19 @@ function analyzeManifestScripts(manifest, options = {}) {
     ...options.rootMemberIds ? { rootMemberIds: options.rootMemberIds } : {},
     ...options.sourceUri ? { sourceUri: options.sourceUri } : {}
   });
-  const sources = /* @__PURE__ */ new Map();
+  const sources2 = /* @__PURE__ */ new Map();
   const scriptPathByMemberId = /* @__PURE__ */ new Map();
   for (const member of manifest.members) {
     if (member.kind !== "computed" && member.kind !== "scriptFunction" || member.script === null) {
       continue;
     }
     const key = inlineScriptKey(member.script.path, member.id);
-    sources.set(key, member.script.sourceText);
+    sources2.set(key, member.script.sourceText);
     scriptPathByMemberId.set(member.id, member.script.path);
   }
   const documents = /* @__PURE__ */ new Map();
   for (const [path, context] of projection.scripts) {
-    const source = sources.get(path);
+    const source = sources2.get(path);
     if (source === void 0) continue;
     const uri = manifestScriptUri(path, options.scriptUri);
     documents.set(path, {
@@ -172949,6 +173768,7 @@ function assertMatcher(condition, expectationValue, messageKind, expected, recei
   }
 }
 function errorMessage2(error) {
+  if (error instanceof NSGetterRuntimeError) return error.diagnosticMessage;
   return error instanceof Error ? error.message : String(error);
 }
 function findDelegateTargetMemberId(value) {
@@ -173188,11 +174008,19 @@ function compileSpec(workspace, compile, absolutePath, projectCompilationHash2)
     }
   } catch {
   }
-  const compiled = {
-    path,
-    source,
-    action: compile(`file://${absolutePath}`, source)
-  };
+  let action;
+  try {
+    action = compile(`file://${absolutePath}`, source);
+  } catch (error) {
+    if (error instanceof CompileError)
+      ERROR_SOURCE_POSITIONS.set(error, {
+        file: path,
+        line: error.line,
+        column: error.column
+      });
+    throw error;
+  }
+  const compiled = { path, source, action };
   atomicWrite(
     artifactPath,
     `${JSON.stringify({
@@ -173222,6 +174050,7 @@ function selectedSpecPaths(workspace, selectors) {
   const normalizedSelectors = selectors.map(
     (selector) => selector.replaceAll("\\", "/").replace(/^\.\//u, "")
   );
+  const realRoot = realpathSync2(workspace.root);
   for (const selector of normalizedSelectors) {
     if (/[*?]/u.test(selector)) continue;
     if (isAbsolute3(selector)) {
@@ -173238,7 +174067,7 @@ function selectedSpecPaths(workspace, selectors) {
     }
     if (!existsSync19(absolute)) continue;
     const real = realpathSync2(absolute);
-    const realRelative = relative9(workspace.root, real);
+    const realRelative = relative9(realRoot, real);
     if (realRelative === ".." || realRelative.startsWith(`..${sep9}`)) {
       throw new Error(
         `Spec selector ${JSON.stringify(selector)} resolves outside the workspace through a symlink.`
@@ -173324,7 +174153,7 @@ function callSitePosition(callSiteId) {
 }
 function portableDelegate(value) {
   try {
-    return structuredClone(value);
+    return cloneWithRuntimeSources(value);
   } catch (error) {
     throw new NeoTestRegistrationError(
       `Test callback could not be captured deterministically: ${errorMessage2(error)}.`
@@ -173851,8 +174680,15 @@ function runCallback(environment, delegate, deadlineMs) {
   }
 }
 function failureFor(error, file, position, member = null) {
+  let runtimePosition;
+  if (error instanceof NSGetterRuntimeError) {
+    const caller = error.callerNode === void 0 ? void 0 : runtimeSource(error.callerNode);
+    runtimePosition = [error.source, caller].find(
+      (source) => source?.uri?.endsWith(`/${file}`)
+    );
+  }
   const timeout = error instanceof NeoScriptWallClockTimeoutError;
-  const sourcePosition = error instanceof NativeFunctionDelegateUnavailableError && error.callSiteId !== void 0 ? callSitePosition(error.callSiteId) : error instanceof Error ? ERROR_SOURCE_POSITIONS.get(error) : void 0;
+  const sourcePosition = error instanceof NativeFunctionDelegateUnavailableError && error.callSiteId !== void 0 ? callSitePosition(error.callSiteId) : error instanceof Error ? ERROR_SOURCE_POSITIONS.get(error) ?? runtimePosition : void 0;
   return {
     kind: error instanceof NeoTestAssertionError ? "assertion" : timeout ? "timeout" : "runtime",
     message: error instanceof NativeFunctionDelegateUnavailableError ? `${error.message} Configure mock.native(...) or mock.function(...) for this exact member before calling production code.` : errorMessage2(error),
@@ -173884,6 +174720,21 @@ async function executeTestFile(spec, document, selected, timeoutMs, interrupted
   );
 }
 async function executeRegisteredSpec(registered, document, selected, timeoutMs, interrupted) {
+  let restoredRuntimeSources = false;
+  const reportFailure = (error, position, member = null) => {
+    if (error instanceof NSGetterRuntimeError && error.node !== void 0 && (error.source === void 0 || error.callerNode !== void 0 && runtimeSource(error.callerNode) === void 0)) {
+      if (!restoredRuntimeSources) {
+        const compiled = lazySpecCompiler(document)(
+          `file:///${registered.spec.path}`,
+          registered.spec.source
+        );
+        copyRuntimeSources(compiled, registered.spec.action);
+        restoredRuntimeSources = true;
+      }
+      error.source ??= runtimeSource(error.node);
+    }
+    return failureFor(error, registered.spec.path, position, member);
+  };
   const results = [];
   const fileFailures = [];
   let testDurationMs = 0;
@@ -173897,9 +174748,7 @@ async function executeRegisteredSpec(registered, document, selected, timeoutMs,
       try {
         runCallback(fixture, hook, suiteDeadline);
       } catch (error) {
-        suiteFailures.push(
-          failureFor(error, registered.spec.path, suite, "beforeAll")
-        );
+        suiteFailures.push(reportFailure(error, suite, "beforeAll"));
       } finally {
         testDurationMs += performance.now() - hookStarted;
       }
@@ -173919,9 +174768,7 @@ async function executeRegisteredSpec(registered, document, selected, timeoutMs,
             try {
               runCallback(environment, hook, deadline);
             } catch (error) {
-              failures.push(
-                failureFor(error, registered.spec.path, test, "beforeEach")
-              );
+              failures.push(reportFailure(error, test, "beforeEach"));
               setupFailed = true;
               break;
             }
@@ -173933,7 +174780,7 @@ async function executeRegisteredSpec(registered, document, selected, timeoutMs,
         try {
           runCallback(environment, test.body, deadline);
         } catch (error) {
-          failures.push(failureFor(error, registered.spec.path, test));
+          failures.push(reportFailure(error, test));
         }
       }
       for (const current of [...test.suites].reverse()) {
@@ -173941,9 +174788,7 @@ async function executeRegisteredSpec(registered, document, selected, timeoutMs,
           try {
             runCallback(environment, hook, Date.now() + timeoutMs);
           } catch (error) {
-            failures.push(
-              failureFor(error, registered.spec.path, test, "afterEach")
-            );
+            failures.push(reportFailure(error, test, "afterEach"));
           }
         }
       }
@@ -173976,9 +174821,7 @@ async function executeRegisteredSpec(registered, document, selected, timeoutMs,
       try {
         runCallback(fixture, hook, Date.now() + timeoutMs);
       } catch (error) {
-        fileFailures.push(
-          failureFor(error, registered.spec.path, suite, "afterAll")
-        );
+        fileFailures.push(reportFailure(error, suite, "afterAll"));
       } finally {
         testDurationMs += performance.now() - hookStarted;
       }
@@ -174293,13 +175136,14 @@ async function runTest(workspace, options, dependencies = {}) {
   } catch (error) {
     const diagnosticCode = interrupted || error instanceof NeoTestInterruptedError ? "NEO_TEST_INTERRUPTED" : error instanceof NeoTestPreparedCandidateError ? "NEO_TEST_PREPARED_CANDIDATE" : error instanceof NeoTestUsageError ? "NEO_TEST_USAGE" : error instanceof NeoTestNoTestsError ? "NEO_TEST_NO_TESTS" : error instanceof NeoTestRegistrationError ? "NEO_TEST_REGISTRATION" : phase === "prepare" ? "NEO_TEST_PREPARATION" : phase === "compile" ? "NEO_TEST_COMPILE" : "NEO_TEST_RUNNER";
     exitCode = interrupted || error instanceof NeoTestInterruptedError ? 130 : error instanceof NeoTestUsageError || error instanceof NeoTestReportWriteError || error instanceof NeoTestPreparedCandidateError || diagnosticCode === "NEO_TEST_RUNNER" ? 2 : 1;
+    const errorPosition = error instanceof Error ? ERROR_SOURCE_POSITIONS.get(error) : void 0;
     diagnostics.push({
       severity: "error",
       code: diagnosticCode,
       message: interrupted ? "Neo test was interrupted by SIGINT; partial results were written." : errorMessage2(error),
-      file: null,
-      line: null,
-      column: null,
+      file: errorPosition?.file ?? null,
+      line: errorPosition?.line ?? null,
+      column: errorPosition?.column ?? null,
       related: []
     });
   }
@@ -174512,6 +175356,8 @@ var TEST_BUILD_CACHE_LIMIT_BYTES, ABANDONED_TEMP_MAX_AGE_MS, TEST_CANDIDATE_CACH
 var init_test = __esm({
   "src/commands/test.ts"() {
     "use strict";
+    init_strict_compile_error();
+    init_runtime_source();
     init_test_worker_pool();
     init_project();
     init_test_prelude();
@@ -178078,7 +178924,7 @@ async function commitLocalizedTextLocaleValueEdits(ctx, edits, options) {
     ))
       primaryTextIds.add(textId);
   }
-  let sources;
+  let sources2;
   const primaryTargets = /* @__PURE__ */ new Map();
   const changes = [];
   for (const [textId, edit] of composed) {
@@ -178087,8 +178933,8 @@ async function commitLocalizedTextLocaleValueEdits(ctx, edits, options) {
       statusWrite: edit.statusWrite
     });
     if (primaryTextIds.has(textId)) {
-      sources ??= indexPrimaryAssignmentSources(document, primaryTextIds);
-      const link = edit.assignmentLink === void 0 ? requireSinglePrimaryAssignment(edit.original, sources) : primaryTextAssignmentLink(edit.original, edit.assignmentLink);
+      sources2 ??= indexPrimaryAssignmentSources(document, primaryTextIds);
+      const link = edit.assignmentLink === void 0 ? requireSinglePrimaryAssignment(edit.original, sources2) : primaryTextAssignmentLink(edit.original, edit.assignmentLink);
       primaryTargets.set(textId, localizedTextReferenceTarget(link));
       details = { assignmentLink: link };
     }
@@ -178238,10 +179084,10 @@ function getChangedLocalizedText(changedRecords, textId) {
   );
 }
 function indexPrimaryAssignmentSources(document, textIds) {
-  const sources = /* @__PURE__ */ new Map();
+  const sources2 = /* @__PURE__ */ new Map();
   const add = (textId, source) => {
-    const list = sources.get(textId);
-    if (list === void 0) sources.set(textId, [source]);
+    const list = sources2.get(textId);
+    if (list === void 0) sources2.set(textId, [source]);
     else list.push(source);
   };
   for (const member of document.members) {
@@ -178271,7 +179117,7 @@ function indexPrimaryAssignmentSources(document, textIds) {
       });
     }
   }
-  if (candidates.length === 0) return sources;
+  if (candidates.length === 0) return sources2;
   const owners = resolveLocalizableStringWriteOwners(document, candidates);
   for (const [valueId, textId] of candidateTextIds) {
     const member = owners.get(valueId);
@@ -178283,11 +179129,11 @@ function indexPrimaryAssignmentSources(document, textIds) {
       label: `${member.name} value (${valueId})`
     });
   }
-  return sources;
+  return sources2;
 }
-function requireSinglePrimaryAssignment(text, sources) {
+function requireSinglePrimaryAssignment(text, sources2) {
   if (text.archivedAt != null) return primaryTextAssignmentLink(text);
-  const found = sources.get(text.id) ?? [];
+  const found = sources2.get(text.id) ?? [];
   if (found.length > 1)
     throw new Error(
       `Choose the source assignment for primary text "${text.id}": ${found.map((source) => source.label).join(", ")}.`
@@ -180890,15 +181736,19 @@ __export(resolve_exports, {
 import { readFileSync as readFileSync28, rmSync as rmSync11, writeFileSync as writeFileSync17 } from "node:fs";
 import { join as join23, relative as relative12 } from "node:path";
 function runResolve(workspace, side) {
-  const marked = readMarkedProjectSourcesV4(workspace.root);
+  const sources2 = readResolvedProjectSourcesV4(workspace.root, side);
+  const marked = sources2.filter((file) => file.marked);
   assertRecordConflictsResolveTogetherV4(
     workspace,
     new Set(marked.map((file) => file.path))
   );
+  const declaredPaths = Object.values(workspace.state.records).some(
+    (state) => state.projectBinary?.conflict !== void 0
+  ) ? declaredProjectFilePaths(sources2) : /* @__PURE__ */ new Map();
   const resolvedRecords = adoptServerConflictBases(workspace);
   let resolvedFiles = 0;
   for (const file of marked) {
-    writeFileSync17(file.absolutePath, resolveMarkers(file.source, side), "utf8");
+    writeFileSync17(file.absolutePath, file.text, "utf8");
     resolvedFiles += 1;
   }
   let resolvedBinaries = 0;
@@ -180906,6 +181756,7 @@ function runResolve(workspace, side) {
     const binary = state.projectBinary;
     const conflict2 = binary?.conflict;
     if (binary === void 0 || conflict2 === void 0) continue;
+    binary.path = declaredPaths.get(state.recordId) ?? binary.path;
     const destination = join23(workspace.root, binary.path);
     if (side === "theirs") {
       if (conflict2.remoteSha256 !== null && conflict2.artifactPath !== void 0) {
@@ -180937,18 +181788,32 @@ function runResolve(workspace, side) {
     `Resolved ${resolvedFiles} source file(s), ${resolvedRecords} record conflict(s), and ${resolvedBinaries} binary file(s) keeping the "${side}" side. Review with "neo diff", then "neo push".`
   );
 }
-function readMarkedProjectSourcesV4(root) {
-  const files = [];
-  for (const absolutePath of listProjectSourceFilesV4(root)) {
+function declaredProjectFilePaths(sources2) {
+  const analysis = compileNeoProjectSources(
+    sources2.map(({ path, text }) => ({
+      uri: path,
+      kind: requiredProjectSourceKindV4(path, text),
+      text
+    }))
+  );
+  return new Map(
+    projectFileDeclarationsV4(analysis).map((declaration) => [
+      declaration.recordId,
+      declaration.path
+    ])
+  );
+}
+function readResolvedProjectSourcesV4(root, side) {
+  return listProjectSourceFilesV4(root).map((absolutePath) => {
     const source = readFileSync28(absolutePath, "utf8");
-    if (detectConflictMarkers(source) === null) continue;
-    files.push({
+    const marked = detectConflictMarkers(source) !== null;
+    return {
       path: normalizeWorkspaceSourcePath(relative12(root, absolutePath)),
       absolutePath,
-      source
-    });
-  }
-  return files;
+      text: marked ? resolveMarkers(source, side) : source,
+      marked
+    };
+  });
 }
 function assertRecordConflictsResolveTogetherV4(workspace, markedPaths) {
   for (const [key, record6] of Object.entries(workspace.state.records)) {
@@ -181024,10 +181889,12 @@ function resolveMarkers(source, side) {
 var init_resolve = __esm({
   "src/commands/resolve.ts"() {
     "use strict";
+    init_project_source_manifest();
     init_workspace();
     init_workspace_status();
     init_source_diagnostics();
     init_workspace_source_path();
+    init_project_file_source();
     init_project_files();
   }
 });
@@ -181285,7 +182152,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.70.2");
+    console.log("0.70.4");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {