@neocompose/cli 0.32.2 → 0.32.4

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [0.32.4] - 2026-08-18
+
+### Fixed
+
+- Validate identifiers in their actual namespace so qualified member labels,
+  enum options, registry entries, and schema keys may reuse unrelated builtin
+  type or module names such as `Set`, `Dictionary`, `List`, and `Math`, while
+  preserving real keyword, binding, global namespace, and codegen conflicts.
+- Share those contextual rules across project compilation, schema validation,
+  rename analysis, CLI emission, generated file registries, and server-side
+  validation so `neo test`, `neo script check --all`, dry runs, and pushes agree.
+
+## [0.32.3] - 2026-08-18
+
+### Fixed
+
+- Accept exact-case builtin type tokens such as `Set` and `Dictionary` in
+  contextual project identifier slots, including member access and parameter
+  references, while continuing to reserve actual NeoScript keywords.
+
 ## [0.32.2] - 2026-08-18
 
 ### Fixed

package/dist/neo.mjs

@@ -2833,12 +2833,6 @@ function referenceAtPosition(snapshot, position) {
     snapshot.source.offsetAt(position)
   );
 }
-function isValidNeoIdentifier(name) {
-  return IDENTIFIER_PATTERN.test(name) && !RESERVED_NAMES.has(name);
-}
-function isValidRenameIdentifier(name) {
-  return isValidNeoIdentifier(name);
-}
 function contextualCompletionItems(snapshot, offset, word) {
   const items = [];
   const expectedType = expectedTypeAt(snapshot, word.start);
@@ -4609,20 +4603,11 @@ function isConstructorTypeReference(snapshot, reference2) {
     (call) => call.kind === "constructor" && call.nameRange.start.line === reference2.range.start.line && call.nameRange.start.character === reference2.range.start.character
   );
 }
-var IDENTIFIER_PATTERN, RESERVED_NAMES;
 var init_analyzer = __esm({
   "../packages/neoscript-language/src/analyzer.ts"() {
     "use strict";
     init_language_spec();
     init_project();
-    IDENTIFIER_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
-    RESERVED_NAMES = /* @__PURE__ */ new Set([
-      ...NEOSCRIPT_KEYWORDS,
-      ...NEOSCRIPT_PRIMITIVE_TYPES,
-      ...NEOSCRIPT_BUILTIN_NAMESPACES,
-      "Dictionary",
-      "Set"
-    ]);
   }
 });
 
@@ -5919,6 +5904,52 @@ var init_strict_compile_error = __esm({
   }
 });
 
