@neocompose/cli 0.54.0 → 0.55.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.55.0] - 2026-09-23
+
+- `@settings` before a `List` element or `Dictionary` value type configures the collection's entries, such as `List<@settings(format: .Plain) string>` or `Dictionary<string, @settings(min: 0) int>`. `neo pull` writes entry settings in this form. Switching entries between Localized and Plain converts every entry's text exactly as the same change on a string member does. Annotations on a Dictionary key, another generic's type argument, or an override's element type are reported at their position. Run `neo pull` before your first push so entry settings set in the web app appear in source.
+- Changing an existing collection's element type, such as `List<string>` to `List<int>`, fails with an error. It used to be ignored: the push kept the old type without saying so.
+- Switching a string member from Plain to Localized converts the values it already stores, including values packed inside their parent row. It used to fail with "Localized text … was not pulled" or "Localizable value references missing localized text".
+- Switching a string member from Localized to Plain keeps packed values packed, so `neo status` is clean after the push.
+- Adding a value beside packed children that link localized text, such as a new field on an item whose names are packed, no longer fails with "must reference an existing localized text id."
+
+## [0.54.1] - 2026-09-22
+
+- Variants with the same name in different folders, such as `Oak/Day1` and `Ash/Day1`, keep their own nested rows on push. Adding overrides to one of them no longer fails with "claims identity …, which another value created by this push already owns."
+
 ## [0.54.0] - 2026-09-22
 
 - `NeoSortingGroup` has a `SortPoint`: where the group sorts along the transparency sort axis, as a cell offset from the object's origin-cell corner. It defaults to `(0.5, 0)`, the bottom center of the origin cell. Generated Unity classes implement `INeoSortingGroup.SortPoint`, which requires Neo Compose SDK 0.40.0.

package/dist/neo.mjs

@@ -9164,15 +9164,15 @@ var init_strict_resolver = __esm({
             symbol
           };
         }
