@neocompose/cli 0.7.5 → 0.7.6

package/CHANGELOG.md

@@ -7,6 +7,13 @@
 - Document the final relation-only world layer-link contract and keep the
   format-4 Hello World corpus free of the retired value-side binding field.
 
+## [0.7.6] - 2026-07-22
+
+### Fixed
+
+- Regenerate readable NeoFlow source names during force and reset pulls, and
+  allow explicit regeneration during a normal pull.
+
 ## [0.7.5] - 2026-07-22
 
 ### Fixed

package/README.md

@@ -338,7 +338,7 @@ neo dialogue new CapitolColdBoot --primary Outpost=Assets.Capitol --group Capito
 | `login` / `whoami`                                       | Authenticate and inspect the selected profile.                               |
 | `init --project <id> [--version <id>]`                   | Create a format-4 working copy and perform its first reset pull.             |
 | `doctor`                                                 | Validate format/compiler/editor/source/file contracts; no .NET discovery.    |
-| `pull [--force\|--reset]`                                | Merge remote changes or regenerate canonical source and binaries.            |
+| `pull [--force\|--reset] [--regenerate-source-names]`    | Merge remote changes or regenerate canonical source, names, and binaries.    |
 | `status [--json]` / `diff [--json]`                      | Compile source and show semantic records, spans, digests, and upload intent. |
 | `push [--dry-run] [--accept-bump]`                       | Validate or commit one atomic compare-and-swap transaction.                  |
 | `dev [--push]`                                           | Watch remote/local changes; pushing remains opt-in.                          |
@@ -362,12 +362,12 @@ security boundary.
 
 ## Regenerating dialogue source names
 
-Normal pull preserves source filenames and symbols by stable record ID. To
-deliberately replace older machine-generated dialogue names with readable
-names derived from the editor, run:
+Normal pull preserves source filenames and symbols by stable record ID. Force
+and reset pulls always derive readable dialogue names from authoritative
+records. To deliberately refresh those names during a normal merge, run:
 
 ```sh
-neo pull --reset --regenerate-source-names
+neo pull --regenerate-source-names
 neo status
 neo push --dry-run
 ```

package/dist/neo.mjs