+// ../packages/neoscript-language/src/project-source-identifiers.ts
+function isValidNeoProjectIdentifier(name) {
+  return PROJECT_IDENTIFIER_PATTERN.test(name) && !PROJECT_RESERVED_NAMES.has(name);
+}
+function isValidNeoProjectMemberIdentifier(name) {
+  return PROJECT_IDENTIFIER_PATTERN.test(name) && !PROJECT_MEMBER_RESERVED_NAMES.has(name);
+}
+function isValidNeoProjectBindingIdentifier(name) {
+  return PROJECT_IDENTIFIER_PATTERN.test(name) && !PROJECT_BINDING_RESERVED_NAMES.has(name);
+}
+function isValidNeoScriptBindingIdentifier(name) {
+  return PROJECT_IDENTIFIER_PATTERN.test(name) && !INLINE_BINDING_RESERVED_NAMES.has(name);
+}
+function isNeoProjectReservedName(name) {
+  return PROJECT_RESERVED_NAMES.has(name);
+}
+function isNeoProjectMemberReservedName(name) {
+  return PROJECT_MEMBER_RESERVED_NAMES.has(name);
+}
+var PROJECT_IDENTIFIER_PATTERN, PROJECT_RESERVED_NAMES, PROJECT_MEMBER_RESERVED_NAMES, PROJECT_BINDING_RESERVED_NAMES, INLINE_BINDING_RESERVED_NAMES;
+var init_project_source_identifiers = __esm({
+  "../packages/neoscript-language/src/project-source-identifiers.ts"() {
+    "use strict";
+    init_language_spec();
+    PROJECT_IDENTIFIER_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
+    PROJECT_RESERVED_NAMES = /* @__PURE__ */ new Set([
+      ...NEOSCRIPT_KEYWORDS,
+      ...NEOSCRIPT_BUILTIN_NAMESPACES
+    ]);
+    PROJECT_MEMBER_RESERVED_NAMES = new Set(NEOSCRIPT_KEYWORDS);
+    PROJECT_BINDING_RESERVED_NAMES = /* @__PURE__ */ new Set([
+      ...PROJECT_RESERVED_NAMES,
+      "this",
+      "root",
+      "context"
+    ]);
+    INLINE_BINDING_RESERVED_NAMES = /* @__PURE__ */ new Set([
+      ...PROJECT_BINDING_RESERVED_NAMES,
+      ...NEOSCRIPT_PRIMITIVE_TYPES,
+      "Dictionary",
+      "List",
+      "Set"
+    ]);
+  }
+});
+
 // ../packages/neoscript-language/src/strict-lexer.ts
 function lex2(source) {
   const tokens = [];
@@ -6463,6 +6494,7 @@ var init_strict_parser = __esm({
     "use strict";
     init_strict_compile_error();
     init_language_spec();
+    init_project_source_identifiers();
     init_strict_lexer();
     Parser = class _Parser {
       constructor(tokens) {
@@ -6501,7 +6533,7 @@ var init_strict_parser = __esm({
       }
       expectMemberName() {
         const token = this.peek();
-        if (token.kind === "ident" || token.kind === "keyword" && token.text === "native") {
+        if (token.kind === "ident" || token.kind === "keyword" && (token.text === "native" || isValidNeoProjectMemberIdentifier(token.text))) {
           return this.next();
         }
         throw new CompileError(
@@ -7273,7 +7305,7 @@ var init_strict_parser = __esm({
         }
         while (true) {
           let name = null;
-          if ((this.peek().kind === "ident" || this.peek().kind === "keyword" && this.peek().text === "default") && this.peek(1).kind === "punct" && this.peek(1).text === ":") {
+          if ((this.peek().kind === "ident" || this.peek().kind === "keyword" && (this.peek().text === "default" || isValidNeoProjectIdentifier(this.peek().text))) && this.peek(1).kind === "punct" && this.peek(1).text === ":") {
             name = this.next().text;
             this.next();
           }
@@ -7320,7 +7352,7 @@ var init_strict_parser = __esm({
         }
         if (t.kind === "punct" && t.text === ".") {
           this.next();
-          const option = this.expect("ident");
+          const option = this.expectMemberName();
           return { kind: "contextualEnum", name: option.text, pos: t.pos };
         }
         if (t.kind === "ident" && t.text === NEOSCRIPT_CONSTRUCTOR_KEYWORD) {
@@ -7424,7 +7456,7 @@ var init_strict_parser = __esm({
           this.expect("punct", ")");
           return inner;
         }
-        if (t.kind === "ident") {
+        if (t.kind === "ident" || t.kind === "keyword" && isValidNeoProjectIdentifier(t.text)) {
           this.next();
           return { kind: "ident", name: t.text, pos: t.pos };
         }
@@ -7440,7 +7472,7 @@ var init_strict_parser = __esm({
         this.expect("punct", "{");
         const entries = [];
         while (!(this.peek().kind === "punct" && this.peek().text === "}")) {
-          const name = this.expect("ident");
+          const name = this.expectMemberName();
           this.expect("op", "=");
           entries.push({ name: name.text, value: this.parseExpr(), pos: name.pos });
           if (!this.eat("punct", ",")) break;
@@ -17940,12 +17972,15 @@ function projectTokenAt(document, position) {
   const containing = tokens.find(
     (token) => token.start <= offset && offset < token.end
   );
-  if (containing?.kind === "identifier") return containing;
+  if (isProjectNameToken(containing)) return containing;
   const touching = tokens.find(
-    (token) => token.kind === "identifier" && token.end === offset
+    (token) => isProjectNameToken(token) && token.end === offset
   );
   return touching ?? containing;
 }
+function isProjectNameToken(token) {
+  return token !== void 0 && (token.kind === "identifier" || token.kind === "type" || token.kind === "keyword");
+}
 function projectTokens(document) {
   const cached = PROJECT_TOKEN_CACHE.get(document);
   if (cached) return cached;
@@ -18108,7 +18143,7 @@ function collectGlobalChildEntries(sourceText, declaration) {
       continue;
     }
     const name = tokens[index + 1];
-    if ((token.kind === "type" || token.kind === "identifier") && name?.kind === "identifier" && tokens[index + 2]?.text === "=" && tokens[index + 3]?.text !== "=" && // A pending annotation or statement boundary precedes a 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 !== ":") {
       entries.push({
@@ -18163,6 +18198,7 @@ var init_project_source_registry = __esm({
   "../packages/neoscript-language/src/project-source-registry.ts"() {
     "use strict";
     init_lexer();
+    init_project_source_identifiers();
     init_project_source_tokens();
   }
 });
@@ -23848,7 +23884,7 @@ function memberKeyArgument(annotation2) {
   if (argument2 === void 0) return null;
   const text = argument2.text.trim();
   return {
-    key: IDENTIFIER_PATTERN2.test(text) ? text : null,
+    key: IDENTIFIER_PATTERN.test(text) ? text : null,
     range: argument2.range
   };
 }
@@ -24037,7 +24073,7 @@ function classDerivesFromName(name, ancestorName, environment, seen = /* @__PURE
     return classDerivesFromName(base.name, ancestorName, environment, seen);
   });
 }
-var NEO_VARIANT_FOLDER_SETTING, primitiveType, IDENTIFIER_PATTERN2, LIST_COLUMN_INHERITANCE_KEY;
+var NEO_VARIANT_FOLDER_SETTING, primitiveType, IDENTIFIER_PATTERN, LIST_COLUMN_INHERITANCE_KEY;
 var init_project_source_semantics = __esm({
   "../packages/neoscript-language/src/project-source-semantics.ts"() {
     "use strict";
@@ -24052,7 +24088,7 @@ var init_project_source_semantics = __esm({
     init_project_root();
     NEO_VARIANT_FOLDER_SETTING = "folder";
     primitiveType = (name) => ({ name });
-    IDENTIFIER_PATTERN2 = /^[A-Za-z_][A-Za-z0-9_]*$/;
+    IDENTIFIER_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
     LIST_COLUMN_INHERITANCE_KEY = "__other__";
   }
 });
@@ -25218,7 +25254,7 @@ function validatePersistedName(uri, name, range2, diagnostics, reservedAlreadyCh
     );
     return;
   }
-  if (!RESERVED_NAMES2.has(name) || reservedAlreadyChecked) return;
+  if (!isNeoProjectReservedName(name) || reservedAlreadyChecked) return;
   diagnose(
     diagnostics,
     uri,
@@ -26489,12 +26525,13 @@ function diagnose(diagnostics, uri, range2, code, message, relatedInformation) {
     ...relatedInformation?.length ? { relatedInformation } : {}
   });
 }
-var BUILTIN_ARITY, BUILTIN_TYPES, RESERVED_NAMES2;
+var BUILTIN_ARITY, BUILTIN_TYPES;
 var init_project_source_type_checker = __esm({
   "../packages/neoscript-language/src/project-source-type-checker.ts"() {
     "use strict";
     init_language_spec();
     init_project_source_ast();
+    init_project_source_identifiers();
     BUILTIN_ARITY = /* @__PURE__ */ new Map([
       ["List", 1],
       ["Set", 1],
@@ -26522,10 +26559,6 @@ var init_project_source_type_checker = __esm({
       "NeoAudioClip",
       "ProjectRelation"
     ]);
-    RESERVED_NAMES2 = /* @__PURE__ */ new Set([
-      ...NEOSCRIPT_KEYWORDS,
-      ...NEOSCRIPT_BUILTIN_NAMESPACES
-    ]);
   }
 });
 
@@ -27029,14 +27062,16 @@ function collectFlowSymbols(uri, content, ownerName, scopeRange, symbols, diagno
   }
 }
 function collectSymbol(uri, kind, name, range2, annotations, ownerName, symbols, diagnostics, scopeRange, detail, callable2, documentation, staticMember) {
-  if (RESERVED_NAMES3.has(name)) {
+  const memberLabel2 = kind === "member" || kind === "enumOption" || kind === "graphChild";
+  const reserved = memberLabel2 ? isNeoProjectMemberReservedName(name) : isNeoProjectReservedName(name);
+  if (reserved) {
     diagnostics.push({
       uri,
       range: range2,
       severity: "error",
       source: "neo-project",
       code: "reserved-project-name",
-      message: `'${name}' is a reserved Neo keyword and cannot be used as a persisted source name without the language's identifier escape syntax.`
+      message: `'${name}' is reserved in this Neo declaration context and cannot be used as a persisted source name without the language's identifier escape syntax.`
     });
   }
   const id2 = sourceId(uri, annotations, diagnostics);
@@ -27412,12 +27447,13 @@ function emptyRange2() {
     end: { line: 0, character: 0 }
   };
 }
-var BUILTIN_TYPE_NAMES, RESERVED_NAMES3, SYSTEM_RECORD_ID_PREFIX, RFC_4122_UUID, QUARANTINED_LEGACY_SYSTEM_ID_PREFIXES, QUARANTINED_LEGACY_SYSTEM_RECORD_IDS;
+var BUILTIN_TYPE_NAMES, SYSTEM_RECORD_ID_PREFIX, RFC_4122_UUID, QUARANTINED_LEGACY_SYSTEM_ID_PREFIXES, QUARANTINED_LEGACY_SYSTEM_RECORD_IDS;
 var init_project_source_analysis = __esm({
   "../packages/neoscript-language/src/project-source-analysis.ts"() {
     "use strict";
     init_language_spec();
     init_pending_id();
+    init_project_source_identifiers();
     init_project_source_parser();
     init_project_source_registry();
     init_project_source_semantics();
@@ -27446,10 +27482,6 @@ var init_project_source_analysis = __esm({
       "NeoAudioClip",
       "ProjectRelation"
     ]);
-    RESERVED_NAMES3 = /* @__PURE__ */ new Set([
-      ...NEOSCRIPT_KEYWORDS,
-      ...NEOSCRIPT_BUILTIN_NAMESPACES
-    ]);
     SYSTEM_RECORD_ID_PREFIX = "system_";
     RFC_4122_UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/u;
     QUARANTINED_LEGACY_SYSTEM_ID_PREFIXES = [
@@ -28508,7 +28540,7 @@ function projectVariantScopeCompletion(analysis, document, position) {
 }
 function projectVariantPathSymbolAt(analysis, document, position) {
   const token = projectTokenAt(document, position);
-  if (!token || token.kind !== "identifier") return null;
+  if (!isProjectNameToken(token)) return null;
   const tokens = projectTokens(document);
   const tokenIndex = tokens.findIndex(
     (candidate) => candidate.start === token.start && candidate.end === token.end
@@ -28519,7 +28551,7 @@ function projectVariantPathSymbolAt(analysis, document, position) {
   for (; ; ) {
     const dot = tokens[cursor];
     const owner = tokens[cursor - 1];
-    if (dot?.text !== "." || owner?.kind !== "identifier") break;
+    if (dot?.text !== "." || !isProjectNameToken(owner)) break;
     segments.unshift(owner.text);
     cursor -= 2;
   }
@@ -29172,10 +29204,12 @@ function projectSemanticTokens(document, analysis) {
       return [];
     }
     const declaration = symbolsDeclaredAt(index, document.uri, token.range)[0];
-    const resolved = token.kind === "identifier" ? indexedProjectSymbolAt(analysis, document, token.range.start, index)?.symbol : void 0;
+    const resolved = isProjectNameToken(token) ? indexedProjectSymbolAt(analysis, document, token.range.start, index)?.symbol : void 0;
     let type;
     if (declaration) {
       type = projectSemanticTokenType(declaration);
+    } else if (resolved) {
+      type = projectSemanticTokenType(resolved);
     } else if (token.kind === "keyword") type = "keyword";
     else if (token.kind === "type") type = "type";
     else if (token.kind === "string") type = "string";
@@ -29227,7 +29261,14 @@ function projectSymbolAt(analysis, document, position) {
 }
 function indexedProjectSymbolAt(analysis, document, position, index) {
   const token = projectTokenAt(document, position);
-  if (!token || token.kind !== "identifier") return null;
+  if (!isProjectNameToken(token)) return null;
+  const body = projectBodySnapshotAt(analysis, document, position);
+  if (body) {
+    const reference2 = referenceAtPosition(body, position);
+    const symbolId = reference2 ? resolveReferenceSymbolId(body, reference2) : null;
+    const symbol = symbolId ? analysis.symbols.find((candidate) => candidate.id === symbolId) : void 0;
+    if (symbol) return { token, symbol };
+  }
   const exact = symbolsDeclaredAt(index, document.uri, token.range);
   if (exact.length === 1) return { token, symbol: exact[0] };
   const candidates = index.byName.get(token.text) ?? [];
@@ -29284,7 +29325,7 @@ function indexedProjectSymbolAt(analysis, document, position, index) {
       dotOwner.range.start,
       index
     );
-    const ownerNames = resolvedOwner ? projectReceiverOwnerNames(analysis, resolvedOwner.symbol) : [dotOwner.text];
+    const ownerNames = dotOwner.text === "this" && owner ? projectTypeAndBaseOwnerNames(analysis, owner) : resolvedOwner ? projectReceiverOwnerNames(analysis, resolvedOwner.symbol) : [dotOwner.text];
     const qualified = visibleCandidates.filter(
       (symbol) => symbol.ownerName !== void 0 && ownerNames.includes(symbol.ownerName) && (resolvedOwner === null || projectQualifiedSymbolMatchesReceiver(symbol, resolvedOwner.symbol))
     );
@@ -29319,27 +29360,33 @@ function projectQualifiedSymbolMatchesReceiver(symbol, receiver) {
 }
 function projectReceiverOwnerNames(analysis, receiver) {
   const result = [];
-  const visitedTypes = /* @__PURE__ */ new Set();
-  const appendTypeAndBases = (typeName2) => {
-    if (visitedTypes.has(typeName2)) return;
-    visitedTypes.add(typeName2);
-    if (!result.includes(typeName2)) result.push(typeName2);
-    const declaration = findTypeDeclaration(analysis, typeName2);
+  if (receiver.kind === "global") {
+    result.push(receiver.name);
+  }
+  const typeName = projectSymbolTypeName(receiver);
+  if (typeName)
+    result.push(...projectTypeAndBaseOwnerNames(analysis, typeName));
+  return result;
+}
+function projectTypeAndBaseOwnerNames(analysis, typeName) {
+  const result = [];
+  const visited = /* @__PURE__ */ new Set();
+  const append = (candidateName) => {
+    if (visited.has(candidateName)) return;
+    visited.add(candidateName);
+    result.push(candidateName);
+    const declaration = findTypeDeclaration(analysis, candidateName);
     if (declaration?.kind !== "class" && declaration?.kind !== "interface") {
       return;
     }
     for (const base of declaration.baseTypes) {
       const resolved = findTypeDeclaration(analysis, base.name);
       if (resolved?.kind === "class" || resolved?.kind === "interface") {
-        appendTypeAndBases(base.name);
+        append(base.name);
       }
     }
   };
-  if (receiver.kind === "global") {
-    result.push(receiver.name);
-  }
-  const typeName = projectSymbolTypeName(receiver);
-  if (typeName) appendTypeAndBases(typeName);
+  append(typeName);
   return result;
 }
 function contextualProjectEnumOptionSymbol(analysis, document, token, candidates, source) {
@@ -33084,6 +33131,8 @@ var init_service = __esm({
     init_analyzer();
     init_compiler();
     init_formatter();
+    init_generated_csharp_identifiers();
+    init_project_source_identifiers();
     init_project_source_analysis();
     init_project_source_construction_quick_fixes();
     init_project_source_language_features();
@@ -33305,9 +33354,25 @@ var init_service = __esm({
         return { range: reference2.range, placeholder: reference2.name };
       }
       rename(uri, position, newName) {
-        if (!isValidRenameIdentifier(newName)) {
+        const state = this.requireState(uri);
+        let validName;
+        if (isProjectDocument(state.document, state.context)) {
+          const resolved = projectSymbolAt(
+            this.projectAnalysis(),
+            state.document,
+            position
+          );
+          if (!resolved) return null;
+          const memberLabel2 = resolved.symbol.kind === "member" || resolved.symbol.kind === "enumOption" || resolved.symbol.kind === "graphChild";
+          const binding = resolved.symbol.kind === "parameter" || resolved.symbol.kind === "genericParameter" || resolved.symbol.kind === "flowBinding";
+          const validNeoName = memberLabel2 ? isValidNeoProjectMemberIdentifier(newName) : binding ? isValidNeoProjectBindingIdentifier(newName) : isValidNeoProjectIdentifier(newName);
+          validName = validNeoName && isGeneratedCSharpIdentifier(newName) && !isGeneratedCSharpReservedKeyword(newName);
+        } else {
+          validName = isValidNeoScriptBindingIdentifier(newName);
+        }
+        if (!validName) {
           throw new Error(
-            `Cannot rename a NeoScript symbol to "${newName}": use a non-keyword identifier containing letters, digits, or underscores.`
+            `Cannot rename a NeoScript symbol to "${newName}": use an identifier valid in this declaration context and generated C#.`
           );
         }
         const prepared = this.prepareRename(uri, position);
@@ -33407,7 +33472,7 @@ var init_service = __esm({
       }
       projectReferences(document, position, includeDeclaration) {
         const token = projectTokenAt(document, position);
-        if (!token || token.kind !== "identifier") return [];
+        if (!isProjectNameToken(token)) return [];
         const analysis = this.projectAnalysis();
         const resolved = projectSymbolAt(analysis, document, position);
         if (!resolved) return [];
@@ -33416,7 +33481,7 @@ var init_service = __esm({
         for (const state of this.documents.values()) {
           if (!isProjectDocument(state.document, state.context)) continue;
           for (const candidate of projectTokens(state.document)) {
-            if (candidate.kind !== "identifier" || candidate.text !== token.text) {
+            if (!isProjectNameToken(candidate) || candidate.text !== token.text) {
               continue;
             }
             const candidateSymbol = projectSymbolAt(
@@ -33719,6 +33784,7 @@ var init_src = __esm({
     init_project();
     init_project_source_ast();
     init_project_source_ignore();
+    init_project_source_identifiers();
     init_project_source_analysis();
     init_project_source_accessors();
     init_project_source_construction_diagnostics();
@@ -41168,6 +41234,46 @@ var init_docs_text2 = __esm({
   }
 });
 
+// ../src/models/project-source-identifiers.ts
+function isValidGeneratedIdentifier(value) {
+  return typeof value === "string" && isGeneratedCSharpIdentifier(value) && !isGeneratedCSharpReservedKeyword(value);
+}
+function isValidProjectSourceIdentifier(value) {
+  return isValidGeneratedIdentifier(value) && isValidNeoProjectIdentifier(value);
+}
+function isValidProjectMemberIdentifier(value) {
+  return isValidGeneratedIdentifier(value) && isValidNeoProjectMemberIdentifier(value);
+}
+function isValidProjectBindingIdentifier(value) {
+  return isValidGeneratedIdentifier(value) && isValidNeoProjectBindingIdentifier(value);
+}
+var init_project_source_identifiers2 = __esm({
+  "../src/models/project-source-identifiers.ts"() {
+    "use strict";
+    init_src();
+  }
+});
+
+// ../src/models/schema-identifiers.ts
+function isValidSchemaAuthoredIdentifier(value) {
+  return isValidProjectSourceIdentifier(value);
+}
+function isValidSchemaMemberIdentifier(value) {
+  return isValidProjectMemberIdentifier(value);
+}
+function isValidSchemaBindingIdentifier(value) {
+  return isValidProjectBindingIdentifier(value);
+}
+function isValidSchemaNSFunctionBindingIdentifier(value) {
+  return isValidSchemaBindingIdentifier(value) && value !== "value";
+}
+var init_schema_identifiers = __esm({
+  "../src/models/schema-identifiers.ts"() {
+    "use strict";
+    init_project_source_identifiers2();
+  }
+});
+
 // ../src/models/neoscript/neoscript-types.ts
 var NS_TYPE_UNKNOWN, NS_TYPE_VOID, NSAssignmentOperator, NSWritability, NSCollectionMutation;
 var init_neoscript_types = __esm({
@@ -42739,12 +42845,20 @@ function isMemberAccessModifierKind(value) {
   if (value === "protected") return true;
   return value === "private";
 }
-function isValidCallableIdentifier(value) {
-  if (typeof value !== "string") return false;
-  if (!FunctionMemberNamePattern.test(value)) return false;
+function isValidCallableMemberIdentifier(value) {
+  if (!isValidSchemaMemberIdentifier(value)) return false;
+  if (value.startsWith("__")) return false;
+  return true;
+}
+function isValidCallableArgumentIdentifier(value) {
+  if (!isValidSchemaBindingIdentifier(value)) return false;
   if (value.startsWith("__")) return false;
   return !FunctionArgumentReservedNames.has(value);
 }
+function isValidNSFunctionArgumentIdentifier(value) {
+  if (!isValidSchemaNSFunctionBindingIdentifier(value)) return false;
+  return !value.startsWith("__");
+}
 function isMemberListColumnSettings(value) {
   if (!value) return false;
   if (typeof value !== "object") return false;
@@ -43108,7 +43222,7 @@ function isMemberAudioBase(value) {
 function isMemberFunctionBase(value) {
   const v = asMemberBaseForKind(value, 13 /* Function */);
   if (v === null) return false;
-  if (!isValidCallableIdentifier(v.name)) return false;
+  if (!isValidCallableMemberIdentifier(v.name)) return false;
   if (!isNSFunctionReturnTypeInfo(v.returnTypeInfo)) return false;
   if (!Array.isArray(v.argumentTypes)) return false;
   if (typeof v.deferred !== "boolean") return false;
@@ -43116,7 +43230,7 @@ function isMemberFunctionBase(value) {
   const argumentTypes = [];
   for (const arg of v.argumentTypes) {
     if (!isNSFunctionArgumentTypeInfo(arg)) return false;
-    if (!isValidCallableIdentifier(arg.name)) return false;
+    if (!isValidCallableArgumentIdentifier(arg.name)) return false;
     if (arg.type === NS_TYPE_UNKNOWN) return false;
     if (names.has(arg.name)) return false;
     names.add(arg.name);
@@ -43162,7 +43276,7 @@ function isNSFunctionUIBody(value) {
 function isMemberNSFunctionBase(value) {
   const v = asMemberBaseForKind(value, 23 /* NSFunction */);
   if (v === null) return false;
-  if (!isValidCallableIdentifier(v.name)) return false;
+  if (!isValidCallableMemberIdentifier(v.name)) return false;
   if (v.required !== false) return false;
   if (v.defaultValue !== void 0 && v.defaultValue !== null) return false;
   if (v.storage !== void 0 && v.storage !== null) return false;
@@ -43178,8 +43292,7 @@ function isMemberNSFunctionBase(value) {
   for (const argument2 of v.argumentTypes) {
     if (!isNSFunctionArgumentTypeInfo(argument2)) return false;
     if (argument2.type === NS_TYPE_UNKNOWN) return false;
-    if (!isValidCallableIdentifier(argument2.name)) return false;
-    if (NSFunctionArgumentReservedNames.has(argument2.name)) return false;
+    if (!isValidNSFunctionArgumentIdentifier(argument2.name)) return false;
     if (names.has(argument2.name)) return false;
     names.add(argument2.name);
     argumentTypes.push(argument2);
@@ -43257,7 +43370,7 @@ function isMemberDelegateBase(value) {
   const names = /* @__PURE__ */ new Set();
   for (const argument2 of v.argumentTypes) {
     if (!isNSFunctionArgumentTypeInfo(argument2)) return false;
-    if (!isValidCallableIdentifier(argument2.name)) return false;
+    if (!isValidCallableArgumentIdentifier(argument2.name)) return false;
     if (argument2.type === NS_TYPE_UNKNOWN) return false;
     if (names.has(argument2.name)) return false;
     names.add(argument2.name);
@@ -43296,7 +43409,7 @@ function isMemberActionBase(value) {
   const names = /* @__PURE__ */ new Set();
   for (const argument2 of v.argumentTypes) {
     if (!isNSFunctionArgumentTypeInfo(argument2)) return false;
-    if (!isValidCallableIdentifier(argument2.name)) return false;
+    if (!isValidCallableArgumentIdentifier(argument2.name)) return false;
     if (argument2.type === NS_TYPE_UNKNOWN) return false;
     if (names.has(argument2.name)) return false;
     names.add(argument2.name);
@@ -43600,7 +43713,7 @@ function isMemberOverrideProps(value) {
   if (v.setter !== void 0 && !isNSVoidBody(v.setter)) return false;
   const isCallableOverride = v.kind === 13 /* Function */ || v.kind === 23 /* NSFunction */;
   if (isCallableOverride) {
-    if (!isValidCallableIdentifier(v.name)) return false;
+    if (!isValidCallableMemberIdentifier(v.name)) return false;
     if (v.returnTypeInfo !== void 0) return false;
     if (v.argumentTypes !== void 0) return false;
     if (v.deferred !== void 0) return false;
@@ -43677,37 +43790,23 @@ function isAnyMember(value) {
 function isAnyMemberAuthoredOrCompiled(value) {
   return isAnyMember(value) || isUncompiledMemberNSFunctionOverride(value);
 }
-var FunctionMemberNamePattern, FunctionArgumentReservedNames, NSFunctionArgumentReservedNames, DECIMAL_STRING_PATTERN, DECIMAL_MAX_SIGNIFICANT_DIGITS, DECIMAL_MAX_SCALE;
+var FunctionArgumentReservedNames, NSFunctionArgumentReservedNames, DECIMAL_STRING_PATTERN, DECIMAL_MAX_SIGNIFICANT_DIGITS, DECIMAL_MAX_SCALE;
 var init_member_kinds = __esm({
   "../src/models/members/member-kinds.ts"() {
     "use strict";
     init_core();
     init_docs_text2();
+    init_schema_identifiers();
     init_neoscript();
     init_classes();
     init_member_kind_enum();
     init_member_storage();
     init_structured_leaf_fields();
     init_member_kind_enum();
-    FunctionMemberNamePattern = /^[A-Za-z_][A-Za-z0-9_]*$/;
     FunctionArgumentReservedNames = /* @__PURE__ */ new Set([
       "this",
       "root",
-      "context",
-      "true",
-      "false",
-      "null",
-      "void",
-      "if",
-      "else",
-      "return",
-      "throw",
-      "var",
-      "int",
-      "float",
-      "decimal",
-      "string",
-      "bool"
+      "context"
     ]);
     NSFunctionArgumentReservedNames = /* @__PURE__ */ new Set([
       ...FunctionArgumentReservedNames,
@@ -47803,28 +47902,6 @@ var init_files = __esm({
   }
 });
 
-// ../src/models/project-source-identifiers.ts
-function isValidProjectSourceIdentifier(value) {
-  return typeof value === "string" && isValidNeoIdentifier(value) && isGeneratedCSharpIdentifier(value) && !isGeneratedCSharpReservedKeyword(value);
-}
-var init_project_source_identifiers = __esm({
-  "../src/models/project-source-identifiers.ts"() {
-    "use strict";
-    init_src();
-  }
-});
-
-// ../src/models/schema-identifiers.ts
-function isValidSchemaAuthoredIdentifier(value) {
-  return isValidProjectSourceIdentifier(value);
-}
-var init_schema_identifiers = __esm({
-  "../src/models/schema-identifiers.ts"() {
-    "use strict";
-    init_project_source_identifiers();
-  }
-});
-
 // ../src/models/enum/enum-types.ts
 function isValidEnumOptionId(id2) {
   if (typeof id2 !== "string" || id2.length === 0) return false;
@@ -47836,7 +47913,7 @@ function isProspectiveEnumOptionId(id2) {
   return isValidEnumOptionId(id2);
 }
 function isValidEnumOptionName(name) {
-  return isValidSchemaAuthoredIdentifier(name);
+  return isValidSchemaMemberIdentifier(name);
 }
 function isEnumOptionWithIds(value, isOptionId) {
   const v = value;
@@ -50778,14 +50855,14 @@ function listAnnotations(member) {
   if (member.kind !== "list") return [];
   return [
     ...member.indexes.map((entry) => {
-      assertIdentifier(entry.schemaKey, "list index member");
+      assertMemberIdentifier(entry.schemaKey, "list index member");
       return `@index(${[
         `member: ${entry.schemaKey}`,
         ...entry.unique ? ["unique: true"] : []
       ].join(", ")})`;
     }),
     ...member.columns.map((entry) => {
-      assertIdentifier(entry.memberKey, "list column member");
+      assertMemberIdentifier(entry.memberKey, "list column member");
       return `@column(${[
         `member: ${entry.memberKey}`,
         ...entry.width === null ? [] : [`width: ${entry.width}`],
@@ -51220,7 +51297,7 @@ function renderNestedValue(context, member, value) {
   return renderDefaultValue(context, member, { value, classId: null });
 }
 function emitTextureTemplate(value) {
-  assertIdentifier(value.name, "texture template");
+  assertProjectIdentifier(value.name, "texture template");
   const platformSettings = `new(
 ${namedArguments(
     [
@@ -51413,7 +51490,7 @@ function emitVector4(value) {
   return `new(x: ${value.x}, y: ${value.y}, z: ${value.z}, w: ${value.w})`;
 }
 function emitAudioTemplate(value) {
-  assertIdentifier(value.name, "audio template");
+  assertProjectIdentifier(value.name, "audio template");
   const enumArguments = /* @__PURE__ */ new Set([
     "loadType",
     "compressionFormat",
@@ -51618,7 +51695,7 @@ function emitVariantFiles(context, variantInitializers) {
 function emitVariantFolder(context, className, folder) {
   for (const segment of folder.path.split("/")) {
     if (segment.length === 0) continue;
-    assertIdentifier(segment, "variant folder path segment");
+    assertProjectIdentifier(segment, "variant folder path segment");
   }
   if (folder.binding === null) {
     return `${id(folder.id)}NeoVariantFolder<${className}> ${variantFolderSymbol(folder)} = new(${quote(folder.path)});`;
@@ -51638,7 +51715,7 @@ function emitVariantFolder(context, className, folder) {
 );`;
 }
 function emitVariant(context, className, variant, folder, variantInitializers) {
-  assertIdentifier(variant.name, "variant");
+  assertProjectIdentifier(variant.name, "variant");
   const initializer = variantInitializers.get(variant.id);
   if (initializer === void 0) {
     throw new Error(
@@ -51693,13 +51770,20 @@ function assertUniqueEmittedPaths(files) {
     paths.set(key, file);
   }
 }
-function assertIdentifier(value, kind) {
-  if (!isValidNeoIdentifier(value)) {
+function assertProjectIdentifier(value, kind) {
+  if (!isValidNeoProjectIdentifier(value)) {
     throw new Error(
       `Persisted ${kind} name ${quote(value)} is not a valid Neo identifier; repair the server record before format-4 conversion.`
     );
   }
 }
+function assertMemberIdentifier(value, kind) {
+  if (!isValidNeoProjectMemberIdentifier(value)) {
+    throw new Error(
+      `Persisted ${kind} name ${quote(value)} is not a valid Neo member identifier; repair the server record before format-4 conversion.`
+    );
+  }
+}
 function required(map, key, kind) {
   const value = map.get(key);
   if (!value) throw new Error(`Unknown ${kind} ${quote(key)}.`);
@@ -51813,7 +51897,7 @@ function assignDeterministicProjectFileSymbols(files, reservedSymbols = []) {
     const candidate = `${item.base}${collidesByStem ? item.extension : ""}`;
     let symbol = candidate;
     let suffix = 2;
-    while (used.has(symbol.toLowerCase()) || !isValidNeoIdentifier(symbol))
+    while (used.has(symbol.toLowerCase()) || !isValidNeoProjectMemberIdentifier(symbol))
       symbol = `${candidate}_${suffix++}`;
     used.add(symbol.toLowerCase());
     result.set(item.stableId, symbol);
@@ -52434,7 +52518,7 @@ ${args.map(([name, value]) => `  ${name}: ${value},`).join("\n")}
 `;
 }
 function emitPriorityGroup(data, recordId, name) {
-  assertIdentifier2(name, "priority group");
+  assertProjectIdentifier2(name, "priority group");
   const options = Array.isArray(data.options) ? data.options : [];
   const body = options.map((option, index) => {
     if (!isObjectRecord2(option) || typeof option.id !== "string" || typeof option.name !== "string") {
@@ -52442,7 +52526,7 @@ function emitPriorityGroup(data, recordId, name) {
         `Priority group ${recordId} option ${index} is malformed.`
       );
     }
-    assertIdentifier2(option.name, "priority option");
+    assertMemberIdentifier2(option.name, "priority option");
     return `  @id(${quote2(option.id)})
   PriorityOption ${option.name} = new();`;
   });
@@ -52457,7 +52541,7 @@ ${body.join("\n\n")}
 `;
 }
 function emitDialogueGroup(data, recordId, name, priorityNames, dialogueNames, uiLogicResolver) {
-  assertIdentifier2(name, "dialogue group");
+  assertProjectIdentifier2(name, "dialogue group");
   const kind = data.type === 1 ? "Lookup" : data.type === 2 ? "Folder" : "Standard";
   const args = [["kind", `.${kind}`]];
   const priority = reference(
@@ -52529,7 +52613,7 @@ function collectDialogueGroupFunctions(data, groupId, resolver) {
     let functionName = functionNameById.get(functionId);
     const code = typeof value.code === "string" ? value.code.trim() : value.type === 0 ? uiConditionSource(value.getter, resolver) : null;
     if (functionName === void 0) {
-      assertIdentifier2(requestedName, "dialogue group function");
+      assertMemberIdentifier2(requestedName, "dialogue group function");
       functionName = uniqueIdentifier(requestedName, names);
       functions.set(functionId, { id: functionId, name: functionName, code });
       functionNameById.set(functionId, functionName);
@@ -53091,7 +53175,7 @@ function requiredName(data, record3) {
   if (typeof data.name !== "string") {
     throw new Error(`${record3.recordKind}:${record3.recordId} has no name.`);
   }
-  assertIdentifier2(data.name, record3.recordKind);
+  assertProjectIdentifier2(data.name, record3.recordKind);
   return data.name;
 }
 function namesById(records2, kind) {
@@ -53183,7 +53267,7 @@ function normalizeSource(value) {
   return value.replace(/\s+/gu, " ").trim();
 }
 function isIdentifier(value) {
-  return /^[A-Za-z_][A-Za-z0-9_]*$/u.test(value);
+  return isValidNeoProjectMemberIdentifier(value);
 }
 function reference(value, names, type) {
   if (value === void 0 || value === null) return null;
@@ -53234,13 +53318,20 @@ function enumCase2(value) {
 function lowerFirst2(value) {
   return `${value[0]?.toLowerCase() ?? ""}${value.slice(1)}`;
 }
-function assertIdentifier2(value, kind) {
-  if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(value)) {
+function assertProjectIdentifier2(value, kind) {
+  if (!isValidNeoProjectIdentifier(value)) {
     throw new Error(
       `${kind} name ${JSON.stringify(value)} is not a valid Neo identifier.`
     );
   }
 }
+function assertMemberIdentifier2(value, kind) {
+  if (!isValidNeoProjectMemberIdentifier(value)) {
+    throw new Error(
+      `${kind} name ${JSON.stringify(value)} is not a valid Neo member identifier.`
+    );
+  }
+}
 function uniqueIdentifier(requested, used) {
   let candidate = requested;
   let suffix = 2;
@@ -53329,7 +53420,7 @@ function isDialogueSourceIdentifier(value) {
 var init_dialogue_source_identifiers = __esm({
   "../src/models/dialogue/dialogue-source-identifiers.ts"() {
     "use strict";
-    init_project_source_identifiers();
+    init_project_source_identifiers2();
   }
 });
 
@@ -53951,6 +54042,7 @@ var init_interface_validation = __esm({
   "../src/models/interfaces/interface-validation.ts"() {
     "use strict";
     init_member_kinds();
+    init_schema_identifiers();
     init_interface_conformance();
     init_interface_graph();
   }
@@ -72783,22 +72875,22 @@ var init_init_backed_value_materialization = __esm({
 function hasRejectedConstructorKey(value) {
   return REJECTED_CONSTRUCTOR_KEYS.some((key) => value[key] !== void 0);
 }
-function isNamedBaseClauseEntry(value) {
+function isNamedBaseClauseEntry(value, nameIsValid) {
   if (typeof value !== "object" || value === null) return false;
   if (Array.isArray(value)) return false;
   const candidate = value;
   if (!Object.keys(candidate).every((key) => key === "name" || key === "code")) {
     return false;
   }
-  if (!isValidCallableIdentifier(candidate.name)) return false;
+  if (!nameIsValid(candidate.name)) return false;
   if (typeof candidate.code !== "string") return false;
   return candidate.code.length > 0;
 }
 function isNeoConstructorBaseArgument(value) {
-  return isNamedBaseClauseEntry(value);
+  return isNamedBaseClauseEntry(value, isValidCallableArgumentIdentifier);
 }
 function isNeoConstructorBaseInitializerField(value) {
-  return isNamedBaseClauseEntry(value);
+  return isNamedBaseClauseEntry(value, isValidSchemaMemberIdentifier);
 }
 function isNeoClassConstructorBase(value) {
   if (typeof value !== "object" || value === null) return false;
@@ -72814,7 +72906,7 @@ function isNeoClassConstructorBase(value) {
   const argumentTypes = [];
   for (const argument2 of v.argumentTypes) {
     if (!isNSFunctionArgumentTypeInfo(argument2)) return false;
-    if (!isValidCallableIdentifier(argument2.name)) return false;
+    if (!isValidCallableArgumentIdentifier(argument2.name)) return false;
     if (parameterNames.has(argument2.name)) return false;
     parameterNames.add(argument2.name);
     argumentTypes.push(argument2);
@@ -72913,6 +73005,7 @@ var init_constructors = __esm({
     init_core();
     init_docs_text2();
     init_member_kinds();
+    init_schema_identifiers();
     init_neoscript();
     REJECTED_CONSTRUCTOR_KEYS = [
       "bodyMode",
@@ -83097,8 +83190,20 @@ function stableValue(value) {
 function stableTypeInfo(value) {
   return JSON.stringify(stableValue(value));
 }
-function isOpaqueCallableIdentifier(value) {
-  return typeof value === "string" && OPAQUE_CALLABLE_IDENTIFIER_PATTERN.test(value) && !value.startsWith("__") && !OPAQUE_CALLABLE_RESERVED_NAMES.has(value);
+function isOpaqueGeneratedIdentifier(value, neoPredicate) {
+  return typeof value === "string" && neoPredicate(value) && isGeneratedCSharpIdentifier(value) && !isGeneratedCSharpReservedKeyword(value);
+}
+function isOpaqueSchemaMemberIdentifier(value) {
+  return isOpaqueGeneratedIdentifier(value, isValidNeoProjectMemberIdentifier);
+}
+function isOpaqueCallableMemberIdentifier(value) {
+  return isOpaqueSchemaMemberIdentifier(value) && !value.startsWith("__");
+}
+function isOpaqueCallableArgumentIdentifier(value) {
+  return isOpaqueGeneratedIdentifier(value, isValidNeoProjectBindingIdentifier) && !value.startsWith("__");
+}
+function isOpaqueNSFunctionArgumentIdentifier(value) {
+  return isOpaqueCallableArgumentIdentifier(value) && value !== "value";
 }
 function isOpaqueNSTypeInfo(value, ancestors = /* @__PURE__ */ new Set()) {
   if (!isRecord7(value) || typeof value.required !== "boolean") return false;
@@ -83192,11 +83297,11 @@ function isOpaqueNSFunctionReturnTypeInfo(value) {
   return isOpaqueNSTypeInfo(value);
 }
 function isOpaqueNSFunctionArgumentTypeInfo(value) {
-  return isOpaqueNSTypeInfo(value) && isOpaqueCallableIdentifier(value.name) && !opaqueTypeInfoContainsUnknown(value) && hasValidOpaqueParameterDefault(value);
+  return isOpaqueNSTypeInfo(value) && isOpaqueNSFunctionArgumentIdentifier(value.name) && !opaqueTypeInfoContainsUnknown(value) && hasValidOpaqueParameterDefault(value);
 }
 function isOpaqueConstructorArgumentTypeInfo(value) {
   if (!isRecord7(value)) return false;
-  return isOpaqueNSTypeInfo(value) && (value.name === "value" || isOpaqueCallableIdentifier(value.name)) && !opaqueTypeInfoContainsUnknown(value) && hasValidOpaqueParameterDefault(value);
+  return isOpaqueNSTypeInfo(value) && isOpaqueCallableArgumentIdentifier(value.name) && !opaqueTypeInfoContainsUnknown(value) && hasValidOpaqueParameterDefault(value);
 }
 function hasValidOpaqueParameterDefault(value) {
   const wrapper = value.defaultValue;
@@ -84649,7 +84754,8 @@ function assertOpaqueBaseClauseListValid(declaredConstructor, spec) {
         `Constructor "${declaredConstructor.id}" has a ${spec.entryLabel} that is not an object.`
       );
     }
-    if (!isOpaqueCallableIdentifier(entry.name)) {
+    const nameIsValid = spec.nameKind === "member" ? isOpaqueSchemaMemberIdentifier : isOpaqueCallableArgumentIdentifier;
+    if (!nameIsValid(entry.name)) {
       throw new Error(
         `Constructor "${declaredConstructor.id}" has a ${spec.entryLabel} with an invalid name.`
       );
@@ -84950,7 +85056,7 @@ function assertOpaqueMemberDefaultValueValid(member) {
 }
 function assertOpaqueNSFunctionValid(member, membersById) {
   if (member.kind !== 23) return;
-  if (!isOpaqueCallableIdentifier(member.name)) {
+  if (!isOpaqueCallableMemberIdentifier(member.name)) {
     throw new Error(`NSFunction "${member.id}" name is invalid.`);
   }
   if (member.storage !== void 0 && member.storage !== null) {
@@ -85086,34 +85192,14 @@ function assertOpaqueNSFunctionValid(member, membersById) {
     deferred: member.deferred
   });
 }
-var NEO_OBJECT_WORLD_KIND, READ_ONLY_SYNTHETIC_VALUE_ID_PREFIX2, OPAQUE_CALLABLE_IDENTIFIER_PATTERN, OPAQUE_CALLABLE_RESERVED_NAMES, REJECTED_OPAQUE_CONSTRUCTOR_KEYS, OPAQUE_INITIALIZER_KEYS, OPAQUE_BASE_ARGUMENTS_SPEC, OPAQUE_BASE_INITIALIZER_FIELDS_SPEC;
+var NEO_OBJECT_WORLD_KIND, READ_ONLY_SYNTHETIC_VALUE_ID_PREFIX2, REJECTED_OPAQUE_CONSTRUCTOR_KEYS, OPAQUE_INITIALIZER_KEYS, OPAQUE_BASE_ARGUMENTS_SPEC, OPAQUE_BASE_INITIALIZER_FIELDS_SPEC;
 var init_projectInterfaceValidation = __esm({
   "../convex/projectInterfaceValidation.ts"() {
     "use strict";
     init_projectVariantValidation();
+    init_src();
     NEO_OBJECT_WORLD_KIND = "object";
     READ_ONLY_SYNTHETIC_VALUE_ID_PREFIX2 = "__neo_readonly_default:";
-    OPAQUE_CALLABLE_IDENTIFIER_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
-    OPAQUE_CALLABLE_RESERVED_NAMES = /* @__PURE__ */ new Set([
-      "this",
-      "root",
-      "context",
-      "value",
-      "true",
-      "false",
-      "null",
-      "void",
-      "if",
-      "else",
-      "return",
-      "throw",
-      "var",
-      "int",
-      "float",
-      "decimal",
-      "string",
-      "bool"
-    ]);
     REJECTED_OPAQUE_CONSTRUCTOR_KEYS = [
       "bodyMode",
       "uiAction",
@@ -85124,6 +85210,7 @@ var init_projectInterfaceValidation = __esm({
     OPAQUE_BASE_ARGUMENTS_SPEC = {
       authoredKey: "baseArguments",
       compiledKey: "compiledBaseArguments",
+      nameKind: "parameter",
       entryLabel: "base argument",
       compiledLabel: "compiled base arguments",
       clauseLabel: "a base call"
@@ -85131,6 +85218,7 @@ var init_projectInterfaceValidation = __esm({
     OPAQUE_BASE_INITIALIZER_FIELDS_SPEC = {
       authoredKey: "baseInitializerFields",
       compiledKey: "compiledBaseInitializerFields",
+      nameKind: "member",
       entryLabel: "base initializer field",
       compiledLabel: "compiled base initializer fields",
       clauseLabel: "a base initializer block"
@@ -85142,34 +85230,37 @@ var init_projectInterfaceValidation = __esm({
 function isRecord8(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function assertIdentifier3(value, label) {
-  if (isValidSchemaAuthoredIdentifier(value)) return;
+function assertIdentifier(value, label, predicate) {
+  if (predicate(value)) return;
   throw new Error(
     `${label} must be a valid Neo/codegen identifier; use letters, digits, and underscores, begin with a letter or underscore, and avoid reserved language keywords.`
   );
 }
-function assertArgumentIdentifiers(value, ownerLabel) {
+function assertArgumentIdentifiers(value, ownerLabel, predicate) {
   if (!Array.isArray(value)) return;
   for (let index = 0; index < value.length; index += 1) {
     const argument2 = value[index];
     if (!isRecord8(argument2)) continue;
-    assertIdentifier3(
+    assertIdentifier(
       argument2.name,
-      `${ownerLabel} parameter ${index + 1} name ${JSON.stringify(argument2.name)}`
+      `${ownerLabel} parameter ${index + 1} name ${JSON.stringify(argument2.name)}`,
+      predicate
     );
   }
 }
 function assertClassIdentifiers(recordId, value) {
   if (!isRecord8(value)) return;
-  assertIdentifier3(
+  assertIdentifier(
     value.name,
-    `Class "${recordId}" name ${JSON.stringify(value.name)}`
+    `Class "${recordId}" name ${JSON.stringify(value.name)}`,
+    isValidSchemaAuthoredIdentifier
   );
   if (isRecord8(value.schema)) {
     for (const schemaKey of Object.keys(value.schema)) {
-      assertIdentifier3(
+      assertIdentifier(
         schemaKey,
-        `Class "${recordId}" schema key ${JSON.stringify(schemaKey)}`
+        `Class "${recordId}" schema key ${JSON.stringify(schemaKey)}`,
+        isValidSchemaMemberIdentifier
       );
     }
   }
@@ -85177,17 +85268,19 @@ function assertClassIdentifiers(recordId, value) {
   for (let index = 0; index < value.genericParams.length; index += 1) {
     const parameter4 = value.genericParams[index];
     if (!isRecord8(parameter4)) continue;
-    assertIdentifier3(
+    assertIdentifier(
       parameter4.name,
-      `Class "${recordId}" generic parameter ${index + 1} name ${JSON.stringify(parameter4.name)}`
+      `Class "${recordId}" generic parameter ${index + 1} name ${JSON.stringify(parameter4.name)}`,
+      isValidSchemaBindingIdentifier
     );
   }
 }
 function assertEnumIdentifiers(recordId, value) {
   if (!isRecord8(value)) return;
-  assertIdentifier3(
+  assertIdentifier(
     value.name,
-    `Enum "${recordId}" name ${JSON.stringify(value.name)}`
+    `Enum "${recordId}" name ${JSON.stringify(value.name)}`,
+    isValidSchemaAuthoredIdentifier
   );
   if (!isRecord8(value.options)) return;
   const optionIdsByFoldedName = /* @__PURE__ */ new Map();
@@ -85203,9 +85296,10 @@ function assertEnumIdentifiers(recordId, value) {
         `Enum "${recordId}" option "${optionId}" must embed the same stable id.`
       );
     }
-    assertIdentifier3(
+    assertIdentifier(
       option.name,
-      `Enum "${recordId}" option "${optionId}" name ${JSON.stringify(option.name)}`
+      `Enum "${recordId}" option "${optionId}" name ${JSON.stringify(option.name)}`,
+      isValidSchemaMemberIdentifier
     );
     const foldedName = option.name.toLowerCase();
     const collidingOptionId = optionIdsByFoldedName.get(foldedName);
@@ -85219,20 +85313,23 @@ function assertEnumIdentifiers(recordId, value) {
 }
 function assertInterfaceIdentifiers(recordId, value) {
   if (!isRecord8(value)) return;
-  assertIdentifier3(
+  assertIdentifier(
     value.name,
-    `Interface "${recordId}" name ${JSON.stringify(value.name)}`
+    `Interface "${recordId}" name ${JSON.stringify(value.name)}`,
+    isValidSchemaAuthoredIdentifier
   );
   if (!isRecord8(value.members)) return;
   for (const [memberKey, member] of Object.entries(value.members)) {
-    assertIdentifier3(
+    assertIdentifier(
       memberKey,
-      `Interface "${recordId}" member name ${JSON.stringify(memberKey)}`
+      `Interface "${recordId}" member name ${JSON.stringify(memberKey)}`,
+      isValidSchemaMemberIdentifier
     );
     if (!isRecord8(member) || member.kind !== "function") continue;
     assertArgumentIdentifiers(
       member.argumentTypes,
-      `Interface "${recordId}" function "${memberKey}"`
+      `Interface "${recordId}" function "${memberKey}"`,
+      isValidSchemaNSFunctionBindingIdentifier
     );
   }
 }
@@ -85244,15 +85341,17 @@ function isCallableOrPropertyMemberKind(value) {
 function assertMemberIdentifiers(recordId, value, directlyAuthoredMemberIds) {
   if (!isRecord8(value)) return;
   if (directlyAuthoredMemberIds.has(recordId) || isCallableOrPropertyMemberKind(value)) {
-    assertIdentifier3(
+    assertIdentifier(
       value.name,
-      `Member "${recordId}" name ${JSON.stringify(value.name)}`
+      `Member "${recordId}" name ${JSON.stringify(value.name)}`,
+      isValidSchemaMemberIdentifier
     );
   }
   if (value.kind !== 13 && value.kind !== 23) return;
   assertArgumentIdentifiers(
     value.argumentTypes,
-    `Function member "${recordId}"`
+    `Function member "${recordId}"`,
+    value.kind === 23 ? isValidSchemaNSFunctionBindingIdentifier : isValidSchemaBindingIdentifier
   );
 }
 function assertSchemaIdentifierWriteChangesValid(changes, directlyAuthoredMemberIds) {
@@ -109307,7 +109406,7 @@ function isObjectRecord5(value) {
 var init_project_file_authoring_identifiers = __esm({
   "../src/models/project-file-authoring-identifiers.ts"() {
     "use strict";
-    init_project_source_identifiers();
+    init_project_source_identifiers2();
   }
 });
 
@@ -112251,7 +112350,7 @@ var init_registry2 = __esm({
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
       formatVersion: 3,
       contractVersion: "3.13",
-      cliVersion: "0.32.2",
+      cliVersion: "0.32.4",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -118846,7 +118945,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.32.2");
+    console.log("0.32.4");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neocompose/cli",
-  "version": "0.32.2",
+  "version": "0.32.4",
   "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.32.2 -->
+<!-- reviewed-through-cli: 0.32.4 -->
 
 # Neo Compose CLI
 

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

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

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

@@ -21,6 +21,15 @@ migration, or `.neoflow` file. NeoFlow has its own single-dialogue exception.
 Persist the declared identifier as the schema name; there is no separate
 technical/display name. Keep existing IDs stable.
 
+NeoScript keywords are case-sensitive. Qualified member labels, schema keys,
+registry entries, and enum options occupy their owner's namespace, so they may
+reuse unrelated builtin names such as `Set`, `Dictionary`, `List`, or `Math`.
+Type-token spellings such as `Set` and `Dictionary` are also legal parameters.
+Actual lowercase grammar keywords such as `class` and `return` remain
+reserved. Top-level declarations and bindings retain their own reservations:
+for example, neither may shadow the unqualified builtin `Math` namespace, and
+implicit bindings such as `this`, `root`, and `context` cannot be parameters.
+
 ```neo
 @id("interface-named-id")
 interface INamed {

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

@@ -108,8 +108,10 @@ language's `float`-to-`int` conversions: they return `int` for `int` and
 at runtime. `Round` rounds midpoints to even, matching `decimal.Round(0)`.
 `Sign` always returns `int`; `Sqrt` takes `int` or `float` only.
 
-`Math` is a qualifier, never a type or a value, and the name is reserved: no
-Class, enum, member, parameter, or local may be named `Math`.
+`Math` is an unqualified builtin qualifier, never a type or value, so no Class,
+enum, parameter, or local may shadow it. Qualified members use their owner's
+namespace and may be named `Math`; access one as `this.Math` or
+`SomeValue.Math` without colliding with the builtin qualifier.
 
 ## Logical operators