@neocompose/cli 0.21.1 → 0.21.2

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.21.2] - 2026-08-03
+
+### Fixed
+
+- Canonical pull emits `@id` only for structurally ambiguous positions such
+  as list entries. Class fields, dictionary entries, and constructor arguments
+  recover their value rows from the owning value and role instead of exposing
+  redundant P61 creation or localization-link identities.
+- Long and nested constructor calls emitted by `neo pull --reset` wrap at a
+  stable 88-column default with one named argument per indented line.
+
 ## [0.21.1] - 2026-08-03
 
 ### Fixed

package/dist/neo.mjs

@@ -75392,7 +75392,6 @@ function buildValueEmitContext(records2, manifest) {
       )
     ),
     fileSymbols: projectFileSymbols(records2),
-    referencedValueIds: externallyReferencedValueIds(records2),
     localizedTextIds: /* @__PURE__ */ new Set(),
     constructionReplays: /* @__PURE__ */ new Map()
   };
@@ -79235,7 +79234,10 @@ function classValue(context, member, value, visited, targetTyped, outerEnvironme
       `${key} = ${emitValue(context, emittedChildMember, childId, {
         environment,
         definitionSite: !context.symbolsByValueId.has(childId),
-        writeIdentity: !context.symbolsByValueId.has(childId) && context.referencedValueIds.has(childId),
+        // A class slot recovers this row from the owning value and schema key.
+        // P61 creation metadata and localization back-pointers must not turn
+        // that structural child into an explicitly identified source value.
+        writeIdentity: false,
         visited
       })}`
     );
@@ -79245,7 +79247,7 @@ function classValue(context, member, value, visited, targetTyped, outerEnvironme
 ${fields.map((field) => indentNeoSourceNonEmptyLines(field, 2)).join(",\n")}
 }`;
   }
-  const constructor2 = storedConstruction !== null ? storedConstruction : projection.arguments.length > 0 ? `new ${name}(${projection.arguments.join(", ")})` : targetTyped ? "new()" : `new ${name}()`;
+  const constructor2 = storedConstruction !== null ? storedConstruction : projection.arguments.length > 0 ? constructorCallSource(`new ${name}`, projection.arguments) : targetTyped ? "new()" : `new ${name}()`;
   return fields.length === 0 ? constructor2 : `${storedConstruction !== null || projection.arguments.length > 0 ? constructor2 : targetTyped ? "new()" : `new ${name}`} {
 ${fields.map((field) => indentNeoSourceNonEmptyLines(field, 2)).join(",\n")}
 }`;
@@ -79322,7 +79324,16 @@ function storedConstructorCallSource(context, schemaClass2, value, className, en
       cloneAggregateArguments
     )}`;
   });