-        const variantPath = this.resolveVariantPath(receiverAst, name, scope, pos);
-        if (variantPath !== null) {
+        const variantPath2 = this.resolveVariantPath(receiverAst, name, scope, pos);
+        if (variantPath2 !== null) {
           if (optional2) {
             throw new CompileError(
               "Optional chaining is not valid on a variant path.",
               pos
             );
           }
-          return variantPath;
+          return variantPath2;
         }
         if (receiverAst.kind === "ident" && !scope.lookup(receiverAst.name)) {
           if (receiverAst.name === "SpriteInfo" && name === "Empty") {
@@ -22366,9 +22366,9 @@ function contextualAnnotationFields(document, position) {
       }
       const typeAnnotation = findTypeAnnotation(member.type, position);
       if (typeAnnotation) {
-        return fieldsForAnnotation(typeAnnotation.name, {
+        return fieldsForAnnotation(typeAnnotation.annotation.name, {
           kind: "type",
-          type: semanticType(member.type)
+          type: semanticType(typeAnnotation.type)
         });
       }
     }
@@ -22466,6 +22466,13 @@ function validateDeclaration(uri, declaration, documentKind, environment, diagno
     diagnostics
   );
   if (declaration.kind === "global") {
+    validateTypeAnnotations(
+      uri,
+      declaration.type,
+      "none",
+      environment,
+      diagnostics
+    );
     if (declaration.type.name === "Root") {
       validateProjectRootGlobal(uri, declaration, environment, diagnostics);
       return;
@@ -22507,11 +22514,26 @@ function validateDeclaration(uri, declaration, documentKind, environment, diagno
         validateTypeAnnotations(
           uri,
           parameter4.constraint,
+          "none",
           environment,
           diagnostics
         );
       }
     }
+    for (const parameter4 of declaration.headerParameters ?? []) {
+      validateTypeAnnotations(
+        uri,
+        parameter4.type,
+        "none",
+        environment,
+        diagnostics
+      );
+    }
+  }
+  if (declaration.kind === "class" || declaration.kind === "interface") {
+    for (const baseType of declaration.baseTypes) {
+      validateTypeAnnotations(uri, baseType, "none", environment, diagnostics);
+    }
   }
   const scope = new Map(environment.globals);
   if (declaration.kind === "class") {
@@ -22810,7 +22832,13 @@ function validateMember(uri, member, ownerName, documentKind, ownerScope, enviro
     environment,
     diagnostics
   );
-  validateTypeAnnotations(uri, member.type, environment, diagnostics);
+  validateTypeAnnotations(
+    uri,
+    member.type,
+    elementSettingsSite(member, documentKind),
+    environment,
+    diagnostics
+  );
   if (documentKind !== "flow") {
     validateListAnnotations(uri, member, ownerName, environment, diagnostics);
   }
@@ -22818,7 +22846,13 @@ function validateMember(uri, member, ownerName, documentKind, ownerScope, enviro
   if (member.kind === "function") {
     for (const parameter4 of member.parameters) {
       scope.set(parameter4.name, semanticType(parameter4.type));
-      validateTypeAnnotations(uri, parameter4.type, environment, diagnostics);
+      validateTypeAnnotations(
+        uri,
+        parameter4.type,
+        "none",
+        environment,
+        diagnostics
+      );
     }
     return;
   }
@@ -22919,16 +22953,77 @@ function validateFlowContent(uri, content, parentScope, environment, diagnostics
     }
   }
 }
-function validateTypeAnnotations(uri, type, environment, diagnostics) {
-  validateAnnotations(
+function elementSettingsSite(member, documentKind) {
+  if (documentKind === "flow" || member.kind !== "field") return "none";
+  const overrides = member.modifiers.includes("override") || member.modifiers.includes("sealed");
+  return overrides ? "override" : "declaringField";
+}
+function validateTypeAnnotations(uri, type, site, environment, diagnostics) {
+  rejectTypeAnnotations(
     uri,
-    type.annotations,
-    { kind: "type", type: semanticType(type) },
-    environment,
+    type,
+    "is not valid before a declared type. Annotate the declaration instead.",
     diagnostics
   );
-  for (const argument2 of type.typeArguments) {
-    validateTypeAnnotations(uri, argument2, environment, diagnostics);
+  validateTypeArgumentAnnotations(uri, type, site, environment, diagnostics);
+}
+function validateTypeArgumentAnnotations(uri, type, site, environment, diagnostics) {
+  const elementIndex = collectionElementIndex(type.name);
+  for (const [index, argument2] of type.typeArguments.entries()) {
+    const element = index === elementIndex;
+    if (!element) {
+      rejectTypeAnnotations(
+        uri,
+        argument2,
+        type.name === "Dictionary" ? "is not valid on a Dictionary key. Only the value type accepts element settings." : `is not valid on a ${type.name} type argument. Only a List element or Dictionary value accepts element settings.`,
+        diagnostics
+      );
+    } else if (site === "override") {
+      rejectTypeAnnotations(
+        uri,
+        argument2,
+        "is not valid on an override's element type. Declare element settings on the member that declares the collection.",
+        diagnostics
+      );
+    } else if (site === "none") {
+      rejectTypeAnnotations(
+        uri,
+        argument2,
+        "is not valid here. Only a field's List element or Dictionary value accepts element settings.",
+        diagnostics
+      );
+    } else {
+      validateAnnotations(
+        uri,
+        argument2.annotations,
+        { kind: "type", type: semanticType(argument2) },
+        environment,
+        diagnostics
+      );
+    }
+    validateTypeArgumentAnnotations(
+      uri,
+      argument2,
+      element ? site : "none",
+      environment,
+      diagnostics
+    );
+  }
+}
+function collectionElementIndex(name) {
+  if (name === "List") return 0;
+  if (name === "Dictionary") return 1;
+  return null;
+}
+function rejectTypeAnnotations(uri, type, reason, diagnostics) {
+  for (const annotation2 of type.annotations) {
+    pushDiagnostic(
+      diagnostics,
+      uri,
+      annotation2.nameRange,
+      "invalid-type-annotation",
+      `@${annotation2.name} ${reason}`
+    );
   }
 }
 function validateAnnotations(uri, annotations, context, environment, diagnostics) {
@@ -22997,6 +23092,7 @@ function fieldsForAnnotation(name, context, environment) {
     return context.kind === "class" ? [{ name: "visibility", type: "NeoClassVisibility" }] : null;
   }
   if (name === "settings") return settingsFields(context);
+  if (context.kind === "type") return null;
   if (name === "storage") return storageFields(context);
   if (name === "distribution") return distributionFields(context);
   if (name === "relations") return relationFields(context, environment);
@@ -23072,7 +23168,7 @@ function settingsFields(context) {
   );
 }
 function distributionFields(context) {
-  if (context.kind === "member" || context.kind === "type") {
+  if (context.kind === "member") {
     return [{ name: "kind", type: "NeoSubtreeDistribution" }];
   }
   return null;
@@ -23081,7 +23177,7 @@ function storageFields(context) {
   if (context.kind === "class") {
     return [{ name: "allowed", type: "NeoAllowedStorage" }];
   }
-  if (context.kind === "member" || context.kind === "type") {
+  if (context.kind === "member") {
     return [
       { name: "allowed", type: "NeoStorage" },
       { name: "key", type: "string?" }
@@ -24636,13 +24732,13 @@ function annotationEnumOption(annotations, name, field) {
   return match?.[1] ?? null;
 }
 function isListContext(context) {
-  return (context.kind === "member" || context.kind === "type") && (context.type.name === "List" || context.type.name === "Set");
+  return context.kind === "member" && (context.type.name === "List" || context.type.name === "Set");
 }
 function findTypeAnnotation(type, position) {
   const own = type.annotations.find(
     (annotation2) => inAnnotationArguments(annotation2, position)
   );
-  if (own) return own;
+  if (own) return { annotation: own, type };
   for (const argument2 of type.typeArguments) {
     const nested = findTypeAnnotation(argument2, position);
     if (nested) return nested;
@@ -29523,13 +29619,13 @@ function activeNamedArgument(text, position) {
   return /([A-Za-z_][A-Za-z0-9_]*)\s*:\s*\.[A-Za-z0-9_]*$/.exec(prefix)?.[1] ?? null;
 }
 function projectHover(analysis, document, position) {
-  const variantPath = projectVariantPathSymbolAt(analysis, document, position);
-  if (variantPath) {
+  const variantPath2 = projectVariantPathSymbolAt(analysis, document, position);
+  if (variantPath2) {
     return {
-      range: variantPath.token.range,
+      range: variantPath2.token.range,
       markdown: projectVariantHoverMarkdown(
-        variantPath.entry,
-        variantPath.entry.declaration.type.name === NEO_VARIANT_FOLDER_TYPE_NAME
+        variantPath2.entry,
+        variantPath2.entry.declaration.type.name === NEO_VARIANT_FOLDER_TYPE_NAME
       )
     };
   }
@@ -29629,12 +29725,12 @@ Construct with \`new(${parameters})\` \u2014 this class declares a required cons
 ${lines.join("\n\n")}`;
 }
 function projectDefinition(analysis, document, position) {
-  const variantPath = projectVariantPathSymbolAt(analysis, document, position);
-  if (variantPath) {
+  const variantPath2 = projectVariantPathSymbolAt(analysis, document, position);
+  if (variantPath2) {
     return [
       {
-        uri: variantPath.entry.uri,
-        range: variantPath.entry.declaration.nameRange
+        uri: variantPath2.entry.uri,
+        range: variantPath2.entry.declaration.nameRange
       }
     ];
   }
@@ -31446,10 +31542,12 @@ function flowArguments(argumentsValue) {
   }));
 }
 function manifestType(type) {
+  const annotations = manifestAnnotations(type.annotations);
   return {
     name: type.name,
     nullable: type.nullable,
-    arguments: type.typeArguments.map(manifestType)
+    arguments: type.typeArguments.map(manifestType),
+    ...annotations.length === 0 ? {} : { annotations }
   };
 }
 function manifestAnnotations(annotations) {
@@ -31979,7 +32077,12 @@ function assertFlowArguments(value, path) {
 }
 function assertType(value, path) {
   const type = record(value, path);
-  exactKeys(type, path, ["name", "nullable", "arguments"]);
+  exactKeysWithOptional(
+    type,
+    path,
+    ["name", "nullable", "arguments"],
+    ["annotations"]
+  );
   string(type.name, `${path}.name`);
   if (typeof type.nullable !== "boolean") {
     throw new Error(`${path}.nullable must be boolean.`);
@@ -31987,6 +32090,10 @@ function assertType(value, path) {
   array(type.arguments, `${path}.arguments`).forEach(
     (argument2, index) => assertType(argument2, `${path}.arguments[${index}]`)
   );
+  if (type.annotations === void 0) return;
+  array(type.annotations, `${path}.annotations`).forEach(
+    (entry, index) => assertAnnotation(entry, `${path}.annotations[${index}]`)
+  );
 }
 function assertAnnotation(value, path) {
   const annotation2 = record(value, path);
@@ -58134,7 +58241,12 @@ ${signature} => ${expression};`;
     context.formAlternates.push({ shorthand, block });
     return shorthand;
   }
-  const type = renderMemberType(context, member, enclosingClassId);
+  const type = renderMemberType(
+    context,
+    member,
+    enclosingClassId,
+    member.overrideOf === null
+  );
   const initializer = initDefaultSource(member) ?? (member.modifier === "static" ? context.staticInitializers.get(member.id) : void 0) ?? context.defaultInitializers.get(member.id) ?? renderDefault(context, member, enclosingClassId);
   return `${annotations.join("\n")}
 ${prefix}${type} ${member.name}${initializer === null ? ";" : ` = ${initializer};`}`;
@@ -58271,7 +58383,18 @@ function listAnnotations(member) {
     })
   ];
 }
-function renderMemberType(context, member, enclosingClassId) {
+function renderEntryType(context, entryMemberId, label, enclosingClassId, elementSettings) {
+  const entry = required(context.members, entryMemberId, label);
+  const type = renderMemberType(
+    context,
+    entry,
+    enclosingClassId,
+    elementSettings
+  );
+  const settings = elementSettings ? memberSettings(context, entry) : [];
+  return settings.length === 0 ? type : `${settings.join(" ")} ${type}`;
+}
+function renderMemberType(context, member, enclosingClassId, elementSettings = false) {
   const nullable2 = !member.required;
   const closedGenerics = enclosingClassId === void 0 ? void 0 : classGenericMemberBindings(context.classes, enclosingClassId);
   let value;
@@ -58362,11 +58485,11 @@ function renderMemberType(context, member, enclosingClassId) {
       break;
     }
     case "list":
-      value = `List<${renderMemberType(context, required(context.members, member.entryMemberId, "list entry"), enclosingClassId)}>`;
+      value = `List<${renderEntryType(context, member.entryMemberId, "list entry", enclosingClassId, elementSettings)}>`;
       break;
     case "dictionary": {
       const key = member.key.kind === "string" ? "string" : required(context.enums, member.key.enumId, "dictionary key enum").name;
-      value = `Dictionary<${key}, ${renderMemberType(context, required(context.members, member.entryMemberId, "dictionary entry"), enclosingClassId)}>`;
+      value = `Dictionary<${key}, ${renderEntryType(context, member.entryMemberId, "dictionary entry", enclosingClassId, elementSettings)}>`;
       break;
     }
     case "lookup": {
@@ -90556,6 +90679,68 @@ function resolveLocalizableStringWriteOwners(document, changes, requestedValueId
   }
   return owners;
 }
+function packedLocalizationConversionChanges(args) {
+  const beforeById = new Map(
+    args.beforeMembers.map((member) => [member.id, member])
+  );
+  const becameLocalized = (member) => {
+    if (!isMemberStringBase(member)) return false;
+    if (!isLocalizedStringMember(member)) return false;
+    const id2 = getOptionalString(member, "id");
+    const before = id2 === void 0 ? void 0 : beforeById.get(id2);
+    if (before === void 0) return false;
+    const resolved = resolveMember2(before, args.beforeMembers);
+    return isMemberStringBase(resolved) && !isLocalizedStringMember(resolved);
+  };
+  const postMembers = new Map(
+    args.postDocument.members.map((member) => [member.id, member])
+  );
+  const flips = args.changes.some((change) => {
+    if (change.recordKind !== "member" || change.operation === "delete") {
+      return false;
+    }
+    const member = postMembers.get(change.recordId);
+    return member !== void 0 && becameLocalized(resolveMember2(member, args.postDocument.members));
+  });
+  if (!flips) return [];
+  const changedValueIds = new Set(
+    args.changes.flatMap(
+      (change) => change.recordKind === "value" ? [change.recordId] : []
+    )
+  );
+  const omitted = /* @__PURE__ */ new Map();
+  for (const change of args.submitted) {
+    if (change.recordKind !== "value" || change.operation === "delete") {
+      continue;
+    }
+    if (!isMemberValue(change.nextData)) continue;
+    for (const child of decodePackedValueRow(change.nextData).children) {
+      if (changedValueIds.has(child.id)) continue;
+      if (typeof child.value !== "string" || child.value === "") continue;
+      omitted.set(child.id, { child, intent: change.intent });
+    }
+  }
+  if (omitted.size === 0) return [];
+  const owners = resolveLocalizableStringWriteOwners(
+    args.postDocument,
+    args.changes,
+    new Set(omitted.keys())
+  );
+  const conversions = [];
+  for (const [valueId, { child, intent }] of omitted) {
+    const owner = owners.get(valueId);
+    if (owner === void 0 || !becameLocalized(owner)) continue;
+    conversions.push({
+      intent,
+      recordKind: "value",
+      recordId: valueId,
+      operation: "update",
+      deleted: false,
+      nextData: child
+    });
+  }
+  return conversions;
+}
 function reconcileMemberTextUsage(document, changes, before, referencedOutsideDocument, now, contentHashByKey) {
   const assignmentChanges = changes.filter(
     (change) => change.recordKind === "member" || change.recordKind === "value"
@@ -90828,6 +91013,7 @@ var init_localizable_member_value_writes = __esm({
     init_project_record_live_references();
     init_localization2();
     init_members();
+    init_packed_value_encoding();
     init_variant_value_graph();
     init_project_version_intents();
     init_constructor_argument_ownership();
@@ -91219,10 +91405,11 @@ function commitPreparationMemberDefaultValueScope(args) {
   return { exactValueIds, descendantValueIds, evaluatesSource };
 }
 function planCommitPreparationInitialScope(args) {
+  const submitted = args.changes;
   args = {
     ...args,
     changes: expandPackedValueWriteChanges({
-      changes: args.changes,
+      changes: submitted,
       baseValues: args.document.values ?? [],
       basePhysicalValues: args.document.physicalValues,
       omitUnchangedChildren: true
@@ -91233,6 +91420,18 @@ function planCommitPreparationInitialScope(args) {
   );
   const currentDocument = overlayPlanningDocument(args.document, []);
   const postDocument = overlayPlanningDocument(currentDocument, args.changes);
+  args = {
+    ...args,
+    changes: [
+      ...args.changes,
+      ...packedLocalizationConversionChanges({
+        submitted,
+        changes: args.changes,
+        beforeMembers: currentDocument.members,
+        postDocument
+      })
+    ]
+  };
   const exactRecords = /* @__PURE__ */ new Map();
   const descendantRecords = /* @__PURE__ */ new Map();
   const rememberExact = (recordKind, recordId, includeDescendants = false) => {
@@ -91722,8 +91921,13 @@ function planCommitPreparationLoadedClosureScope(args) {
     postings.set(commitPreparationPostingRequestKey(posting), posting);
   };
   for (const record6 of args.records) {
-    if (record6.recordKind === "value" && isMemberValue(record6.data) && typeof record6.data.value === "string" && record6.data.value !== "") {
-      rememberExact("localized-text", record6.data.value);
+    if (record6.recordKind === "value" && isMemberValue(record6.data)) {
+      const decoded = decodePackedValueRow(record6.data);
+      for (const row of [decoded.row, ...decoded.children]) {
+        if (typeof row.value === "string" && row.value !== "") {
+          rememberExact("localized-text", row.value);
+        }
+      }
     }
     if (record6.recordKind === "member" && isMemberStringBase(record6.data) && isLocalizedStringMember(record6.data) && typeof record6.data.defaultValue?.value === "string" && record6.data.defaultValue.value !== "") {
       rememberExact("localized-text", record6.data.defaultValue.value);
@@ -97069,6 +97273,14 @@ function* prepareServerOwnedSchemaCommitPasses(args) {
       true
     );
   authoredChanges = retargeted;
+  authoredChanges.push(
+    ...packedLocalizationConversionChanges({
+      submitted: args.changes,
+      changes: authoredChanges,
+      beforeMembers: args.document.members,
+      postDocument: authoredPost
+    })
+  );
   const editedValueIds = new Set(
     authoredChanges.filter(
       (change) => change.recordKind === "value" && change.operation === "update"
@@ -109196,7 +109408,15 @@ function lowerMemberKind(context, ownerClass, declaration, id2, owner) {
       deferred: declaration.modifiers.includes("async")
     };
   }
-  return lowerFieldMember(context, ownerClass, declaration, id2, common, base);
+  return lowerFieldMember(
+    context,
+    ownerClass,
+    declaration,
+    id2,
+    common,
+    base,
+    "declaration"
+  );
 }
 function lowerUiFunctionAction(context, ownerName, declaration, base, memberId, sourceText) {
   const compiled = context.compiledFunctionBodiesByMemberId.get(memberId) ?? context.compiledFunctionBodiesBySourceName.get(
@@ -109343,7 +109563,7 @@ function resolvedMemberStorage(context, memberId, visited = /* @__PURE__ */ new
   }
   return null;
 }
-function lowerFieldMember(context, ownerClass, declaration, id2, commonInput, base) {
+function lowerFieldMember(context, ownerClass, declaration, id2, commonInput, base, entrySettings) {
   const partial = declaration.type.name === "Partial";
   const fieldType = partial ? requiredTypeArgument(declaration.type, 0) : declaration.type;
   const storedStatic = declaration.modifiers.includes("static") && !declaration.modifiers.includes("readonly");
@@ -109506,6 +109726,7 @@ function lowerFieldMember(context, ownerClass, declaration, id2, commonInput, ba
       );
     }
     const multiselect = fieldType.name === "Set" || selection2 === "Multi";
+    assertNoElementSettings(fieldType, ownerClass, declaration, "lookup");
     return {
       ...common,
       kind: "lookup",
@@ -109540,9 +109761,11 @@ function lowerFieldMember(context, ownerClass, declaration, id2, commonInput, ba
     }
     const multiselect = name === "Set" || selection2 === "Multi";
     if (enumId2 && multiselect) {
+      assertNoElementSettings(fieldType, ownerClass, declaration, "enum");
       return { ...common, kind: "enum", enumId: enumId2, multiselect: true };
     }
     if (entryType.name === "Dialogue" && multiselect) {
+      assertNoElementSettings(fieldType, ownerClass, declaration, "dialogue");
       return {
         ...common,
         kind: "dialogueLookup",
@@ -109567,7 +109790,8 @@ function lowerFieldMember(context, ownerClass, declaration, id2, commonInput, ba
       entryType,
       entryId,
       id2,
-      declaringMemberId
+      declaringMemberId,
+      entrySettings
     );
     return {
       ...common,
@@ -109596,7 +109820,8 @@ function lowerFieldMember(context, ownerClass, declaration, id2, commonInput, ba
       entryType,
       entryId,
       id2,
-      declaringMemberId
+      declaringMemberId,
+      entrySettings
     );
     return {
       ...common,
@@ -109657,6 +109882,12 @@ function lowerFieldMember(context, ownerClass, declaration, id2, commonInput, ba
     `Unsupported field type ${JSON.stringify(name)} on ${ownerClass.name}.${declaration.name}.`
   );
 }
+function assertNoElementSettings(fieldType, ownerClass, declaration, kind) {
+  if (!fieldType.arguments[0]?.annotations?.length) return;
+  throw new Error(
+    `Member ${ownerClass.name}.${declaration.name} is a multi-select ${kind}, which has no entry member for element settings. Remove the annotations before its element type.`
+  );
+}
 function inheritedMember(context, memberId) {
   if (memberId === null) return void 0;
   return context.loweredMembers.get(memberId) ?? context.baseMembers.get(memberId);
@@ -109756,7 +109987,7 @@ function overrideParentMemberId(context, memberId) {
   const overrides = member.modifiers.includes("override") || member.modifiers.includes("sealed");
   return overrides ? inheritedMemberId(context, ownerClass, member.name) : null;
 }
-function lowerCollectionEntry(context, ownerClass, entryType, entryId, parentMemberId, declaringMemberId) {
+function lowerCollectionEntry(context, ownerClass, entryType, entryId, parentMemberId, declaringMemberId, entrySettings) {
   const declared = declaredCollectionEntryType(context, declaringMemberId);
   const expected = declared === null ? null : resolveManifestTypeInDescendant(
     context,
@@ -109783,7 +110014,7 @@ function lowerCollectionEntry(context, ownerClass, entryType, entryId, parentMem
   context.entryTypesByEntryId.set(entryId, entryDeclarationType);
   if (context.loweredMembers.has(entryId)) return;
   const base = context.baseMembers.get(entryId);
-  if (base) {
+  if (base !== void 0 && entrySettings === "stored") {
     context.loweredMembers.set(base.id, {
       ...base,
       owner: { kind: "collectionEntry", parentMemberId }
@@ -109801,7 +110032,7 @@ function lowerCollectionEntry(context, ownerClass, entryType, entryId, parentMem
     name: "Item",
     type: entryDeclarationType,
     modifiers: [],
-    annotations: [],
+    annotations: entryDeclarationType.annotations ?? [],
     initializer: null,
     body: null,
     parameters: []
@@ -109814,18 +110045,89 @@ function lowerCollectionEntry(context, ownerClass, entryType, entryId, parentMem
     { kind: "collectionEntry", parentMemberId },
     base
   );
+  const lowered = lowerFieldMember(
+    context,
+    entryOwnerClass,
+    declaration,
+    entryId,
+    common,
+    base,
+    entrySettings
+  );
+  if (base !== void 0 && entryTarget(base) !== entryTarget(lowered)) {
+    throw new Error(
+      `Collection member ${ownerClass.name}.${parentMemberId} declares element type ${formatManifestType(entryDeclarationType)}, but its stored entry member is a ${base.kind} of another type. An existing collection's element type cannot change; declare a new member instead.`
+    );
+  }
   context.loweredMembers.set(
     entryId,
-    lowerFieldMember(
-      context,
-      entryOwnerClass,
-      declaration,
-      entryId,
-      common,
-      base
-    )
+    base === void 0 ? lowered : {
+      ...withEntrySettings(base, lowered),
+      owner: { kind: "collectionEntry", parentMemberId }
+    }
   );
 }
+function entryTarget(member) {
+  switch (member.kind) {
+    case "class":
+      return `class:${member.classId}`;
+    case "enum":
+      return `enum:${member.enumId}`;
+    case "generic":
+      return `generic:${member.genericParamId}`;
+    default:
+      return member.kind;
+  }
+}
+function withEntrySettings(base, lowered) {
+  switch (lowered.kind) {
+    case "string":
+      return base.kind === lowered.kind ? {
+        ...base,
+        localizable: lowered.localizable,
+        searchKey: lowered.searchKey
+      } : base;
+    case "int":
+      return base.kind === lowered.kind ? { ...base, min: lowered.min, max: lowered.max } : base;
+    case "float":
+      return base.kind === lowered.kind ? {
+        ...base,
+        min: lowered.min,
+        max: lowered.max,
+        decimalPoints: lowered.decimalPoints
+      } : base;
+    case "decimal":
+      return base.kind === lowered.kind ? {
+        ...base,
+        min: lowered.min,
+        max: lowered.max,
+        decimalPoints: lowered.decimalPoints
+      } : base;
+    case "list":
+      return base.kind === lowered.kind ? { ...base, listKind: lowered.listKind } : base;
+    case "enum":
+      return base.kind === lowered.kind ? { ...base, multiselect: lowered.multiselect } : base;
+    case "lookup":
+      return base.kind === lowered.kind ? {
+        ...base,
+        collectionMemberId: lowered.collectionMemberId,
+        collectionValueId: lowered.collectionValueId,
+        multiselect: lowered.multiselect
+      } : base;
+    case "dialogueLookup":
+      return base.kind === lowered.kind ? {
+        ...base,
+        dialogueGroupId: lowered.dialogueGroupId,
+        multiselect: lowered.multiselect
+      } : base;
+    case "sprite":
+      return base.kind === lowered.kind ? { ...base, templateId: lowered.templateId } : base;
+    case "audio":
+      return base.kind === lowered.kind ? { ...base, templateId: lowered.templateId } : base;
+    default:
+      return base;
+  }
+}
 function declaredCollectionEntryType(context, declaringMemberId) {
   const placement = context.sourceMembersById.get(declaringMemberId);
   if (placement === void 0) return null;
@@ -111065,7 +111367,8 @@ function lowerGenericArgument(context, ownerClass, type, memberId, genericParamI
         requiredTypeArgument(type, base.kind === "list" ? 0 : 1),
         base.entryMemberId,
         memberId,
-        memberId
+        memberId,
+        "stored"
       );
     }
     return;
@@ -111106,7 +111409,8 @@ function lowerGenericArgument(context, ownerClass, type, memberId, genericParamI
         storage: base?.storage ?? null,
         storageKey: base?.storageKey ?? null
       },
-      base
+      base,
+      "stored"
     )
   );
 }
@@ -111856,6 +112160,9 @@ function variantValueBindingsV4(manifest, analysis) {
   const classNames = new Map(
     manifest.classes.map((entry) => [entry.id, entry.name])
   );
+  const folderPaths = new Map(
+    manifest.variantFolders.map((folder) => [folder.id, folder.path])
+  );
   return variantGlobals(analysis).flatMap((global) => {
     const variant2 = variantsById.get(
       variantRecordId(global, NEO_VARIANT_TYPE_NAME)
@@ -111877,11 +112184,31 @@ function variantValueBindingsV4(manifest, analysis) {
         valueId: variant2.valueId,
         initializer: global.initializer,
         source: global.source,
-        label: `${requiredClassName2(classNames, variant2.classId)}.${NEO_VARIANT_SCOPE_NAME}.${variant2.name}`
+        label: variantLabel(
+          requiredClassName2(classNames, variant2.classId),
+          variant2,
+          folderPaths
+        )
       }
     ];
   });
 }
+function variantLabel(className, variant2, folderPaths) {
+  if (variant2.folderId === null) {
+    return variantPath(className, null, variant2.name);
+  }
+  const folderPath3 = folderPaths.get(variant2.folderId);
+  if (folderPath3 === void 0) {
+    throw new Error(
+      `Variant ${variant2.name} sits in folder ${JSON.stringify(variant2.folderId)}, which this push does not declare.`
+    );
+  }
+  return variantPath(className, folderPath3, variant2.name);
+}
+function variantPath(className, folderPath3, name) {
+  const scope = folderPath3 === null || folderPath3 === "" ? `${className}.${NEO_VARIANT_SCOPE_NAME}` : `${className}.${NEO_VARIANT_SCOPE_NAME}.${folderPath3.split(NEO_VARIANT_FOLDER_PATH_SEPARATOR).join(".")}`;
+  return `${scope}.${name}`;
+}
 function requiredClassName2(classNames, classId) {
   const name = classNames.get(classId);
   if (name === void 0) {
@@ -112013,8 +112340,7 @@ function buildVariantPathIndexV4(classIdsByName, analysis) {
       annotationsForFolderLookup(global.annotations)
     );
     const path = symbol === null ? null : foldersBySymbol.get(folderSymbolKey(className, symbol)) ?? null;
-    const scope = path === null || path === "" ? `${className}.${NEO_VARIANT_SCOPE_NAME}` : `${className}.${NEO_VARIANT_SCOPE_NAME}.${path.split(NEO_VARIANT_FOLDER_PATH_SEPARATOR).join(".")}`;
-    index.set(`${scope}.${global.name}`, {
+    index.set(variantPath(className, path, global.name), {
       classId,
       variantId: variantRecordId(global, global.type.name),
       valueClassId: global.type.name === NEO_LOOKUP_VARIANT_TYPE_NAME ? classIdsByName.get(valueClassName(global)) ?? null : null
@@ -115252,6 +115578,8 @@ var init_root_value_paths = __esm({
 // src/project-source/packed-value-parity.ts
 function logicalValueBaseRecordsV4(records2) {
   let expanded = null;
+  const parentByPackedId = /* @__PURE__ */ new Map();
+  const rootByPackedId = /* @__PURE__ */ new Map();
   for (const [key, record6] of Object.entries(records2)) {
     if (record6.recordKind !== "value") continue;
     if (!isObjectRecord2(record6.data)) continue;
@@ -115263,6 +115591,12 @@ function logicalValueBaseRecordsV4(records2) {
       );
     }
     const decoded = decodePackedValueRow(authoredData);
+    for (const [parentId, childIds] of decoded.packedChildIdsByParentId) {
+      for (const childId of childIds) {
+        parentByPackedId.set(childId, parentId);
+        rootByPackedId.set(childId, record6.recordId);
+      }
+    }
     expanded ??= { ...records2 };
     expanded[key] = { ...record6, data: decoded.row };
     for (const child of decoded.children) {
@@ -115275,7 +115609,10 @@ function logicalValueBaseRecordsV4(records2) {
       };
     }
   }
-  return expanded ?? records2;
+  return {
+    records: expanded ?? records2,
+    residency: { parentByPackedId, rootByPackedId }
+  };
 }
 function foldCandidateValueRowsV4(args) {
   if (args.candidates.size === 0) return EMPTY_FOLD;
@@ -115287,7 +115624,11 @@ function foldCandidateValueRowsV4(args) {
     rows.push(row);
     inputById.set(valueId, row);
   }
-  const fold = foldPackedValueRows({ rows, document: args.schema });
+  const fold = foldPackedValueRows({
+    rows,
+    document: args.schema,
+    residency: args.residency
+  });
   if (fold.rootByFoldedId.size === 0) return EMPTY_FOLD;
   const adoptedRootIds = /* @__PURE__ */ new Set();
   for (const [childId, rootId] of fold.rootByFoldedId) {
@@ -116388,9 +116729,7 @@ function computeWorkspaceStatus(workspace, options) {
       binaryFiles: []
     };
   }
-  const loweringRecords = logicalValueBaseRecordsV4(
-    loweringBaseRecords(workspace.state.records)
-  );
+  const { records: loweringRecords, residency: packedResidency } = logicalValueBaseRecordsV4(loweringBaseRecords(workspace.state.records));
   const baseDocuments = schemaBaseDocuments(workspace);
   const staticMemberOwnershipRecoveries = [];
   const baseManifest = baseDocuments.length === 0 ? void 0 : documentsToProjectSchemaManifest(baseDocuments, {
@@ -116956,6 +117295,14 @@ function computeWorkspaceStatus(workspace, options) {
       workspace.config.projectId
     ),
     reconstructed: reconstructed3,
+    changes,
+    residency: packedResidency,
+    rewrittenValueIds: valueLowerRegistry.localizationConversionValueIds
+  });
+  writeLocalizationConversionRowsV4({
+    workspace,
+    rootByPackedId: packedResidency.rootByPackedId,
+    valueIds: valueLowerRegistry.localizationConversionValueIds,
     changes
   });
   reportPhase("packed-value-fold", "Checking initializers\u2026");
@@ -117590,7 +117937,7 @@ function applyPackedValueFoldV4(args) {
     candidates.set(record6.recordId, record6.fullData);
     const logicalBase = args.loweringRecords[key];
     const physicalBase = args.workspace.state.records[key];
-    if (logicalBase === void 0 || physicalBase === void 0 || physicalBase.conflictServerHash !== void 0 || isPendingId(record6.recordId) || !recordsSemanticallyEqual("value", record6.fullData, logicalBase.data)) {
+    if (logicalBase === void 0 || physicalBase === void 0 || physicalBase.conflictServerHash !== void 0 || isPendingId(record6.recordId) || args.rewrittenValueIds.has(record6.recordId) || !recordsSemanticallyEqual("value", record6.fullData, logicalBase.data)) {
       touchedValueIds.add(record6.recordId);
     }
   }
@@ -117598,6 +117945,7 @@ function applyPackedValueFoldV4(args) {
     candidates,
     base: args.loweringRecords,
     physicalBase: args.workspace.state.records,
+    residency: args.residency,
     touchedValueIds,
     projectId: args.workspace.config.projectId,
     schema: args.schema
@@ -117682,6 +118030,32 @@ function applyPackedValueFoldV4(args) {
     args.reconstructed.set(key, { ...record6, fullData: packedBody });
   }
 }
+function writeLocalizationConversionRowsV4(args) {
+  if (args.valueIds.size === 0) return;
+  const records2 = args.workspace.state.records;
+  const written = new Set(
+    args.changes.map(
+      (change) => recordStateKey(change.recordKind, change.recordId)
+    )
+  );
+  for (const valueId of args.valueIds) {
+    const rootId = args.rootByPackedId.get(valueId) ?? valueId;
+    const key = recordStateKey("value", rootId);
+    if (written.has(key)) continue;
+    const base = records2[key];
+    if (base === void 0 || !isObjectRecord2(base.data)) continue;
+    written.add(key);
+    args.changes.push(
+      recordUpsertChange({
+        base,
+        recordKind: "value",
+        recordId: base.recordId,
+        file: base.file ?? null,
+        nextData: base.data
+      })
+    );
+  }
+}
 function packedFoldSchemaV4(documents, base, projectId) {
   const seedEnvelope = { projectId, createdAt: 0, updatedAt: 0 };
   const completed = /* @__PURE__ */ new Map();
@@ -120235,6 +120609,7 @@ function createValueLowerRegistryV4(options = {}) {
     pendingContainerChildCounts: /* @__PURE__ */ new Map(),
     pendingLocalizedTexts: /* @__PURE__ */ new Map(),
     pendingBindingMembersByClassId: /* @__PURE__ */ new Map(),
+    localizationConversionValueIds: /* @__PURE__ */ new Set(),
     referenceObligations: [],
     initAuthoredRowIds: /* @__PURE__ */ new Map(),
     loweringFailures: [],
@@ -120354,6 +120729,7 @@ function buildValueLowerContext(state, manifest, options = {}) {
     pendingValues: registry.pendingValues,
     pendingContainerChildCounts: registry.pendingContainerChildCounts,
     pendingLocalizedTexts: registry.pendingLocalizedTexts,
+    localizationConversionValueIds: registry.localizationConversionValueIds,
     loweredMemberIdByValueId: /* @__PURE__ */ new Map(),
     storedClassSchemaMemberIds: /* @__PURE__ */ new Map(),
     pendingBindingMembersByClassId: registry.pendingBindingMembersByClassId,
@@ -123204,6 +123580,10 @@ function retainStoredValueSubgraph(context, valueId, source, visited, member, en
         `Localizable value ${valueId} has no existing localized-text link.`
       );
     }
+    if (pulledStringMemberIsPlain(context.state, owningMember.id)) {
+      context.localizationConversionValueIds.add(valueId);
+      return;
+    }
     const textState = context.state[`localized-text:${textId}`];
     if (!isObjectRecord2(textState?.data)) {
       throw new Error(`Localized text ${textId} was not pulled.`);
@@ -123954,6 +124334,10 @@ function lowerStringValue(context, member, expression, base, source) {
       `Localizable value ${String(base.id)} has no existing localized-text link.`
     );
   }
+  if (pulledStringMemberIsPlain(context.state, member.id)) {
+    context.localizationConversionValueIds.add(String(base.id));
+    return expression.value;
+  }
   return lowerLinkedLocalizedText(
     context,
     base.value,
@@ -123961,6 +124345,19 @@ function lowerStringValue(context, member, expression, base, source) {
     source
   );
 }
+function pulledStringMemberIsPlain(state, memberId) {
+  const visited = /* @__PURE__ */ new Set();
+  let id2 = memberId;
+  while (typeof id2 === "string" && !visited.has(id2)) {
+    visited.add(id2);
+    const data = state[`member:${id2}`]?.data;
+    if (!isObjectRecord2(data)) return false;
+    if (data.format !== void 0)
+      return data.format === 1 /* Plain */;
+    id2 = data.extendsMemberId;
+  }
+  return false;
+}
 function lowerLinkedLocalizedText(context, textId, value, source) {
   const textState = context.state[`localized-text:${textId}`];
   if (!isObjectRecord2(textState?.data)) {
@@ -127607,7 +128004,7 @@ var init_project_document_cache = __esm({
     init_src();
     init_project_documents();
     PROJECT_SOURCE_BUILD_CACHE_PATH = ".neo/build/project-source-analysis-v4.json";
-    PROJECT_SOURCE_BUILD_CACHE_REVISION = 1;
+    PROJECT_SOURCE_BUILD_CACHE_REVISION = 2;
     PROJECT_SOURCE_DOCUMENT_BUILD_CACHE_PATH = ".neo/build/project-source-documents-v1.json";
     PROJECT_SOURCE_DOCUMENT_BUILD_CACHE_REVISION = 1;
   }
@@ -138844,7 +139241,7 @@ var init_registry2 = __esm({
   "schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.54.0",
+      cliVersion: "0.55.0",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -146665,7 +147062,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.54.0");
+    console.log("0.55.0");
     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.54.0",
+  "version": "0.55.0",
   "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.54.0 -->
+<!-- reviewed-through-cli: 0.55.0 -->
 
 # Neo Compose CLI
 

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

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

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

@@ -85,6 +85,10 @@ Use context-aware typed annotations:
 - `@visibility(.Hidden)` only on a class; absence means visible.
 - Stateful settings use contextual enum cases, such as
   `@settings(format: .Plain)` and `@settings(selection: .Multi)`.
+- `@settings(...)` before a `List` element or `Dictionary` value type
+  configures the collection's entries: `List<@settings(format: .Plain) string>`,
+  `Dictionary<string, @settings(min: 0) int>`. Only the member that declares
+  the collection spells them; overrides share its entries.
 - `@relations(...)` only on the source class of a specialized direct relation.
 - `@distribution(kind: .Sparse | .Packed)` only on a value-owning member
   declaration or override. It chooses whether the member's value keeps its