@neocompose/cli 0.75.1 → 0.75.2

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.75.2
+
+### Patch Changes
+
+- 45f828c: Preserve generic constructor arguments and nested reference types when exporting member defaults, so Neowyn animation schemas compile without changing record identities.
+- 60935a5: Report invalid object-initializer semicolons consistently in the editor and CLI, with the authored file position and a comma-separator hint.
+- 869b95b: Ignore formatting-only changes in stored initializer recipes, computed member
+  defaults, and inline constructor delegates. Preserve their existing compiled
+  bodies while continuing to detect code and string-literal content edits.
+- 267ccd2: Keep valid root value graphs available when another root construction fails, and show required-member declaration locations in CLI diagnostics.
+
 ## 0.75.1
 
 ### Patch Changes

package/dist/neo.mjs

@@ -18773,6 +18773,12 @@ var init_executable_parser = __esm({
             value: this.parseExpr(),
             pos: at(name)
           });
+          if (this.peek().text === ";") {
+            throw new CompileError(
+              "Object initializer assignments use commas, not semicolons. Replace ';' with ',' or omit it after the last assignment; the enclosing declaration still ends with ';'.",
+              at(this.peek())
+            );
+          }
           if (!this.eat("punctuation", ",")) break;
           if (this.peek().kind === "punctuation" && this.peek().text === "}") break;
         }
@@ -22534,8 +22540,13 @@ var init_source_diagnostics = __esm({
       "neoflow-incomplete-draft"
     ]);
     SchemaSourceError = class extends Error {
-      constructor(detail, file, line, column, code, severity = "error", range2) {
-        super(`${file}:${line}:${column} \u2014 ${detail}`);
+      constructor(detail, file, line, column, code, severity = "error", range2, relatedInformation) {
+        super(
+          `${file}:${line}:${column} \u2014 ${detail}${relatedInformation?.map(
+            ({ location: location3, message }) => `
+  ${location3.uri}:${location3.range.start.line + 1}:${location3.range.start.character + 1} \u2014 ${message}`
+          ).join("") ?? ""}`
+        );
         this.detail = detail;
         this.file = file;
         this.line = line;
@@ -22543,6 +22554,7 @@ var init_source_diagnostics = __esm({
         this.code = code;
         this.severity = severity;
         this.range = range2;
+        this.relatedInformation = relatedInformation;
         this.name = "SchemaSourceError";
       }
       detail;
@@ -22552,6 +22564,7 @@ var init_source_diagnostics = __esm({
       code;
       severity;
       range;
+      relatedInformation;
     };
   }
 });
@@ -43398,7 +43411,11 @@ function validateDeclaration(uri, declaration, documentKind, environment, diagno
       environment,
       declaration.initializer.range,
       diagnostics,
-      anchorOf(declaration.initializer)
+      anchorOf(declaration.initializer),
+      DECLARATION_BODY_GLOBAL_TYPES.has(declaration.type.name) || isNeoVariantFamilyTypeName(declaration.type.name) ? void 0 : {
+        code: "invalid-project-global-initializer",
+        label: `Global '${declaration.name}' initializer`
+      }
     );
     return;
   }
@@ -43753,6 +43770,10 @@ function validateProjectRootGlobal(uri, declaration, environment, diagnostics) {
       {
         text: actual.initializer,
         start: slotPosition(declaration.initializer.range.start, actual.start)
+      },
+      {
+        code: "invalid-project-global-initializer",
+        label: `Root '${expected.name}' initializer`
       }
     );
   }
