@neocompose/cli 0.81.2 → 0.81.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.81.3
+
+### Patch Changes
+
+- 9bdbe4b: Preserve outer construction values after editing an inline child. Stored children at their virtual IDs keep the outer construction's omitted fields when their variant selection matches, and ToVariant applies in place without recording an independent applied layer.
+- 45e1b8b: Keep nested generic constructions bound to their own type arguments. Root values such as `Box<Box<int>>` and `Box<List<Box<int>>>` now push and round-trip without constructor argument errors.
+- b6bb4b8: Fix edits to deeply nested projected constructor arguments when a changed field is packed inside its parent. Reconciliation now protects the edit with the physical parent row's content hash.
+
 ## 0.81.2
 
 ### Patch Changes

package/dist/neo.mjs

@@ -54564,7 +54564,7 @@ var init_registry = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.81.2",
+      cliVersion: "0.81.3",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -84200,9 +84200,27 @@ function validateClassConstructorDescriptor(info, ctx, requireEveryRequiredField
       `Cannot construct abstract Class '${schemaClass2.name}'.`
     );
   }
-  const genericSlot = ctx.__constructionGenericSlots?.toReversed().find((slot) => slot.classId === classId) ?? ctx.__storedConstructionReplaySlot;
-  const slotArguments = genericSlot?.classId === classId ? genericSlot.classArguments : void 0;
-  const typeArguments = slotArguments === void 0 ? receiverClosedTypeArguments(info.schemaClassInfo.typeArguments, ctx) : void 0;
+  const typeArguments = receiverClosedTypeArguments(
+    info.schemaClassInfo.typeArguments,
+    ctx
+  );
+  const matchesSlot = (slot) => {
+    if (slot.classId !== classId) return false;
+    if (typeArguments === void 0) return true;
+    const env = cachedInstanceEnv(classId, slot.classArguments, ctx);
+    return Object.entries(typeArguments).every(([parameterId, typeInfo]) => {
+      const binding = env.get(parameterId);
+      if (binding?.kind !== "member") return false;
+      const member = evalMemberById(ctx.vm, binding.memberId);
+      return member !== null && typeInfosInvariantlyEqual(
+        runtimeTypeInfoForMember(member, env, ctx, /* @__PURE__ */ new Set()),
+        typeInfo
+      );
+    });
+  };
+  const genericSlot = ctx.__constructionGenericSlots?.findLast(matchesSlot);
+  const replaySlot = ctx.__storedConstructionReplaySlot;
+  const slotArguments = genericSlot?.classArguments ?? (replaySlot !== void 0 && matchesSlot(replaySlot) ? replaySlot.classArguments : void 0);
   const descriptorCache = evaluatorValueGeneration(ctx).constructorDescriptors;
   const descriptorCacheKey = `${requireEveryRequiredField}:${ctx.storedConstructionReplay === true}:${JSON.stringify(slotArguments ?? typeArguments ?? null)}`;
   const cachedDescriptor = descriptorCache.get(info)?.get(descriptorCacheKey);
@@ -89386,20 +89404,6 @@ var init_variant_value_graph = __esm({
   }
 });
 
-// ../packages/neoscript-runtime/src/declaration-default-source.ts
-function declarationDefaultSource(id2, stored, resolveGraph) {
-  if (stored !== null && !isCollapseStampedInstanceRoot(stored)) return stored;
-  const graph = resolveGraph(id2);
-  return defaultSourceWithListeners(graph?.rowsById.get(id2) ?? stored, graph);
-}
-var init_declaration_default_source = __esm({
-  "../packages/neoscript-runtime/src/declaration-default-source.ts"() {
-    "use strict";
-    init_instance_provenance();
-    init_member_change_listeners();
-  }
-});
-
 // ../packages/models/src/members/stored-value-placement-index.ts
 function buildStoredValuePlacementIndex(args) {
   return createStoredValuePlacementTraversal(args)();
@@ -89779,6 +89783,20 @@ var init_stored_value_placement_index = __esm({
   }
 });
 
