@neocompose/cli 0.73.0 → 0.73.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [0.73.2] - 2026-10-08
+
+- Use the same pending getter identity in schema declarations and NeoFlow interpolation. New getters export before their first push, including inherited getters, without manually authored IDs.
+
+- Reject lookup declarations and constructed targets incompatible with their configured collection before push, test, or export. Preserve valid subclass lookups and report declaration errors at the authored collection annotation.
+
+## [0.73.1] - 2026-10-08
+
+- Breaking: rename `PriorityOption` to `NeoPriorityOption` in priority groups, to match `NeoPriorityGroup`. The old name is a compile error that names its replacement, and dialogue priorities that use the option still resolve. Stored data doesn't change. `neo pull` writes the new name.
+
 ## [0.73.0] - 2026-10-08
 
 - Trigger dialogues from NeoScript. `root.Dialogues` mirrors the generated C# `Dialogues`, with `TryTrigger(dialogueId, onFinish)`, `CanTrigger(dialogueId)`, `VisitCount`, and `HasVisited`. Standard groups get `TryTrigger(onFinish)` and `CanTrigger()`, lookup groups take their entry class, and `NeoDialogueReference` gets `TryTrigger(onFinish)` and `CanTrigger()`. `TryTrigger` compiles only in functions and dialogue actions. `neo test`, `neo script eval`, and dialogue dry runs return false.

package/dist/neo.mjs

@@ -1202,7 +1202,8 @@ var init_dialogue_types = __esm({
         { base: "NeoDialogueReference", value: "NeoDialogueReference" }
       ],
       ["DialogueGroup", { base: "NeoDialogueGroup", value: "NeoDialogueGroup" }],
-      ["PriorityGroup", { base: "NeoPriorityGroup", value: "NeoPriorityGroup" }]
+      ["PriorityGroup", { base: "NeoPriorityGroup", value: "NeoPriorityGroup" }],
+      ["PriorityOption", { base: "NeoPriorityOption", value: "NeoPriorityOption" }]
     ]);
     BOOL_TYPE = { kind: "primitive", name: "bool" };
     INT_TYPE = { kind: "primitive", name: "int" };
