@neocompose/cli 0.57.1 → 0.57.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.57.2] - 2026-09-23
+
+- Removing a variant's last `overrides:` argument deletes its stored override row. Dry run and push accept the edit, including variants whose initializer is an inline delegate.
+
 ## [0.57.1] - 2026-09-23
 
 - A dialogue authored in `.neoflow` for a `.Lookup` group is triggered by its `@primary` value, matching dialogues created in the web editor. Before, it was saved with no lookup value, so the group never triggered it. Moving a dialogue to another kind of group clears its lookup value. Push again to repair affected dialogues.

package/dist/neo.mjs

@@ -46299,7 +46299,8 @@ function isValidProjectBindingIdentifier(value) {
 var init_project_source_identifiers2 = __esm({
   "../src/models/project-source-identifiers.ts"() {
     "use strict";
-    init_src();
+    init_generated_csharp_identifiers();
+    init_project_source_identifiers();
   }
 });
 
@@ -46323,46 +46324,6 @@ var init_schema_identifiers = __esm({
   }
 });
 
-// ../src/models/neoscript/neoscript-types.ts
-var NS_TYPE_UNKNOWN, NS_TYPE_VOID, NSAssignmentOperator, NSWritability, NSCollectionMutation;
-var init_neoscript_types = __esm({
-  "../src/models/neoscript/neoscript-types.ts"() {
-    "use strict";
-    NS_TYPE_UNKNOWN = "Unknown";
-    NS_TYPE_VOID = "Void";
-    NSAssignmentOperator = /* @__PURE__ */ ((NSAssignmentOperator2) => {
-      NSAssignmentOperator2["Assign"] = "=";
-      NSAssignmentOperator2["AddAssign"] = "+=";
-      NSAssignmentOperator2["SubtractAssign"] = "-=";
-      NSAssignmentOperator2["MultiplyAssign"] = "*=";
-      NSAssignmentOperator2["DivideAssign"] = "/=";
-      NSAssignmentOperator2["ModuloAssign"] = "%=";
-      NSAssignmentOperator2["Increment"] = "++";
-      NSAssignmentOperator2["Decrement"] = "--";
-      return NSAssignmentOperator2;
-    })(NSAssignmentOperator || {});
-    NSWritability = /* @__PURE__ */ ((NSWritability2) => {
-      NSWritability2["Local"] = "local";
-      NSWritability2["Save"] = "save";
-      NSWritability2["Session"] = "session";
-      NSWritability2["Immutable"] = "immutable";
-      NSWritability2["ImmutableToSaveLookup"] = "immutableToSaveLookup";
-      NSWritability2["ImmutableToSessionLookup"] = "immutableToSessionLookup";
-      NSWritability2["Runtime"] = "runtime";
-      NSWritability2["ReadOnly"] = "readOnly";
-      NSWritability2["Setter"] = "setter";
-      return NSWritability2;
-    })(NSWritability || {});
-    NSCollectionMutation = /* @__PURE__ */ ((NSCollectionMutation2) => {
-      NSCollectionMutation2["Add"] = "Add";
-      NSCollectionMutation2["Remove"] = "Remove";
-      NSCollectionMutation2["RemoveAt"] = "RemoveAt";
-      NSCollectionMutation2["Clear"] = "Clear";
-      return NSCollectionMutation2;
-    })(NSCollectionMutation || {});
-  }
-});
-
 // ../src/models/neoscript/neoscript-compiler-revision.ts
 function isAcceptedNeoScriptCompilerRevision(stamp, rollout = ACTIVE_NEOSCRIPT_COMPILER_REVISION_ROLLOUT) {
   if (stamp === NEOSCRIPT_COMPILER_REVISION) return true;
@@ -46407,12 +46368,52 @@ var ACTIVE_NEOSCRIPT_COMPILER_REVISION_ROLLOUT;
 var init_neoscript_compiler_revision = __esm({
   "../src/models/neoscript/neoscript-compiler-revision.ts"() {
     "use strict";
-    init_src();
+    init_strict_ir();
     ACTIVE_NEOSCRIPT_COMPILER_REVISION_ROLLOUT = // <neoscript-compiler-revision-rollout>
     null;
   }
 });
 
+// ../src/models/neoscript/neoscript-types.ts
+var NS_TYPE_UNKNOWN, NS_TYPE_VOID, NSAssignmentOperator, NSWritability, NSCollectionMutation;
+var init_neoscript_types = __esm({
+  "../src/models/neoscript/neoscript-types.ts"() {
+    "use strict";
+    NS_TYPE_UNKNOWN = "Unknown";
+    NS_TYPE_VOID = "Void";
+    NSAssignmentOperator = /* @__PURE__ */ ((NSAssignmentOperator2) => {
+      NSAssignmentOperator2["Assign"] = "=";
+      NSAssignmentOperator2["AddAssign"] = "+=";
+      NSAssignmentOperator2["SubtractAssign"] = "-=";
+      NSAssignmentOperator2["MultiplyAssign"] = "*=";
+      NSAssignmentOperator2["DivideAssign"] = "/=";
+      NSAssignmentOperator2["ModuloAssign"] = "%=";
+      NSAssignmentOperator2["Increment"] = "++";
+      NSAssignmentOperator2["Decrement"] = "--";
+      return NSAssignmentOperator2;
+    })(NSAssignmentOperator || {});
+    NSWritability = /* @__PURE__ */ ((NSWritability2) => {
+      NSWritability2["Local"] = "local";
+      NSWritability2["Save"] = "save";
+      NSWritability2["Session"] = "session";
+      NSWritability2["Immutable"] = "immutable";
+      NSWritability2["ImmutableToSaveLookup"] = "immutableToSaveLookup";
+      NSWritability2["ImmutableToSessionLookup"] = "immutableToSessionLookup";
+      NSWritability2["Runtime"] = "runtime";
+      NSWritability2["ReadOnly"] = "readOnly";
+      NSWritability2["Setter"] = "setter";
+      return NSWritability2;
+    })(NSWritability || {});
+    NSCollectionMutation = /* @__PURE__ */ ((NSCollectionMutation2) => {
+      NSCollectionMutation2["Add"] = "Add";
+      NSCollectionMutation2["Remove"] = "Remove";
+      NSCollectionMutation2["RemoveAt"] = "RemoveAt";
+      NSCollectionMutation2["Clear"] = "Clear";
+      return NSCollectionMutation2;
+    })(NSCollectionMutation || {});
+  }
+});
+
 // ../src/models/neoscript/neoscript-guards.ts
 function isNSTypeInfoBase(value) {
   const v = value;
@@ -47460,7 +47461,7 @@ var init_neoscript_guards = __esm({
   "../src/models/neoscript/neoscript-guards.ts"() {
     "use strict";
     init_neoscript_compiler_revision();
-    init_member_kinds();
+    init_member_kind_enum();
     init_core();
     init_neoscript_types();
     NS_STRING_OPS = [
@@ -47536,78 +47537,7 @@ var init_parameter_defaults = __esm({
   }
 });
 
-// ../src/models/interfaces/interface-graph.ts
-function resolveInterfaceClosure(interfaceId, interfaces) {
-  const byId = new Map(
-    interfaces.map((neoInterface) => [neoInterface.id, neoInterface])
-  );
-  const result = [];
-  const emitted = /* @__PURE__ */ new Set();
-  const visiting = [];
-  const visitingSet = /* @__PURE__ */ new Set();
-  const visit = (id2) => {
-    if (visitingSet.has(id2)) {
-      throw new CircularInterfaceExtensionError(id2, [...visiting, id2]);
-    }
-    if (emitted.has(id2)) return;
-    const neoInterface = byId.get(id2);
-    if (!neoInterface) return;
-    visiting.push(id2);
-    visitingSet.add(id2);
-    result.push(neoInterface);
-    emitted.add(id2);
-    for (const parentId of neoInterface.extendsInterfaceIds ?? []) {
-      visit(parentId);
-    }
-    visiting.pop();
-    visitingSet.delete(id2);
-  };
-  visit(interfaceId);
-  return result;
-}
-function resolveImplementedInterfaces(classId, classes, interfaces) {
-  const result = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const schemaClass2 of resolveInheritanceChain(classId, classes)) {
-    for (const interfaceId of schemaClass2.implementsInterfaceIds ?? []) {
-      for (const neoInterface of resolveInterfaceClosure(
-        interfaceId,
-        interfaces
-      )) {
-        if (seen.has(neoInterface.id)) continue;
-        seen.add(neoInterface.id);
-        result.push(neoInterface);
-      }
-    }
-  }
-  return result;
-}
-function classImplementsInterface(classId, interfaceId, classes, interfaces) {
-  return resolveImplementedInterfaces(classId, classes, interfaces).some(
-    (neoInterface) => neoInterface.id === interfaceId
-  );
-}
-var CircularInterfaceExtensionError;
-var init_interface_graph = __esm({
-  "../src/models/interfaces/interface-graph.ts"() {
-    "use strict";
-    init_inheritance();
-    CircularInterfaceExtensionError = class extends Error {
-      constructor(interfaceId, chain) {
-        super(
-          `Circular interface extension detected at "${interfaceId}"; chain: ${chain.join(" -> ")}`
-        );
-        this.interfaceId = interfaceId;
-        this.chain = chain;
-        this.name = "CircularInterfaceExtensionError";
-      }
-      interfaceId;
-      chain;
-    };
-  }
-});
-
-// ../src/models/neoscript/type-info-compatibility.ts
+// ../src/models/neoscript/type-info-equality.ts
 function typeInfosInvariantlyEqual(left, right) {
   if (left.type !== right.type) return false;
   if (left.required !== right.required) return false;
@@ -47657,25 +47587,11 @@ function typeInfosInvariantlyEqual(left, right) {
   }
   return true;
 }
-var init_type_info_compatibility = __esm({
-  "../src/models/neoscript/type-info-compatibility.ts"() {
-    "use strict";
-    init_member_kinds();
-    init_inheritance();
-    init_interface_graph();
-    init_neoscript_types();
-  }
-});
-
-// ../src/models/neoscript/index.ts
-var init_neoscript = __esm({
-  "../src/models/neoscript/index.ts"() {
+var init_type_info_equality = __esm({
+  "../src/models/neoscript/type-info-equality.ts"() {
     "use strict";
+    init_member_kind_enum();
     init_neoscript_types();
-    init_neoscript_guards();
-    init_parameter_defaults();
-    init_type_info_compatibility();
-    init_neoscript_compiler_revision();
   }
 });
 
@@ -49116,7 +49032,10 @@ var init_member_kinds = __esm({
     init_core();
     init_docs_text2();
     init_schema_identifiers();
-    init_neoscript();
+    init_neoscript_guards();
+    init_neoscript_types();
+    init_parameter_defaults();
+    init_type_info_equality();
     init_classes();
     init_member_kind_enum();
     init_member_kind_taxonomy();
@@ -49700,6 +49619,102 @@ var init_inheritance = __esm({
   }
 });
 
+// ../src/models/interfaces/interface-graph.ts
+function resolveInterfaceClosure(interfaceId, interfaces) {
+  const byId = new Map(
+    interfaces.map((neoInterface) => [neoInterface.id, neoInterface])
+  );
+  const result = [];
+  const emitted = /* @__PURE__ */ new Set();
+  const visiting = [];
+  const visitingSet = /* @__PURE__ */ new Set();
+  const visit = (id2) => {
+    if (visitingSet.has(id2)) {
+      throw new CircularInterfaceExtensionError(id2, [...visiting, id2]);
+    }
+    if (emitted.has(id2)) return;
+    const neoInterface = byId.get(id2);
+    if (!neoInterface) return;
+    visiting.push(id2);
+    visitingSet.add(id2);
+    result.push(neoInterface);
+    emitted.add(id2);
+    for (const parentId of neoInterface.extendsInterfaceIds ?? []) {
+      visit(parentId);
+    }
+    visiting.pop();
+    visitingSet.delete(id2);
+  };
+  visit(interfaceId);
+  return result;
+}
+function resolveImplementedInterfaces(classId, classes, interfaces) {
+  const result = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const schemaClass2 of resolveInheritanceChain(classId, classes)) {
+    for (const interfaceId of schemaClass2.implementsInterfaceIds ?? []) {
+      for (const neoInterface of resolveInterfaceClosure(
+        interfaceId,
+        interfaces
+      )) {
+        if (seen.has(neoInterface.id)) continue;
+        seen.add(neoInterface.id);
+        result.push(neoInterface);
+      }
+    }
+  }
+  return result;
+}
+function classImplementsInterface(classId, interfaceId, classes, interfaces) {
+  return resolveImplementedInterfaces(classId, classes, interfaces).some(
+    (neoInterface) => neoInterface.id === interfaceId
+  );
+}
+var CircularInterfaceExtensionError;
+var init_interface_graph = __esm({
+  "../src/models/interfaces/interface-graph.ts"() {
+    "use strict";
+    init_inheritance();
+    CircularInterfaceExtensionError = class extends Error {
+      constructor(interfaceId, chain) {
+        super(
+          `Circular interface extension detected at "${interfaceId}"; chain: ${chain.join(" -> ")}`
+        );
+        this.interfaceId = interfaceId;
+        this.chain = chain;
+        this.name = "CircularInterfaceExtensionError";
+      }
+      interfaceId;
+      chain;
+    };
+  }
+});
+
+// ../src/models/neoscript/type-info-compatibility.ts
+var init_type_info_compatibility = __esm({
+  "../src/models/neoscript/type-info-compatibility.ts"() {
+    "use strict";
+    init_member_kind_enum();
+    init_type_info_equality();
+    init_inheritance();
+    init_interface_graph();
+    init_neoscript_types();
+  }
+});
+
+// ../src/models/neoscript/index.ts
+var init_neoscript = __esm({
+  "../src/models/neoscript/index.ts"() {
+    "use strict";
+    init_neoscript_types();
+    init_neoscript_guards();
+    init_parameter_defaults();
+    init_type_info_compatibility();
+    init_type_info_equality();
+    init_neoscript_compiler_revision();
+  }
+});
+
 // node_modules/uuid/dist-node/regex.js
 var regex_default;
 var init_regex = __esm({
@@ -52713,7 +52728,6 @@ var init_generics = __esm({
     init_structural_narrow();
     init_classes();
     init_inheritance();
-    init_members();
   }
 });
 
@@ -53458,7 +53472,6 @@ var init_read_only_members = __esm({
     init_member_storage();
     init_unordered_list_membership();
     init_dist_node();
-    init_members();
     init_classes();
     READ_ONLY_SYNTHETIC_VALUE_ID_PREFIX = "__neo_readonly_default:";
   }
@@ -54557,13 +54570,13 @@ function resolveConstructionTypeArguments(typeArguments, document) {
 var init_construction_requirements = __esm({
   "../src/models/classes/construction-requirements.ts"() {
     "use strict";
-    init_type_info_compatibility();
+    init_type_info_equality();
     init_classes();
     init_inheritance();
     init_generics();
     init_constructors2();
     init_parameter_defaults();
-    init_members();
+    init_member_kinds();
   }
 });
 
@@ -55538,7 +55551,7 @@ var OPTION_ID_REGEX;
 var init_enum_types = __esm({
   "../src/models/enum/enum-types.ts"() {
     "use strict";
-    init_src();
+    init_pending_id();
     init_core();
     init_schema_identifiers();
     init_system_record_id();
@@ -56893,7 +56906,6 @@ var init_build_default_member_value = __esm({
     init_member_storage_key();
     init_structured_leaf_fields();
     init_stored_value_shape();
-    init_members();
     init_classes();
     init_unordered_list_membership();
     init_stored_value_shape();
@@ -57241,7 +57253,6 @@ var init_list_indexes = __esm({
     init_core();
     init_generics();
     init_inheritance();
-    init_members();
     init_classes();
   }
 });
@@ -62187,7 +62198,7 @@ var init_lookup_declared_type = __esm({
   "../src/models/members/lookup-declared-type.ts"() {
     "use strict";
     init_member_kind_enum();
-    init_members();
+    init_member_kinds();
   }
 });
 
@@ -62203,9 +62214,9 @@ var init_interface_conformance = __esm({
     init_neoscript_guards();
     init_core();
     init_type_info_compatibility();
+    init_type_info_equality();
     init_interface_types();
     init_lookup_declared_type();
-    init_members();
   }
 });
 
@@ -69231,7 +69242,7 @@ function evaluateCellPatternNative(memberId, receiver, args, ctx) {
 var init_cell_pattern2 = __esm({
   "../src/runtime/neoscript/cell-pattern.ts"() {
     "use strict";
-    init_src();
+    init_cell_pattern();
     init_member_kinds();
   }
 });
@@ -70866,7 +70877,7 @@ var DecimalOverflowError, DecimalDivisionByZeroError, DecimalDigitsRangeError, D
 var init_decimal_math = __esm({
   "../src/models/decimal/decimal-math.ts"() {
     "use strict";
-    init_members();
+    init_member_kinds();
     DecimalOverflowError = class extends Error {
     };
     DecimalDivisionByZeroError = class extends Error {
@@ -81205,7 +81216,7 @@ var init_evaluateNSGetter = __esm({
     init_initializer_dependencies();
     init_unattributable_reads();
     init_value_row_owner_members();
-    init_src();
+    init_cell_pattern();
     init_cell_pattern2();
     init_world_grid_query();
     init_classes();
@@ -81988,7 +81999,6 @@ var init_stored_value_placement_index = __esm({
     init_constructors2();
     init_project2();
     init_member_kinds();
-    init_members();
   }
 });
 
@@ -84658,7 +84668,7 @@ var init_virtual_instance_graph = __esm({
     init_neoscript();
     init_project_schema_index();
     init_initializer_context();
-    init_src();
+    init_strict_ir();
     init_initializer_materialization();
     init_unattributable_reads();
     KEPT_ROW_SAMPLE_LIMIT = 12;
@@ -90065,7 +90075,7 @@ var init_neo_script_derived_bodies = __esm({
     "use strict";
     init_members();
     init_dialogue();
-    init_src();
+    init_strict_ir();
     init_packed_value_encoding();
   }
 });
@@ -94975,7 +94985,7 @@ var init_general_function_call_ir_source_recompile = __esm({
     init_compiler_adapter();
     init_neoscript();
     init_dialogue_node_index();
-    init_src();
+    init_strict_ir();
     init_neo_script_derived_bodies();
     VOID_ACTION_TYPE_INFO = {
       type: 0 /* Null */,
@@ -95957,7 +95967,7 @@ function neoScriptCompilationProjectContract(document) {
 var init_project_fingerprint = __esm({
   "../src/database/neoscript/project-fingerprint.ts"() {
     "use strict";
-    init_src();
+    init_strict_ir();
     init_neo_script_recompile_scope();
     init_compiler_adapter();
   }
@@ -97672,8 +97682,62 @@ function appendAuthoredOwnedValueCascadeDeletes(args) {
           thisClass: replayMembers.ownerClassesByMemberId.get(member.id) ?? null
         });
     }
+    const replayCandidates = /* @__PURE__ */ new Map();
+    const authoredCandidateIds = /* @__PURE__ */ new Set();
+    for (const change of args.authoredChanges) {
+      if (change.recordKind !== "value" || change.operation === "delete") {
+        continue;
+      }
+      const row = postValuesById.get(change.recordId);
+      if (row === void 0) continue;
+      if (inlineDelegateArgumentRow(row) === null && delegateValueRow(row) === null) {
+        continue;
+      }
+      replayCandidates.set(change.recordId, row);
+      authoredCandidateIds.add(change.recordId);
+    }
+    for (const rootId of survivingConstructionIds) {
+      const root = postValuesById.get(rootId);
+      const inline = inlineDelegateArgumentRow(root);
+      if (inline !== null) replayCandidates.set(rootId, inline);
+    }
+    const compiledReplayRows = /* @__PURE__ */ new Map();
+    if (replayCandidates.size > 0) {
+      const compiler = createDelegateValueBodyCompiler(
+        authoredPost,
+        new Set(replayCandidates.keys())
+      );
+      if (authoredCandidateIds.size > 0) {
+        args.earlyDelegateCompilation.contractHash = hashCanonicalJson(
+          neoScriptCompilationProjectContract(authoredPost)
+        );
+      }
+      for (const [id2, row] of replayCandidates) {
+        let compiled = row;
+        const closure = delegateValueRow(compiled);
+        if (closure !== null) compiled = compiler.compileClosure(closure);
+        const inline = inlineDelegateArgumentRow(compiled);
+        if (inline !== null) {
+          compiled = {
+            ...inline,
+            constructorArgs: compiler.compileInline(inline)
+          };
+        }
+        compiledReplayRows.set(id2, compiled);
+        if (authoredCandidateIds.has(id2)) {
+          args.earlyDelegateCompilation.rows.set(id2, {
+            source: row,
+            compiled,
+            ...compiler.ownershipIds(id2)
+          });
+        }
+      }
+    }
     const replayDocument = {
       ...postScope.document,
+      values: postScope.document.values.map(
+        (value) => compiledReplayRows.get(value.id) ?? value
+      ),
       initializerCompiler: documentInitializerCompiler(
         postScope.document,
         compilationProject
@@ -97687,7 +97751,7 @@ function appendAuthoredOwnedValueCascadeDeletes(args) {
       document: resolverDocument
     });
     for (const rootId of survivingConstructionIds) {
-      const instanceRoot = postValuesById.get(rootId);
+      const instanceRoot = compiledReplayRows.get(rootId) ?? postValuesById.get(rootId);
       const rootMember = postPlacements.get(rootId).member;
       const expanded = expandStoredInstance({
         document: resolverDocument,
@@ -97867,11 +97931,16 @@ function* prepareServerOwnedSchemaCommitPasses(args) {
       authoredChanges
     );
   }
+  const earlyDelegateCompilation = {
+    contractHash: null,
+    rows: /* @__PURE__ */ new Map()
+  };
   let authoredPost = appendAuthoredOwnedValueCascadeDeletes({
     document: args.document,
     authoredChanges,
     contentHashHeads: args.contentHashHeads,
-    expandReadOnlySourceConversions: args.expandReadOnlySourceConversions === true
+    expandReadOnlySourceConversions: args.expandReadOnlySourceConversions === true,
+    earlyDelegateCompilation
   }) ?? applyProjectVersionWriteChanges(args.document, authoredChanges);
   if (authoredPost.localizationConfig?.mainLocale !== args.document.localizationConfig?.mainLocale) {
     const normalized = planMemberLocalizationNormalization(
@@ -98271,7 +98340,8 @@ function* prepareServerOwnedSchemaCommitPasses(args) {
     prepared,
     targetIds: recompileTargets.valueIds,
     contentHashHeads: args.contentHashHeads,
-    physicalValues: args.document.physicalValues
+    physicalValues: args.document.physicalValues,
+    earlyDelegateCompilation
   });
   args.passLifecycle?.("complete", "delegate-value-bodies");
   yield { pass: "delegate-value-bodies", preparedChanges: prepared };
@@ -101287,43 +101357,19 @@ function compileInlineDelegateConstructorArguments(args) {
   }
   return compiled;
 }
-function prepareServerOwnedDelegateValueBodies(args) {
-  const explicitRows = /* @__PURE__ */ new Map();
-  const inlineArgumentRows = /* @__PURE__ */ new Map();
-  for (let index = 0; index < args.prepared.length; index += 1) {
-    const change = args.prepared[index];
-    if (change?.recordKind !== "value" || change.operation === "delete") {
-      continue;
-    }
-    const row = delegateValueRow(change.nextData);
-    if (row !== null) explicitRows.set(index, row);
-    const withInlineArgs = inlineDelegateArgumentRow(change.nextData);
-    if (withInlineArgs !== null) inlineArgumentRows.set(index, withInlineArgs);
-  }
-  const { closureRows: sweepRows, inlineRows: inlineSweepRows } = collectDelegateSweepRows(args);
-  if (explicitRows.size === 0 && sweepRows.length === 0 && inlineArgumentRows.size === 0 && inlineSweepRows.length === 0) {
-    return;
-  }
-  const committedDocument = applyProjectVersionWriteChanges(
-    args.postDocument,
-    args.prepared
-  );
-  const targetIds = valueIdsFromRows(
-    [...explicitRows.values(), ...inlineArgumentRows.values()],
-    [...sweepRows, ...inlineSweepRows]
+function createDelegateValueBodyCompiler(postDocument, targetIds) {
+  const scope = withVariantOwnershipRoots(
+    postDocument,
+    postDocument.variants ?? []
   );
   const rootOwnerByValueId = /* @__PURE__ */ new Map();
-  const delegateScope = withVariantOwnershipRoots(
-    committedDocument,
-    committedDocument.variants ?? []
-  );
   const ownerByValueId = resolveSemanticOwnerMembersForValues(
-    delegateScope.document,
+    scope.document,
     targetIds,
-    delegateScope.roots,
+    scope.roots,
     rootOwnerByValueId
   );
-  const compileOne = (document, row) => {
+  const compileClosure = (row, document = scope.document) => {
     const member = ownerByValueId.get(row.id);
     if (!isMemberDelegateBase(member)) {
       const placement = typeof row.containerId === "string" ? `container "${row.containerId}"` : `map key "${row.mapKey ?? "none"}"`;
@@ -101333,8 +101379,9 @@ function prepareServerOwnedDelegateValueBodies(args) {
     }
     const rootOwner = rootOwnerByValueId.get(row.id);
     const thisClass = findSchemaPlacement(rootOwner?.id ?? "", document.classes)?.ownerClass ?? null;
+    const compiled = { ...row, value: { ...row.value } };
     try {
-      row.value = compileDelegateClosureValue(row.value.code, {
+      compiled.value = compileDelegateClosureValue(row.value.code, {
         project: document.project,
         projectFiles: document.projectFiles,
         members: document.members,
@@ -101342,9 +101389,8 @@ function prepareServerOwnedDelegateValueBodies(args) {
         enums: document.enums,
         interfaces: document.interfaces,
         constructors: document.constructors ?? [],
-        // P67 §3.5 — a variant's `initialize` may delegate to another
-        // variant's, so the closure being compiled has to see the variant
-        // records committed alongside it.
+        // P67 §3.5: one variant's initialize may call another variant's, so
+        // compilation must see variants committed alongside this closure.
         variants: document.variants ?? [],
         variantFolders: document.variantFolders ?? [],
         thisClass,
@@ -101359,24 +101405,71 @@ function prepareServerOwnedDelegateValueBodies(args) {
         { cause: error }
       );
     }
+    return compiled;
+  };
+  const compileInline = (row, document = scope.document) => compileInlineDelegateConstructorArguments({
+    document,
+    row,
+    ownerMember: ownerByValueId.get(row.id),
+    rootOwner: rootOwnerByValueId.get(row.id) ?? null
+  });
+  const ownershipIds = (valueId) => ({
+    ownerMemberId: getOptionalString(ownerByValueId.get(valueId), "id") ?? null,
+    rootOwnerId: rootOwnerByValueId.get(valueId)?.id ?? null
+  });
+  return { compileClosure, compileInline, ownershipIds };
+}
+function prepareServerOwnedDelegateValueBodies(args) {
+  const explicitRows = /* @__PURE__ */ new Map();
+  const inlineArgumentRows = /* @__PURE__ */ new Map();
+  for (let index = 0; index < args.prepared.length; index += 1) {
+    const change = args.prepared[index];
+    if (change?.recordKind !== "value" || change.operation === "delete") {
+      continue;
+    }
+    const row = delegateValueRow(change.nextData);
+    if (row !== null) explicitRows.set(index, row);
+    const withInlineArgs = inlineDelegateArgumentRow(change.nextData);
+    if (withInlineArgs !== null) inlineArgumentRows.set(index, withInlineArgs);
+  }
+  const { closureRows: sweepRows, inlineRows: inlineSweepRows } = collectDelegateSweepRows(args);
+  if (explicitRows.size === 0 && sweepRows.length === 0 && inlineArgumentRows.size === 0 && inlineSweepRows.length === 0) {
+    return;
+  }
+  const committedDocument = applyProjectVersionWriteChanges(
+    args.postDocument,
+    args.prepared
+  );
+  const targetIds = valueIdsFromRows(
+    [...explicitRows.values(), ...inlineArgumentRows.values()],
+    [...sweepRows, ...inlineSweepRows]
+  );
+  const compiler = createDelegateValueBodyCompiler(
+    committedDocument,
+    targetIds
+  );
+  const early = args.earlyDelegateCompilation;
+  const sameCompilerContract = early.rows.size > 0 && early.contractHash === hashCanonicalJson(neoScriptCompilationProjectContract(committedDocument));
+  const reusableEarlyRow = (row) => {
+    if (!sameCompilerContract) return null;
+    const candidate = early.rows.get(row.id);
+    if (candidate?.source !== row) return null;
+    const ownership = compiler.ownershipIds(row.id);
+    return ownership.ownerMemberId === candidate.ownerMemberId && ownership.rootOwnerId === candidate.rootOwnerId ? candidate.compiled : null;
   };
   for (const [index, row] of explicitRows) {
-    const compiled = { ...row, value: { ...row.value } };
-    compileOne(delegateScope.document, compiled);
+    const reused = reusableEarlyRow(row);
+    const compiled = (reused === null ? null : delegateValueRow(reused)) ?? compiler.compileClosure(row);
     const change = args.prepared[index];
     if (change !== void 0) {
       args.prepared[index] = { ...change, nextData: compiled };
     }
   }
   for (const [index, row] of inlineArgumentRows) {
-    const ownerMember = ownerByValueId.get(row.id);
-    const rootOwner = rootOwnerByValueId.get(row.id);
-    const compiledArgs = compileInlineDelegateConstructorArguments({
-      document: delegateScope.document,
-      row,
-      ownerMember,
-      rootOwner: rootOwner ?? null
-    });
+    const reused = reusableEarlyRow(row);
+    const compiledArgs = asRecord4(
+      reused?.constructorArgs
+    ) ?? compiler.compileInline(row);
     const change = args.prepared[index];
     if (change !== void 0) {
       args.prepared[index] = {
@@ -101416,16 +101509,16 @@ function prepareServerOwnedDelegateValueBodies(args) {
     });
   };
   for (const row of sweepRows) {
-    const compiled = { ...row, value: { ...row.value } };
+    let compiled;
     try {
-      compileOne(delegateScope.document, compiled);
+      compiled = compiler.compileClosure(row);
     } catch (postWriteError) {
       const current = delegateValueRow(
         structuredClone(currentById.get(row.id))
       );
       if (current === null) throw postWriteError;
       try {
-        compileOne(args.document, current);
+        compiler.compileClosure(current, args.document);
       } catch (preWriteError) {
         if (sameCompileFailure(preWriteError, postWriteError)) continue;
       }
@@ -101433,21 +101526,15 @@ function prepareServerOwnedDelegateValueBodies(args) {
     }
     refresh(row.id, compiled);
   }
-  const compileInlineOne = (document, row) => compileInlineDelegateConstructorArguments({
-    document,
-    row,
-    ownerMember: ownerByValueId.get(row.id),
-    rootOwner: rootOwnerByValueId.get(row.id) ?? null
-  });
   for (const row of inlineSweepRows) {
     let compiledArgs;
     try {
-      compiledArgs = compileInlineOne(delegateScope.document, row);
+      compiledArgs = compiler.compileInline(row);
     } catch (postWriteError) {
       const current = inlineDelegateSweepRow(currentById.get(row.id));
       if (current === null) throw postWriteError;
       try {
-        compileInlineOne(args.document, current);
+        compiler.compileInline(current, args.document);
       } catch (preWriteError) {
         if (sameCompileFailure(preWriteError, postWriteError)) continue;
       }
@@ -101968,7 +102055,7 @@ var nativePatternMembers;
 var init_unity_static_members = __esm({
   "../src/models/exports/unity-static-members.ts"() {
     "use strict";
-    init_src();
+    init_cell_pattern();
     init_members();
     nativePatternMembers = new Set(
       Object.values(NEO_CELL_PATTERN_MEMBER_IDS)
@@ -121162,6 +121249,7 @@ function buildValueEmitContext(records2, manifest, options = {}) {
     localizedTextIds: /* @__PURE__ */ new Set(),
     constructionReplays: /* @__PURE__ */ new Map(),
     constructorBodySchemaKeys: /* @__PURE__ */ new WeakMap(),
+    activeStoredConstructorArguments: /* @__PURE__ */ new Set(),
     materializedConstructors: /* @__PURE__ */ new Map(),
     materializedConstructorOverrideKeys: /* @__PURE__ */ new Map()
   };
@@ -126792,6 +126880,9 @@ function classValueBody(context, member, value, visited, targetTyped, outerEnvir
     storedEnvironment
   );
   const name = targetTyped ? stringField3(schemaClass2, "name") : classValueTypeName(context, classId, member, environment);
+  const storedArgumentEntries = isObjectRecord2(value.constructorArgs) ? Object.entries(value.constructorArgs).filter(
+    (entry) => typeof entry[1] === "string"
+  ) : [];
   let storedConstruction;
   try {
     storedConstruction = partial ? null : storedConstructorCallSource(
@@ -126809,6 +126900,12 @@ function classValueBody(context, member, value, visited, targetTyped, outerEnvir
       { cause: error }
     );
   }
+  const constructorArgumentValueIds = /* @__PURE__ */ new Set();
+  for (const [, id2] of storedArgumentEntries) {
+    if (context.values.has(id2) && visited.has(id2)) {
+      constructorArgumentValueIds.add(id2);
+    }
+  }
   const replayConstruction = storedConstruction === null ? null : storedConstructorCallSource(
     context,
     schemaClass2,
@@ -126833,6 +126930,15 @@ function classValueBody(context, member, value, visited, targetTyped, outerEnvir
     )
   );
   const replayBody = isObjectRecord2(replayRoot?.value) ? replayRoot.value : {};
+  const replayArgs = isObjectRecord2(replayRoot?.constructorArgs) ? replayRoot.constructorArgs : {};
+  const replayArgumentIdsByStoredId = /* @__PURE__ */ new Map();
+  for (const [slot, storedId] of storedArgumentEntries) {
+    const replayId = replayArgs[slot];
+    if (typeof replayId !== "string") continue;
+    const ids = replayArgumentIdsByStoredId.get(storedId) ?? /* @__PURE__ */ new Set();
+    ids.add(replayId);
+    replayArgumentIdsByStoredId.set(storedId, ids);
+  }
   const order = Array.isArray(schemaClass2.schemaKeyOrder) ? schemaClass2.schemaKeyOrder.filter(
     (entry) => typeof entry === "string" && typeof schema[entry] === "string"
   ) : Object.keys(schema);
@@ -126856,6 +126962,30 @@ function classValueBody(context, member, value, visited, targetTyped, outerEnvir
     const childMember = context.members.get(childMemberId);
     if (childMember === void 0)
       throw new Error(`Class ${name}.${key} has no member record.`);
+    if (constructorArgumentValueIds.has(childId)) {
+      const replayChildId2 = replayBody[key];
+      const replaysBodyKey = replayGraph !== null && typeof replayChildId2 === "string" && replayArgumentIdsByStoredId.get(childId)?.has(replayChildId2) === true && materializedValueSubgraphsEqual(
+        context,
+        context.readEffectiveValues(),
+        replayGraph,
+        childId,
+        replayChildId2,
+        childMember,
+        environment
+      );
+      if (!replaysBodyKey) {
+        const type = schemaTypeForBindingMember(
+          context,
+          childMemberId,
+          environment
+        );
+        fields.push(
+          `${key} = Reference<${storedSchemaTypeName(context, type, environment, childId)}>(id: ${quote5(childId)})`
+        );
+        overrideKeys.add(key);
+      }
+      continue;
+    }
     const preservesExternalBinding = context.collectionBindingValueIds.has(childId);
     const baseChildBody = context.storedValueBase?.get(childId)?.value;
     const clearedStoredClassOverrides = isObjectRecord2(baseChildBody) && Object.keys(baseChildBody).length > 0;
@@ -127631,11 +127761,12 @@ function storedTypedRowSource(context, type, valueId, environment, visited, writ
   if (!constructorOwnsGraph && context.readMaterializedGraph().independentlyOwnedValueIds.has(valueId)) {
     return `Reference<${storedSchemaTypeName(context, type, environment, valueId)}>(id: ${quote5(valueId)})`;
   }
-  if (visited.has(valueId)) {
+  if (context.activeStoredConstructorArguments.has(valueId)) {
     throw new Error(
       `Stored constructor argument containment cycle reaches ${valueId}.`
     );
   }
+  context.activeStoredConstructorArguments.add(valueId);
   visited.add(valueId);
   try {
     if (type.kind === "class" || type.kind === "interface" || type.kind === "generic") {
@@ -127767,7 +127898,7 @@ ${entries.flatMap(
       )
     );
   } finally {
-    visited.delete(valueId);
+    context.activeStoredConstructorArguments.delete(valueId);
   }
 }
 function storedRowIdentitySource(valueId, writeIdentity, expression) {
@@ -140290,7 +140421,7 @@ var init_registry2 = __esm({
   "schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.57.1",
+      cliVersion: "0.57.2",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -148111,7 +148242,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.57.1");
+    console.log("0.57.2");
     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.57.1",
+  "version": "0.57.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.57.1 -->
+<!-- reviewed-through-cli: 0.57.2 -->
 
 # 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.57.1 -->
+<!-- reviewed-through-cli: 0.57.2 -->
 ```
 
 The quoted version above is checked too, so this instruction cannot go stale