+// ../packages/neoscript-runtime/src/declaration-default-source.ts
+function declarationDefaultSource(id2, stored, resolveGraph) {
+  if (stored !== null && !isCollapseStampedInstanceRoot(stored)) return stored;
+  const graph = resolveGraph(id2);
+  return defaultSourceWithListeners(graph?.rowsById.get(id2) ?? stored, graph);
+}
+var init_declaration_default_source = __esm({
+  "../packages/neoscript-runtime/src/declaration-default-source.ts"() {
+    "use strict";
+    init_instance_provenance();
+    init_member_change_listeners();
+  }
+});
+
 // ../packages/neoscript-runtime/src/listener-endpoint-projection.ts
 function projectListenerEndpoint(args) {
   const { descriptor } = args;
@@ -89859,6 +89877,14 @@ var init_overlay_readonly_map = __esm({
 });
 
 // ../packages/neoscript-runtime/src/virtual-instance-graph.ts
+function isMaterializedSpine(location3) {
+  const stored = location3?.materializedRow;
+  if (stored == null || location3?.parentId == null) return false;
+  const virtual = location3.virtualRow;
+  if (!isLiteralValueContent(stored) || !isLiteralValueContent(virtual))
+    return false;
+  return stored.id === virtual.id && (stored.instanceVariantId ?? null) === (virtual.instanceVariantId ?? null) && (stored.instanceVariantRowValueId ?? null) === (virtual.instanceVariantRowValueId ?? null) && (stored.instanceAppliedVariantId ?? null) === (virtual.instanceAppliedVariantId ?? null) && (stored.instanceAppliedVariantRowValueId ?? null) === (virtual.instanceAppliedVariantRowValueId ?? null);
+}
 function buildVirtualInstanceMaterializedIndex(args) {
   const rowsById = new Map(
     (args.materializedRows ?? args.document.values).map((row) => [row.id, row])
@@ -91103,6 +91129,7 @@ function resolveStoredInstanceGraphs(args) {
     if (next === void 0 || resolvedRootIds.has(next.root.id)) continue;
     resolvedRootIds.add(next.root.id);
     enqueueStoredRoots(stored.includeRoot(next.root, next.member));
+    if (isMaterializedSpine(resolvedLocations.get(next.root.id))) continue;
     const graph = isMemberClassBase(next.member) ? args.resolveClassGraph?.(next.root, next.member) ?? resolveStoredClassValue({
       evaluateInitializer: args.evaluateInitializer,
       document,
@@ -93168,6 +93195,10 @@ function createHeadlessVirtualInstanceResolver(args) {
     graphByValueId.set(graph.instanceRootId, graph);
   };
   const expandRoot = (rootId, declaredMember) => {
+    const containing = graphByValueId.get(rootId);
+    if (containing !== void 0 && isMaterializedSpine(containing.locationsById.get(rootId))) {
+      return expandRoot(containing.instanceRootId, void 0);
+    }
     const cached = graphRowsByRootId.get(rootId);
     if (cached !== void 0) {
       const reads2 = readsByRootId.get(rootId);
@@ -93257,17 +93288,21 @@ function createHeadlessVirtualInstanceResolver(args) {
     recorder.recordValuePlacementRead();
     recorder.recordValueRead(receiverValueId);
     let placement = placements().get(receiverValueId) ?? null;
+    const roots = [];
     while (placement !== null) {
       recorder.recordValueRead(placement.valueId);
       const raw = rawById.get(placement.valueId);
       if (raw !== void 0 && isLiteralValueContent(raw) && isStoredClassResolutionRoot(raw)) {
-        return expandRoot(
-          placement.valueId,
-          membersById.get(placement.memberId)
-        );
+        roots.push(placement);
       }
       placement = placement.parentValueId === null ? null : placements().get(placement.parentValueId) ?? null;
     }
+    let resolved = emptyRows;
+    for (let index = roots.length - 1; index >= 0; index -= 1) {
+      const root2 = roots[index];
+      resolved = expandRoot(root2.valueId, membersById.get(root2.memberId));
+    }
+    if (roots.length > 0) return resolved;
     const root = rawById.get(receiverValueId);
     if (root !== void 0 && typeof root.classId === "string" && isStoredClassResolutionRoot(root)) {
       return expandRoot(receiverValueId, {
@@ -93302,7 +93337,7 @@ function createHeadlessVirtualInstanceResolver(args) {
       const known = graphByValueId.get(valueId);
       if (known?.instanceRootId === valueId) return known;
       const stored = rawById.get(valueId);
-      if (known !== void 0 && (stored === void 0 || !isStoredClassResolutionRoot(stored)))
+      if (known !== void 0 && (stored === void 0 || !isStoredClassResolutionRoot(stored) || isMaterializedSpine(known.locationsById.get(valueId))))
         return known;
       virtualInstanceRowsForValue(valueId);
       return graphByValueId.get(valueId) ?? null;
@@ -94657,6 +94692,7 @@ var init_effective_value_reader = __esm({
     init_core();
     init_members();
     init_packed_value_encoding();
+    init_stored_value_placement_index();
     init_read_class_member();
     init_initializer_materialization();
     init_evaluateInitializer();
@@ -94721,6 +94757,7 @@ var init_effective_value_reader = __esm({
       resolvedDocument;
       indexedDocument;
       materializedIndex;
+      storedPlacements;
       graphCache;
       createNormalizer(rowIdentities) {
         return createTypedValueNormalizer(
@@ -94994,6 +95031,30 @@ var init_effective_value_reader = __esm({
             unorderedListEntryIds: unorderedListEntryIds2
           });
         }
+        const materializedIndex = this.materializedIndex;
+        this.storedPlacements ??= buildStoredValuePlacementIndex({
+          ...this.readDocument,
+          constructors: this.readDocument.constructors ?? [],
+          indexedRows: {
+            valuesById: this.materializedIndex.rowsById,
+            unorderedListEntryIds: (id2) => materializedIndex.unorderedEntryIdsByContainerId.get(id2) ?? []
+          },
+          resolveStaticValueId: (memberId) => this.memberForId(memberId)?.valueId ?? null
+        });
+        const positions = this.storedPlacements.placementByValueId;
+        let parentId = positions.get(valueId)?.parentValueId;
+        while (parentId != null) {
+          const position = positions.get(parentId);
+          if (position === void 0) break;
+          const parentMember = this.memberForId(position.memberId);
+          if (parentMember !== null && isMemberClassBase(parentMember)) {
+            const containingRows = this.resolveGraph(parentId, parentMember);
+            if (isMaterializedSpine(this.locations.get(valueId)))
+              return containingRows;
+            break;
+          }
+          parentId = position.parentValueId;
+        }
         const rows = resolveStoredInstanceGraphs({
           ...this.context,
           readRecorder: this.context.readTracking === void 0 ? void 0 : virtualReadRecorder(this.context.readTracking),
@@ -117871,6 +117932,7 @@ function* prepareServerOwnedSchemaCommitPasses(args) {
   });
   materializePreparedInstanceInitializers({
     document: args.document,
+    physicalValues: args.document.physicalValues,
     prepared,
     contentHashHeads: args.contentHashHeads
   });
@@ -118190,6 +118252,7 @@ function materializePreparedInstanceInitializers(args) {
     args.contentHashHeads,
     "value"
   );
+  let writeBaseHashFor;
   const owners = resolveSemanticOwnerMembersForValues(
     materializationScope.document,
     new Set(sites.keys()),
@@ -118330,7 +118393,14 @@ function materializePreparedInstanceInitializers(args) {
       const existing = existingValueById.get(created.id);
       if (existing !== void 0) {
         if (materializedValueRowsEqual(existing, created)) continue;
-        const contentHash = liveValueHashes().get(created.id);
+        writeBaseHashFor ??= createValueWriteBaseHashResolver({
+          document: args.document,
+          physicalValues: args.physicalValues,
+          prepared: args.prepared,
+          contentHashHeads: args.contentHashHeads,
+          source: "server-initializer-materialization"
+        });
+        const contentHash = writeBaseHashFor(created.id);
         if (contentHash === void 0) {
           throw new Error(
             `Cannot reconcile materialized initializer row "${created.id}": its live content hash is unavailable.`
@@ -118345,7 +118415,7 @@ function materializePreparedInstanceInitializers(args) {
             source: "server-initializer-materialization",
             sourceValueId: valueId
           }),
-          expectedBaseContentHash: contentHash
+          ...contentHash === null ? {} : { expectedBaseContentHash: contentHash }
         });
         existingValueById.set(created.id, created);
         continue;
@@ -120278,7 +120348,7 @@ function valueIdsFromRows(explicitRows, sweepRows) {
   for (const row of sweepRows) ids.add(row.id);
   return ids;
 }
-function createValueRecompileBaseHashResolver(args) {
+function createValueWriteBaseHashResolver(args) {
   const hashById = indexLiveContentHashesByRecordId(
     args.contentHashHeads,
     "value"
@@ -120323,7 +120393,7 @@ function createValueRecompileBaseHashResolver(args) {
         nextData: root,
         expectedBaseContentHash: rootHash,
         intent: createProjectVersionIntent("value.update", {
-          source: "server-neoscript-recompile"
+          source: args.source
         })
       });
     }
@@ -120441,7 +120511,8 @@ function prepareServerOwnedValueInitializerBodies(args) {
   const currentById = new Map(
     args.document.values.map((value) => [value.id, value])
   );
-  const baseHashFor = createValueRecompileBaseHashResolver({
+  const baseHashFor = createValueWriteBaseHashResolver({
+    source: "server-neoscript-recompile",
     document: committedDocument,
     physicalValues: args.document.physicalValues,
     prepared: args.prepared,
@@ -120913,7 +120984,8 @@ function prepareServerOwnedDelegateValueBodies(args) {
   const currentById = new Map(
     args.document.values.map((value) => [value.id, value])
   );
-  const baseHashFor = createValueRecompileBaseHashResolver({
+  const baseHashFor = createValueWriteBaseHashResolver({
+    source: "server-neoscript-recompile",
     document: committedDocument,
     physicalValues: args.physicalValues,
     prepared: args.prepared,
@@ -201775,7 +201847,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.81.2");
+    console.log("0.81.3");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {

package/dist/test-worker.mjs

@@ -25166,9 +25166,27 @@ function validateClassConstructorDescriptor(info, ctx, requireEveryRequiredField
       `Cannot construct abstract Class '${schemaClass2.name}'.`
     );
   }
-  const genericSlot = ctx.__constructionGenericSlots?.toReversed().find((slot) => slot.classId === classId) ?? ctx.__storedConstructionReplaySlot;
-  const slotArguments = genericSlot?.classId === classId ? genericSlot.classArguments : void 0;
-  const typeArguments = slotArguments === void 0 ? receiverClosedTypeArguments(info.schemaClassInfo.typeArguments, ctx) : void 0;
+  const typeArguments = receiverClosedTypeArguments(
+    info.schemaClassInfo.typeArguments,
+    ctx
+  );
+  const matchesSlot = (slot) => {
+    if (slot.classId !== classId) return false;
+    if (typeArguments === void 0) return true;
+    const env = cachedInstanceEnv(classId, slot.classArguments, ctx);
+    return Object.entries(typeArguments).every(([parameterId, typeInfo]) => {
+      const binding = env.get(parameterId);
+      if (binding?.kind !== "member") return false;
+      const member = evalMemberById(ctx.vm, binding.memberId);
+      return member !== null && typeInfosInvariantlyEqual(
+        runtimeTypeInfoForMember(member, env, ctx, /* @__PURE__ */ new Set()),
+        typeInfo
+      );
+    });
+  };
+  const genericSlot = ctx.__constructionGenericSlots?.findLast(matchesSlot);
+  const replaySlot = ctx.__storedConstructionReplaySlot;
+  const slotArguments = genericSlot?.classArguments ?? (replaySlot !== void 0 && matchesSlot(replaySlot) ? replaySlot.classArguments : void 0);
   const descriptorCache = evaluatorValueGeneration(ctx).constructorDescriptors;
   const descriptorCacheKey = `${requireEveryRequiredField}:${ctx.storedConstructionReplay === true}:${JSON.stringify(slotArguments ?? typeArguments ?? null)}`;
   const cachedDescriptor = descriptorCache.get(info)?.get(descriptorCacheKey);
@@ -32604,6 +32622,14 @@ function materializeMemberDefaultValue(args) {
 }
 
 // ../packages/neoscript-runtime/src/virtual-instance-graph.ts
+function isMaterializedSpine(location) {
+  const stored = location?.materializedRow;
+  if (stored == null || location?.parentId == null) return false;
+  const virtual = location.virtualRow;
+  if (!isLiteralValueContent(stored) || !isLiteralValueContent(virtual))
+    return false;
+  return stored.id === virtual.id && (stored.instanceVariantId ?? null) === (virtual.instanceVariantId ?? null) && (stored.instanceVariantRowValueId ?? null) === (virtual.instanceVariantRowValueId ?? null) && (stored.instanceAppliedVariantId ?? null) === (virtual.instanceAppliedVariantId ?? null) && (stored.instanceAppliedVariantRowValueId ?? null) === (virtual.instanceAppliedVariantRowValueId ?? null);
+}
 function buildVirtualInstanceMaterializedIndex(args) {
   const rowsById = new Map(
     (args.materializedRows ?? args.document.values).map((row) => [row.id, row])
@@ -35156,6 +35182,10 @@ function createHeadlessVirtualInstanceResolver(args) {
     graphByValueId.set(graph.instanceRootId, graph);
   };
   const expandRoot = (rootId, declaredMember) => {
+    const containing = graphByValueId.get(rootId);
+    if (containing !== void 0 && isMaterializedSpine(containing.locationsById.get(rootId))) {
+      return expandRoot(containing.instanceRootId, void 0);
+    }
     const cached = graphRowsByRootId.get(rootId);
     if (cached !== void 0) {
       const reads2 = readsByRootId.get(rootId);
@@ -35245,17 +35275,21 @@ function createHeadlessVirtualInstanceResolver(args) {
     recorder.recordValuePlacementRead();
     recorder.recordValueRead(receiverValueId);
     let placement = placements().get(receiverValueId) ?? null;
+    const roots = [];
     while (placement !== null) {
       recorder.recordValueRead(placement.valueId);
       const raw = rawById.get(placement.valueId);
       if (raw !== void 0 && isLiteralValueContent(raw) && isStoredClassResolutionRoot(raw)) {
-        return expandRoot(
-          placement.valueId,
-          membersById.get(placement.memberId)
-        );
+        roots.push(placement);
       }
       placement = placement.parentValueId === null ? null : placements().get(placement.parentValueId) ?? null;
     }
+    let resolved = emptyRows;
+    for (let index = roots.length - 1; index >= 0; index -= 1) {
+      const root2 = roots[index];
+      resolved = expandRoot(root2.valueId, membersById.get(root2.memberId));
+    }
+    if (roots.length > 0) return resolved;
     const root = rawById.get(receiverValueId);
     if (root !== void 0 && typeof root.classId === "string" && isStoredClassResolutionRoot(root)) {
       return expandRoot(receiverValueId, {
@@ -35290,7 +35324,7 @@ function createHeadlessVirtualInstanceResolver(args) {
       const known = graphByValueId.get(valueId);
       if (known?.instanceRootId === valueId) return known;
       const stored = rawById.get(valueId);
-      if (known !== void 0 && (stored === void 0 || !isStoredClassResolutionRoot(stored)))
+      if (known !== void 0 && (stored === void 0 || !isStoredClassResolutionRoot(stored) || isMaterializedSpine(known.locationsById.get(valueId))))
         return known;
       virtualInstanceRowsForValue(valueId);
       return graphByValueId.get(valueId) ?? null;
@@ -59559,7 +59593,7 @@ var INITIALIZER_KEY_PLACEHOLDER = new RegExp(
 
 // ../packages/manifest/schema-contract/registry.mjs
 var PROJECT_SCHEMA_CONTRACT = Object.freeze({
-  cliVersion: "0.81.2",
+  cliVersion: "0.81.3",
   projectFileUploadBatchSize: 32,
   documentRecords: {
     member: {

package/package.json

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

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

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

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

@@ -247,6 +247,9 @@ initializer as its default. Omitted fields remain virtual and resolve through
 the instance's recorded constructor or variant. They track later source-default
 edits until that field is explicitly overridden; resetting an override makes it
 virtual again.
+Editing an inline child preserves the outer construction's call-site values for
+its other fields. The child keeps that construction while its variant selection
+matches; selecting a different variant gives it an independent recipe.
 
 Declare a lookup member as `Reference<T>`. `public Reference<Config> Config`
 selects one row and reads as `Config`. `public Set<Reference<Config>> Configs`
@@ -578,6 +581,12 @@ 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.
 
+Generic constructions can nest the same generic class, including through
+collections, such as `Box<Box<int>>` or `Box<List<Box<int>>>`. Each `new` uses
+its own type arguments during first push and stored replay. Editing a nested
+constructor argument rebuilds its projected fields in place, including fields
+stored inside a packed parent; push followed by pull leaves a clean checkout.
+
 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