@neocompose/cli 0.36.3 → 0.36.5

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [0.36.5] - 2026-08-20
+
+### Fixed
+
+- Recover malformed persisted static members during pull without weakening
+  authored schema validation: orphaned rows are queued for deletion and
+  structurally owned rows are queued for an `isStatic` correction on the next
+  push. Diagnostics now identify the member id, name, and inferred owner kind.
+
+## [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

@@ -39618,9 +39618,11 @@ function assertStaticMemberInvariants(manifest) {
     const path = `$.members[${memberIndex}]`;
     const owner = requireRecord(member.owner, `${path}.owner`);
     if (owner.kind !== "classMember") {
+      const memberName = typeof member.name === "string" ? member.name : "(unnamed)";
+      const ownerKind = typeof owner.kind === "string" ? owner.kind : "unknown";
       invalid(
         `${path}.owner`,
-        "a static member must have exactly one direct Class owner."
+        `static member ${JSON.stringify(memberName)} (${memberId}) has owner kind ${JSON.stringify(ownerKind)}; expected exactly one direct Class owner.`
       );
     }
     const ownerClassId = nonEmptyString(owner.classId, `${path}.owner.classId`);
@@ -41593,6 +41595,18 @@ function documentsToProjectSchemaManifest(records2, optionsOrContext = {}) {
     records2,
     options.sourceContext ?? DEFAULT_DOCUMENT_TO_MANIFEST_CONTEXT
   );
+  let projectionContext = context;
+  let recoveredMemberRecords;
+  if (options.onInvalidStaticMemberOwnership !== void 0) {
+    const normalizedMembers = new Map(context.normalizedMembers);
+    recoveredMemberRecords = recoverInvalidStaticMemberOwnership(
+      context.recordsByKind.get("member") ?? [],
+      context,
+      normalizedMembers,
+      options.onInvalidStaticMemberOwnership
+    );
+    projectionContext = { ...context, normalizedMembers };
+  }
   const collections = {
     classes: [],
     constructors: [],
@@ -41608,7 +41622,8 @@ function documentsToProjectSchemaManifest(records2, optionsOrContext = {}) {
     internalRecordRelations: []
   };
   for (const adapter of SCHEMA_RECORD_ADAPTERS) {
-    const adapterRecords = context.recordsByKind.get(adapter.recordKind) ?? [];
+    const rawAdapterRecords = context.recordsByKind.get(adapter.recordKind) ?? [];
+    const adapterRecords = adapter.recordKind === "member" && recoveredMemberRecords !== void 0 ? recoveredMemberRecords : rawAdapterRecords;
     if (adapter.cardinality === "one") {
       if (adapterRecords.length !== 1) {
         throw new Error(
@@ -41617,12 +41632,12 @@ function documentsToProjectSchemaManifest(records2, optionsOrContext = {}) {
       }
       collections[adapter.manifestCollection] = adapter.fromDocument(
         adapterRecords[0],
-        context
+        projectionContext
       );
       continue;
     }
     collections[adapter.manifestCollection] = adapterRecords.map(
-      (record3) => adapter.fromDocument(record3, context)
+      (record3) => adapter.fromDocument(record3, projectionContext)
     );
   }
   return parseProjectSchemaManifest({
@@ -41632,6 +41647,50 @@ function documentsToProjectSchemaManifest(records2, optionsOrContext = {}) {
     ...collections
   });
 }
+function recoverInvalidStaticMemberOwnership(records2, context, normalizedMembers, onRecovery) {
+  const recovered = [];
+  for (const record3 of records2) {
+    const member = context.normalizedMembers.get(record3.recordId);
+    if (member?.isStatic !== true) {
+      recovered.push(record3);
+      continue;
+    }
+    const owner = context.memberOwners.get(record3.recordId) ?? {
+      kind: "loose"
+    };
+    if (owner.kind === "classMember") {
+      recovered.push(record3);
+      continue;
+    }
+    const ownerKind = typeof owner.kind === "string" ? owner.kind : "unknown";
+    const memberName = typeof member.name === "string" ? member.name : record3.recordId;
+    if (ownerKind === "loose") {
+      normalizedMembers.delete(record3.recordId);
+      onRecovery({
+        memberId: record3.recordId,
+        memberName,
+        ownerKind,
+        action: "delete"
+      });
+      continue;
+    }
+    onRecovery({
+      memberId: record3.recordId,
+      memberName,
+      ownerKind,
+      action: "demote"
+    });
+    normalizedMembers.set(record3.recordId, {
+      ...member,
+      isStatic: false
+    });
+    recovered.push({
+      ...record3,
+      data: { ...record3.data, isStatic: false }
+    });
+  }
+  return recovered;
+}
 function projectSchemaManifestToDocuments(manifestInput, context) {
   const manifest = parseProjectSchemaManifest(manifestInput);
   const emissionContext = {
@@ -80398,6 +80457,19 @@ var init_root_source = __esm({
   }
 });
 
+// src/project-source/static-member-ownership-recovery.ts
+function staticMemberOwnershipRecoveryMessage(recovery) {
+  const identity2 = `${JSON.stringify(recovery.memberName)} (${recovery.memberId})`;
+  return recovery.action === "delete" ? `Recovered malformed static member ${identity2}: it has no Class declaration, so no source was emitted and the next push will delete the orphaned record.` : `Recovered malformed static member ${identity2}: it is owned as ${recovery.ownerKind}, so source projected it as instance metadata and the next push will correct isStatic.`;
+}
+var STATIC_MEMBER_OWNERSHIP_RECOVERY_SOURCE;
+var init_static_member_ownership_recovery = __esm({
+  "src/project-source/static-member-ownership-recovery.ts"() {
+    "use strict";
+    STATIC_MEMBER_OWNERSHIP_RECOVERY_SOURCE = "<project>";
+  }
+});
+
 // ../src/models/animation/animation-clips.ts
 function isWorldAnimationStructuralMember(memberId, members) {
   const membersById = new Map(members.map((member) => [member.id, member]));
@@ -95029,7 +95101,13 @@ function computeWorkspaceStatus(workspace, options) {
     };
   }
   const baseDocuments = schemaBaseDocuments(workspace);
-  const baseManifest = baseDocuments.length === 0 ? void 0 : documentsToProjectSchemaManifest(baseDocuments);
+  const staticMemberOwnershipRecoveries = [];
+  const baseManifest = baseDocuments.length === 0 ? void 0 : documentsToProjectSchemaManifest(baseDocuments, {
+    onInvalidStaticMemberOwnership: (recovery) => staticMemberOwnershipRecoveries.push(recovery)
+  });
+  const orphanedStaticMemberKeys = new Set(
+    staticMemberOwnershipRecoveries.filter((recovery) => recovery.action === "delete").map((recovery) => recordStateKey("member", recovery.memberId))
+  );
   let manifest;
   let authoredValueSeeds = /* @__PURE__ */ new Map();
   let staticMemberValueIds = /* @__PURE__ */ new Map();
@@ -95455,11 +95533,12 @@ function computeWorkspaceStatus(workspace, options) {
   }
   const deletedValueIds = /* @__PURE__ */ new Set();
   for (const [key, recordState] of Object.entries(workspace.state.records)) {
-    if (recordState.file === void 0) continue;
+    const recordFile = recordState.file ?? (orphanedStaticMemberKeys.has(key) ? STATIC_MEMBER_OWNERSHIP_RECOVERY_SOURCE : void 0);
+    if (recordFile === void 0) continue;
     if (reconstructed3.has(key)) continue;
     const fileStillBroken = parseErrors.some(
-      (error) => error.file === recordState.file && isBlockingSchemaSourceError(error)
-    ) || conflictedFiles.includes(recordState.file);
+      (error) => error.file === recordFile && isBlockingSchemaSourceError(error)
+    ) || conflictedFiles.includes(recordFile);
     if (fileStillBroken) continue;
     if (recordState.recordKind === "value") {
       deletedValueIds.add(recordState.recordId);
@@ -95468,7 +95547,7 @@ function computeWorkspaceStatus(workspace, options) {
       kind: "delete",
       recordKind: recordState.recordKind,
       recordId: recordState.recordId,
-      file: recordState.file,
+      file: recordFile,
       baseData: recordState.data,
       baseContentHash: recordState.contentHash,
       casBaseHash: recordState.conflictServerHash !== void 0 ? recordState.conflictServerHash : recordState.contentHash
@@ -96274,6 +96353,7 @@ var init_workspace_status_core = __esm({
     init_value_sources();
     init_lower_variants();
     init_root_source();
+    init_static_member_ownership_recovery();
     init_root_value_paths();
     init_project_documents();
     init_animation_clips();
@@ -99654,7 +99734,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 +100338,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;
@@ -104142,7 +104232,10 @@ function emitProjectDocumentFilesV4(records2) {
       data: record3.data
     });
   }
-  const manifest = documentsToProjectSchemaManifest(schemaRecords);
+  const staticMemberOwnershipRecoveries = [];
+  const manifest = documentsToProjectSchemaManifest(schemaRecords, {
+    onInvalidStaticMemberOwnership: (recovery) => staticMemberOwnershipRecoveries.push(recovery)
+  });
   const staticValues = emitStaticValueSourcesV4(records2, manifest);
   const memberDefaults = emitMemberDefaultSourcesV4(records2, manifest);
   const variantValues = emitVariantValueSourcesV4(records2, manifest);
@@ -104215,6 +104308,13 @@ function emitProjectDocumentFilesV4(records2) {
   ]) {
     for (const key of file.recordKeys) recordFiles.set(key, file.path);
   }
+  for (const recovery of staticMemberOwnershipRecoveries) {
+    if (recovery.action !== "delete") continue;
+    recordFiles.set(
+      `member:${recovery.memberId}`,
+      STATIC_MEMBER_OWNERSHIP_RECOVERY_SOURCE
+    );
+  }
   const analysis = compileNeoProjectSources(
     files.map((file) => {
       const kind = neoProjectSourceKind(file.path);
@@ -104242,7 +104342,8 @@ ${errors.map(
     recordFiles,
     analysis,
     materializedConstructors,
-    formAlternates: source.formAlternates
+    formAlternates: source.formAlternates,
+    staticMemberOwnershipRecoveries
   };
 }
 function relationEndpointExpressions(records2) {
@@ -104295,6 +104396,7 @@ var init_project_documents = __esm({
     init_root_value_paths();
     init_source_diagnostics();
     init_source_format();
+    init_static_member_ownership_recovery();
     PROJECT_SOURCE_ANALYSIS_V4_CACHE_PATH = ".neo/project-source-analysis-v4.json";
     SCHEMA_RECORD_KINDS2 = /* @__PURE__ */ new Set([
       "class",
@@ -105958,7 +106060,8 @@ function resetWorkspaceToProjectSourcesV4(workspace, document, options = {}) {
   return {
     written: emitted.files.length,
     removed,
-    fileCount: emitted.files.length
+    fileCount: emitted.files.length,
+    staticMemberOwnershipRecoveries: emitted.staticMemberOwnershipRecoveries
   };
 }
 function preserveManagedSpecs(root) {
@@ -106680,6 +106783,9 @@ async function runResetPull(workspace) {
     const reset = resetWorkspaceToProjectSourcesV4(workspace, document, {
       regenerateSourceNames: true
     });
+    for (const recovery of reset.staticMemberOwnershipRecoveries ?? []) {
+      warn(staticMemberOwnershipRecoveryMessage(recovery));
+    }
     for (const [key, state] of binaries.states) {
       const record3 = workspace.state.records[key];
       if (record3) record3.projectBinary = state;
@@ -106759,6 +106865,9 @@ async function finishFormat4Pull(args) {
     )
   );
   const localResult = emitProjectDocumentFilesV4(localRecords);
+  for (const recovery of localResult.staticMemberOwnershipRecoveries ?? []) {
+    warn(staticMemberOwnershipRecoveryMessage(recovery));
+  }
   const serverResult = conflictCount === 0 ? null : emitProjectDocumentFilesV4(
     buildEmitRecordSet(document, plans, "server")
   );
@@ -107196,6 +107305,7 @@ var init_pull = __esm({
     init_project_file_pull();
     init_dialogue_sources();
     init_static_value_seed_records();
+    init_static_member_ownership_recovery();
   }
 });
 
@@ -112353,6 +112463,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 +113299,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 +113325,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 +113514,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 +114140,7 @@ var init_registry2 = __esm({
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
       formatVersion: 3,
       contractVersion: "3.14",
-      cliVersion: "0.36.3",
+      cliVersion: "0.36.5",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -120612,7 +120742,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.5");
     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.5",
   "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.5 -->
 
 # 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.5 -->
 ```
 
 The quoted version above is checked too, so this instruction cannot go stale