@neocompose/cli 0.46.1 → 0.46.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [0.46.2] - 2026-09-04
+
+### Fixed
+
+- Pulling variants with non-class value rows no longer produces false local
+  `classId: null` updates. Unchanged status, pull, and test preparation avoid
+  the animation validation those false edits triggered.
+- Normal pull checks the remote head before local reconstruction, avoiding
+  compilation when there are no remote changes.
+- Terminal spinners keep animating during synchronous compilation and show
+  workspace loading and preparation phases for status, diff, pull, and test.
+  `NO_COLOR` disables color without disabling animation; piped and JSON
+  status/test output remain free of terminal controls.
+- Prospective animation validation reuses one class index for each validation
+  document instead of rebuilding it for every animation root and initializer.
+- Stored construction replay validates and compiles constructor records once per
+  emission batch, and reuses each value's constructor-body schema-key index.
+
 ## [0.46.1] - 2026-09-04
 
 ### Changed

package/dist/neo.mjs

@@ -539,6 +539,64 @@ var init_token_store = __esm({
   }
 });
 
+// src/spinner-renderer.ts
+import { writeSync } from "node:fs";
+import { Worker } from "node:worker_threads";
+function startSpinnerRenderer(label, frames, colored) {
+  const state = new Int32Array(new SharedArrayBuffer(4));
+  const open = colored ? "\x1B[36m" : "";
+  const close = colored ? "\x1B[39m" : "";
+  writeSync(1, `\r\x1B[2K${open}${frames[0]}${close} ${label}`);
+  const worker = new Worker(RENDERER, {
+    eval: true,
+    execArgv: [],
+    workerData: { state: state.buffer, frames, label, open, close }
+  });
+  const stop = () => {
+    for (; ; ) {
+      const previous = Atomics.compareExchange(state, 0, 0, 2);
+      if (previous === 2) return;
+      if (previous === 0) break;
+      Atomics.wait(state, 0, 1);
+    }
+    void worker.terminate();
+    writeSync(1, "\r\x1B[2K");
+  };
+  worker.on("error", stop);
+  worker.unref();
+  return {
+    update(next) {
+      if (Atomics.load(state, 0) !== 2) worker.postMessage(next);
+    },
+    stop
+  };
+}
+var RENDERER;
+var init_spinner_renderer = __esm({
+  "src/spinner-renderer.ts"() {
+    "use strict";
+    RENDERER = `
+const { workerData, parentPort } = require("node:worker_threads");
+const { writeSync } = require("node:fs");
+const state = new Int32Array(workerData.state);
+let label = workerData.label;
+let frame = 1;
+function render() {
+  if (Atomics.compareExchange(state, 0, 0, 1) !== 0) return;
+  try {
+    const glyph = workerData.frames[frame++ % workerData.frames.length];
+    writeSync(1, "\\r\\u001b[2K" + workerData.open + glyph + workerData.close + " " + label);
+  } finally {
+    Atomics.store(state, 0, 0);
+    Atomics.notify(state, 0);
+  }
+}
+parentPort.on("message", (next) => { label = next; render(); });
+setInterval(render, 80);
+`;
+  }
+});
+
 // src/ui.ts
 function paint(open, close) {
   if (!colorEnabled) return (text) => text;
@@ -564,42 +622,45 @@ function paintChangeKind(kind) {
   return painter === void 0 ? kind : painter(kind);
 }
 function spinner(text) {
-  if (!colorEnabled) {
+  if (process.stdout.isTTY !== true || process.env.TERM === "dumb") {
     console.log(text);
+    let stopped2 = false;
     return {
       update: () => void 0,
-      succeed: (done) => console.log(done),
-      fail: (done) => console.error(done),
-      stop: () => void 0
+      succeed(done) {
+        if (!stopped2) console.log(done);
+        stopped2 = true;
+      },
+      fail(done) {
+        if (!stopped2) console.error(done);
+        stopped2 = true;
+      },
+      stop() {
+        stopped2 = true;
+      }
     };
   }
-  let frame = 0;
-  let label = text;
-  const render = () => {
-    process.stdout.write(
-      `\r\x1B[2K${color.cyan(SPINNER_FRAMES[frame % SPINNER_FRAMES.length])} ${label}`
-    );
-    frame += 1;
-  };
-  render();
-  const timer = setInterval(render, 80);
+  const renderer = startSpinnerRenderer(text, SPINNER_FRAMES, colorEnabled);
+  let stopped = false;
   const clear = () => {
-    clearInterval(timer);
-    process.stdout.write("\r\x1B[2K");
+    if (stopped) return false;
+    stopped = true;
+    renderer.stop();
+    return true;
   };
   return {
     update(next) {
-      label = next;
+      if (!stopped) renderer.update(next);
     },
     succeed(done) {
-      clear();
-      console.log(`${sym.ok} ${done}`);
+      if (clear()) console.log(`${sym.ok} ${done}`);
     },
     fail(done) {
-      clear();
-      console.error(`${sym.fail} ${done}`);
+      if (clear()) console.error(`${sym.fail} ${done}`);
     },
-    stop: clear
+    stop() {
+      clear();
+    }
   };
 }
 async function promptSelect(args) {
@@ -643,6 +704,7 @@ var colorEnabled, color, sym, CHANGE_KIND_COLOR, SPINNER_FRAMES;
 var init_ui = __esm({
   "src/ui.ts"() {
     "use strict";
+    init_spinner_renderer();
     colorEnabled = process.stdout.isTTY === true && process.env.NO_COLOR === void 0 && process.env.TERM !== "dumb";
     color = {
       bold: paint(1, 22),
@@ -46679,12 +46741,24 @@ function projectSchemaIndexFor(source, revision = EMPTY_REVISION) {
     byMembers = /* @__PURE__ */ new WeakMap();
     projectSchemaIndexes.set(source.classes, byMembers);
   }
-  const cached = byMembers.get(source.members);
+  let byEnums = byMembers.get(source.members);
+  if (byEnums === void 0) {
+    byEnums = /* @__PURE__ */ new WeakMap();
+    byMembers.set(source.members, byEnums);
+  }
+  const enumKey = source.enums ?? ABSENT_COLLECTION;
+  let byConstructors = byEnums.get(enumKey);
+  if (byConstructors === void 0) {
+    byConstructors = /* @__PURE__ */ new WeakMap();
+    byEnums.set(enumKey, byConstructors);
+  }
+  const constructorKey = source.constructors ?? ABSENT_COLLECTION;
+  const cached = byConstructors.get(constructorKey);
   if (cached !== void 0 && isCurrent(cached, source, revision)) {
     return cached.index;
   }
   const index = new ProjectSchemaIndex(source);
-  byMembers.set(source.members, {
+  byConstructors.set(constructorKey, {
     classCount: source.classes.length,
     memberCount: source.members.length,
     enums: source.enums,
@@ -46697,7 +46771,7 @@ function projectSchemaIndexFor(source, revision = EMPTY_REVISION) {
   });
   return index;
 }
-var CircularInheritanceError, ProjectSchemaIndex, EMPTY_STRING_SET, EMPTY_REVISION, projectSchemaIndexEpoch, projectSchemaIndexes;
+var CircularInheritanceError, ProjectSchemaIndex, EMPTY_STRING_SET, EMPTY_REVISION, projectSchemaIndexEpoch, projectSchemaIndexes, ABSENT_COLLECTION;
 var init_project_schema_index = __esm({
   "../src/models/project/project-schema-index.ts"() {
     "use strict";
@@ -46859,6 +46933,7 @@ var init_project_schema_index = __esm({
     EMPTY_REVISION = [];
     projectSchemaIndexEpoch = 0;
     projectSchemaIndexes = /* @__PURE__ */ new WeakMap();
+    ABSENT_COLLECTION = {};
   }
 });
 
@@ -70862,9 +70937,9 @@ function evaluatorOwnershipDistances(rowId, indexes) {
   if (cached !== void 0) return cached;
   const distances = /* @__PURE__ */ new Map([[rowId, 0]]);
   const pending = [rowId];
-  while (pending.length > 0) {
-    const currentId = pending.shift();
-    if (currentId === void 0) break;
+  for (let cursor = 0; cursor < pending.length; cursor += 1) {
+    const currentId = pending[cursor];
+    if (currentId === void 0) continue;
     const currentDistance = distances.get(currentId);
     if (currentDistance === void 0) continue;
     for (const parent of evaluatorParentLinks(indexes, currentId)) {
@@ -71482,6 +71557,19 @@ function finalizeConstructorAllocations(ctx, returnValue, ownsInvocationState, r
   }
   const escapedRoots = /* @__PURE__ */ new Set();
   const scannedRows = /* @__PURE__ */ new Set();
+  let rowsByContainerId;
+  const containerEntryIds = (containerId) => {
+    if (rowsByContainerId === void 0) {
+      rowsByContainerId = /* @__PURE__ */ new Map();
+      for (const candidate of evaluatorValues(ctx)) {
+        if (typeof candidate.containerId !== "string") continue;
+        const entries = rowsByContainerId.get(candidate.containerId) ?? [];
+        entries.push(candidate.id);
+        rowsByContainerId.set(candidate.containerId, entries);
+      }
+    }
+    return rowsByContainerId.get(containerId) ?? [];
+  };
   const markConstructorGroupEscaped = (rootId) => {
     if (escapedRoots.has(rootId)) return;
     escapedRoots.add(rootId);
@@ -71531,13 +71619,11 @@ function finalizeConstructorAllocations(ctx, returnValue, ownsInvocationState, r
         ctx.onUnattributableValueRead?.(
           `constructor-argument-list:${argumentId}`
         );
-        for (const candidate of evaluatorValues(ctx)) {
-          if (candidate.containerId === argumentId) {
-            scanCreationDataRow({
-              id: candidate.id,
-              typeInfo: typeInfo.entryTypeInfo
-            });
-          }
+        for (const childId of containerEntryIds(argumentId)) {
+          scanCreationDataRow({
+            id: childId,
+            typeInfo: typeInfo.entryTypeInfo
+          });
         }
         return;
       }
@@ -71557,9 +71643,11 @@ function finalizeConstructorAllocations(ctx, returnValue, ownsInvocationState, r
     }
     const rawMember = hintedMember ?? activeStaticBindingRoot(valueId, ctx)?.member ?? memberForValueRow(row, ctx);
     let member = rawMember;
+    let resolvedMemberForSubstitution;
     if (rawMember !== null) {
       try {
-        member = resolveMember2(rawMember, ctx.vm.members);
+        member = cachedResolvedMember(rawMember, ctx);
+        resolvedMemberForSubstitution = member;
       } catch {
         member = rawMember;
       }
@@ -71569,7 +71657,8 @@ function finalizeConstructorAllocations(ctx, returnValue, ownsInvocationState, r
         member = substituteMember(
           member,
           envFromStamp(row.genericBindings),
-          ctx.vm.members
+          ctx.vm.members,
+          resolvedMemberForSubstitution
         );
       } catch {
       }
@@ -71589,10 +71678,8 @@ function finalizeConstructorAllocations(ctx, returnValue, ownsInvocationState, r
       const entryMember = evalMemberById(ctx.vm, member.entryMemberId);
       if (listKindOf(member) === 1 /* Unordered */) {
         ctx.onUnattributableValueRead?.(`constructed-unordered-list:${row.id}`);
-        for (const candidate of evaluatorValues(ctx)) {
-          if (candidate.containerId === row.id) {
-            scanOwnedRow(candidate.id, entryMember);
-          }
+        for (const childId of containerEntryIds(row.id)) {
+          scanOwnedRow(childId, entryMember);
         }
         return;
       }
@@ -104746,10 +104833,12 @@ function compareWorkspacePaths(left, right) {
 }
 function computeWorkspaceStatus(workspace, options) {
   let phaseStarted = performance.now();
-  const reportPhase = (phase) => {
+  options.onPhase?.("Reading project schema\u2026");
+  const reportPhase = (phase, nextLabel) => {
     const finished = performance.now();
     options.reportPhase?.(phase, finished - phaseStarted);
     phaseStarted = finished;
+    if (nextLabel !== void 0) options.onPhase?.(nextLabel);
   };
   const conflictedFiles = [];
   const parseErrors = [];
@@ -104912,7 +105001,7 @@ function computeWorkspaceStatus(workspace, options) {
       analysis,
       compilationSources
     );
-    reportPhase("analysis-schema-defaults");
+    reportPhase("analysis-schema-defaults", "Reading stored values\u2026");
   } catch (error) {
     parseErrors.push(
       error instanceof SchemaSourceError ? error : new SchemaSourceError(
@@ -104987,7 +105076,7 @@ function computeWorkspaceStatus(workspace, options) {
     manifest,
     { registry: valueLowerRegistry }
   );
-  reportPhase("documents-static-root");
+  reportPhase("documents-static-root", "Reading variants and dialogues\u2026");
   authoredValueSeeds = new Map([...authoredValueSeeds, ...rootValues.seeds]);
   const rootPathResolutionState = overlayProspectiveSourceRecords(
     loweringRecords,
@@ -105145,7 +105234,7 @@ function computeWorkspaceStatus(workspace, options) {
     prospectiveState,
     projectAnalysisV4
   );
-  reportPhase("supplemental-dialogue");
+  reportPhase("supplemental-dialogue", "Comparing records\u2026");
   records2.push(
     ...staticValues.records,
     ...memberDefaults.records,
@@ -105268,7 +105357,7 @@ function computeWorkspaceStatus(workspace, options) {
       )
     );
   }
-  reportPhase("record-diff-references");
+  reportPhase("record-diff-references", "Checking packed values\u2026");
   if (referenceFailures.length > 0) {
     return {
       changes: [],
@@ -105349,7 +105438,7 @@ function computeWorkspaceStatus(workspace, options) {
     reconstructed: reconstructed3,
     changes
   });
-  reportPhase("packed-value-fold");
+  reportPhase("packed-value-fold", "Checking initializers\u2026");
   for (const change of changes) {
     if (change.recordKind !== "value" || change.kind !== "update") continue;
     const refusal = valueDematerializationRefusal({
@@ -105393,7 +105482,7 @@ function computeWorkspaceStatus(workspace, options) {
       )
     );
   }
-  reportPhase("initializer-reconciliation");
+  reportPhase("initializer-reconciliation", "Checking project files\u2026");
   for (const fileId of options.trustedPendingProjectFiles?.keys() ?? []) {
     const key = `project-file:${fileId}`;
     const base = workspace.state.records[key];
@@ -105430,7 +105519,7 @@ function computeWorkspaceStatus(workspace, options) {
   binaryChanges = binaryFiles.filter(
     (binary) => binary.action !== "unchanged" && binary.action !== "converged"
   );
-  reportPhase("binary-inspection");
+  reportPhase("binary-inspection", "Validating animation changes\u2026");
   const invalidatedFileIds = /* @__PURE__ */ new Set();
   for (const binary of binaryFiles) {
     if (binary.action === "create" || binary.action === "upload") {
@@ -105479,7 +105568,7 @@ function computeWorkspaceStatus(workspace, options) {
       );
     }
   }
-  reportPhase("animation-clip-validation");
+  reportPhase("animation-clip-validation", "Preparing new values\u2026");
   for (const binary of binaryChanges) {
     if (binary.action !== "missing-local") continue;
     parseErrors.push(
@@ -105616,7 +105705,7 @@ function replayAnimationDeclarationInitializersV4(records2, document, fallbackDo
     if (owner === void 0) continue;
     const declaredClassId = typeof row.classId === "string" ? row.classId : Reflect.get(owner, "classId");
     if (typeof declaredClassId !== "string") continue;
-    if (!classBelongsToAnimationFamily(document.classes, declaredClassId)) {
+    if (!classBelongsToAnimationFamily(document.classesById, declaredClassId)) {
       continue;
     }
     const fallback = fallbackValues.get(row.id);
@@ -105695,10 +105784,7 @@ function animationRecordsFromState(records2) {
     return isObjectRecord2(data) ? [{ recordKind: record4.recordKind, data }] : [];
   });
 }
-function classBelongsToAnimationFamily(classes, classId) {
-  const classesById = new Map(
-    classes.map((schemaClass2) => [schemaClass2.id, schemaClass2])
-  );
+function classBelongsToAnimationFamily(classesById, classId) {
   const visited = /* @__PURE__ */ new Set();
   let currentId = classId;
   while (currentId !== null && !visited.has(currentId)) {
@@ -105764,6 +105850,9 @@ function prospectiveAnimationDocumentV4(records2) {
     }
   }
   if (project === void 0) return null;
+  const classesById = new Map(
+    classes.map((schemaClass2) => [schemaClass2.id, schemaClass2])
+  );
   const classIdByName = new Map(classes.map((value) => [value.name, value.id]));
   const validationValues = expandPackedValueRows(values).map((value) => {
     if (typeof value.classId === "string") return value;
@@ -105788,10 +105877,12 @@ function prospectiveAnimationDocumentV4(records2) {
   return {
     project,
     classes,
+    classesById,
     members,
     values: expandProspectiveAnimationInstances({
       project,
       classes,
+      classesById,
       constructors,
       members,
       values: validationValues
@@ -105800,7 +105891,7 @@ function prospectiveAnimationDocumentV4(records2) {
 }
 function expandProspectiveAnimationInstances(document) {
   const animationRoots = document.values.filter(
-    (row) => isLiteralValueContent(row) && isVirtualInstanceRootShape(row) && typeof row.classId === "string" && classBelongsToAnimationFamily(document.classes, row.classId)
+    (row) => isLiteralValueContent(row) && isVirtualInstanceRootShape(row) && typeof row.classId === "string" && classBelongsToAnimationFamily(document.classesById, row.classId)
   );
   if (animationRoots.length === 0) return [...document.values];
   const lookups = cliEvaluatorLookups({
@@ -107194,8 +107285,7 @@ var init_commit_preparation_scope_planner = __esm({
           "source-only-rows",
           "whole-graph-validation-members",
           "world-value-ranges"
-        ],
-        mutatesDocument: []
+        ]
       },
       "authored-value-seeds": {
         order: 2,
@@ -107217,10 +107307,7 @@ var init_commit_preparation_scope_planner = __esm({
           "every-variant-root",
           "localizable-reference-candidates",
           "world-value-ranges"
-        ],
-        // `materializeStaticSeedBindingMembers` pushes the binding member it mints
-        // into the document the rest of this pass reads, not only into `prepared`.
-        mutatesDocument: ["members"]
+        ]
       },
       "variant-child-override-binding-members": {
         order: 3,
@@ -107236,10 +107323,7 @@ var init_commit_preparation_scope_planner = __esm({
           "every-variant-root",
           "stamp-edge-candidates",
           "world-value-ranges"
-        ],
-        // The minted binding member is pushed straight into the document the
-        // later passes read, not only into `prepared`.
-        mutatesDocument: ["members"]
+        ]
       },
       "prepared-instance-initializers": {
         order: 4,
@@ -107252,8 +107336,7 @@ var init_commit_preparation_scope_planner = __esm({
           "full-content-dimension",
           "member-default-value-closure",
           "world-value-ranges"
-        ],
-        mutatesDocument: []
+        ]
       },
       "delegate-value-bodies": {
         order: 5,
@@ -107269,8 +107352,7 @@ var init_commit_preparation_scope_planner = __esm({
           "every-variant-root",
           "source-only-rows",
           "world-value-ranges"
-        ],
-        mutatesDocument: []
+        ]
       },
       "variant-constructor-args": {
         order: 6,
@@ -107283,8 +107365,7 @@ var init_commit_preparation_scope_planner = __esm({
           "touched-variant-schema-key-children",
           "member-default-value-closure",
           "world-value-ranges"
-        ],
-        mutatesDocument: []
+        ]
       }
     };
   }
@@ -108997,6 +109078,12 @@ var init_server_preparation_preflight = __esm({
 function isPulledInitializerCompilationDocumentV4(document) {
   return typeof Reflect.get(document, "project") === "object" && Reflect.get(document, "project") !== null && Array.isArray(Reflect.get(document, "projectFiles")) && Array.isArray(Reflect.get(document, "members")) && Array.isArray(Reflect.get(document, "classes")) && Array.isArray(Reflect.get(document, "enums")) && Array.isArray(Reflect.get(document, "interfaces")) && Array.isArray(Reflect.get(document, "constructors")) && Array.isArray(Reflect.get(document, "values"));
 }
+function createPulledConstructionReplayContext(args) {
+  return {
+    document: args.document,
+    constructorsValidated: false
+  };
+}
 function pulledInitializerCompilerStateV4(document, compilationProject) {
   const existing = pulledInitializerCompilerStates.get(document);
   if (existing !== void 0) {
@@ -109072,6 +109159,14 @@ function describePulledProjectBodyCompileError(error) {
 }
 function replayStoredConstructionV4(args) {
   const document = args.document ?? readPulledProjectDocumentV4(args.records);
+  if (args.replayContext !== void 0 && args.replayContext.document !== document) {
+    throw new Error(
+      "Construction replay context belongs to a different document."
+    );
+  }
+  if (args.compileDocumentBodies === true && args.replayContext !== void 0) {
+    args.replayContext.constructorsValidated = false;
+  }
   const compilationProject = args.compilationProject ?? (args.compileDocumentBodies === true ? createNeoScriptCompilationProject({
     project: document.project,
     projectFiles: document.projectFiles,
@@ -109156,8 +109251,12 @@ function replayStoredConstructionV4(args) {
     ...candidate,
     init: withoutInitializerConstructionFields(candidate.init)
   } : candidate;
-  compilePulledUncompiledConstructorsV4(document, compilationProject);
-  assertPulledConstructorsCompiled(document);
+  compilePulledUncompiledConstructorsV4(
+    document,
+    compilationProject,
+    args.replayContext
+  );
+  assertPulledConstructorsCompiled(document, args.replayContext);
   const materialized = materializeInitializerValue2({
     document: {
       ...document,
@@ -109185,11 +109284,15 @@ function replayStoredConstructionV4(args) {
     ])
   );
 }
-function compilePulledUncompiledConstructorsV4(document, compilationProject) {
+function compilePulledUncompiledConstructorsV4(document, compilationProject, replayContext) {
+  if (replayContext?.constructorsValidated === true) return;
   const uncompiled = (document.constructors ?? []).filter(
     (constructor2) => !isNeoClassConstructor(constructor2)
   );
-  if (uncompiled.length === 0) return;
+  if (uncompiled.length === 0) {
+    if (replayContext !== void 0) replayContext.constructorsValidated = true;
+    return;
+  }
   const project = compilationProject ?? createNeoScriptCompilationProject({
     project: document.project,
     projectFiles: document.projectFiles,
@@ -109212,6 +109315,7 @@ function compilePulledUncompiledConstructorsV4(document, compilationProject) {
   for (const constructor2 of uncompiled) {
     compileConstructorRecord({ ...compileArgs, constructor: constructor2 });
   }
+  assertPulledConstructorsCompiled(document, replayContext);
 }
 function valueInitializerCompilationSites(document) {
   const cached = pulledValueInitializerCompilationSites.get(document);
@@ -109319,7 +109423,13 @@ function compilePulledProjectDocumentForEvaluationV4(document, compilationProjec
     }
   }
 }
-function assertPulledConstructorsCompiled(document) {
+function assertPulledConstructorsCompiled(document, replayContext) {
+  if (replayContext !== void 0 && replayContext.document !== document) {
+    throw new Error(
+      "Constructor validation context belongs to a different document."
+    );
+  }
+  if (replayContext?.constructorsValidated === true) return;
   const uncompiled = (document.constructors ?? []).find(
     (constructor2) => !isNeoClassConstructor(constructor2)
   );
@@ -109328,6 +109438,7 @@ function assertPulledConstructorsCompiled(document) {
       `Constructor "${uncompiled.id}" was read from authored source but was not compiled before evaluation.`
     );
   }
+  if (replayContext !== void 0) replayContext.constructorsValidated = true;
 }
 function compilePulledMemberInitializerBodyV4(document, memberId, compilationProject) {
   const compileArgs = {
@@ -109526,11 +109637,16 @@ function buildValueEmitContext(records2, manifest) {
   const readDocument = () => document ??= readPulledProjectDocumentV4(records2);
   let compilationProject;
   const readCompilationProject = () => compilationProject ??= createNeoScriptCompilationProject(readDocument());
+  let replayContext;
+  const readReplayContext = () => replayContext ??= createPulledConstructionReplayContext({
+    document: readDocument()
+  });
   let materializedGraph;
   return {
     records: records2,
     readDocument,
     readCompilationProject,
+    readReplayContext,
     readMaterializedGraph: () => {
       if (materializedGraph !== void 0) return materializedGraph;
       materializedGraph = new MaterializedValueGraphContext(
@@ -109572,6 +109688,7 @@ function buildValueEmitContext(records2, manifest) {
     fileSymbols: projectFileSymbols(records2),
     localizedTextIds: /* @__PURE__ */ new Set(),
     constructionReplays: /* @__PURE__ */ new Map(),
+    constructorBodySchemaKeys: /* @__PURE__ */ new WeakMap(),
     materializedConstructors: /* @__PURE__ */ new Map(),
     materializedConstructorOverrideKeys: /* @__PURE__ */ new Map()
   };
@@ -110475,6 +110592,9 @@ function variantReconstructedFields(context, row) {
 }
 function mergedOverStoredRow(base, lowered) {
   const merged = { ...valueFileFields(base), ...lowered };
+  if (lowered.classId === null && base.classId === void 0) {
+    delete merged.classId;
+  }
   const storedArgs = isObjectRecord2(base.constructorArgs) ? base.constructorArgs : null;
   const loweredArgs = isObjectRecord2(merged.constructorArgs) ? merged.constructorArgs : null;
   if (storedArgs !== null && loweredArgs !== null) {
@@ -115149,7 +115269,8 @@ function storedConstructionReplayRows(context, valueId, code, member) {
     valueId,
     code,
     member,
-    compilationProject: context.readCompilationProject()
+    compilationProject: context.readCompilationProject(),
+    replayContext: context.readReplayContext()
   });
   context.constructionReplays.set(valueId, replay);
   return replay;
@@ -115291,7 +115412,11 @@ function storedConstructorCallSource(context, schemaClass2, value, className, en
         // re-declared that external graph under the construction, and the
         // emitter then refused the whole pull with a containment cycle on the
         // re-declared row's own children.
-        constructorArgumentBodySchemaKey(value, constructorArgs[key]) !== void 0
+        constructorArgumentBodySchemaKey(
+          context,
+          value,
+          constructorArgs[key]
+        ) !== void 0
       )}`
     ];
   });
@@ -115303,7 +115428,11 @@ function storedConstructorCallSource(context, schemaClass2, value, className, en
 function settledMemberForConstructorArgument(context, schemaClass2, value, argument2, argumentName) {
   if (typeof argument2 !== "string") return void 0;
   const schema = isObjectRecord2(schemaClass2.schema) ? schemaClass2.schema : {};
-  const bodySchemaKey = constructorArgumentBodySchemaKey(value, argument2);
+  const bodySchemaKey = constructorArgumentBodySchemaKey(
+    context,
+    value,
+    argument2
+  );
   if (bodySchemaKey !== void 0) {
     return memberForSchemaKey(context, schema, bodySchemaKey);
   }
@@ -115320,11 +115449,22 @@ function settledMemberForConstructorArgument(context, schemaClass2, value, argum
   const namedSchemaKey = schemaKeyForParameterName(schema, argumentName);
   return namedSchemaKey === void 0 ? void 0 : memberForSchemaKey(context, schema, namedSchemaKey);
 }
-function constructorArgumentBodySchemaKey(value, argument2) {
+function constructorArgumentBodySchemaKey(context, value, argument2) {
   if (typeof argument2 !== "string") return void 0;
   const body = value.value;
   if (!isObjectRecord2(body)) return void 0;
-  return Object.entries(body).find(([, rowId]) => rowId === argument2)?.[0];
+  let keysByArgument = context.constructorBodySchemaKeys.get(value);
+  if (keysByArgument === void 0) {
+    const created = /* @__PURE__ */ new Map();
+    for (const [schemaKey, rowId] of Object.entries(body)) {
+      if (typeof rowId === "string" && !created.has(rowId)) {
+        created.set(rowId, schemaKey);
+      }
+    }
+    keysByArgument = created;
+    context.constructorBodySchemaKeys.set(value, keysByArgument);
+  }
+  return keysByArgument.get(argument2);
 }
 function memberForSchemaKey(context, schema, schemaKey) {
   const memberId = schema[schemaKey];
@@ -117790,6 +117930,7 @@ function listProjectTestFilesV1(root) {
   return listNeoWorkspaceFilesV1(root).specs;
 }
 function computeWorkspaceStatus2(workspace, options = {}) {
+  options.onPhase?.("Reading project sources\u2026");
   const virtualSourceFiles = options.virtualSourceFiles ?? listProjectSourceFilesV4(workspace.root).map((path) => ({
     path: relative3(workspace.root, path).split(sep3).join("/"),
     content: readFileSync7(path, "utf8")
@@ -119408,12 +119549,11 @@ import {
   readFileSync as readFileSync9
 } from "node:fs";
 import { dirname as dirname8 } from "node:path";
-async function runPull(workspace, options) {
+async function runPull(workspace, options, progress = spinner("Checking local workspace\u2026")) {
   if (options.reset) {
-    await runResetPull(workspace);
+    await runResetPull(workspace, progress);
     return;
   }
-  const progress = spinner("Checking local workspace\u2026");
   try {
     await runNormalPull(workspace, options, progress);
   } catch (error) {
@@ -119428,32 +119568,6 @@ async function runNormalPull(workspace, options, progress) {
   if (acceptSourceEquivalentConflictBases(workspace, mainLocale) > 0) {
     writeWorkspaceState(workspace.root, workspace.state);
   }
-  let localByKey = /* @__PURE__ */ new Map();
-  let localStatus = null;
-  if (hasBaseline && !destructive) {
-    const status = computeWorkspaceStatus2(workspace);
-    localStatus = status;
-    if (status.conflictedFiles.length > 0) {
-      throw new Error(
-        `Resolve conflict markers before pulling: ${status.conflictedFiles.join(", ")}`
-      );
-    }
-    const blockingErrors = status.parseErrors.filter(
-      isBlockingSchemaSourceError
-    );
-    if (blockingErrors.length > 0) {
-      throw new Error(
-        `Fix parse errors before pulling:
-${blockingErrors.map((error) => `  ${error.message}`).join("\n")}`
-      );
-    }
-    localByKey = new Map(
-      [...status.reconstructed.entries()].map(([key, record4]) => [
-        key,
-        record4.fullData
-      ])
-    );
-  }
   let changedRecordKeys = null;
   let nextCursor = null;
   let observedHeadTransactionHash;
@@ -119508,6 +119622,35 @@ ${blockingErrors.map((error) => `  ${error.message}`).join("\n")}`
     document = await fetchProjectDocument(workspace);
     nextCursor = document.revision === void 0 ? null : cursorFromRevision(document.revision);
   }
+  let localByKey = /* @__PURE__ */ new Map();
+  let localStatus = null;
+  if (hasBaseline && !destructive) {
+    const status = computeWorkspaceStatus2(workspace, {
+      onPhase: (label) => progress.update(label)
+    });
+    localStatus = status;
+    if (status.conflictedFiles.length > 0) {
+      throw new Error(
+        `Resolve conflict markers before pulling: ${status.conflictedFiles.join(", ")}`
+      );
+    }
+    const blockingErrors = status.parseErrors.filter(
+      isBlockingSchemaSourceError
+    );
+    if (blockingErrors.length > 0) {
+      throw new Error(
+        `Fix parse errors before pulling:
+${blockingErrors.map((error) => `  ${error.message}`).join("\n")}`
+      );
+    }
+    localByKey = new Map(
+      [...status.reconstructed.entries()].map(([key, record4]) => [
+        key,
+        record4.fullData
+      ])
+    );
+  }
+  progress.update("Merging remote changes\u2026");
   const plans = /* @__PURE__ */ new Map();
   let mergedCount = 0;
   let conflictCount = 0;
@@ -119639,8 +119782,8 @@ ${blockingErrors.map((error) => `  ${error.message}`).join("\n")}`
     progress
   });
 }
-async function runResetPull(workspace) {
-  const progress = spinner("Pulling project snapshot\u2026");
+async function runResetPull(workspace, progress) {
+  progress.update("Pulling project snapshot\u2026");
   try {
     const document = await fetchProjectDocument(workspace);
     progress.update("Downloading project files\u2026");
@@ -125108,6 +125251,7 @@ async function downloadProjectVersionTransactionResult(args) {
 async function preparePushStatus(workspace, options, onPhase = () => void 0) {
   onPhase("Analyzing working copy\u2026");
   const status = computeWorkspaceStatus2(workspace, {
+    onPhase,
     forceRecompile: options.forceRecompile
   });
   if (status.conflictedFiles.length > 0) {
@@ -127497,7 +127641,7 @@ var init_registry2 = __esm({
   "schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.46.1",
+      cliVersion: "0.46.2",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -134316,6 +134460,17 @@ var init_resolve = __esm({
 
 // src/main.ts
 var main_exports = {};
+function computeCommandWorkspaceStatus(args) {
+  const progress = !boolFlag(args, "json") && process.stdout.isTTY === true ? spinner("Reading local workspace\u2026") : null;
+  try {
+    const workspace = loadWorkspaceForCommand(args);
+    return computeWorkspaceStatus2(workspace, {
+      onPhase: (label) => progress?.update(label)
+    });
+  } finally {
+    progress?.stop();
+  }
+}
 function profileFlag(args) {
   const value = stringFlag(args, "profile");
   if (value === null) return null;
@@ -134510,7 +134665,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.46.1");
+    console.log("0.46.2");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {
@@ -134585,13 +134740,25 @@ async function main() {
         args,
         /* @__PURE__ */ new Set(["api", "force", "reset", "regenerate-source-names"])
       );
-      const workspace = loadWorkspaceForCommand(args);
-      const { runPull: runPull2 } = await Promise.resolve().then(() => (init_pull(), pull_exports));
-      await runPull2(workspace, {
-        force: boolFlag(args, "force"),
-        reset: boolFlag(args, "reset"),
-        regenerateSourceNames: boolFlag(args, "regenerate-source-names")
-      });
+      const progress = spinner("Reading local workspace\u2026");
+      try {
+        const workspace = loadWorkspaceForCommand(args);
+        const { runPull: runPull2 } = await Promise.resolve().then(() => (init_pull(), pull_exports));
+        await runPull2(
+          workspace,
+          {
+            force: boolFlag(args, "force"),
+            reset: boolFlag(args, "reset"),
+            regenerateSourceNames: boolFlag(args, "regenerate-source-names")
+          },
+          progress
+        );
+      } catch (error) {
+        progress.fail("Pull failed.");
+        throw error;
+      } finally {
+        progress.stop();
+      }
       return;
     }
     case "doctor": {
@@ -134799,7 +134966,6 @@ async function main() {
       return;
     }
     case "test": {
-      const workspace = loadWorkspaceForCommand(args);
       const reporterValue = stringFlag(args, "reporter") ?? "default";
       if (reporterValue !== "default" && reporterValue !== "json") {
         throw new NeoCliUsageError('--reporter must be "default" or "json".');
@@ -134821,8 +134987,9 @@ async function main() {
           "--testTimeout must be a positive number of milliseconds."
         );
       }
-      const progress = reporterValue === "default" && process.stdout.isTTY === true ? spinner("Preparing test project\u2026") : null;
+      const progress = reporterValue === "default" && process.stdout.isTTY === true ? spinner("Reading local workspace\u2026") : null;
       try {
+        const workspace = loadWorkspaceForCommand(args);
         const { runTest: runTest2 } = await Promise.resolve().then(() => (init_test(), test_exports));
         await runTest2(
           workspace,
@@ -134839,6 +135006,8 @@ async function main() {
       } catch (error) {
         progress?.fail("Test run failed.");
         throw error;
+      } finally {
+        progress?.stop();
       }
       return;
     }
@@ -134924,8 +135093,7 @@ async function main() {
       return;
     }
     case "status": {
-      const workspace = loadWorkspaceForCommand(args);
-      const status = computeWorkspaceStatus2(workspace);
+      const status = computeCommandWorkspaceStatus(args);
       if (boolFlag(args, "json")) {
         console.log(
           JSON.stringify(
@@ -134969,8 +135137,7 @@ async function main() {
       return;
     }
     case "diff": {
-      const workspace = loadWorkspaceForCommand(args);
-      const status = computeWorkspaceStatus2(workspace);
+      const status = computeCommandWorkspaceStatus(args);
       if (boolFlag(args, "json")) {
         console.log(
           JSON.stringify(

package/package.json

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

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

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

package/skills/neocompose-cli/references/commands-and-sync.md

@@ -31,7 +31,9 @@ and managed binaries. Reset retains declaration file grouping already recorded
 by the workspace, while declarations with no prior placement use the canonical
 per-declaration layout. Use `--force` only to discard local edits for the server
 version. Normal pulls persist a transaction cursor and fetch only changed
-records; an undo/reset metadata change invalidates the cursor and causes a safe
+records. If the remote head is unchanged, pull preserves the local source
+without compiling it; use `neo status` to inspect local edits and diagnostics.
+An undo/reset metadata change invalidates the cursor and causes a safe
 full-snapshot fallback.
 
 Treat `neo push --dry-run` as a full local commit rehearsal: source emission,
@@ -52,6 +54,11 @@ bodies affected by changed declarations. Use `--force-recompile` with either a
 dry run or a real push only when diagnosing stale derived IR: it retains the
 exhaustive project-wide body sweep and is intentionally slower.
 
+Interactive status, diff, pull, and test commands report workspace loading and
+preparation phases. Spinners continue animating during synchronous compilation;
+`NO_COLOR` removes color without stopping the animation. JSON reporters and
+piped status/test output contain no terminal animation.
+
 Interactive pushes report the active preparation phase before workspace
 discovery, lowering, compilation, source hashing, and validation begin.
 A normal push prepares that transport once before confirmation and reuses it