@neocompose/cli 0.7.5 → 0.8.0

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

@@ -11812,7 +11812,7 @@ var init_project_schema_contract_generated = __esm({
   "../packages/neoscript-language/src/project-schema-contract.generated.ts"() {
     "use strict";
     PROJECT_SCHEMA_MANIFEST_FORMAT_VERSION = 3;
-    PROJECT_SCHEMA_MANIFEST_CONTRACT_VERSION = "3.3";
+    PROJECT_SCHEMA_MANIFEST_CONTRACT_VERSION = "3.4";
     NEO_PROJECT_SOURCE_RECORD_CONTRACT = {
       "recordFields": {
         "member": [
@@ -12041,11 +12041,13 @@ var init_project_schema_contract_generated = __esm({
           "Audio",
           "Generic"
         ],
-        "NeoSystemDisallowedOperation": [
-          "EditRecord",
-          "DeleteRecord",
-          "SelectRecord",
-          "ReplaceValue"
+        "NeoSystemProtectionKind": [
+          "WorldAuthoring",
+          "DialogueMemorySchema",
+          "DialogueMemoryContainer",
+          "DialoguePriorityDefault",
+          "PolicyImmutable",
+          "PolicyDeleteBlocked"
         ],
         "NeoWorldKind": [
           "None",
@@ -12354,23 +12356,17 @@ var init_project_schema_contract_generated = __esm({
           ],
           "constructor": [
             {
-              "type": "NeoSystemDisallowedOperation[]",
-              "name": "disallow",
-              "modifier": "params",
-              "assigns": "Disallow"
+              "type": "NeoSystemProtectionKind",
+              "name": "kind",
+              "assigns": "Kind"
             }
           ],
           "properties": [
             {
-              "type": "NeoSystemDisallowedOperation[]",
-              "name": "Disallow",
+              "type": "NeoSystemProtectionKind",
+              "name": "Kind",
               "access": "get"
             },
-            {
-              "type": "string?",
-              "name": "Reason",
-              "access": "set"
-            },
             {
               "type": "NeoWorldKind",
               "name": "WorldKind",
@@ -13257,13 +13253,9 @@ var init_project_schema_contract_generated = __esm({
           "constructors": [],
           "properties": [
             {
-              "type": "IReadOnlyList<NeoSystemDisallowedOperation>",
-              "name": "Disallow",
-              "default": "new List<NeoSystemDisallowedOperation>()"
-            },
-            {
-              "type": "string?",
-              "name": "Reason"
+              "type": "NeoSystemProtectionKind",
+              "name": "Kind",
+              "default": "NeoSystemProtectionKind.WorldAuthoring"
             },
             {
               "type": "NeoWorldKind?",
@@ -22797,8 +22789,7 @@ function documentValuesEqual(left, right) {
 function systemToDocument(system) {
   if (system === null) return void 0;
   return omitUndefined({
-    disallow: system.disallow,
-    reason: system.reason ?? void 0,
+    kind: system.kind,
     worldKind: system.worldKind ?? void 0
   });
 }
@@ -23152,12 +23143,8 @@ function jsonValue(value, record3, path) {
 function systemFromDocument(value, record3, path) {
   if (value === null || value === void 0) return null;
   const system = requireRecordValue(value, record3, path);
-  const disallow = optionalArray(system.disallow).map(
-    (entry, index) => requiredStringValue(entry, record3, `${path}.disallow[${index}]`)
-  );
   const candidate = {
-    disallow,
-    reason: optionalStringOrNull(system.reason),
+    kind: requiredStringValue(system.kind, record3, `${path}.kind`),
     worldKind: optionalStringOrNull(system.worldKind)
   };
   if (!isSchemaSystemMetadata(candidate)) {
@@ -23167,11 +23154,13 @@ function systemFromDocument(value, record3, path) {
 }
 function isSchemaSystemMetadata(value) {
   if (!isRecord2(value)) return false;
-  const operations = /* @__PURE__ */ new Set([
-    "editRecord",
-    "deleteRecord",
-    "selectRecord",
-    "replaceValue"
+  const kinds = /* @__PURE__ */ new Set([
+    "worldAuthoring",
+    "dialogueMemorySchema",
+    "dialogueMemoryContainer",
+    "dialoguePriorityDefault",
+    "policyImmutable",
+    "policyDeleteBlocked"
   ]);
   const worlds = /* @__PURE__ */ new Set([
     "tileGrid",
@@ -23192,9 +23181,7 @@ function isSchemaSystemMetadata(value) {
     "smartTileRule",
     "smartTileNeighbor"
   ]);
-  return Array.isArray(value.disallow) && value.disallow.every(
-    (entry) => typeof entry === "string" && operations.has(entry)
-  ) && (value.reason === null || typeof value.reason === "string") && (value.worldKind === null || typeof value.worldKind === "string" && worlds.has(value.worldKind));
+  return typeof value.kind === "string" && kinds.has(value.kind) && (value.worldKind === null || typeof value.worldKind === "string" && worlds.has(value.worldKind));
 }
 function genericBindingsFromDocument(value, record3, path) {
   if (value === void 0 || value === null) return {};
@@ -25019,11 +25006,8 @@ function assertPosition(value, path) {
 }
 function assertSystem(value, path) {
   if (value === null) return;
-  const system = objectAt(value, path, ["disallow", "reason", "worldKind"]);
-  arrayOf(system.disallow, `${path}.disallow`, (entry, entryPath) => {
-    stringIn(entry, SYSTEM_OPERATIONS, entryPath);
-  });
-  nullableString2(system.reason, `${path}.reason`);
+  const system = objectAt(value, path, ["kind", "worldKind"]);
+  stringIn(system.kind, SYSTEM_PROTECTION_KINDS, `${path}.kind`);
   if (system.worldKind !== null) {
     stringIn(system.worldKind, WORLD_KINDS, `${path}.worldKind`);
   }
@@ -26243,7 +26227,7 @@ function exactValue(value, expected, path) {
 function invalid(path, message) {
   throw new ProjectSchemaManifestValidationError(path, message);
 }
-var ProjectSchemaManifestValidationError, WORLD_RELATION_CONTRACTS, MANIFEST_ENDPOINT_KINDS, PROJECT_RECORD_KINDS, SOURCE_KINDS, SYSTEM_OPERATIONS, WORLD_KINDS, MEMBER_COMMON_KEYS, MEMBER_KEYS_BY_KIND, PRIMITIVE_TYPE_KINDS, TEXTURE_TYPES, ALPHA_SOURCES, NPOT_SCALES, WRAP_MODES, RESIZE_ALGORITHMS, TEXTURE_COMPRESSIONS, PLATFORM_FORMATS, SPRITE_ALIGNMENTS;
+var ProjectSchemaManifestValidationError, WORLD_RELATION_CONTRACTS, MANIFEST_ENDPOINT_KINDS, PROJECT_RECORD_KINDS, SOURCE_KINDS, SYSTEM_PROTECTION_KINDS, WORLD_KINDS, MEMBER_COMMON_KEYS, MEMBER_KEYS_BY_KIND, PRIMITIVE_TYPE_KINDS, TEXTURE_TYPES, ALPHA_SOURCES, NPOT_SCALES, WRAP_MODES, RESIZE_ALGORITHMS, TEXTURE_COMPRESSIONS, PLATFORM_FORMATS, SPRITE_ALIGNMENTS;
 var init_validate = __esm({
   "src/project-manifest/validate.ts"() {
     "use strict";
@@ -26404,11 +26388,13 @@ var init_validate = __esm({
       "localizationStatus",
       "internalRecordRelation"
     ]);
-    SYSTEM_OPERATIONS = /* @__PURE__ */ new Set([
-      "editRecord",
-      "deleteRecord",
-      "selectRecord",
-      "replaceValue"
+    SYSTEM_PROTECTION_KINDS = /* @__PURE__ */ new Set([
+      "worldAuthoring",
+      "dialogueMemorySchema",
+      "dialogueMemoryContainer",
+      "dialoguePriorityDefault",
+      "policyImmutable",
+      "policyDeleteBlocked"
     ]);
     WORLD_KINDS = /* @__PURE__ */ new Set([
       "tileGrid",
@@ -27022,15 +27008,13 @@ function contextualEnumArgument(value, name) {
 function systemMetadata(annotations) {
   const system = annotation(annotations, "system");
   if (!system) return null;
-  const disallowRaw = argument(system, "disallow");
-  const disallow = disallowRaw ? parseExpression(disallowRaw) : null;
-  const operations = disallow?.kind === "litList" ? disallow.elements.filter(
-    (entry) => entry.kind === "contextualEnum"
-  ).map((entry) => lowerFirst2(entry.name)) : [];
+  const kind = contextualEnumArgument(system, "kind");
+  if (kind === null) {
+    throw new Error("@system requires a kind inferred enum argument.");
+  }
   const worldKind = contextualEnumArgument(system, "worldKind");
   return {
-    disallow: operations,
-    reason: stringArgument(system, "reason"),
+    kind: lowerFirst2(kind),
     worldKind: worldKind ? lowerFirst2(worldKind) : null
   };
 }
@@ -30753,11 +30737,8 @@ function genericName(context, idValue) {
 }
 function systemAnnotation(system) {
   const args = [
-    ...system.worldKind ? [`worldKind: .${enumCase(system.worldKind)}`] : [],
-    ...system.disallow.length ? [
-      `disallow: [${system.disallow.map((entry) => `.${enumCase(entry)}`).join(", ")}]`
-    ] : [],
-    ...system.reason ? [`reason: ${quote(system.reason)}`] : []
+    `kind: .${enumCase(system.kind)}`,
+    ...system.worldKind ? [`worldKind: .${enumCase(system.worldKind)}`] : []
   ];
   return `@system(${args.join(", ")})`;
 }
@@ -32846,15 +32827,12 @@ function reference(value, names, type) {
   return names.get(value) ?? `Reference<${type}>(id: ${quote2(value)})`;
 }
 function emitSystemAnnotation(system) {
-  const disallow = Array.isArray(system.disallow) ? system.disallow.filter(
-    (entry) => typeof entry === "string"
-  ) : [];
+  if (typeof system.kind !== "string") {
+    throw new Error("System metadata requires a protection kind.");
+  }
   const args = [
-    ...typeof system.worldKind === "string" ? [`worldKind: .${enumCase2(system.worldKind)}`] : [],
-    ...disallow.length > 0 ? [
-      `disallow: [${disallow.map((entry) => `.${enumCase2(entry)}`).join(", ")}]`
-    ] : [],
-    ...typeof system.reason === "string" ? [`reason: ${quote2(system.reason)}`] : []
+    `kind: .${enumCase2(system.kind)}`,
+    ...typeof system.worldKind === "string" ? [`worldKind: .${enumCase2(system.worldKind)}`] : []
   ];
   return `@system(${args.join(", ")})`;
 }
@@ -32867,26 +32845,16 @@ function lowerSystemMetadata(annotations) {
     )?.expression;
     return raw === void 0 ? void 0 : parseExpression(raw);
   };
-  const disallowExpression = argument2("disallow");
-  const disallow = disallowExpression?.kind === "litList" ? disallowExpression.elements.map((entry) => {
-    if (entry.kind !== "contextualEnum") {
-      throw new Error("@system disallow entries must be inferred enums.");
-    }
-    return lowerFirst3(entry.name);
-  }) : [];
-  const reasonExpression = argument2("reason");
-  const worldKindExpression = argument2("worldKind");
-  if (reasonExpression !== void 0 && reasonExpression.kind !== "litString" && reasonExpression.kind !== "litNull") {
-    throw new Error("@system reason must be a string or null.");
+  const kindExpression = argument2("kind");
+  if (kindExpression?.kind !== "contextualEnum") {
+    throw new Error("@system kind must be an inferred enum.");
   }
+  const worldKindExpression = argument2("worldKind");
   if (worldKindExpression !== void 0 && worldKindExpression.kind !== "contextualEnum" && worldKindExpression.kind !== "litNull") {
     throw new Error("@system worldKind must be an inferred enum or null.");
   }
   return {
-    ...disallowExpression === void 0 ? {} : { disallow },
-    ...reasonExpression === void 0 ? {} : {
-      reason: reasonExpression.kind === "litString" ? reasonExpression.value : null
-    },
+    kind: lowerFirst3(kindExpression.name),
     ...worldKindExpression === void 0 ? {} : {
       worldKind: worldKindExpression.kind === "contextualEnum" ? lowerFirst3(worldKindExpression.name) : null
     }
@@ -32949,8 +32917,8 @@ function isEpochMillis(value) {
   if (typeof value !== "number") return false;
   return Number.isFinite(value);
 }
-function isSystemDisallowedOperation(value) {
-  return value === SystemDisallowedOperation.EditRecord || value === SystemDisallowedOperation.DeleteRecord || value === SystemDisallowedOperation.SelectRecord || value === SystemDisallowedOperation.ReplaceValue;
+function isSystemProtectionKind(value) {
+  return value === SystemProtectionKind.WorldAuthoring || value === SystemProtectionKind.DialogueMemorySchema || value === SystemProtectionKind.DialogueMemoryContainer || value === SystemProtectionKind.DialoguePriorityDefault || value === SystemProtectionKind.PolicyImmutable || value === SystemProtectionKind.PolicyDeleteBlocked;
 }
 function isNeoWorldSystemClassKind(value) {
   return value === NeoWorldSystemClassKind.TileGrid || value === NeoWorldSystemClassKind.TileLayer || value === NeoWorldSystemClassKind.ObjectLayer || value === NeoWorldSystemClassKind.Tile || value === NeoWorldSystemClassKind.ObjectBase || value === NeoWorldSystemClassKind.LayerGroupBase || value === NeoWorldSystemClassKind.SpriteObject || value === NeoWorldSystemClassKind.Object || value === NeoWorldSystemClassKind.TileLayerLink || value === NeoWorldSystemClassKind.ObjectLayerLink || value === NeoWorldSystemClassKind.ObjectPlacementTile || value === NeoWorldSystemClassKind.TileInstance || value === NeoWorldSystemClassKind.ObjectCollider || value === NeoWorldSystemClassKind.SortingLayer || value === NeoWorldSystemClassKind.SmartTile || value === NeoWorldSystemClassKind.SmartTileRule || value === NeoWorldSystemClassKind.SmartTileNeighbor;
@@ -32959,11 +32927,7 @@ function isSystemMetadata(value) {
   const v = value;
   if (typeof v !== "object") return false;
   if (v === null) return false;
-  if (!Array.isArray(v.disallow)) return false;
-  if (!v.disallow.every(isSystemDisallowedOperation)) return false;
-  if (v.reason !== void 0 && v.reason !== null) {
-    if (typeof v.reason !== "string") return false;
-  }
+  if (!isSystemProtectionKind(v.kind)) return false;
   if (v.worldKind !== void 0 && v.worldKind !== null) {
     return isNeoWorldSystemClassKind(v.worldKind);
   }
@@ -32972,27 +32936,17 @@ function isSystemMetadata(value) {
 function isWithName(value) {
   return typeof value?.name === "string";
 }
-var SystemDisallowedOperation, NeoWorldSystemClassKind;
+var SystemProtectionKind, NeoWorldSystemClassKind;
 var init_core_types = __esm({
   "../src/models/core/core-types.ts"() {
     "use strict";
-    SystemDisallowedOperation = {
-      /**
-       * Blocks project-author edits to the record's schema/configuration.
-       */
-      EditRecord: "editRecord",
-      /**
-       * Blocks project-author deletion of the record.
-       */
-      DeleteRecord: "deleteRecord",
-      /**
-       * Removes the record from normal creation/selection affordances.
-       */
-      SelectRecord: "selectRecord",
-      /**
-       * Blocks replacing the value row attached to a member as a whole.
-       */
-      ReplaceValue: "replaceValue"
+    SystemProtectionKind = {
+      WorldAuthoring: "worldAuthoring",
+      DialogueMemorySchema: "dialogueMemorySchema",
+      DialogueMemoryContainer: "dialogueMemoryContainer",
+      DialoguePriorityDefault: "dialoguePriorityDefault",
+      PolicyImmutable: "policyImmutable",
+      PolicyDeleteBlocked: "policyDeleteBlocked"
     };
     NeoWorldSystemClassKind = {
       TileGrid: "tileGrid",
@@ -48051,11 +48005,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 +48033,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 +48061,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 +48201,8 @@ ${blockingErrors.map((error) => `  ${error.message}`).join("\n")}`
     conflictCount,
     conflictKeys,
     localStatus,
-    destructive
+    destructive,
+    regenerateSourceNames: destructive || options.regenerateSourceNames
   });
 }
 async function finishFormat4Pull(args) {
@@ -48264,11 +48214,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 +48261,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 +48493,7 @@ var init_pull = __esm({
     init_project_manifest();
     init_project_documents();
     init_project_file_pull();
+    init_dialogue_sources();
   }
 });
 
@@ -65732,9 +65693,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.8.0",
   "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