@@ -48051,11 +48051,6 @@ import {
 } from "node:fs";
 import { dirname as dirname5, join as join8 } from "node:path";
 async function runPull(workspace, options) {
-  if (options.regenerateSourceNames && !options.reset) {
-    throw new Error(
-      "--regenerate-source-names requires --reset because source-name regeneration rewrites the managed source tree."
-    );
-  }
   const destructive = options.force || options.reset;
   const hasBaseline = Object.keys(workspace.state.records).length > 0;
   let localByKey = /* @__PURE__ */ new Map();
@@ -48084,7 +48079,7 @@ ${blockingErrors.map((error) => `  ${error.message}`).join("\n")}`
       ])
     );
   }
-  if (!destructive && workspace.state.headTransactionHash !== void 0) {
+  if (!destructive && !options.regenerateSourceNames && workspace.state.headTransactionHash !== void 0) {
     const convex = await createConvexClient(workspace);
     const signal = await convex.query(api2.projectExportData.schemaSignal, {
       projectId: workspace.config.projectId,
@@ -48112,7 +48107,7 @@ ${blockingErrors.map((error) => `  ${error.message}`).join("\n")}`
       destructive: true
     });
     const reset = resetWorkspaceToProjectSourcesV4(workspace, document, {
-      regenerateSourceNames: options.regenerateSourceNames
+      regenerateSourceNames: true
     });
     for (const [key, state] of binaries.states) {
       const record3 = workspace.state.records[key];
@@ -48252,7 +48247,8 @@ ${blockingErrors.map((error) => `  ${error.message}`).join("\n")}`
     conflictCount,
     conflictKeys,
     localStatus,
-    destructive
+    destructive,
+    regenerateSourceNames: destructive || options.regenerateSourceNames
   });
 }
 async function finishFormat4Pull(args) {
@@ -48264,11 +48260,17 @@ async function finishFormat4Pull(args) {
     conflictCount,
     conflictKeys,
     localStatus,
-    destructive
+    destructive,
+    regenerateSourceNames
   } = args;
-  const localResult = emitProjectDocumentFilesV4(
-    buildEmitRecordSet(document, plans, "emit")
+  const plannedLocalRecords = buildEmitRecordSet(document, plans, "emit");
+  const localRecords = regenerateSourceNames ? regenerateDialogueSourceNamesV4(plannedLocalRecords) : plannedLocalRecords;
+  const regeneratedRecordKeys = new Set(
+    [...plannedLocalRecords].flatMap(
+      ([key, record3]) => localRecords.get(key) === record3 ? [] : [key]
+    )
   );
+  const localResult = emitProjectDocumentFilesV4(localRecords);
   const serverResult = emitProjectDocumentFilesV4(
     buildEmitRecordSet(document, plans, "server")
   );
@@ -48305,6 +48307,10 @@ async function finishFormat4Pull(args) {
     emittedPaths,
     mainLocale: workspaceMainLocale(workspace.state.records)
   });
+  for (const key of regeneratedRecordKeys) {
+    const path = localResult.recordFiles.get(key);
+    if (path !== void 0) rewritePaths.add(path);
+  }
   let written = 0;
   for (const path of emittedPaths) {
     const local = localByPath.get(path)?.content;
@@ -48533,6 +48539,7 @@ var init_pull = __esm({
     init_project_manifest();
     init_project_documents();
     init_project_file_pull();
+    init_dialogue_sources();
   }
 });
 
@@ -65732,9 +65739,9 @@ ${h("Usage")}
   neo pull ${d("[--force|--reset] [--regenerate-source-names]")}
 
 ${h("Flags")}
-  --force  ${d("Discard local edits and take the current server schema.")}
-  --reset  ${d("Destructively regenerate the entire working copy and schema marker scaffold, even when the sync head is unchanged.")}
-  --regenerate-source-names  ${d("With --reset, derive readable dialogue symbols from editor names and stable graph order.")}
+  --force  ${d("Discard local edits, take the current server schema, and regenerate readable dialogue symbols.")}
+  --reset  ${d("Destructively regenerate the entire working copy, binaries, and readable dialogue symbols, even when the sync head is unchanged.")}
+  --regenerate-source-names  ${d("Regenerate readable dialogue symbols during an otherwise normal pull.")}
 
 Use ${h("--reset")} to reconstruct every managed ${h(".neo")}/${h(".neoflow")} source file
 and tracked project binary from the authoritative server records.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neocompose/cli",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "description": "Neo Compose native project-source CLI with bidirectional sync.",
   "license": "MIT",
   "type": "module",

package/skills/neocompose-cli/SKILL.md

@@ -62,8 +62,11 @@ neo init --project <id> [--version <id>] [--dir neo]
 ```
 
 For an existing format-4 workspace, `neo pull --reset` regenerates canonical
-source and managed binaries. `neo pull --force` discards local edits in favor
-of the server. Use neither casually.
+source, readable dialogue names, and managed binaries. `neo pull --force`
+discards local edits in favor of the server and also regenerates readable
+dialogue names. Use neither casually. A normal
+`neo pull --regenerate-source-names` refreshes only source naming as local
+authored changes while retaining normal merge behavior.
 
 Neo never installs, discovers, or requires .NET. `neo doctor` validates the
 format-4 browser compiler, VS Code analysis contract/cache, source bundle, and
@@ -103,8 +106,9 @@ neo/
 
 All non-hidden `.neo`, `.neoflow`, and supported managed binaries are tracked.
 `.neo/` is ignored private state. Normal pull preserves declaration placement
-and spelling by stable ID when possible. Reset may regroup source into the
-canonical layout.
+and spelling by stable ID when possible. Force and reset derive readable
+dialogue names from authoritative records; reset may also regroup source into
+the canonical layout.
 
 ## Native project declarations