-  return argumentsValue.length === 0 && targetTyped ? "new()" : `new ${className}(${argumentsValue.join(", ")})`;
+  return argumentsValue.length === 0 && targetTyped ? "new()" : constructorCallSource(`new ${className}`, argumentsValue);
+}
+function constructorCallSource(callee, argumentsValue) {
+  const inline = `${callee}(${argumentsValue.join(", ")})`;
+  if (!argumentsValue.some((argument2) => argument2.includes("\n")) && inline.length <= CANONICAL_CONSTRUCTOR_INLINE_WIDTH) {
+    return inline;
+  }
+  return `${callee}(
+${argumentsValue.map((argument2) => `${indentNeoSourceNonEmptyLines(argument2, 2)},`).join("\n")}
+)`;
 }
 function storedValueConstructor(context, schemaClass2, constructorArgs) {
   const requiredId = schemaClass2.requiredConstructorId;
@@ -79419,7 +79430,14 @@ function storedConstructorArgumentSource(context, type, value, environment, visi
       if (cloneAggregateArguments) {
         return storedAggregateCloneSource(context, type, value, environment);
       }
-      return storedTypedRowSource(context, type, value, environment, visited);
+      return storedTypedRowSource(
+        context,
+        type,
+        value,
+        environment,
+        visited,
+        false
+      );
     }
     case "interface":
     case "generic":
@@ -79433,7 +79451,14 @@ function storedConstructorArgumentSource(context, type, value, environment, visi
       if (cloneAggregateArguments) {
         return storedAggregateCloneSource(context, type, value, environment);
       }
-      return storedTypedRowSource(context, type, value, environment, visited);
+      return storedTypedRowSource(
+        context,
+        type,
+        value,
+        environment,
+        visited,
+        false
+      );
     case "lookup":
       return referenceValue(
         context,
@@ -79552,7 +79577,7 @@ function storedSchemaTypeName(context, type, environment, valueId) {
       return "null";
   }
 }
-function storedTypedRowSource(context, type, valueId, environment, visited) {
+function storedTypedRowSource(context, type, valueId, environment, visited, writeIdentity) {
   const symbol = context.symbolsByValueId.get(valueId);
   if (symbol !== void 0) return symbol;
   const row = context.values.get(valueId);
@@ -79575,32 +79600,34 @@ function storedTypedRowSource(context, type, valueId, environment, visited) {
           `Stored ${type.kind} constructor argument ${valueId} has no concrete class.`
         );
       }
-      return `@id(${quote4(valueId)})
-${classValue(
-        context,
-        {
-          id: `__constructor_arg__:${valueId}`,
-          name: "argument",
-          kind: 7 /* Class */,
-          classId,
-          classArguments: {},
-          partial: false
-        },
-        row,
-        visited,
-        false,
-        environment
-      )}`;
+      return storedRowIdentitySource(
+        valueId,
+        writeIdentity,
+        classValue(
+          context,
+          {
+            id: `__constructor_arg__:${valueId}`,
+            name: "argument",
+            kind: 7 /* Class */,
+            classId,
+            classArguments: {},
+            partial: false
+          },
+          row,
+          visited,
+          false,
+          environment
+        )
+      );
     }
     if (type.kind === "list") {
-      if (row.value === null) return "null";
+      if (row.value === null) {
+        return storedRowIdentitySource(valueId, writeIdentity, "null");
+      }
       const ids = Array.isArray(row.value) ? row.value.filter(
         (entry) => typeof entry === "string"
       ) : [...context.values].filter(([, candidate]) => candidate.containerId === valueId).map(([id2]) => id2).sort(compareCodePoints);
-      if (ids.length === 0) return `@id(${quote4(valueId)})
-[]`;
-      return `@id(${quote4(valueId)})
-[
+      const expression = ids.length === 0 ? "[]" : `[
 ${ids.map(
         (id2) => indentNeoSourceNonEmptyLines(
           storedTypedRowSource(
@@ -79608,22 +79635,26 @@ ${ids.map(
             type.entryType,
             id2,
             environment,
-            visited
+            visited,
+            true
           ),
           2
         )
       ).join(",\n\n")}
 ]`;
+      return storedRowIdentitySource(valueId, writeIdentity, expression);
     }
     if (type.kind === "dictionary") {
-      if (row.value === null) return "null";
-      if (!isObjectRecord2(row.value)) return "{}";
+      if (row.value === null) {
+        return storedRowIdentitySource(valueId, writeIdentity, "null");
+      }
+      if (!isObjectRecord2(row.value)) {
+        return storedRowIdentitySource(valueId, writeIdentity, "{}");
+      }
       const entries = Object.entries(row.value).sort(
         ([left], [right]) => compareCodePoints(left, right)
       );
-      return entries.length === 0 ? `@id(${quote4(valueId)})
-{}` : `@id(${quote4(valueId)})
-{
+      const expression = entries.length === 0 ? "{}" : `{
 ${entries.flatMap(
         ([key, id2]) => typeof id2 === "string" ? [
           indentNeoSourceNonEmptyLines(
@@ -79632,53 +79663,71 @@ ${entries.flatMap(
               type.entryType,
               id2,
               environment,
-              visited
+              visited,
+              false
             )}`,
             2
           )
         ] : []
       ).join(",\n")}
 }`;
+      return storedRowIdentitySource(valueId, writeIdentity, expression);
     }
     if (type.kind === "lookup") {
-      return referenceValue(
-        context,
-        {
-          id: `__constructor_arg__:${valueId}`,
-          name: "argument",
-          kind: 9 /* Lookup */,
-          collectionMemberId: type.collectionMemberId,
-          collectionValueId: type.collectionValueId,
-          multiselect: false
-        },
-        row.value,
-        false
+      return storedRowIdentitySource(
+        valueId,
+        writeIdentity,
+        referenceValue(
+          context,
+          {
+            id: `__constructor_arg__:${valueId}`,
+            name: "argument",
+            kind: 9 /* Lookup */,
+            collectionMemberId: type.collectionMemberId,
+            collectionValueId: type.collectionValueId,
+            multiselect: false
+          },
+          row.value,
+          false
+        )
       );
     }
     if (type.kind === "dialogueLookup") {
-      return referenceValue(
-        context,
-        {
-          id: `__constructor_arg__:${valueId}`,
-          name: "argument",
-          kind: 18 /* DialogueLookup */,
-          multiselect: false
-        },
-        row.value,
-        true
+      return storedRowIdentitySource(
+        valueId,
+        writeIdentity,
+        referenceValue(
+          context,
+          {
+            id: `__constructor_arg__:${valueId}`,
+            name: "argument",
+            kind: 18 /* DialogueLookup */,
+            multiselect: false
+          },
+          row.value,
+          true
+        )
       );
     }
-    return storedConstructorArgumentSource(
-      context,
-      type,
-      row.value,
-      environment,
-      visited
+    return storedRowIdentitySource(
+      valueId,
+      writeIdentity,
+      storedConstructorArgumentSource(
+        context,
+        type,
+        row.value,
+        environment,
+        visited
+      )
     );
   } finally {
     visited.delete(valueId);
   }
 }
+function storedRowIdentitySource(valueId, writeIdentity, expression) {
+  return `${writeIdentity ? `@id(${quote4(valueId)})
+` : ""}${expression}`;
+}
 function storedVectorSource(value, name, keys) {
   if (!isObjectRecord2(value)) {
     throw new Error(`Stored ${name} constructor argument is not an object.`);
@@ -80001,7 +80050,9 @@ ${entries.flatMap(
         `${quote4(key)}: ${emitValue(context, entryMember, id2, {
           environment,
           definitionSite: !context.symbolsByValueId.has(id2),
-          writeIdentity: !context.symbolsByValueId.has(id2) && context.referencedValueIds.has(id2),
+          // Dictionary keys, like class schema keys, recover entry
+          // identity from the owning row. Only list entries need an id.
+          writeIdentity: false,
           visited
         })}`,
         2
@@ -80215,33 +80266,6 @@ function projectFileSymbols(records2) {
   });
   return assignDeterministicFileSymbols(files);
 }
-function externallyReferencedValueIds(records2) {
-  const counts = /* @__PURE__ */ new Map();
-  const visit = (value) => {
-    if (typeof value === "string") {
-      if (records2.has(`value:${value}`))
-        counts.set(value, (counts.get(value) ?? 0) + 1);
-      return;
-    }
-    if (Array.isArray(value)) {
-      value.forEach((entry) => visit(entry));
-      return;
-    }
-    if (isObjectRecord2(value)) {
-      for (const [childKey, child] of Object.entries(value)) {
-        if (childKey === "id") continue;
-        if (childKey === "sourceValueId") continue;
-        visit(child);
-      }
-    }
-  };
-  for (const record3 of records2.values()) {
-    if (!record3.deleted) visit(record3.data);
-  }
-  return new Set(
-    [...counts].filter(([, count]) => count > 1).map(([id2]) => id2)
-  );
-}
 function projectMainLocale(records2) {
   const config = [...records2.values()].find(
     (record3) => !record3.deleted && record3.recordKind === "localization-config"
@@ -80330,7 +80354,7 @@ function memberDefaultBody(member) {
   if (!("value" in defaultValue)) return null;
   return defaultValue.value;
 }
-var INFERRED_GENERIC_CLASS_PREFIX, MEMBER_KIND_DICTIONARY, MEMBER_KIND_LIST, MEMBER_KIND_CLASS;
+var INFERRED_GENERIC_CLASS_PREFIX, MEMBER_KIND_DICTIONARY, MEMBER_KIND_LIST, MEMBER_KIND_CLASS, CANONICAL_CONSTRUCTOR_INLINE_WIDTH;
 var init_value_sources = __esm({
   "src/project-source/value-sources.ts"() {
     "use strict";
@@ -80356,6 +80380,7 @@ var init_value_sources = __esm({
     MEMBER_KIND_DICTIONARY = 5;
     MEMBER_KIND_LIST = 6;
     MEMBER_KIND_CLASS = 7;
+    CANONICAL_CONSTRUCTOR_INLINE_WIDTH = 88;
   }
 });
 

package/package.json

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

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

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