@neocompose/cli 0.36.3 → 0.36.4

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.36.4] - 2026-08-19
+
+### Fixed
+
+- Keep computed static/root binding value identities derived from their member
+  ids, so post-push source rewriting never inserts an `@id` inside the
+  initializer expression.
+- Validate assigned-id source rewriting during `neo push --dry-run`, and keep
+  materialized scalar bindings stable so a successful push is followed by a
+  clean `neo status` without changing the authored initializer expression.
+
 ## [0.36.3] - 2026-08-19
 
 ### Fixed

package/dist/neo.mjs

@@ -99654,7 +99654,7 @@ function lowerSeedRow(context, member, sourceExpression, source, valueId, path,
         `Value ${path} in ${source.label} writes @id(${JSON.stringify(unattachedId)}) on part of a computed expression rather than on the row. Parenthesize the expression so the annotation names the whole row.`
       );
     }
-    if (annotated.id === null && isPendingId(valueId) && !context.pendingValueIdentitySites.has(valueId)) {
+    if (annotated.id === null && isPendingId(valueId) && pendingMemberValueMemberId(valueId) === null && !context.pendingValueIdentitySites.has(valueId)) {
       context.pendingValueIdentitySites.set(valueId, {
         id: valueId,
         uri: source.source.uri,
@@ -100258,6 +100258,16 @@ function lowerValueRow(context, member, sourceExpression, expectedValueId, sourc
     }
     indexInitAuthoredRowIds(context, code, source.label);
     const storedConstructorArgs = isObjectRecord2(base.constructorArgs) ? base.constructorArgs : null;
+    if (resolvedMember.kind !== "class" && isLiteralValueContent(base)) {
+      addReconstructed(
+        context,
+        "value",
+        expectedValueId,
+        valueFileFields(base),
+        source.source
+      );
+      return expectedValueId;
+    }
     const materializedClass = resolvedMember.kind === "class" && isObjectRecord2(base.value);
     const effectiveClassId = resolvedMember.kind === "class" ? stringOrNull(base.classId) ?? resolvedMember.classId : null;
     const materializedPlainClass = materializedClass && effectiveClassId !== null && context.classes.get(effectiveClassId)?.requiredConstructorId === void 0;
@@ -112353,6 +112363,13 @@ async function prepareLocalPushArtifactsV4(workspace, status, onPhase = () => vo
   );
   let preparedChanges = null;
   if (options.fullValidation) {
+    onPhase("Verifying the assigned-id source rewrite\u2026");
+    materializeAssignedSchemaIdsInAuthoredSource(
+      workspace,
+      pendingAssignment.assigned,
+      status.pendingValueIdentitySites,
+      true
+    );
     onPhase("Verifying the complete source round trip\u2026");
     verifyProjectSourceCommitAgainstStateV4({
       projectId: workspace.config.projectId,
@@ -113182,17 +113199,7 @@ function rewriteFilesFromState(workspace, records2 = new Map(
       return { uri: file.path, kind, text: file.content };
     })
   );
-  const finalErrors = finalAnalysis.diagnostics.filter(
-    (diagnostic) => diagnostic.severity === "error" && !isPullRecoveryDiagnosticCode(diagnostic.code)
-  );
-  if (finalErrors.length > 0) {
-    throw new Error(
-      `Assigned-id source rewrite produced invalid source:
-${finalErrors.map(
-        (diagnostic) => `  ${diagnostic.uri}:${diagnostic.range.start.line + 1}:${diagnostic.range.start.character + 1} ${diagnostic.message}`
-      ).join("\n")}`
-    );
-  }
+  assertAssignedIdSourceRewriteValid(finalAnalysis);
   writeProjectSourceAnalysisCacheV4(workspace.root, finalAnalysis);
   const emittedPaths = new Set(files.map((file) => file.path));
   for (const recordState of Object.values(workspace.state.records)) {
@@ -113218,7 +113225,20 @@ ${finalErrors.map(
     workspace.state.records[key] = nextState;
   }
 }
-function materializeAssignedSchemaIdsInAuthoredSource(workspace, replacements, pendingValueIdentitySites = /* @__PURE__ */ new Map()) {
+function assertAssignedIdSourceRewriteValid(analysis) {
+  const finalErrors = analysis.diagnostics.filter(
+    (diagnostic) => diagnostic.severity === "error" && !isPullRecoveryDiagnosticCode(diagnostic.code)
+  );
+  if (finalErrors.length > 0) {
+    throw new Error(
+      `Assigned-id source rewrite produced invalid source:
+${finalErrors.map(
+        (diagnostic) => `  ${diagnostic.uri}:${diagnostic.range.start.line + 1}:${diagnostic.range.start.character + 1} ${diagnostic.message}`
+      ).join("\n")}`
+    );
+  }
+}
+function materializeAssignedSchemaIdsInAuthoredSource(workspace, replacements, pendingValueIdentitySites = /* @__PURE__ */ new Map(), validateResult = false) {
   const pendingIdsByUri = /* @__PURE__ */ new Map();
   for (const pendingId2 of replacements.keys()) {
     if (!isPendingId(pendingId2)) continue;
@@ -113394,6 +113414,16 @@ function materializeAssignedSchemaIdsInAuthoredSource(workspace, replacements, p
     }
     preserved.set(uri, source);
   }
+  if (validateResult && preserved.size > 0) {
+    assertAssignedIdSourceRewriteValid(
+      compileNeoProjectSources(
+        inputs.map((input) => ({
+          ...input,
+          text: preserved.get(input.uri) ?? input.text
+        }))
+      )
+    );
+  }
   return preserved;
 }
 function sourceOffsetInsideInitializer(source, oneBasedLine, oneBasedColumn) {
@@ -114010,7 +114040,7 @@ var init_registry2 = __esm({
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
       formatVersion: 3,
       contractVersion: "3.14",
-      cliVersion: "0.36.3",
+      cliVersion: "0.36.4",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -120612,7 +120642,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.36.3");
+    console.log("0.36.4");
     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.36.3",
+  "version": "0.36.4",
   "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.36.3 -->
+<!-- reviewed-through-cli: 0.36.4 -->
 
 # Neo Compose CLI
 

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

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