@@ -46105,7 +46126,7 @@ function classDerivesFromName(name, ancestorName, environment, seen = /* @__PURE
     return classDerivesFromName(base.name, ancestorName, environment, seen);
   });
 }
-var NEO_VARIANT_FOLDER_SETTING, primitiveType, LIST_COLUMN_INHERITANCE_KEY, SEMANTIC_PRIMITIVE_TYPE_NAMES;
+var NEO_VARIANT_FOLDER_SETTING, primitiveType, LIST_COLUMN_INHERITANCE_KEY, DECLARATION_BODY_GLOBAL_TYPES, SEMANTIC_PRIMITIVE_TYPE_NAMES;
 var init_project_source_semantics = __esm({
   "../packages/neoscript-language/src/project-source-semantics.ts"() {
     "use strict";
@@ -46129,6 +46150,12 @@ var init_project_source_semantics = __esm({
     NEO_VARIANT_FOLDER_SETTING = "folder";
     primitiveType = (name) => ({ name });
     LIST_COLUMN_INHERITANCE_KEY = "__other__";
+    DECLARATION_BODY_GLOBAL_TYPES = /* @__PURE__ */ new Set([
+      NEOSCRIPT_IMAGE_REGISTRY_TYPE,
+      NEOSCRIPT_AUDIO_CLIP_REGISTRY_TYPE,
+      "NeoPriorityGroup",
+      "NeoDialogueGroup"
+    ]);
     SEMANTIC_PRIMITIVE_TYPE_NAMES = /* @__PURE__ */ new Set([
       "bool",
       "int",
@@ -51821,7 +51848,7 @@ var init_registry = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.75.1",
+      cliVersion: "0.75.2",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -63657,6 +63684,7 @@ var init_variant_selection_source = __esm({
 function emitProjectSourcesV4(manifest, options = {}) {
   const context = {
     manifest,
+    classBindings: /* @__PURE__ */ new Map(),
     classes: new Map(manifest.classes.map((entry) => [entry.id, entry])),
     interfaces: new Map(manifest.interfaces.map((entry) => [entry.id, entry])),
     enums: new Map(manifest.enums.map((entry) => [entry.id, entry])),
@@ -64373,7 +64401,6 @@ function renderEntryType(context, entryMemberId, label, enclosingClassId, elemen
 }
 function renderMemberType(context, member, enclosingClassId, elementSettings = false) {
   const nullable2 = !member.required;
-  const closedGenerics = enclosingClassId === void 0 ? void 0 : classGenericMemberBindings(context.classes, enclosingClassId);
   let value;
   switch (member.kind) {
     case "null":
@@ -64441,11 +64468,11 @@ function renderMemberType(context, member, enclosingClassId, elementSettings = f
           if (binding.kind === "member") {
             boundMemberId = binding.memberId;
           } else {
-            const closed = closedGenerics?.get(binding.genericParamId);
-            if (closed === void 0) {
-              return genericName(context, binding.genericParamId);
-            }
-            boundMemberId = closed;
+            return renderGenericType(
+              context,
+              binding.genericParamId,
+              enclosingClassId
+            );
           }
           return renderMemberType(
             context,
@@ -64478,7 +64505,11 @@ function renderMemberType(context, member, enclosingClassId, elementSettings = f
       value = member.multiselect ? "Set<NeoDialogueReference>" : "NeoDialogueReference";
       break;
     case "generic":
-      value = genericName(context, member.genericParamId);
+      value = renderGenericType(
+        context,
+        member.genericParamId,
+        enclosingClassId
+      );
       break;
     case "computed":
       value = renderType(context, member.returnType);
@@ -64705,7 +64736,71 @@ function dictionaryOptions(context, enumId) {
   context.dictionaryKeyOptions.set(enumId, result);
   return result;
 }
+function cachedClassBindings(context, classId) {
+  let bindings = context.classBindings.get(classId);
+  if (bindings === void 0) {
+    bindings = classGenericBindings(context.classes, classId);
+    context.classBindings.set(classId, bindings);
+  }
+  return bindings;
+}
+function renderGenericType(context, parameterId, enclosingClassId) {
+  const bindings = context.genericBindings ?? (enclosingClassId === void 0 ? void 0 : cachedClassBindings(context, enclosingClassId));
+  const binding = resolveGenericBinding(parameterId, bindings);
+  return binding.kind === "member" ? renderMemberType(
+    context,
+    required(context.members, binding.memberId, "generic binding"),
+    enclosingClassId
+  ) : genericName(context, binding.genericParamId);
+}
+function resolveGenericBinding(parameterId, bindings) {
+  const visited = /* @__PURE__ */ new Set();
+  let cursor = parameterId;
+  while (!visited.has(cursor)) {
+    visited.add(cursor);
+    const binding = bindings?.get(cursor);
+    if (binding === void 0) break;
+    if (binding.kind === "member") return binding;
+    cursor = binding.genericParamId;
+  }
+  return { kind: "generic", genericParamId: cursor };
+}
+function constructionContext(context, member, enclosingClassId) {
+  const outer = context.genericBindings ?? (enclosingClassId === void 0 ? void 0 : cachedClassBindings(context, enclosingClassId));
+  const inherited = cachedClassBindings(context, member.classId);
+  const arguments_ = Object.entries(member.classArguments);
+  if (inherited.size === 0 && arguments_.length === 0) return context;
+  const bindings = new Map(outer);
+  for (const [parameter4, binding] of inherited)
+    bindings.set(parameter4, binding);
+  for (const [parameter4, binding] of arguments_) {
+    bindings.set(
+      parameter4,
+      binding.kind === "generic" ? resolveGenericBinding(binding.genericParamId, outer) : binding
+    );
+  }
+  return { ...context, genericBindings: bindings };
+}
 function renderDefaultValue(context, member, wrapper, enclosingClassId) {
+  if (member.kind === "generic" && context.genericBindings) {
+    const bindingId = terminalGenericBindingMemberId(
+      member.genericParamId,
+      context.genericBindings
+    );
+    if (bindingId !== void 0) {
+      const binding = required(
+        context.members,
+        bindingId,
+        "generic default binding"
+      );
+      const positioned = structuredLeafPartialChild(
+        member.partial === true,
+        binding
+      );
+      const resolved = positioned.kind === "class" && member.partial === true ? { ...positioned, partial: true } : positioned;
+      return renderDefaultValue(context, resolved, wrapper, enclosingClassId);
+    }
+  }
   const value = wrapper.value;
   if (value === null) return "null";
   if (member.kind === "decimal" && typeof value === "string") return value;
@@ -64741,16 +64836,21 @@ function renderDefaultValue(context, member, wrapper, enclosingClassId) {
   }
   if (member.kind === "class" && isObject3(value)) {
     const target = required(context.classes, member.classId, "class");
+    const nestedContext = constructionContext(
+      context,
+      member,
+      enclosingClassId
+    );
     const assignments = Object.entries(value).map(([key, item]) => {
       const childId = target.schema[key];
       const child2 = childId ? context.members.get(childId) : void 0;
       const positioned = child2 ? structuredLeafPartialChild(member.partial === true, child2) : void 0;
-      return `${key} = ${positioned ? renderNestedValue(context, positioned, item, enclosingClassId) : jsonValue2(item)}`;
+      return `${key} = ${positioned ? renderNestedValue(nestedContext, positioned, item, enclosingClassId) : jsonValue2(item)}`;
     });
     if (member.partial === true) {
       return `new { ${assignments.join(", ")} }`;
     }
-    return `new ${target.name}${assignments.length ? ` { ${assignments.join(", ")} }` : "()"}`;
+    return `new ${renderMemberType(context, member, enclosingClassId).replace(/\?$/u, "")}${assignments.length ? ` { ${assignments.join(", ")} }` : "()"}`;
   }
   if (member.kind === "action") {
     return renderActionListeners(context, member, value);
@@ -66138,45 +66238,30 @@ function commentEndIndex(source, index) {
   return null;
 }
 function stripInitializerComments(source) {
-  const lines = [{ parts: [], removedComment: false }];
-  let quote6 = null;
-  let segmentStart = 0;
-  const specialCharacters = /["'\\/\n]/g;
-  for (let token = specialCharacters.exec(source); token !== null; token = specialCharacters.exec(source)) {
-    const index = token.index;
-    const character = token[0];
-    if (quote6 !== null) {
-      if (character === "\\") specialCharacters.lastIndex = index + 2;
-      else if (character === quote6) quote6 = null;
-      continue;
-    }
-    const afterComment = commentEndIndex(source, index);
-    if (afterComment !== null) {
-      const line = lines[lines.length - 1];
-      if (segmentStart < index) {
-        line.parts.push(source.slice(segmentStart, index));
-      }
-      line.removedComment = true;
-      specialCharacters.lastIndex = afterComment;
-      segmentStart = afterComment;
-      continue;
-    }
-    if (character === "\n") {
-      if (segmentStart < index) {
-        lines[lines.length - 1].parts.push(source.slice(segmentStart, index));
-      }
-      lines.push({ parts: [], removedComment: false });
-      segmentStart = index + 1;
-      continue;
+  const lexed = lex(source);
+  const commentLines = /* @__PURE__ */ new Set();
+  const parts = [];
+  let cursor = 0;
+  for (const token of lexed.tokens) {
+    if (token.kind !== "comment") continue;
+    parts.push(source.slice(cursor, token.start));
+    parts.push(token.raw.replace(/[^\r\n]/g, ""));
+    cursor = token.end;
+    for (let line = token.range.start.line; line <= token.range.end.line; line++) {
+      commentLines.add(line);
     }
-    if (character === '"' || character === "'") quote6 = character;
   }
-  if (segmentStart < source.length) {
-    lines[lines.length - 1].parts.push(source.slice(segmentStart));
+  parts.push(source.slice(cursor));
+  const literalNewlines = /* @__PURE__ */ new Set();
+  for (const token of lexed.roots) {
+    if (token.kind !== "string") continue;
+    for (let line = token.range.start.line; line < token.range.end.line; line++) {
+      literalNewlines.add(line);
+    }
   }
-  return lines.map((line) => ({
-    text: line.parts.join("").trimEnd(),
-    removedComment: line.removedComment
+  return parts.join("").split("\n").map((line, index) => ({
+    text: literalNewlines.has(index) ? line : line.trimEnd(),
+    removedComment: commentLines.has(index)
   })).filter((line) => !line.removedComment || line.text.trim().length > 0).map((line) => line.text).join("\n").trim();
 }
 function normalizeBodySource(source) {
@@ -66222,7 +66307,8 @@ function normalizeInitializerSourceUncached(source) {
   const stripped = stripInitializerComments(source);
   const lines = stripped.split("\n");
   if (lines.length < 2) return stripped;
-  const continuations = lines.slice(1).filter((line) => line.length > 0);
+  const literalLines = neoScriptLiteralContinuationLines(stripped);
+  const continuations = lines.slice(1).filter((line, index) => !literalLines.has(index + 1) && line.length > 0);
   if (continuations.length === 0) return stripped;
   const common = Math.min(
     ...continuations.map((line) => line.length - line.trimStart().length)
@@ -66230,7 +66316,9 @@ function normalizeInitializerSourceUncached(source) {
   if (common === 0) return stripped;
   return [
     lines[0],
-    ...lines.slice(1).map((line) => line.length === 0 ? line : line.slice(common))
+    ...lines.slice(1).map(
+      (line, index) => literalLines.has(index + 1) || line.length === 0 ? line : line.slice(common)
+    )
   ].join("\n");
 }
 function constructorExpressionSlice(source) {
@@ -66362,7 +66450,10 @@ function matchesStoredInitializer(defaultValue, source) {
   if (!isObjectRecord2(defaultValue) || !isObjectRecord2(defaultValue.init))
     return false;
   const code = defaultValue.init.code;
-  return typeof code === "string" && normalizeInitializerSource(code) === normalizeInitializerSource(source);
+  return typeof code === "string" && sameNeoScriptTokens(
+    normalizeInitializerSource(code),
+    normalizeInitializerSource(source)
+  );
 }
 var normalizedInitializers, normalizedInitializerCharacters, MAX_NORMALIZED_INITIALIZER_CHARACTERS;
 var init_init_source = __esm({
@@ -126720,7 +126811,8 @@ function mergedOverStoredRow(base, lowered) {
       if ("action" in argument2) continue;
       const stored = storedArgs[key];
       if (!isObjectRecord2(stored)) continue;
-      if (stored.code !== argument2.code) continue;
+      if (typeof stored.code !== "string") continue;
+      if (!sameNeoScriptTokens(stored.code, argument2.code)) continue;
       if (!("action" in stored)) continue;
       preserved ??= { ...loweredArgs };
       preserved[key] = stored;
@@ -127065,6 +127157,27 @@ function drainValueReferenceObligationsV4(state, manifest, options) {
     ...collectionValueObligations(manifest),
     ...options.registry.referenceObligations
   ]) {
+    if (obligation.kind === "reference" && options.unavailableReferenceMemberIds?.has(obligation.memberId))
+      continue;
+    if (options.unavailableValueIds?.size) {
+      let targetId;
+      switch (obligation.kind) {
+        case "collectionValue":
+          targetId = obligation.collectionValueId;
+          break;
+        case "constructorProjection":
+          targetId = obligation.targetId;
+          break;
+        case "reference":
+          if (obligation.target.spelling === "id")
+            targetId = obligation.target.id;
+          else if (obligation.target.spelling === "symbol")
+            targetId = obligation.target.resolved.id;
+          break;
+      }
+      if (targetId !== void 0 && options.unavailableValueIds.has(targetId))
+        continue;
+    }
     const failure = settleReferenceObligation(
       context,
       obligation,
@@ -131707,6 +131820,10 @@ function annotationId2(annotations) {
 }
 function addReconstructed(context, recordKind, recordId, fileFields, source, options = {}) {
   const key = `${recordKind}:${recordId}`;
+  const base = context.state[key]?.data;
+  if (recordKind === "value" && isObjectRecord2(base) && isObjectRecord2(fileFields.init) && typeof fileFields.init.code === "string" && matchesStoredInitializer(base, fileFields.init.code)) {
+    fileFields = { ...fileFields, init: base.init };
+  }
   const existing = context.reconstructed.get(key);
   const line = source.range.start.line + 1;
   if (existing !== void 0) {
@@ -134006,6 +134123,7 @@ var INFERRED_GENERIC_CLASS_PREFIX, MEMBER_KIND_DICTIONARY2, MEMBER_KIND_LIST2, M
 var init_value_sources = __esm({
   "src/project-source/value-sources.ts"() {
     "use strict";
+    init_lexer();
     init_codecs();
     init_reference_target_types();
     init_listener_template_graph();
@@ -136920,26 +137038,94 @@ ${declarations.join("\n\n")}
 }
 function lowerProjectRootSourceV4(state, analysis, manifest, options = {}) {
   const registry = options.registry ?? createValueLowerRegistryV4();
+  const unavailableSlots = /* @__PURE__ */ new Set();
+  const unavailableValueIds = /* @__PURE__ */ new Set();
   const validated = validateProjectRootEnvelopeV4(
     state,
     analysis,
     registry.parsedInitializers
   );
   if (validated === null) {
-    return { records: [], memberValueIds: /* @__PURE__ */ new Map(), seeds: /* @__PURE__ */ new Map() };
+    return {
+      records: [],
+      memberValueIds: /* @__PURE__ */ new Map(),
+      seeds: /* @__PURE__ */ new Map(),
+      unavailableSlots,
+      unavailableValueIds
+    };
   }
   const { expected, global, slots } = validated;
-  const bindings = expected.map((root, index) => ({
-    memberId: root.memberId,
-    purpose: "stored",
-    initializer: slots[index].initializer,
-    source: global.source,
-    label: `root.${root.slot.name}`
-  }));
-  return lowerStoredValueBindingsV4(state, manifest, bindings, {
-    analysis,
-    registry
+  const initializerStart = global.initializerSource?.range.start;
+  const errors = analysis.diagnostics.filter(
+    (diagnostic) => diagnostic.severity === "error" && diagnostic.uri === global.source.uri
+  );
+  const bindings = expected.flatMap((root, index) => {
+    const slot = slots[index];
+    if (errors.length > 0 && initializerStart !== void 0) {
+      const line = initializerStart.line + slot.start.line - 1;
+      const character = slot.start.column - 1 + (slot.start.line === 1 ? initializerStart.character : 0);
+      const lines = slot.initializer.split("\n");
+      const endLine = line + lines.length - 1;
+      const endCharacter = lines.length === 1 ? character + slot.initializer.length : lines[lines.length - 1].length;
+      if (errors.some(
+        ({ range: { start } }) => (start.line > line || start.line === line && start.character >= character) && (start.line < endLine || start.line === endLine && start.character < endCharacter)
+      )) {
+        unavailableSlots.add(slot.name);
+        collectAuthoredValueIds(
+          parseCachedInitializer(registry.parsedInitializers, slot.initializer),
+          unavailableValueIds
+        );
+        return [];
+      }
+    } else if (errors.length > 0) {
+      unavailableSlots.add(slot.name);
+      collectAuthoredValueIds(
+        parseCachedInitializer(registry.parsedInitializers, slot.initializer),
+        unavailableValueIds
+      );
+      return [];
+    }
+    return [
+      {
+        memberId: root.memberId,
+        purpose: "stored",
+        initializer: slots[index].initializer,
+        source: global.source,
+        label: `root.${root.slot.name}`
+      }
+    ];
   });
+  return {
+    ...lowerStoredValueBindingsV4(state, manifest, bindings, {
+      analysis,
+      registry
+    }),
+    unavailableSlots,
+    unavailableValueIds
+  };
+}
+function collectAuthoredValueIds(expression, ids) {
+  const pending = [expression];
+  while (pending.length > 0) {
+    const node = pending.pop();
+    if (Array.isArray(node)) {
+      for (const entry of node) pending.push(entry);
+      continue;
+    }
+    if (!isObjectRecord2(node)) continue;
+    if (node.kind === "annotated" && Array.isArray(node.annotations)) {
+      for (const annotation2 of node.annotations) {
+        if (!isObjectRecord2(annotation2) || annotation2.name !== "id" || !Array.isArray(annotation2.args))
+          continue;
+        const argument2 = annotation2.args[0];
+        if (isObjectRecord2(argument2) && argument2.kind === "litString" && typeof argument2.value === "string")
+          ids.add(argument2.value);
+      }
+    }
+    for (const [key, value] of Object.entries(node)) {
+      if (key !== "pos" && key !== "range") pending.push(value);
+    }
+  }
 }
 function validateProjectRootEnvelopeV4(state, analysis, parsedInitializers) {
   const project = Object.values(state).find(
@@ -137048,7 +137234,8 @@ function resolveRootPathCollectionValuesV4(args) {
       placements,
       rootValues,
       fail2,
-      args.resolveVirtualPath
+      args.resolveVirtualPath,
+      args.unavailableSlots
     );
     if (target !== null) resolved.set(member.id, target);
   }
@@ -137087,7 +137274,8 @@ function resolveRootPathVariantFolderCollectionValuesV4(args) {
       placements,
       rootValues,
       fail2,
-      args.resolveVirtualPath
+      args.resolveVirtualPath,
+      args.unavailableSlots
     );
     if (target !== null) resolved.set(folder.id, target);
   }
@@ -137125,7 +137313,8 @@ function resolveRootPathDialogueGroupCollectionValuesV4(args) {
           label: String(record7.fileFields.name)
         }
       }),
-      args.resolveVirtualPath
+      args.resolveVirtualPath,
+      args.unavailableSlots
     );
     if (target !== null) record7.fileFields.collectionValueId = target;
   }
@@ -137143,7 +137332,7 @@ function rootSlotValueIds(state) {
   }
   return values;
 }
-function walkRootValuePath(path, state, registry, placements, rootValues, fail2, resolveVirtualPath) {
+function walkRootValuePath(path, state, registry, placements, rootValues, fail2, resolveVirtualPath, unavailableSlots) {
   const segments = path.split(".");
   const slotName = segments[1];
   if (segments[0] !== "root" || slotName === void 0) {
@@ -137152,6 +137341,7 @@ function walkRootValuePath(path, state, registry, placements, rootValues, fail2,
     );
     return null;
   }
+  if (unavailableSlots?.has(slotName)) return null;
   const slotIndex = PROJECT_ROOT_SOURCE_SLOTS.findIndex(
     (slot) => slot.name === slotName
   );
@@ -140890,24 +141080,25 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
         diagnostic2.range.start.character + 1,
         diagnostic2.code,
         diagnostic2.severity,
-        diagnostic2.range
+        diagnostic2.range,
+        diagnostic2.relatedInformation
       );
       if (positioned.severity === "error") parseErrors.push(positioned);
       else parseWarnings.push(positioned);
     }
     if (analysis.diagnostics.some(
-      (diagnostic2) => diagnostic2.code === "duplicate-project-id" && diagnostic2.severity === "error"
+      (diagnostic2) => diagnostic2.severity === "error" && (diagnostic2.code === "duplicate-project-id" || diagnostic2.code === "invalid-project-global-initializer")
     )) {
       return refusedStatus(conflictedFiles, parseErrors, parseWarnings);
     }
     const rootDeclaration = analysis.configuration.globals.find(
       (global) => global.type.name === "Root"
     );
-    const rootHasCompilerError = rootDeclaration !== void 0 && analysis.diagnostics.some(
-      (error) => error.severity === "error" && error.uri === rootDeclaration.source.uri && sourceRangeContains(rootDeclaration.source.range, error.range.start)
+    const rootHasEnvelopeError = rootDeclaration !== void 0 && analysis.diagnostics.some(
+      (error) => error.severity === "error" && (error.code === "invalid-root-envelope" || error.code === "protected-root-envelope") && error.uri === rootDeclaration.source.uri && sourceRangeContains(rootDeclaration.source.range, error.range.start)
     );
     try {
-      if (!rootHasCompilerError) {
+      if (!rootHasEnvelopeError) {
         validateProjectRootEnvelopeV4(
           loweringRecords,
           analysis,
@@ -140940,7 +141131,7 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
       ...analysis,
       configuration: {
         globals: analysis.configuration.globals.filter(
-          (global) => global.type.name !== "Root" || rootEnvelopeValid && !rootHasCompilerError
+          (global) => global.type.name !== "Root" || rootEnvelopeValid && !rootHasEnvelopeError
         )
       },
       schema: {
@@ -141143,8 +141334,28 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
   }) : {
     records: [],
     memberValueIds: /* @__PURE__ */ new Map(),
-    seeds: /* @__PURE__ */ new Map()
-  };
+    seeds: /* @__PURE__ */ new Map(),
+    unavailableSlots: new Set(
+      PROJECT_ROOT_SOURCE_SLOTS.map((slot) => slot.name)
+    ),
+    unavailableValueIds: /* @__PURE__ */ new Set()
+  };
+  const unavailableReferenceMemberIds = /* @__PURE__ */ new Set();
+  if (rootValues.unavailableSlots.size > 0) {
+    for (const member of manifest.members) {
+      if (member.kind !== "lookup") continue;
+      const spelled = member.collectionValueId;
+      if (typeof spelled !== "string" || !spelled.startsWith("__pending__:root-path:") && !rootValues.unavailableValueIds.has(spelled))
+        continue;
+      if (rootValues.unavailableValueIds.has(spelled)) {
+        unavailableReferenceMemberIds.add(member.id);
+        continue;
+      }
+      const slot = spelled.slice("__pending__:root-path:".length).split(".")[1];
+      if (slot !== void 0 && rootValues.unavailableSlots.has(slot))
+        unavailableReferenceMemberIds.add(member.id);
+    }
+  }
   reportPhase("documents-static-root", "Reading variants and dialogues\u2026");
   authoredValueSeeds = new Map([...authoredValueSeeds, ...rootValues.seeds]);
   const rootPathResolutionState = overlayProspectiveSourceRecords(
@@ -141182,6 +141393,7 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
     manifest,
     state: rootPathResolutionState,
     resolveVirtualPath,
+    unavailableSlots: rootValues.unavailableSlots,
     registry: valueLowerRegistry,
     siteForMember: (memberId) => {
       const span2 = sourceByKey.get(recordStateKey("member", memberId))?.span;
@@ -141211,6 +141423,7 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
     manifest,
     state: rootPathResolutionState,
     resolveVirtualPath,
+    unavailableSlots: rootValues.unavailableSlots,
     registry: valueLowerRegistry,
     siteForFolder: (folderId) => {
       const span2 = sourceByKey.get(
@@ -141324,6 +141537,7 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
     manifest,
     state: rootPathResolutionState,
     resolveVirtualPath,
+    unavailableSlots: rootValues.unavailableSlots,
     registry: valueLowerRegistry
   });
   if (collectionBindings !== void 0) {
@@ -141527,6 +141741,8 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
       registry: valueLowerRegistry,
       analysis: projectAnalysisV4,
       deletedValueIds,
+      unavailableReferenceMemberIds,
+      unavailableValueIds: rootValues.unavailableValueIds,
       sourceTextByUri
     }
   );
@@ -142991,6 +143207,7 @@ var ANIMATION_DOCUMENT_RECORD_KINDS, ANIMATION_REPLAY_RECORD_KINDS, PROSPECTIVE_
 var init_workspace_status_core = __esm({
   "src/project-source/workspace-status-core.ts"() {
     "use strict";
+    init_project_root();
     init_source_text();
     init_runtime_diagnostic();
     init_NSGetterRuntimeError();
@@ -145862,7 +146079,8 @@ function projectStatusJsonV4(status, options) {
         code: error.code ?? null,
         severity: error.severity,
         blocking: isBlockingSchemaSourceError(error),
-        message: error.message
+        message: error.message,
+        ...error.relatedInformation?.length ? { relatedInformation: error.relatedInformation } : {}
       })
     ),
     records: status.changes.map(
@@ -192010,7 +192228,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.75.1");
+    console.log("0.75.2");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {

package/dist/test-worker.mjs

@@ -29803,6 +29803,12 @@ var Parser = class _Parser {
         value: this.parseExpr(),
         pos: at(name)
       });
+      if (this.peek().text === ";") {
+        throw new CompileError(
+          "Object initializer assignments use commas, not semicolons. Replace ';' with ',' or omit it after the last assignment; the enclosing declaration still ends with ';'.",
+          at(this.peek())
+        );
+      }
       if (!this.eat("punctuation", ",")) break;
       if (this.peek().kind === "punctuation" && this.peek().text === "}") break;
     }
@@ -55714,7 +55720,7 @@ var SPECIALIZED_RELATION_KINDS = /* @__PURE__ */ new Set([
 
 // ../packages/manifest/schema-contract/registry.mjs
 var PROJECT_SCHEMA_CONTRACT = Object.freeze({
-  cliVersion: "0.75.1",
+  cliVersion: "0.75.2",
   projectFileUploadBatchSize: 32,
   documentRecords: {
     member: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neocompose/cli",
-  "version": "0.75.1",
+  "version": "0.75.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.75.1 -->
+<!-- reviewed-through-cli: 0.75.2 -->
 
 # Neo Compose CLI
 
@@ -308,5 +308,6 @@ and `insert_final_newline` there to keep regenerated source consistent with your
 editor. Defaults are two spaces, LF, and a final newline. Push preserves authored
 text when regeneration has the same tokens; pull preserves semantically unchanged
 files. Formatting-only body or source-location changes do not create a subsequent
-push; real code and string-content edits still do. Formatting preferences belong
+push, including stored initializer recipes, computed member defaults, and inline
+constructor delegates; real code and string-content edits still do. Formatting preferences belong
 to the checkout, not stored script bodies.

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

@@ -105,7 +105,10 @@ project-file bytes, and web editor commits use the shared client preparation pro
 Unrelated source files are not uploaded or recompiled on every push.
 Optional source maps missing from valid stored bodies do not request a backfill.
 Formatting-only source location changes do not create pushes, including when
-other records change. Evaluation maps the current local layout; authored edits,
+other records change. Stored initializer recipes, computed member defaults, and
+inline constructor delegates preserve their pulled code and compiled bodies when
+source tokens are unchanged. String-literal content remains significant.
+Evaluation maps the current local layout; authored edits,
 dependency changes, and explicit forced recompilation retain their normal compile scope. A CLI lowering mismatch on a normal push is exposed by the next
 canonical pull; `neo push --dry-run` remains the complete source-to-record
 rehearsal.
@@ -126,7 +129,7 @@ wrappers.
 The marker near the top of `SKILL.md` must exactly match the package version:
 
 ```html
-<!-- reviewed-through-cli: 0.75.1 -->
+<!-- reviewed-through-cli: 0.75.2 -->
 ```
 
 The quoted version above is checked too, so this instruction cannot go stale

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

@@ -446,3 +446,28 @@ A lookup's declared class must be assignable to the entry class of its
 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.
+
+Schema export retains a constructed default's generic arguments, including
+nested collection references. For example, a `NeoAnimationClip<ArmPart>`
+default constructs `new NeoAnimationClip<ArmPart>` and its frames reference
+`List<NeoAnimationFrame<ArmPart>>`.
+
+When a construction leaves a required member unsettled, CLI diagnostics point to
+`new` and include the member declaration as a related location. Fix that
+construction before pushing. Valid root initializers still participate in
+reference checking, so an unrelated root error does not imply their values are
+missing or deleted. Independent reference errors remain visible.
+
+Object initializer assignments use commas. The last comma is optional; the
+semicolon terminating the enclosing declaration is valid:
+
+```neo
+AudioSettings AUDIO_SETTINGS = new() {
+  Main = new AudioMixerGroupSettingsFolder("Main", "Master", "MasterVolume", []),
+};
+```
+
+A semicolon after `Main = ...` inside the initializer is invalid. Editor and CLI
+diagnostics highlight that separator in the authored file, including global,
+static member, and protected root initializers. Statement semicolons inside
+function or delegate bodies remain valid.