@@ -20691,6 +20692,13 @@ function span(identity2) {
 function materializedId(identity2, kind, name) {
   return materializedIdentityId(identity2, kind, name);
 }
+function materializedMemberId(owner, member) {
+  return materializedId(
+    member,
+    owner.kind === "class" ? "member" : "interface-member",
+    `${owner.name}.${member.name}`
+  );
+}
 function materializedIdentityId(identity2, kind, name) {
   return identity2.id ?? `__pending__:${kind}:${encodeURIComponent(identity2.source.uri)}:${identity2.source.range.start.line}:${identity2.source.range.start.character}:${encodeURIComponent(name)}`;
 }
@@ -27192,6 +27200,7 @@ function sourceDialogueGroups(source) {
   if (cached) return cached;
   const symbols = /* @__PURE__ */ new Map();
   const globals = /* @__PURE__ */ new Map();
+  const priorityGroups = /* @__PURE__ */ new Map();
   const options = /* @__PURE__ */ new Map();
   for (const symbol of source.symbols) {
     if (symbol.kind !== "global") continue;
@@ -27199,12 +27208,13 @@ function sourceDialogueGroups(source) {
       continue;
     const id2 = symbol.id ?? `${symbol.location.uri}#${symbol.name}`;
     globals.set(symbol.name, id2);
+    if (symbol.detail === "NeoPriorityGroup")
+      priorityGroups.set(symbol.name, id2);
     symbols.set(id2, symbol);
   }
   for (const symbol of source.symbols) {
-    if (symbol.kind !== "graphChild" || symbol.detail !== "PriorityOption")
-      continue;
-    const owner = globals.get(symbol.ownerName ?? "");
+    if (symbol.kind !== "graphChild") continue;
+    const owner = priorityGroups.get(symbol.ownerName ?? "");
     if (!owner) continue;
     const id2 = symbol.id ?? `${owner}.${symbol.name}`;
     symbols.set(id2, symbol);
@@ -27545,6 +27555,7 @@ function collectGlobalChildEntries(syntax, declaration) {
       const value = tokens[index + 3];
       entries.push({
         typeName: token.text,
+        typeRange: token.range,
         name: name.text,
         nameRange: name.range,
         annotations: pendingAnnotations,
@@ -43880,6 +43891,16 @@ function validateAnnotations(uri, annotations, context, environment, diagnostics
           continue;
         }
       }
+      if (annotation2.name === "settings" && field.name === "collection" && "type" in context) {
+        validateLookupCollectionType(
+          uri,
+          argument2.text,
+          argument2.range,
+          context.type,
+          environment,
+          diagnostics
+        );
+      }
       validateExpressionText(
         uri,
         argument2.text,
@@ -43893,6 +43914,37 @@ function validateAnnotations(uri, annotations, context, environment, diagnostics
     }
   }
 }
+function validateLookupCollectionType(uri, collection, range2, declared, environment, diagnostics) {
+  const path = collection.trim().split(".");
+  const [owner, name] = path;
+  if (path.length !== 2 || owner === void 0 || name === void 0) return;
+  const field = sourceClassMemberForType({ name: owner }, name, environment);
+  if (!field) return;
+  const collectionType = substituteSemanticType(
+    semanticType(field.member.type),
+    field.bindings
+  );
+  const entryIndex = collectionElementIndex(collectionType.name);
+  const entry = entryIndex === null ? void 0 : collectionType.arguments?.[entryIndex];
+  const target = declared.name === "List" || declared.name === "Set" ? declared.arguments?.[0] : declared;
+  if (!entry || !target) return;
+  if (!environment.types.has(target.name) || !environment.types.has(entry.name))
+    return;
+  if (constructionTypesAssignable(
+    { ...target, nullable: false },
+    { ...entry, nullable: false },
+    environment.globals,
+    environment
+  ))
+    return;
+  pushDiagnostic(
+    diagnostics,
+    uri,
+    range2,
+    "lookup-collection-type-mismatch",
+    `Lookup declares ${describeType(target)}, but collection ${collection.trim()} holds ${describeType(entry)}.`
+  );
+}
 function fieldsForAnnotation(name, context, environment) {
   if (name === "id") {
     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;
@@ -49490,7 +49542,7 @@ var init_project_source_type_checker = __esm({
       "Localization",
       "LocalizationStatus",
       "NeoPriorityGroup",
-      "PriorityOption",
+      "NeoPriorityOption",
       "NeoDialogueGroup",
       "ImageRegistry",
       "AudioClipRegistry",
@@ -49944,7 +49996,18 @@ function collectDeclarationSymbols(uri, document, declaration, symbols, diagnost
 }
 function collectGlobalChildSymbols(uri, document, declaration, symbols, diagnostics) {
   if (declaration.type.name === "Root") return;
+  const priorityGroup = declaration.type.name === "NeoPriorityGroup";
   for (const entry of collectGlobalChildEntries(document.syntax, declaration)) {
+    if (priorityGroup && entry.typeName !== "NeoPriorityOption") {
+      diagnostics.push({
+        uri,
+        range: entry.typeRange,
+        severity: "error",
+        source: "neo-project",
+        code: "unknown-project-type",
+        message: renamedDialogueTypeMessage(entry.typeName, "value") ?? `Priority group options are declared as \`NeoPriorityOption\`, not \`${entry.typeName}\`.`
+      });
+    }
     collectSymbol(
       uri,
       "graphChild",
@@ -50416,7 +50479,7 @@ var init_project_source_analysis = __esm({
       "Localization",
       "LocalizationStatus",
       "NeoPriorityGroup",
-      "PriorityOption",
+      "NeoPriorityOption",
       "NeoDialogueGroup",
       "ImageRegistry",
       "AudioClipRegistry",
@@ -51626,7 +51689,7 @@ var init_registry = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.73.0",
+      cliVersion: "0.73.2",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -66482,11 +66545,7 @@ function lowerClass(context, declaration) {
   const schema = {};
   const schemaKeyOrder = [];
   for (const memberDeclaration of declaration.members) {
-    const memberId = materializedId(
-      memberDeclaration,
-      "member",
-      `${declaration.name}.${memberDeclaration.name}`
-    );
+    const memberId = materializedMemberId(declaration, memberDeclaration);
     schema[memberDeclaration.name] = memberId;
     schemaKeyOrder.push(memberDeclaration.name);
     const placement = { classId: id2, schemaKey: memberDeclaration.name };
@@ -67541,11 +67600,7 @@ function lowerInterface(context, declaration) {
   const id2 = materializedId(declaration, "interface", declaration.name);
   const base = context.baseInterfaces.get(id2);
   const members = declaration.members.map((member) => {
-    const memberId = materializedId(
-      member,
-      "interface-member",
-      `${declaration.name}.${member.name}`
-    );
+    const memberId = materializedMemberId(declaration, member);
     const source = sourceIdentity(member, "interfaceMember", member.name);
     const accessModifier = effectiveSourceAccessModifier(
       member.modifiers,
@@ -68814,11 +68869,7 @@ function effectiveMemberIdByName(context, startClassId, name) {
         (member) => member.name === name
       );
       if (sourceMember !== void 0) {
-        return materializedId(
-          sourceMember,
-          "member",
-          `${sourceClass.name}.${sourceMember.name}`
-        );
+        return materializedMemberId(sourceClass, sourceMember);
       }
       const sourceBase = sourceClass.baseTypes.find(
         (entry) => context.classIdsByName.has(entry.name)
@@ -70188,7 +70239,7 @@ function emitPriorityGroup(data, recordId, name) {
     }
     assertMemberIdentifier2(option.name, "priority option");
     return `  @id(${quote2(option.id)})
-  PriorityOption ${option.name} = new();`;
+  NeoPriorityOption ${option.name} = new();`;
   });
   const annotations = [
     `@id(${quote2(recordId)})`,
@@ -71071,7 +71122,7 @@ var init_supplemental_records = __esm({
     init_project_file_source();
     init_source_format();
     init_ui_action_source();
-    PRIORITY_OPTION_PATTERN = /^(?:@id\(\s*"((?:[^"\\]|\\.)+)"\s*\)\s*)?PriorityOption\s+([A-Za-z_][A-Za-z0-9_]*)\s*=\s*new\s*\(\s*\)\s*;/;
+    PRIORITY_OPTION_PATTERN = /^(?:@id\(\s*"((?:[^"\\]|\\.)+)"\s*\)\s*)?[A-Za-z_][A-Za-z0-9_]*\s+([A-Za-z_][A-Za-z0-9_]*)\s*=\s*new\s*\(\s*\)\s*;/;
   }
 });
 
@@ -72496,10 +72547,10 @@ function lowerDialogueGroupSettings(context, member, base) {
       member.arguments,
       "priority"
     );
-    const priorityOptionId = priorityExpression === null ? null : referenceId3(priorityExpression, "PriorityOption");
+    const priorityOptionId = priorityExpression === null ? null : referenceId3(priorityExpression, "NeoPriorityOption");
     if (priorityExpression !== null && priorityOptionId === null) {
       throw dialogueSourceError(
-        'Trigger priority must be authored as Reference<PriorityOption>(id: "...").',
+        'Trigger priority must be authored as Reference<NeoPriorityOption>(id: "...").',
         prioritySource
       );
     }
@@ -73034,7 +73085,7 @@ function globalIds2(globals, kind) {
   return new Map(
     globals.map((global) => [
       global.name,
-      schemaIdentityId(global, kind, global.name)
+      materializedId(global, kind, global.name)
     ])
   );
 }
@@ -73047,9 +73098,6 @@ function sourceId2(source, kind, name) {
     name
   );
 }
-function schemaIdentityId(source, kind, name) {
-  return source.id ?? `__pending__:${kind}:${encodeURIComponent(source.source.uri)}:${source.source.range.start.line}:${source.source.range.start.character}:${encodeURIComponent(name)}`;
-}
 function pendingId(kind, uri, owner, ordinal, name) {
   return `__pending__:${kind}:${encodeURIComponent(uri)}:${encodeURIComponent(owner)}:${ordinal}:${encodeURIComponent(name)}`;
 }
@@ -73092,6 +73140,7 @@ var SourceSchemaIndex;
 var init_dialogue_lower = __esm({
   "src/project-source/dialogue-lower.ts"() {
     "use strict";
+    init_lower_support();
     init_dialogue_source_names();
     init_dialogue_group_paths();
     init_local_values();
@@ -73125,7 +73174,7 @@ var init_dialogue_lower = __esm({
         );
         this.classesById = new Map(
           analysis.schema.classes.map((entry) => [
-            schemaIdentityId(entry, "class", entry.name),
+            materializedId(entry, "class", entry.name),
             entry
           ])
         );
@@ -73134,7 +73183,7 @@ var init_dialogue_lower = __esm({
         );
         this.interfacesById = new Map(
           analysis.schema.interfaces.map((entry) => [
-            schemaIdentityId(entry, "interface", entry.name),
+            materializedId(entry, "interface", entry.name),
             entry
           ])
         );
@@ -73142,20 +73191,18 @@ var init_dialogue_lower = __esm({
           analysis.schema.enums.map((entry) => [entry.name, entry])
         );
         this.memberNamesById = new Map(
-          [
-            ...analysis.schema.classes.flatMap((entry) => entry.members),
-            ...analysis.schema.interfaces.flatMap((entry) => entry.members)
-          ].map((member) => [
-            schemaIdentityId(member, "member", member.name),
-            member.name
-          ])
+          [...analysis.schema.classes, ...analysis.schema.interfaces].flatMap(
+            (owner) => owner.members.map(
+              (member) => [materializedMemberId(owner, member), member.name]
+            )
+          )
         );
         this.staticMemberExpressionsById = new Map(
           analysis.schema.classes.flatMap(
             (schemaClass2) => schemaClass2.members.flatMap(
               (member) => member.modifiers.includes("static") ? [
                 [
-                  schemaIdentityId(member, "member", member.name),
+                  materializedMemberId(schemaClass2, member),
                   `${schemaClass2.name}.${member.name}`
                 ]
               ] : []
@@ -73166,7 +73213,7 @@ var init_dialogue_lower = __esm({
           analysis.schema.enums.flatMap(
             (schemaEnum) => schemaEnum.options.map(
               (option) => [
-                schemaIdentityId(option, "enum-option", option.name),
+                materializedId(option, "enum-option", option.name),
                 option.name
               ]
             )
@@ -73230,13 +73277,13 @@ var init_dialogue_lower = __esm({
         };
       }
       classMember(schemaClass2, receiver, name, visited) {
-        const classId = schemaIdentityId(schemaClass2, "class", schemaClass2.name);
+        const classId = materializedId(schemaClass2, "class", schemaClass2.name);
         if (visited.has(classId)) return null;
         visited.add(classId);
         const generics = this.genericEnvironment(schemaClass2, receiver);
         const own = schemaClass2.members.find((member) => member.name === name);
         if (own !== void 0) {
-          return this.resolvedMember(own, generics, true);
+          return this.resolvedMember(schemaClass2, own, generics);
         }
         for (const base of schemaClass2.baseTypes) {
           const parent = this.classesByName.get(base.name);
@@ -73249,7 +73296,7 @@ var init_dialogue_lower = __esm({
         return null;
       }
       interfaceMember(schemaInterface, name, visited) {
-        const interfaceId = schemaIdentityId(
+        const interfaceId = materializedId(
           schemaInterface,
           "interface",
           schemaInterface.name
@@ -73257,7 +73304,8 @@ var init_dialogue_lower = __esm({
         if (visited.has(interfaceId)) return null;
         visited.add(interfaceId);
         const own = schemaInterface.members.find((member) => member.name === name);
-        if (own !== void 0) return this.resolvedMember(own, /* @__PURE__ */ new Map(), false);
+        if (own !== void 0)
+          return this.resolvedMember(schemaInterface, own, /* @__PURE__ */ new Map());
         for (const base of schemaInterface.baseTypes) {
           const parent = this.interfacesByName.get(base.name);
           if (parent === void 0) continue;
@@ -73266,13 +73314,13 @@ var init_dialogue_lower = __esm({
         }
         return null;
       }
-      resolvedMember(member, generics, classPropertyIsGetter) {
+      resolvedMember(owner, member, generics) {
         if (member.kind === "function") return null;
         const typeInfo = this.typeInfoForManifestType(member.type, generics);
         if (typeInfo === null) return null;
         return {
-          kind: classPropertyIsGetter && member.kind === "property" ? "getter" : "stored",
-          memberId: schemaIdentityId(member, "member", member.name),
+          kind: owner.kind === "class" && member.kind === "property" ? "getter" : "stored",
+          memberId: materializedMemberId(owner, member),
           schemaKey: member.name,
           typeInfo
         };
@@ -73280,7 +73328,7 @@ var init_dialogue_lower = __esm({
       genericEnvironment(schemaClass2, receiver) {
         const result = /* @__PURE__ */ new Map();
         for (const parameter4 of schemaClass2.genericParameters) {
-          const parameterId = schemaIdentityId(
+          const parameterId = materializedId(
             parameter4.identity,
             "generic-parameter",
             `${schemaClass2.name}.${parameter4.name}`
@@ -73333,12 +73381,12 @@ var init_dialogue_lower = __esm({
             type: type.name === "Dictionary" ? 5 /* Dictionary */ : 6 /* List */,
             required: required2,
             entryTypeInfo,
-            ...keyEnum === void 0 ? {} : { keyEnumId: schemaIdentityId(keyEnum, "enum", keyEnum.name) }
+            ...keyEnum === void 0 ? {} : { keyEnumId: materializedId(keyEnum, "enum", keyEnum.name) }
           };
         }
         const schemaClass2 = this.classesByName.get(type.name);
         if (schemaClass2 !== void 0) {
-          const classId = schemaIdentityId(schemaClass2, "class", schemaClass2.name);
+          const classId = materializedId(schemaClass2, "class", schemaClass2.name);
           const typeArguments = Object.fromEntries(
             schemaClass2.genericParameters.flatMap((parameter4, index) => {
               const argument2 = type.arguments[index];
@@ -73347,7 +73395,7 @@ var init_dialogue_lower = __esm({
               if (argumentType === null) return [];
               return [
                 [
-                  schemaIdentityId(
+                  materializedId(
                     parameter4.identity,
                     "generic-parameter",
                     `${schemaClass2.name}.${parameter4.name}`
@@ -73368,7 +73416,7 @@ var init_dialogue_lower = __esm({
         if (neoInterface !== void 0) {
           return {
             type: 22 /* Interface */,
-            interfaceId: schemaIdentityId(
+            interfaceId: materializedId(
               neoInterface,
               "interface",
               neoInterface.name
@@ -73380,7 +73428,7 @@ var init_dialogue_lower = __esm({
         if (neoEnum !== void 0) {
           return {
             type: 8 /* Enum */,
-            enumId: schemaIdentityId(neoEnum, "enum", neoEnum.name),
+            enumId: materializedId(neoEnum, "enum", neoEnum.name),
             required: required2
           };
         }
@@ -106545,6 +106593,67 @@ var init_project_commit_preparation_scoped_loader = __esm({
   }
 });
 
+// ../src/database/lookup-target-class-contract.ts
+function lookupTargetClassContractViolation(args) {
+  const actualClassId = typeof args.targetClassId === "string" ? args.targetClassId : null;
+  if (actualClassId === null) return null;
+  const classById = args.schemaIndex.classesById;
+  if (!classById.has(actualClassId)) return null;
+  const entryClassId = lookupEntryClassId(
+    args.member,
+    args.schemaIndex.membersById
+  );
+  if (entryClassId !== null && classById.has(entryClassId) && !args.schemaIndex.classIsOrExtends(actualClassId, entryClassId)) {
+    return `lookup member ${args.member.name} target ${args.targetValueId} is ${classDisplayName(actualClassId, classById)}, but collection ${collectionMemberName(args.member, args.schemaIndex)} holds ${classDisplayName(entryClassId, classById)}.`;
+  }
+  const declaredClassId = lookupDeclaredClassId(args.member, classById);
+  if (declaredClassId !== null && !args.schemaIndex.classIsOrExtends(actualClassId, declaredClassId)) {
+    const narrowedFrom = entryClassId === null || !classById.has(entryClassId) ? `the collection ${collectionMemberName(args.member, args.schemaIndex)}` : `the collection ${collectionMemberName(args.member, args.schemaIndex)} holds ${classDisplayName(entryClassId, classById)}`;
+    return `lookup member ${args.member.name} target ${args.targetValueId} is ${classDisplayName(actualClassId, classById)}, but the member declares ${classDisplayName(declaredClassId, classById)} \u2014 ${narrowedFrom} and this member narrows it. Point it at a ${classDisplayName(declaredClassId, classById)} row.`;
+  }
+  return null;
+}
+function lookupEntryClassId(member, memberById2) {
+  const collection = memberById2.get(member.collectionMemberId);
+  if (collection === void 0) return null;
+  if (!isMemberListBase(collection) && !isMemberDictionaryBase(collection)) {
+    return null;
+  }
+  const entry = memberById2.get(collection.entryMemberId);
+  if (entry === void 0) return null;
+  return isMemberClassBase(entry) ? entry.classId : null;
+}
+function lookupDeclaredClassId(member, classById) {
+  const declared = member.declaredTypeInfo;
+  if (declared === void 0) return null;
+  if (declared === null) return null;
+  if (declared.type !== 7 /* Class */) return null;
+  return classById.has(declared.classId) ? declared.classId : null;
+}
+function classDisplayName(classId, classById) {
+  return classById.get(classId)?.name ?? classId;
+}
+function collectionMemberName(member, schemaIndex) {
+  const collection = schemaIndex.membersById.get(member.collectionMemberId);
+  if (collection === void 0) return member.collectionMemberId;
+  const owner = schemaIndex.schemaPlacementsByMemberId.get(collection.id)?.[0]?.ownerClass;
+  return owner ? `${owner.name}.${collection.name}` : collection.name;
+}
+function lookupDeclaredClassContractViolation(member, schemaIndex) {
+  const declared = lookupDeclaredClassId(member, schemaIndex.classesById);
+  const entry = lookupEntryClassId(member, schemaIndex.membersById);
+  if (declared === null || entry === null || !schemaIndex.classesById.has(entry))
+    return null;
+  if (schemaIndex.classIsOrExtends(declared, entry)) return null;
+  return `Lookup member ${member.name} declares ${classDisplayName(declared, schemaIndex.classesById)}, but collection ${collectionMemberName(member, schemaIndex)} holds ${classDisplayName(entry, schemaIndex.classesById)}.`;
+}
+var init_lookup_target_class_contract = __esm({
+  "../src/database/lookup-target-class-contract.ts"() {
+    "use strict";
+    init_member_kinds();
+  }
+});
+
 // ../src/models/dialogue-context-resolver.ts
 function resolveDialoguePrimaryValueId(dialogue) {
   return dialogue.primaryLinkedValueId ?? null;
@@ -110112,76 +110221,6 @@ var init_project_document_value_overlay = __esm({
   }
 });
 
-// ../src/database/lookup-target-class-contract.ts
-function lookupTargetClassContractViolation(args) {
-  const actualClassId = typeof args.targetClassId === "string" ? args.targetClassId : null;
-  if (actualClassId === null) return null;
-  const classById = new Map(
-    args.classes.map((schemaClass2) => [schemaClass2.id, schemaClass2])
-  );
-  if (!classById.has(actualClassId)) return null;
-  const entryClassId = lookupEntryClassId(args.member, args.memberById);
-  const collectionName = collectionMemberName(
-    args.member,
-    args.memberById,
-    args.classes
-  );
-  if (entryClassId !== null && classById.has(entryClassId) && !classAssignableToClass(actualClassId, entryClassId, classById)) {
-    return `lookup member ${args.member.name} target ${args.targetValueId} is ${classDisplayName(actualClassId, classById)}, but collection ${collectionName} holds ${classDisplayName(entryClassId, classById)}.`;
-  }
-  const declaredClassId = lookupDeclaredClassId(args.member, classById);
-  if (declaredClassId !== null && !classAssignableToClass(actualClassId, declaredClassId, classById)) {
-    const narrowedFrom = entryClassId === null || !classById.has(entryClassId) ? `the collection ${collectionName}` : `the collection ${collectionName} holds ${classDisplayName(entryClassId, classById)}`;
-    return `lookup member ${args.member.name} target ${args.targetValueId} is ${classDisplayName(actualClassId, classById)}, but the member declares ${classDisplayName(declaredClassId, classById)} \u2014 ${narrowedFrom} and this member narrows it. Point it at a ${classDisplayName(declaredClassId, classById)} row.`;
-  }
-  return null;
-}
-function lookupEntryClassId(member, memberById2) {
-  const collection = memberById2.get(member.collectionMemberId);
-  if (collection === void 0) return null;
-  if (!isMemberListBase(collection) && !isMemberDictionaryBase(collection)) {
-    return null;
-  }
-  const entry = memberById2.get(collection.entryMemberId);
-  if (entry === void 0) return null;
-  return isMemberClassBase(entry) ? entry.classId : null;
-}
-function lookupDeclaredClassId(member, classById) {
-  const declared = member.declaredTypeInfo;
-  if (declared === void 0) return null;
-  if (declared === null) return null;
-  if (declared.type !== 7 /* Class */) return null;
-  return classById.has(declared.classId) ? declared.classId : null;
-}
-function classAssignableToClass(actualClassId, expectedClassId, classById) {
-  const visited = /* @__PURE__ */ new Set();
-  let current = actualClassId;
-  while (current !== void 0 && !visited.has(current)) {
-    if (current === expectedClassId) return true;
-    visited.add(current);
-    current = classById.get(current)?.extendsClassId;
-  }
-  return false;
-}
-function classDisplayName(classId, classById) {
-  return classById.get(classId)?.name ?? classId;
-}
-function collectionMemberName(member, memberById2, classes) {
-  const collection = memberById2.get(member.collectionMemberId);
-  if (collection === void 0) return member.collectionMemberId;
-  const owner = classes.find(
-    (schemaClass2) => Object.values(schemaClass2.schema).includes(member.collectionMemberId)
-  );
-  if (owner === void 0) return collection.name;
-  return `${owner.name}.${collection.name}`;
-}
-var init_lookup_target_class_contract = __esm({
-  "../src/database/lookup-target-class-contract.ts"() {
-    "use strict";
-    init_member_kinds();
-  }
-});
-
 // ../src/database/stored-value-graph-semantics.ts
 function inspectStoredValueNode(options) {
   try {
@@ -111009,8 +111048,7 @@ var init_project_version_static_value_writes = __esm({
               member: dependency.member,
               targetValueId: targetId,
               targetClassId: target.classId ?? null,
-              memberById: this.schemaIndex.membersById,
-              classes: this.schemaIndex.classes
+              schemaIndex: this.schemaIndex
             });
             if (violation !== null) throw new Error(`${path} ${violation}`);
           }
@@ -114335,7 +114373,10 @@ function hasAuthoredNeoScriptBody(member) {
 function assertConstructedGraphReferencesResolve(args) {
   const sites = collectTouchedInitializerSites(args);
   if (sites.length === 0) return;
-  const valueIds = new Set(args.document.values.map((value) => value.id));
+  const valueById = new Map(
+    args.document.values.map((value) => [value.id, value])
+  );
+  const schemaIndex = projectSchemaIndexFor(args.document);
   for (const site of sites) {
     if ((site.init.compiled?.parameters.length ?? 2) > 2) continue;
     if (site.sourceValueId === void 0 && [
@@ -114359,7 +114400,8 @@ function assertConstructedGraphReferencesResolve(args) {
       site,
       produced,
       createdValues,
-      documentValueIds: valueIds
+      documentValuesById: valueById,
+      schemaIndex
     });
   }
 }
@@ -114423,7 +114465,6 @@ function collectTouchedInitializerSites(args) {
   return sites;
 }
 function assertProducedGraphLookupsResolve(args) {
-  if (args.createdValues.length === 0) return;
   const rootMember = args.produced.classId === null ? args.site.member : { ...args.site.member, classId: args.produced.classId };
   const graphValues = args.createdValues;
   const rootRow = {
@@ -114449,20 +114490,28 @@ function assertProducedGraphLookupsResolve(args) {
     new Set(args.createdValues.map((value) => value.id)),
     [{ member: rootMember, valueId: rootRow.id }]
   );
-  const resolvableIds = /* @__PURE__ */ new Set([
-    ...args.documentValueIds,
-    ...args.createdValues.map((value) => value.id)
-  ]);
-  for (const row of args.createdValues) {
-    const member = ownerByValueId.get(row.id);
-    if (member === void 0 || member.kind !== 9 /* Lookup */) continue;
+  const createdById = new Map(graphValues.map((value) => [value.id, value]));
+  createdById.set(rootRow.id, rootRow);
+  for (const row of createdById.values()) {
+    const member = row === rootRow ? rootMember : ownerByValueId.get(row.id);
+    if (member === void 0 || !isMemberLookupBase(member)) continue;
     if (!Array.isArray(row.value)) continue;
     for (const targetId of row.value) {
       if (typeof targetId !== "string") continue;
-      if (resolvableIds.has(targetId)) continue;
-      throw new Error(
-        `${args.site.label} constructs "${member.name}" pointing at value "${targetId}", which the construction does not produce and this project version does not contain.`
-      );
+      const target = createdById.get(targetId) ?? args.documentValuesById.get(targetId) ?? initializerEvaluatorLookups(args.document).valueById(targetId);
+      if (target === void 0 || target === null) {
+        throw new Error(
+          `${args.site.label} constructs "${member.name}" pointing at value "${targetId}", which the construction does not produce and this project version does not contain.`
+        );
+      }
+      const violation = lookupTargetClassContractViolation({
+        member,
+        targetValueId: targetId,
+        targetClassId: target.classId,
+        schemaIndex: args.schemaIndex
+      });
+      if (violation !== null)
+        throw new Error(`${args.site.label} ${violation}`);
     }
   }
 }
@@ -115453,6 +115502,9 @@ var SERVER_COMPILATION_PROJECT_CACHE_LIMIT, serverCompilationProjectCache, READ_
 var init_project_version_schema_commit = __esm({
   "../src/database/project-version-schema-commit.ts"() {
     "use strict";
+    init_member_kinds();
+    init_project_schema_index();
+    init_lookup_target_class_contract();
     init_dialogue_logic_compile_pure();
     init_neoscript_compiler_revision();
     init_neoscript_source_catalog();
@@ -121188,6 +121240,19 @@ function assertProjectVersionWholeGraphWritesValid(args) {
   assertStagedUnorderedContainmentValid(args.document, projected, changes);
   assertWorldFootprintEntryTypes(projected, changes);
   assertStagedSchemaIdentifiersValid(projected, changes);
+  if (changes.some(
+    (change) => change.recordKind === "member" || change.recordKind === "class"
+  )) {
+    const schemaIndex = projectSchemaIndexFor(projected);
+    for (const member of projected.members) {
+      if (!isMemberLookupBase(member)) continue;
+      const violation = lookupDeclaredClassContractViolation(
+        member,
+        schemaIndex
+      );
+      if (violation !== null) throw new Error(violation);
+    }
+  }
   assertStagedActionListenersValid(projected, changes);
   assertStagedUserDelegateTargetsValid(projected, changes);
   assertAuthoredMemberChangeListenersValid(args.document, projected, changes);
@@ -122402,6 +122467,9 @@ var KNOWN_TRANSACTION_OPERATIONS, INTERFACE_VALIDATED_RECORD_KINDS, ACTION_LISTE
 var init_project_version_whole_graph_validation = __esm({
   "../src/database/project-version-whole-graph-validation.ts"() {
     "use strict";
+    init_member_kinds();
+    init_project_schema_index();
+    init_lookup_target_class_contract();
     init_project_root_members();
     init_neoscript_source_catalog();
     init_canonical_json();
@@ -129650,7 +129718,7 @@ function constructedClass(context, member, expression, currentClassId, path) {
   return target;
 }
 function assertConstructedClassAssignable(context, named, member, path) {
-  if (classAssignableToClass2(context, named.id, member.classId)) return;
+  if (classAssignableToClass(context, named.id, member.classId)) return;
   const declaredName = context.classes.get(member.classId)?.name ?? member.classId;
   throw new Error(
     `Class value ${path} constructs ${named.name}, which does not descend from the declared class ${declaredName}.`
@@ -130356,13 +130424,13 @@ function validateReferenceContract(context, member, target, ownerValueId) {
     const expectedTypeName = lookupEntryTypeName(context, member);
     const targetData = valueData(context, target.id);
     const actualClassId = targetData && typeof targetData.classId === "string" ? targetData.classId : null;
-    if (expectedClassId && actualClassId && !classAssignableToClass2(context, actualClassId, expectedClassId)) {
+    if (expectedClassId && actualClassId && !classAssignableToClass(context, actualClassId, expectedClassId)) {
       throw new Error(
         `Lookup member ${member.name} target ${target.id} is ${classDisplayName2(context, actualClassId)}, but collection ${collectionMemberName2(context, member)} holds ${classDisplayName2(context, expectedClassId)}.`
       );
     }
     const declaredClassId = lookupDeclaredClassId2(context, member);
-    if (declaredClassId && actualClassId && !classAssignableToClass2(context, actualClassId, declaredClassId)) {
+    if (declaredClassId && actualClassId && !classAssignableToClass(context, actualClassId, declaredClassId)) {
       const narrowedFrom = expectedClassId === null ? `the collection ${collectionMemberName2(context, member)}` : `the collection ${collectionMemberName2(context, member)} holds ${classDisplayName2(context, expectedClassId)}`;
       throw new Error(
         `Lookup member ${member.name} target ${target.id} is ${classDisplayName2(context, actualClassId)}, but the member declares ${classDisplayName2(context, declaredClassId)} \u2014 ${narrowedFrom} and this member narrows it. Point it at a ${classDisplayName2(context, declaredClassId)} row.`
@@ -130422,7 +130490,7 @@ function referenceTypeNameAssignable(context, actualName, expectedName) {
   const actualClass = context.classesByName.get(actualName);
   const expectedClass = context.classesByName.get(expectedName);
   if (actualClass && expectedClass) {
-    return classAssignableToClass2(context, actualClass.id, expectedClass.id);
+    return classAssignableToClass(context, actualClass.id, expectedClass.id);
   }
   const expectedInterfaceId = context.interfaceIdsByName.get(expectedName);
   return actualClass && expectedInterfaceId ? classImplementsInterface2(
@@ -130706,7 +130774,7 @@ function lookupEntryClassId2(context, member) {
   const entry = collection?.kind === "list" || collection?.kind === "dictionary" ? context.members.get(collection.entryMemberId) : null;
   return entry?.kind === "class" ? entry.classId : null;
 }
-function classAssignableToClass2(context, actualClassId, expectedClassId) {
+function classAssignableToClass(context, actualClassId, expectedClassId) {
   let current = actualClassId;
   const visited = /* @__PURE__ */ new Set();
   while (current && !visited.has(current)) {
@@ -135954,11 +136022,7 @@ function lowerProjectSchemaV4(base, analysis, options = {}) {
     analysis.schema.classes.flatMap(
       (ownerClass) => ownerClass.members.map(
         (member) => [
-          materializedId(
-            member,
-            "member",
-            `${ownerClass.name}.${member.name}`
-          ),
+          materializedMemberId(ownerClass, member),
           { ownerClass, member }
         ]
       )
@@ -137416,7 +137480,7 @@ function emitTrigger(context, node) {
       if (optionId) {
         args.push([
           "priority",
-          `Reference<PriorityOption>(id: ${quote5(optionId)})`
+          `Reference<NeoPriorityOption>(id: ${quote5(optionId)})`
         ]);
       }
     }
@@ -137661,6 +137725,7 @@ function emitProse(context, textId, rawVariables, nodeBindings, primaryAlias) {
   );
   const variables = isObjectRecord2(rawVariables) ? rawVariables : {};
   const pieces = [];
+  let pointerResolver;
   let cursor = 0;
   const pattern = /\{\{neo-var:([^}]+)\}\}/g;
   for (let match = pattern.exec(text); match !== null; match = pattern.exec(text)) {
@@ -137672,12 +137737,25 @@ function emitProse(context, textId, rawVariables, nodeBindings, primaryAlias) {
       cursor = pattern.lastIndex;
       continue;
     }
-    const sourcePath = authoredVariablePath(
-      variable2.sourcePath,
-      nodeBindings,
-      context.bindings,
-      context.memberNames
-    );
+    let sourcePath;
+    if (isObjectRecord2(variable2.pointer) && variable2.pointer.type !== "value" && variable2.sourcePath.includes(".@getter:") || variable2.sourcePath.startsWith(`ref:${PENDING_ID_PREFIX}`) || variable2.sourcePath.startsWith(`linked:${PENDING_ID_PREFIX}`)) {
+      pointerResolver ??= {
+        primaryAlias,
+        bindingNameByValueId: {
+          get: (valueId) => (nodeBindings.get(valueId) ?? context.bindings.get(valueId))?.name
+        },
+        memberNameById: context.memberNames,
+        staticMemberExpressionById: context.staticMemberExpressions,
+        enumOptionNameById: context.enumOptionNames
+      };
+      sourcePath = pointerSource2(variable2.pointer, pointerResolver);
+    } else {
+      sourcePath = authoredVariablePath(
+        variable2.sourcePath,
+        nodeBindings,
+        context.bindings
+      );
+    }
     if (sourcePath === null) {
       pieces.push(`{MissingVariable(${quote5(variableId)})}`);
       cursor = pattern.lastIndex;
@@ -137722,27 +137800,14 @@ function recoverableProse(context, textId, rawVariables, owner, nodeBindings, pr
     return { source: recoveryProse(reason), reason };
   }
 }
-function authoredVariablePath(sourcePath, nodeBindings, dialogueBindings, memberNames) {
+function authoredVariablePath(sourcePath, nodeBindings, dialogueBindings) {
   const persisted = PERSISTED_VARIABLE_PATH.exec(sourcePath);
   const lexicalPath = persisted ? (() => {
     const valueId = persisted[1];
     const binding = nodeBindings.get(valueId) ?? dialogueBindings.get(valueId);
     return binding ? `${binding.name}${persisted[2] ?? ""}` : null;
   })() : sourcePath;
-  if (lexicalPath === null) return null;
-  let missingMember = false;
-  const authored = lexicalPath.replace(
-    /\.@getter:([^.]+)/gu,
-    (_match, memberId) => {
-      const memberName = memberNames.get(memberId);
-      if (memberName === void 0) {
-        missingMember = true;
-        return "";
-      }
-      return `.${memberName}`;
-    }
-  );
-  return missingMember ? null : authored;
+  return lexicalPath;
 }
 function recoveryProse(reason) {
   return `"""
@@ -138108,6 +138173,8 @@ var PERSISTED_VARIABLE_PATH, DIALOGUE_SYSTEM_TYPE_NAMES, ValuePlacementIndex, Un
 var init_dialogue_sources = __esm({
   "src/project-source/dialogue-sources.ts"() {
     "use strict";
+    init_pending_id();
+    init_ui_action_source();
     init_generated_csharp_identifiers();
     init_dialogue_group_symbols();
     init_language_spec();
@@ -151992,7 +152059,7 @@ function dialogueGroupCompletions(analysis, document, position) {
     items.push({
       label: name,
       kind: "enumMember",
-      detail: "PriorityOption",
+      detail: "NeoPriorityOption",
       insertText: name,
       symbolId: option.id
     });
@@ -191424,7 +191491,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.73.0");
+    console.log("0.73.2");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {

package/dist/test-worker.mjs

@@ -1609,7 +1609,8 @@ var RENAMED_DIALOGUE_TYPES = /* @__PURE__ */ new Map([
     { base: "NeoDialogueReference", value: "NeoDialogueReference" }
   ],
   ["DialogueGroup", { base: "NeoDialogueGroup", value: "NeoDialogueGroup" }],
-  ["PriorityGroup", { base: "NeoPriorityGroup", value: "NeoPriorityGroup" }]
+  ["PriorityGroup", { base: "NeoPriorityGroup", value: "NeoPriorityGroup" }],
+  ["PriorityOption", { base: "NeoPriorityOption", value: "NeoPriorityOption" }]
 ]);
 function renamedDialogueTypeMessage(name, position) {
   const replacement = RENAMED_DIALOGUE_TYPES.get(name)?.[position];
@@ -55287,7 +55288,7 @@ var SPECIALIZED_RELATION_KINDS = /* @__PURE__ */ new Set([
 
 // ../packages/manifest/schema-contract/registry.mjs
 var PROJECT_SCHEMA_CONTRACT = Object.freeze({
-  cliVersion: "0.73.0",
+  cliVersion: "0.73.2",
   projectFileUploadBatchSize: 32,
   documentRecords: {
     member: {

package/package.json

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

package/skills/neocompose-cli/SKILL.md

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

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

@@ -118,7 +118,7 @@ wrappers.
 The marker near the top of `SKILL.md` must exactly match the package version:
 
 ```html
-<!-- reviewed-through-cli: 0.73.0 -->
+<!-- reviewed-through-cli: 0.73.2 -->
 ```
 
 The quoted version above is checked too, so this instruction cannot go stale

package/skills/neocompose-cli/references/declarations-and-construction.md

@@ -440,3 +440,9 @@ Populated unordered member defaults, such as `@settings(kind: .Unordered)` with
 `List<Entry> Entries = [new Entry()]`, are constructed by an initializer for
 each instance. A declaration has no container value row to own unordered entries.
 Nested unordered lists already have container rows and retain their stored values.
+
+A lookup's declared class must be assignable to the entry class of its
+`@settings(collection: Owner.Member)` collection. A subclass may narrow the
+selection. Constructor arguments and member initializers must select compatible
+targets too. An `NPC` lookup cannot select from `List<Quest>`, even when its
+initializer is typed `NPC`; status reports the conflicting collection annotation.

package/skills/neocompose-cli/references/values-identities-and-references.md

@@ -283,3 +283,7 @@ Pull/push compare server-verified SHA-256, not storage ETags. A divergent
 binary keeps local bytes and writes the verified remote side under
 `.neo/conflicts/files/<file-id>/`. A retained declaration with a missing binary
 is an error; remove the declaration to request deletion.
+
+New schema getters referenced by NeoFlow interpolation need no `@id`. Export and
+`neo dev` assign the same identity to the declaration and its references, including
+inherited getters. Repeated exports and the next push reuse the export identity ledger.