@neocompose/cli 0.2.0 → 0.2.1

package/README.md

@@ -49,16 +49,16 @@ project only; the game never references or ships it. The public
 `NeoCompose.Schema` SDK and analyzer are materialized from the npm package
 under `.neo/tooling`. There is no generated `Schema/NeoSchemaAttributes.cs`.
 
-Format v2 is a clean break. A workspace with no `formatVersion`, or with
-`formatVersion: 1`, rejects normal schema commands with an instruction to run:
+Format v2 is a clean break and `neo.json` must contain `formatVersion: 2`.
+A workspace with a missing or different format version is unsupported. Preserve
+any source you need, then create a fresh v2 working copy with:
 
 ```sh
-neo pull --reset
+neo init --project <id> [--version <id>] [--dir neo]
 ```
 
-Reset reconstructs the schema from the server as v2, refreshes tooling, and
-removes obsolete generated authoring files. There is no v1 parser or
-compatibility shim.
+`neo pull --reset` remains available for an existing v2 workspace: it
+reconstructs its managed schema files from the server and refreshes tooling.
 
 ## Real C# authoring
 

package/dist/neo.mjs

@@ -278,7 +278,17 @@ function readWorkspaceConfig(root) {
     throw new Error(`"${NEO_CONFIG_FILE}" must contain a JSON object.`);
   }
   const config = parsed;
-  const formatVersion = config.formatVersion === 2 ? 2 : 1;
+  if (config.formatVersion === void 0) {
+    throw new Error(
+      `"${NEO_CONFIG_FILE}" is missing required field "formatVersion"; expected ${CURRENT_FORMAT_VERSION}. Recreate this working copy with \`neo init\`.`
+    );
+  }
+  if (config.formatVersion !== CURRENT_FORMAT_VERSION) {
+    throw new Error(
+      `"${NEO_CONFIG_FILE}" field "formatVersion" must be ${CURRENT_FORMAT_VERSION}; received ${JSON.stringify(config.formatVersion)}. Recreate this working copy with \`neo init\`.`
+    );
+  }
+  const formatVersion = CURRENT_FORMAT_VERSION;
   if (typeof config.apiBaseUrl !== "string") {
     throw new Error(
       `"${NEO_CONFIG_FILE}" is missing string field "apiBaseUrl".`
@@ -327,12 +337,6 @@ function readWorkspaceConfig(root) {
     convexUrl
   };
 }
-function assertCurrentSchemaFormat(config) {
-  if (config.formatVersion === CURRENT_FORMAT_VERSION) return;
-  throw new Error(
-    `This working copy uses Neo schema format v${config.formatVersion}. Run \`neo pull --reset\` to reconstruct it as format v${CURRENT_FORMAT_VERSION}.`
-  );
-}
 function writeWorkspaceConfig(root, config) {
   let persisted = { ...config };
   if (config.unityConfigPath !== void 0) {
@@ -447,7 +451,7 @@ var init_workspace = __esm({
   }
 });
 
-// src/schema-v2/source-diagnostics.ts
+// src/schema/source-diagnostics.ts
 function detectConflictMarkers(source) {
   const lines = source.split("\n");
   for (let index = 0; index < lines.length; index += 1) {
@@ -460,7 +464,7 @@ function detectConflictMarkers(source) {
 }
 var SchemaSourceError;
 var init_source_diagnostics = __esm({
-  "src/schema-v2/source-diagnostics.ts"() {
+  "src/schema/source-diagnostics.ts"() {
     "use strict";
     SchemaSourceError = class extends Error {
       constructor(message, file, line, column) {
@@ -477,7 +481,7 @@ var init_source_diagnostics = __esm({
   }
 });
 
-// src/schema/names.ts
+// src/schema/sync/names.ts
 function sanitizeCsIdentifier(value) {
   let identifier = "";
   let upperNext = false;
@@ -496,7 +500,7 @@ function sanitizeCsIdentifier(value) {
 }
 var CSHARP_KEYWORDS, IdentifierTable;
 var init_names = __esm({
-  "src/schema/names.ts"() {
+  "src/schema/sync/names.ts"() {
     "use strict";
     CSHARP_KEYWORDS = /* @__PURE__ */ new Set([
       "abstract",
@@ -601,7 +605,7 @@ var init_names = __esm({
   }
 });
 
-// src/schema/projection.ts
+// src/schema/sync/projection.ts
 function isObjectRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -642,13 +646,13 @@ function isPendingId(id) {
 }
 var PENDING_ID_PREFIX;
 var init_projection = __esm({
-  "src/schema/projection.ts"() {
+  "src/schema/sync/projection.ts"() {
     "use strict";
     PENDING_ID_PREFIX = "__pending__:";
   }
 });
 
-// src/schema/migration-files.ts
+// src/schema/sync/migration-files.ts
 import { randomUUID } from "node:crypto";
 function migrationFileName(order, name) {
   const slug = sanitizeCsIdentifier(name).replace(/_/g, "-").toLowerCase();
@@ -760,7 +764,7 @@ function parseMigrationFile(source, file, typeIdsByName) {
 }
 var MIGRATION_VOLATILE_FIELDS, MIGRATION_PROJECTED_FIELDS;
 var init_migration_files = __esm({
-  "src/schema/migration-files.ts"() {
+  "src/schema/sync/migration-files.ts"() {
     "use strict";
     init_source_diagnostics();
     init_names();
@@ -782,7 +786,7 @@ var init_migration_files = __esm({
   }
 });
 
-// src/schema-v2/dotnet-host.ts
+// src/schema/dotnet-host.ts
 import { spawnSync } from "node:child_process";
 import {
   accessSync,
@@ -1265,7 +1269,7 @@ ${detail}`,
 }
 var DOTNET_HOST_CACHE_FORMAT_VERSION, DOTNET_HOST_CACHE_FILE, DEFAULT_DOTNET_HOST_CACHE_MAX_AGE_MS, MINIMUM_DOTNET_RUNTIME_MAJOR, DotnetHostDiscoveryError;
 var init_dotnet_host = __esm({
-  "src/schema-v2/dotnet-host.ts"() {
+  "src/schema/dotnet-host.ts"() {
     "use strict";
     DOTNET_HOST_CACHE_FORMAT_VERSION = 1;
     DOTNET_HOST_CACHE_FILE = ".neo/dotnet-host.json";
@@ -1282,7 +1286,7 @@ var init_dotnet_host = __esm({
   }
 });
 
-// src/schema-v2/generated/source-protocol.ts
+// src/schema/generated/source-protocol.ts
 function assertGeneratedRoslynAnalysisResponseV2(value) {
   assertProtocolReference(value, "CompilerResponse", "$");
 }
@@ -1358,7 +1362,7 @@ function isRecord2(value) {
 }
 var SCHEMA_MANIFEST_FORMAT_VERSION, SCHEMA_MANIFEST_CONTRACT_VERSION, SCHEMA_SOURCE_MANIFEST_NAME, SCHEMA_COMPILER_PROTOCOL_VERSION, SCHEMA_SDK_VERSION, SCHEMA_CLI_VERSION, SCHEMA_API_TARGET, SCHEMA_REFERENCE_ASSEMBLY_SET, SCHEMA_REQUIRED_TOOLING_FILES, SOURCE_PROTOCOL_CONTRACT, GeneratedSchemaProtocolValidationError;
 var init_source_protocol = __esm({
-  "src/schema-v2/generated/source-protocol.ts"() {
+  "src/schema/generated/source-protocol.ts"() {
     "use strict";
     SCHEMA_MANIFEST_FORMAT_VERSION = 2;
     SCHEMA_MANIFEST_CONTRACT_VERSION = "2.0";
@@ -1842,7 +1846,7 @@ var init_source_protocol = __esm({
   }
 });
 
-// src/schema-v2/source-manifest.ts
+// src/schema/source-manifest.ts
 function assertRoslynAnalysisResponseV2(value) {
   if (!isRecord3(value))
     throw new RoslynSourceManifestError("Compiler response must be an object.");
@@ -1917,7 +1921,7 @@ function assemblyVersionMatches(actual, expected) {
 }
 var RoslynSourceManifestError;
 var init_source_manifest = __esm({
-  "src/schema-v2/source-manifest.ts"() {
+  "src/schema/source-manifest.ts"() {
     "use strict";
     init_source_protocol();
     RoslynSourceManifestError = class extends Error {
@@ -1929,14 +1933,13 @@ var init_source_manifest = __esm({
   }
 });
 
-// src/schema-v2/scaffold.ts
+// src/schema/scaffold.ts
 import {
   appendFileSync,
   cpSync,
   existsSync as existsSync4,
   mkdirSync as mkdirSync4,
   readFileSync as readFileSync4,
-  readdirSync as readdirSync2,
   renameSync as renameSync2,
   rmSync,
   writeFileSync as writeFileSync4
@@ -1951,15 +1954,6 @@ function scaffoldWorkspaceV2(root, options = {}) {
     writeFileSync4(csprojPath, CSPROJ_CONTENT, "utf8");
     changed.push(CSPROJ_NAME);
   }
-  const obsoletePath = join4(root, OBSOLETE_ATTRIBUTES_FILE);
-  if (existsSync4(obsoletePath)) {
-    rmSync(obsoletePath);
-    changed.push(OBSOLETE_ATTRIBUTES_FILE);
-  }
-  const obsoleteDirectory = dirname3(obsoletePath);
-  if (existsSync4(obsoleteDirectory) && readdirSync2(obsoleteDirectory).length === 0) {
-    rmSync(obsoleteDirectory, { recursive: true });
-  }
   for (const directory of [
     "Types",
     "Enums",
@@ -2115,13 +2109,12 @@ function resolveBundledToolingSource() {
   ];
   return candidates.find((candidate) => existsSync4(candidate)) ?? candidates[0];
 }
-var CSPROJ_NAME, OBSOLETE_ATTRIBUTES_FILE, CSPROJ_CONTENT;
+var CSPROJ_NAME, CSPROJ_CONTENT;
 var init_scaffold = __esm({
-  "src/schema-v2/scaffold.ts"() {
+  "src/schema/scaffold.ts"() {
     "use strict";
     init_workspace();
     CSPROJ_NAME = "NeoCompose.Schema.csproj";
-    OBSOLETE_ATTRIBUTES_FILE = "Schema/NeoSchemaAttributes.cs";
     CSPROJ_CONTENT = `<Project Sdk="Microsoft.NET.Sdk">
 
   <!-- IDE-only schema project. Neo statically analyzes this project; authored
@@ -2144,7 +2137,7 @@ var init_scaffold = __esm({
   }
 });
 
-// src/schema-v2/compiler-client.ts
+// src/schema/compiler-client.ts
 import { existsSync as existsSync5 } from "node:fs";
 import { join as join5, resolve as resolve4 } from "node:path";
 import { spawnSync as spawnSync2 } from "node:child_process";
@@ -2228,7 +2221,7 @@ function runSchemaCompiler(executable, args) {
 }
 var SCHEMA_COMPILER_ASSEMBLY, SchemaCompilerInvocationError;
 var init_compiler_client = __esm({
-  "src/schema-v2/compiler-client.ts"() {
+  "src/schema/compiler-client.ts"() {
     "use strict";
     init_dotnet_host();
     init_source_manifest();
@@ -10436,8 +10429,8 @@ var init_src = __esm({
   }
 });
 
-// src/schema-v2/sidecars.ts
-import { existsSync as existsSync6, readFileSync as readFileSync5, readdirSync as readdirSync3 } from "node:fs";
+// src/schema/sidecars.ts
+import { existsSync as existsSync6, readFileSync as readFileSync5, readdirSync as readdirSync2 } from "node:fs";
 import { join as join6, relative, sep } from "node:path";
 function schemaSidecarPath(declaringType, member) {
   return `Scripts/${sanitizeCsIdentifier(declaringType)}/${sanitizeCsIdentifier(member)}.neo`;
@@ -10632,7 +10625,7 @@ function hasFullNeoScriptContextWrapper(source) {
 function listNeoFiles(root) {
   if (!existsSync6(root)) return [];
   const result = [];
-  for (const entry of readdirSync3(root, { withFileTypes: true })) {
+  for (const entry of readdirSync2(root, { withFileTypes: true })) {
     const path = join6(root, entry.name);
     if (entry.isDirectory()) result.push(...listNeoFiles(path));
     else if (entry.isFile() && entry.name.endsWith(".neo")) result.push(path);
@@ -10641,7 +10634,7 @@ function listNeoFiles(root) {
 }
 var SchemaSidecarError;
 var init_sidecars = __esm({
-  "src/schema-v2/sidecars.ts"() {
+  "src/schema/sidecars.ts"() {
     "use strict";
     init_src();
     init_names();
@@ -10658,15 +10651,15 @@ var init_sidecars = __esm({
   }
 });
 
-// src/schema-v2/manifest/types.ts
+// src/schema/manifest/types.ts
 var init_types = __esm({
-  "src/schema-v2/manifest/types.ts"() {
+  "src/schema/manifest/types.ts"() {
     "use strict";
     init_source_protocol();
   }
 });
 
-// src/schema-v2/manifest/validate.ts
+// src/schema/manifest/validate.ts
 function parseSchemaManifestV2(value) {
   assertSchemaManifestV2(value);
   return value;
@@ -11901,7 +11894,7 @@ function invalid(path, message) {
 }
 var SchemaManifestValidationError, SOURCE_KINDS, SYSTEM_OPERATIONS, WORLD_KINDS, ATTRIBUTE_COMMON_KEYS, ATTRIBUTE_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/schema-v2/manifest/validate.ts"() {
+  "src/schema/manifest/validate.ts"() {
     "use strict";
     init_types();
     SchemaManifestValidationError = class extends Error {
@@ -12060,7 +12053,7 @@ var init_validate = __esm({
   }
 });
 
-// src/schema-v2/frontend.ts
+// src/schema/frontend.ts
 function formatFrontendDiagnostics(diagnostics) {
   return [
     `Schema authoring failed (${diagnostics.length}):`,
@@ -12432,7 +12425,7 @@ function lowerFirst(value) {
 }
 var SchemaFrontendError, SchemaFrontend, map, TEXTURE_TYPES2, ALPHA_SOURCES2, NPOT_SCALES2, MIP_FILTERS, WRAP_MODES2, FILTER_MODES, RESIZE_ALGORITHMS2, COMPRESSIONS, TEXTURE_FORMATS, SPRITE_MODES, MESH_TYPES, ALIGNMENTS, NORMAL_FILTERS, COOKIE_LIGHT_TYPES, SINGLE_CHANNELS, SWIZZLES, AUDIO_LOAD_TYPES, AUDIO_COMPRESSIONS, AUDIO_SAMPLE_RATES;
 var init_frontend = __esm({
-  "src/schema-v2/frontend.ts"() {
+  "src/schema/frontend.ts"() {
     "use strict";
     init_sidecars();
     init_types();
@@ -16221,10 +16214,10 @@ var init_frontend = __esm({
   }
 });
 
-// src/schema-v2/generated/document-contracts.ts
+// src/schema/generated/document-contracts.ts
 var SCHEMA_DOCUMENT_FIELD_CONTRACTS_V2;
 var init_document_contracts = __esm({
-  "src/schema-v2/generated/document-contracts.ts"() {
+  "src/schema/generated/document-contracts.ts"() {
     "use strict";
     SCHEMA_DOCUMENT_FIELD_CONTRACTS_V2 = {
       "attribute": {
@@ -16508,7 +16501,7 @@ var init_document_contracts = __esm({
   }
 });
 
-// src/schema-v2/manifest/contracts.ts
+// src/schema/manifest/contracts.ts
 function fieldDispositionV2(recordKind, field) {
   const contract = SCHEMA_DOCUMENT_FIELD_CONTRACTS_V2[recordKind];
   if (contract.authored.includes(field)) return "authored";
@@ -16683,7 +16676,7 @@ function isRecord4(value) {
 }
 var SchemaDocumentContractError;
 var init_contracts = __esm({
-  "src/schema-v2/manifest/contracts.ts"() {
+  "src/schema/manifest/contracts.ts"() {
     "use strict";
     init_document_contracts();
     init_document_contracts();
@@ -16703,7 +16696,7 @@ var init_contracts = __esm({
   }
 });
 
-// src/schema-v2/manifest/adapters.ts
+// src/schema/manifest/adapters.ts
 function createSyntheticDocumentSourceV2(recordKind, recordId, symbolKind) {
   const encodedKind = encodeURIComponent(recordKind);
   const encodedId = encodeURIComponent(recordId);
@@ -16761,7 +16754,7 @@ function assertOnlyAuthoredFields(recordKind, fields) {
 }
 var DEFAULT_DOCUMENT_TO_MANIFEST_CONTEXT_V2;
 var init_adapters = __esm({
-  "src/schema-v2/manifest/adapters.ts"() {
+  "src/schema/manifest/adapters.ts"() {
     "use strict";
     init_contracts();
     DEFAULT_DOCUMENT_TO_MANIFEST_CONTEXT_V2 = {
@@ -16770,7 +16763,7 @@ var init_adapters = __esm({
   }
 });
 
-// src/schema-v2/manifest/record-adapters/codecs.ts
+// src/schema/manifest/record-adapters/codecs.ts
 function inferAttributeOwners(types, attributes) {
   const owners = /* @__PURE__ */ new Map();
   const set = (attributeId, owner) => {
@@ -17826,7 +17819,7 @@ function invalidDocument(record2, path, message) {
 }
 var ATTRIBUTE_TYPE, TYPE_KIND_BY_ATTRIBUTE_TYPE, SIMPLE_ATTRIBUTE_KIND_BY_TYPE, ATTRIBUTE_TYPE_BY_KIND, TYPE_ATTRIBUTE_TYPE_BY_KIND, ATTRIBUTE_IDENTITY_FIELDS;
 var init_codecs = __esm({
-  "src/schema-v2/manifest/record-adapters/codecs.ts"() {
+  "src/schema/manifest/record-adapters/codecs.ts"() {
     "use strict";
     init_contracts();
     init_sidecars();
@@ -17931,7 +17924,7 @@ var init_codecs = __esm({
   }
 });
 
-// src/schema-v2/manifest/record-adapters/enum.ts
+// src/schema/manifest/record-adapters/enum.ts
 function enumFromDocument(record2, context) {
   const data = normalizeDocumentFieldsV2("enum", record2.data);
   const source = context.sourceForRecord("enum", record2.recordId, "enum");
@@ -17979,7 +17972,7 @@ function enumToDocument(neoEnum, baseData) {
 }
 var ENUM_SCHEMA_RECORD_ADAPTER_V2;
 var init_enum = __esm({
-  "src/schema-v2/manifest/record-adapters/enum.ts"() {
+  "src/schema/manifest/record-adapters/enum.ts"() {
     "use strict";
     init_contracts();
     init_codecs();
@@ -18000,7 +17993,7 @@ var init_enum = __esm({
   }
 });
 
-// src/schema-v2/manifest/record-adapters/interface.ts
+// src/schema/manifest/record-adapters/interface.ts
 function interfaceFromDocument(record2, context) {
   const data = normalizeDocumentFieldsV2("interface", record2.data);
   const source = context.sourceForRecord(
@@ -18101,7 +18094,7 @@ function interfaceToDocument(neoInterface) {
 }
 var INTERFACE_SCHEMA_RECORD_ADAPTER_V2;
 var init_interface = __esm({
-  "src/schema-v2/manifest/record-adapters/interface.ts"() {
+  "src/schema/manifest/record-adapters/interface.ts"() {
     "use strict";
     init_contracts();
     init_codecs();
@@ -18119,7 +18112,7 @@ var init_interface = __esm({
   }
 });
 
-// src/schema-v2/manifest/record-adapters/localization.ts
+// src/schema/manifest/record-adapters/localization.ts
 function localizationFromDocument(record2, context) {
   const data = normalizeDocumentFieldsV2("localization-config", record2.data);
   return {
@@ -18217,7 +18210,7 @@ function localizationStatusToDocument(status) {
 }
 var LOCALIZATION_SCHEMA_RECORD_ADAPTER_V2, LOCALIZATION_STATUS_SCHEMA_RECORD_ADAPTER_V2;
 var init_localization = __esm({
-  "src/schema-v2/manifest/record-adapters/localization.ts"() {
+  "src/schema/manifest/record-adapters/localization.ts"() {
     "use strict";
     init_contracts();
     init_codecs();
@@ -18248,7 +18241,7 @@ var init_localization = __esm({
   }
 });
 
-// src/schema-v2/manifest/record-adapters/loose.ts
+// src/schema/manifest/record-adapters/loose.ts
 function createSchemaRecordProjectionContextV2(records2, sourceContext) {
   const recordsByKind = groupSchemaDocumentRecordsV2(records2);
   const typeRecords = recordsByKind.get("type") ?? [];
@@ -18294,17 +18287,17 @@ function groupSchemaDocumentRecordsV2(records2) {
   return result;
 }
 var init_loose = __esm({
-  "src/schema-v2/manifest/record-adapters/loose.ts"() {
+  "src/schema/manifest/record-adapters/loose.ts"() {
     "use strict";
     init_contracts();
     init_codecs();
   }
 });
 
-// src/schema-v2/manifest/record-adapters/member.ts
+// src/schema/manifest/record-adapters/member.ts
 var MEMBER_SCHEMA_RECORD_ADAPTER_V2;
 var init_member = __esm({
-  "src/schema-v2/manifest/record-adapters/member.ts"() {
+  "src/schema/manifest/record-adapters/member.ts"() {
     "use strict";
     init_codecs();
     MEMBER_SCHEMA_RECORD_ADAPTER_V2 = {
@@ -18331,7 +18324,7 @@ var init_member = __esm({
   }
 });
 
-// src/schema-v2/manifest/record-adapters/template.ts
+// src/schema/manifest/record-adapters/template.ts
 function simpleRecordFromDocument(record2, context) {
   const data = normalizeDocumentFieldsV2(record2.recordKind, record2.data);
   const authored = partitionDocumentFieldsV2(record2.recordKind, data).authored;
@@ -18347,7 +18340,7 @@ function simpleRecordFromDocument(record2, context) {
 }
 var TEXTURE_TEMPLATE_SCHEMA_RECORD_ADAPTER_V2, AUDIO_TEMPLATE_SCHEMA_RECORD_ADAPTER_V2;
 var init_template = __esm({
-  "src/schema-v2/manifest/record-adapters/template.ts"() {
+  "src/schema/manifest/record-adapters/template.ts"() {
     "use strict";
     init_contracts();
     TEXTURE_TEMPLATE_SCHEMA_RECORD_ADAPTER_V2 = {
@@ -18383,7 +18376,7 @@ var init_template = __esm({
   }
 });
 
-// src/schema-v2/manifest/record-adapters/type.ts
+// src/schema/manifest/record-adapters/type.ts
 function customTypeFromDocument(record2, context) {
   const data = normalizeDocumentFieldsV2("type", record2.data);
   const source = context.sourceForRecord("type", record2.recordId, "customType");
@@ -18457,7 +18450,7 @@ function customTypeToDocument(type) {
 }
 var TYPE_SCHEMA_RECORD_ADAPTER_V2;
 var init_type = __esm({
-  "src/schema-v2/manifest/record-adapters/type.ts"() {
+  "src/schema/manifest/record-adapters/type.ts"() {
     "use strict";
     init_contracts();
     init_codecs();
@@ -18475,10 +18468,10 @@ var init_type = __esm({
   }
 });
 
-// src/schema-v2/manifest/record-adapters/registry.ts
+// src/schema/manifest/record-adapters/registry.ts
 var SCHEMA_RECORD_ADAPTER_REGISTRY_V2, SCHEMA_RECORD_ADAPTERS_V2;
 var init_registry = __esm({
-  "src/schema-v2/manifest/record-adapters/registry.ts"() {
+  "src/schema/manifest/record-adapters/registry.ts"() {
     "use strict";
     init_enum();
     init_interface();
@@ -18509,9 +18502,9 @@ var init_registry = __esm({
   }
 });
 
-// src/schema-v2/manifest/record-adapters/index.ts
+// src/schema/manifest/record-adapters/index.ts
 var init_record_adapters = __esm({
-  "src/schema-v2/manifest/record-adapters/index.ts"() {
+  "src/schema/manifest/record-adapters/index.ts"() {
     "use strict";
     init_enum();
     init_interface();
@@ -18524,7 +18517,7 @@ var init_record_adapters = __esm({
   }
 });
 
-// src/schema-v2/manifest/document-adapters.ts
+// src/schema/manifest/document-adapters.ts
 function documentsToSchemaManifestV2(records2, optionsOrContext = {}) {
   const options = isDocumentToManifestContextV2(optionsOrContext) ? { sourceContext: optionsOrContext } : optionsOrContext;
   const context = createSchemaRecordProjectionContextV2(
@@ -18602,7 +18595,7 @@ function manifestToDocumentContextV2(records2) {
 }
 var SCHEMA_MANIFEST_V2_CACHE_PATH;
 var init_document_adapters = __esm({
-  "src/schema-v2/manifest/document-adapters.ts"() {
+  "src/schema/manifest/document-adapters.ts"() {
     "use strict";
     init_adapters();
     init_record_adapters();
@@ -18612,7 +18605,7 @@ var init_document_adapters = __esm({
   }
 });
 
-// src/schema/merge.ts
+// src/schema/sync/merge.ts
 function threeWayMergeRecord(base, server, local, policy = {}) {
   const baseRecord = isObjectRecord2(base) ? base : {};
   const serverRecord = isObjectRecord2(server) ? server : {};
@@ -18654,13 +18647,13 @@ function threeWayMergeRecord(base, server, local, policy = {}) {
   return { merged, conflictFields };
 }
 var init_merge = __esm({
-  "src/schema/merge.ts"() {
+  "src/schema/sync/merge.ts"() {
     "use strict";
     init_projection();
   }
 });
 
-// src/schema-v2/manifest/merge.ts
+// src/schema/manifest/merge.ts
 function schemaDocumentSemanticallyEqualV2(recordKind, left, right) {
   return canonicallyEqual(
     normalizeDocumentForComparisonV2(recordKind, left, "left"),
@@ -18734,7 +18727,7 @@ function requireDocumentRecord(value, recordKind, side) {
   );
 }
 var init_merge2 = __esm({
-  "src/schema-v2/manifest/merge.ts"() {
+  "src/schema/manifest/merge.ts"() {
     "use strict";
     init_merge();
     init_projection();
@@ -18742,9 +18735,9 @@ var init_merge2 = __esm({
   }
 });
 
-// src/schema-v2/manifest/index.ts
+// src/schema/manifest/index.ts
 var init_manifest = __esm({
-  "src/schema-v2/manifest/index.ts"() {
+  "src/schema/manifest/index.ts"() {
     "use strict";
     init_adapters();
     init_contracts();
@@ -18756,7 +18749,7 @@ var init_manifest = __esm({
   }
 });
 
-// src/schema-v2/emitter.ts
+// src/schema/emitter.ts
 function emitSchemaManifestV2(manifest) {
   if (manifest.formatVersion !== 2) {
     throw new Error(
@@ -20564,7 +20557,7 @@ function emitLocalizationStatus(status, className) {
 }
 var HEADER;
 var init_emitter = __esm({
-  "src/schema-v2/emitter.ts"() {
+  "src/schema/emitter.ts"() {
     "use strict";
     init_src();
     init_names();
@@ -20582,7 +20575,7 @@ namespace ProjectSchema;
   }
 });
 
-// src/schema-v2/project-documents.ts
+// src/schema/project-documents.ts
 import { mkdirSync as mkdirSync5, writeFileSync as writeFileSync5 } from "node:fs";
 import { dirname as dirname4, join as join7 } from "node:path";
 function writeSchemaManifestCacheV2(workspaceRoot, manifest) {
@@ -20644,7 +20637,7 @@ function isSchemaDocumentKind(kind) {
 }
 var SCHEMA_DOCUMENT_KINDS;
 var init_project_documents = __esm({
-  "src/schema-v2/project-documents.ts"() {
+  "src/schema/project-documents.ts"() {
     "use strict";
     init_migration_files();
     init_names();
@@ -25498,14 +25491,14 @@ var init_neoscript_language_adapter = __esm({
   }
 });
 
-// src/schema/status.ts
-import { existsSync as existsSync7, readFileSync as readFileSync6, readdirSync as readdirSync4 } from "node:fs";
+// src/schema/sync/status.ts
+import { existsSync as existsSync7, readFileSync as readFileSync6, readdirSync as readdirSync3 } from "node:fs";
 import { join as join8, relative as relative2, sep as sep2 } from "node:path";
 function listSchemaFiles(root) {
   const files = [];
   const visit = (directory, insideNeoScriptRoot) => {
     if (!existsSync7(directory)) return;
-    for (const entry of readdirSync4(directory, { withFileTypes: true })) {
+    for (const entry of readdirSync3(directory, { withFileTypes: true })) {
       if (entry.isSymbolicLink()) continue;
       const path = join8(directory, entry.name);
       if (entry.isDirectory()) {
@@ -25527,7 +25520,6 @@ function listSchemaFiles(root) {
   return [...new Set(files)].sort();
 }
 function computeWorkspaceStatus(workspace, options = {}) {
-  assertCurrentSchemaFormat(workspace.config);
   const conflictedFiles = [];
   const parseErrors = [];
   const migrationSources = [];
@@ -25816,7 +25808,7 @@ function summarizeFieldDiff(baseData, nextData) {
 }
 var IGNORED_SCHEMA_DIRECTORIES;
 var init_status = __esm({
-  "src/schema/status.ts"() {
+  "src/schema/sync/status.ts"() {
     "use strict";
     init_workspace();
     init_source_diagnostics();
@@ -28092,18 +28084,18 @@ var init_document = __esm({
   }
 });
 
-// src/schema-v2/workspace-file.ts
+// src/schema/workspace-file.ts
 function workspaceSegmentsToContentV2(segments) {
   return `${segments.flatMap((segment) => segment.lines).join("\n")}
 `;
 }
 var init_workspace_file = __esm({
-  "src/schema-v2/workspace-file.ts"() {
+  "src/schema/workspace-file.ts"() {
     "use strict";
   }
 });
 
-// src/schema-v2/reset.ts
+// src/schema/reset.ts
 import {
   existsSync as existsSync8,
   mkdirSync as mkdirSync6,
@@ -28119,15 +28111,16 @@ function resetWorkspaceToSchemaV2(workspace, document, options = {}) {
   materializeWorkspaceToolingV2(workspace.root, options);
   const previousFiles = /* @__PURE__ */ new Set();
   for (const state of Object.values(workspace.state.records)) {
-    if (state.file !== void 0) previousFiles.add(state.file);
-    if (state.scriptFile !== void 0) previousFiles.add(state.scriptFile);
+    if (state.file !== void 0 && isManagedResetFile(state.file)) {
+      previousFiles.add(state.file);
+    }
+    if (state.scriptFile !== void 0 && isManagedResetFile(state.scriptFile)) {
+      previousFiles.add(state.scriptFile);
+    }
   }
   if (existsSync8(join9(workspace.root, "Localization.cs"))) {
     previousFiles.add("Localization.cs");
   }
-  if (existsSync8(join9(workspace.root, "Loose.cs"))) {
-    previousFiles.add("Loose.cs");
-  }
   if (existsSync8(join9(workspace.root, "Root.cs"))) {
     previousFiles.add("Root.cs");
   }
@@ -28135,7 +28128,6 @@ function resetWorkspaceToSchemaV2(workspace, document, options = {}) {
     rmSync2(join9(workspace.root, path), { recursive: true, force: true });
   }
   rmSync2(join9(workspace.root, "Localization.cs"), { force: true });
-  rmSync2(join9(workspace.root, "Loose.cs"), { force: true });
   rmSync2(join9(workspace.root, "Root.cs"), { force: true });
   scaffoldWorkspaceV2(workspace.root, options);
   let written = 0;
@@ -28172,17 +28164,20 @@ function resetWorkspaceToSchemaV2(workspace, document, options = {}) {
   ).length;
   return { written, removed, fileCount: allFiles.length };
 }
+function isManagedResetFile(path) {
+  if (path === "Localization.cs" || path === "Root.cs") return true;
+  return MANAGED_RESET_PATHS.some(
+    (directory) => path.startsWith(`${directory}/`)
+  );
+}
 var MANAGED_RESET_PATHS;
 var init_reset = __esm({
-  "src/schema-v2/reset.ts"() {
+  "src/schema/reset.ts"() {
     "use strict";
     init_workspace();
     init_project_documents();
     init_scaffold();
     MANAGED_RESET_PATHS = [
-      // Attributes/ was the initial v2 name. Reset removes it after emitting the
-      // canonical Types/ tree so stale declarations cannot compile twice.
-      "Attributes",
       "Types",
       "Enums",
       "Interfaces",
@@ -28283,7 +28278,6 @@ import {
 } from "node:fs";
 import { dirname as dirname6, join as join11 } from "node:path";
 async function runPull(workspace, options) {
-  if (!options.reset) assertCurrentSchemaFormat(workspace.config);
   const destructive = options.force || options.reset;
   const hasBaseline = Object.keys(workspace.state.records).length > 0;
   let localByKey = /* @__PURE__ */ new Map();
@@ -32692,9 +32686,8 @@ var init_project_migration_runner = __esm({
   }
 });
 
-// src/schema-v2/workspace-manifest.ts
+// src/schema/workspace-manifest.ts
 function analyzeWorkspaceSchemaManifestV2(workspace, options = {}) {
-  assertCurrentSchemaFormat(workspace.config);
   const baseDocuments = workspaceSchemaBaseDocumentsV2(workspace);
   const baseManifest = baseDocuments.length === 0 ? void 0 : documentsToSchemaManifestV2(baseDocuments);
   const analysis = (options.analyze ?? analyzeSchemaWorkspaceV2)(
@@ -32729,9 +32722,8 @@ function workspaceSchemaBaseDocumentsV2(workspace) {
   return records2;
 }
 var init_workspace_manifest = __esm({
-  "src/schema-v2/workspace-manifest.ts"() {
+  "src/schema/workspace-manifest.ts"() {
     "use strict";
-    init_workspace();
     init_projection();
     init_compiler_client();
     init_frontend();
@@ -33272,7 +33264,6 @@ function readSource(options, fallback) {
   return stdin;
 }
 async function runScript(workspace, command, options, dependencies = {}) {
-  assertCurrentSchemaFormat(workspace.config);
   let localCheckManifest = null;
   if (command === "check" && (options.all || options.attributeRef !== null)) {
     localCheckManifest = (dependencies.analyzeWorkspaceManifest ?? analyzeWorkspaceSchemaManifestV2)(workspace);
@@ -34126,7 +34117,6 @@ var init_script = __esm({
     init_convex();
     init_project_version_intents();
     init_http();
-    init_workspace();
     init_projection();
     init_compiler_adapter();
     init_neoscript_evaluator();
@@ -34161,7 +34151,7 @@ __export(migrate_exports, {
   runMigrate: () => runMigrate
 });
 import { randomUUID as randomUUID2 } from "node:crypto";
-import { existsSync as existsSync12, mkdirSync as mkdirSync9, readdirSync as readdirSync5, writeFileSync as writeFileSync9 } from "node:fs";
+import { existsSync as existsSync12, mkdirSync as mkdirSync9, readdirSync as readdirSync4, writeFileSync as writeFileSync9 } from "node:fs";
 import { join as join14 } from "node:path";
 async function runMigrate(workspace, subcommand, positional, targetRef, json, dependencies = {}) {
   if (subcommand === "new") {
@@ -34175,7 +34165,7 @@ async function runMigrate(workspace, subcommand, positional, targetRef, json, de
     mkdirSync9(migrationsDir, { recursive: true });
     let nextOrder = 1;
     if (existsSync12(migrationsDir)) {
-      for (const entry of readdirSync5(migrationsDir)) {
+      for (const entry of readdirSync4(migrationsDir)) {
         const match = /^(\d+)-/.exec(entry);
         if (match !== null) {
           nextOrder = Math.max(nextOrder, Number(match[1]) + 1);
@@ -38737,7 +38727,6 @@ function assertKnownFlags(args) {
 // src/main.ts
 init_status();
 init_workspace();
-init_workspace();
 init_ui();
 var DEFAULT_API_BASE_URL = "http://localhost:3000";
 function profileFlag(args) {
@@ -38746,7 +38735,7 @@ function profileFlag(args) {
   if (value === "editor" || value === "release") return value;
   throw new Error(`--profile must be "editor" or "release", not "${value}".`);
 }
-function loadWorkspaceForCommand(args, options = {}) {
+function loadWorkspaceForCommand(args) {
   const workspace = loadWorkspace(process.cwd());
   const apiOverride = stringFlag(args, "api");
   if (apiOverride !== null) {
@@ -38755,9 +38744,6 @@ function loadWorkspaceForCommand(args, options = {}) {
       apiBaseUrl: apiOverride
     };
   }
-  if (options.allowLegacyFormat !== true) {
-    assertCurrentSchemaFormat(workspace.config);
-  }
   return workspace;
 }
 function usage() {
@@ -38805,9 +38791,8 @@ ${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.")}
 
-Use ${h("--reset")} to migrate a legacy v1 working copy or refresh the v2
-compiler/SDK contract. It reconstructs managed schema files from the server
-without parsing the obsolete generated marker vocabulary.
+Use ${h("--reset")} to refresh an existing v2 working copy and compiler/SDK
+contract. It reconstructs all managed schema files from the server.
 `;
   }
   if (command === "push") {
@@ -38890,10 +38875,7 @@ async function main() {
       }
       return;
     case "pull": {
-      const workspace = loadWorkspaceForCommand(args, {
-        allowLegacyFormat: true
-      });
-      if (!boolFlag(args, "reset")) assertCurrentSchemaFormat(workspace.config);
+      const workspace = loadWorkspaceForCommand(args);
       const { runPull: runPull2 } = await Promise.resolve().then(() => (init_pull(), pull_exports));
       await runPull2(workspace, {
         force: boolFlag(args, "force"),
@@ -38902,9 +38884,7 @@ async function main() {
       return;
     }
     case "doctor": {
-      const workspace = loadWorkspaceForCommand(args, {
-        allowLegacyFormat: true
-      });
+      const workspace = loadWorkspaceForCommand(args);
       const { runDoctor: runDoctor2 } = await Promise.resolve().then(() => (init_doctor(), doctor_exports));
       runDoctor2(workspace, boolFlag(args, "json"));
       return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neocompose/cli",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Neo Compose schema-as-code CLI with compiler-backed C# authoring and bidirectional sync.",
   "license": "MIT",
   "type": "module",

package/skills/neocompose-cli/SKILL.md

@@ -31,7 +31,7 @@ The compiler reports file:line:column diagnostics and never guesses. Unknown
 authorable server fields fail with “CLI contract upgrade required”; they never
 hide in an opaque JSON carrier.
 
-## Setup and format migration
+## Setup and format requirement
 
 ```sh
 npm i -g @neocompose/cli
@@ -44,16 +44,15 @@ Repository development uses `node cli/bin/neo.mjs`. Agents should always pass
 explicit flags/IDs. Human terminals may show pickers and confirms; non-TTY/CI
 use fails with an actionable missing-flag diagnostic rather than blocking.
 
-`neo.json` must contain `formatVersion: 2`. A missing marker is legacy v1.
-Normal schema commands reject v1; run:
+`neo.json` must contain `formatVersion: 2`. A missing or different marker is
+unsupported. Preserve any source you need, then create a fresh v2 working copy:
 
 ```sh
-neo pull --reset
+neo init --project <id> [--version <id>] [--dir neo]
 ```
 
-Reset reconstructs from the server using v2, refreshes the compiler SDK and
-analyzer, and deletes obsolete `Schema/NeoSchemaAttributes.cs`. There is no
-v1 parser or compatibility shim.
+`neo pull --reset` is only for an existing v2 workspace; it reconstructs
+CLI-managed source from the server and refreshes the compiler SDK and analyzer.
 
 Neo never downloads or installs .NET. Compiler host discovery is:
 
@@ -178,7 +177,7 @@ Allowed values are statically analyzable literals, enum values, `nameof`,
 and `Neo.Ref<T>`, `Neo.Lookup<T>`, `Neo.Dialogue`, `Neo.Sprite`, `Neo.Audio`,
 or `Neo.Member` references. Authored code is never executed.
 
-Never introduce v1 carriers or identity escapes: `ExtraJson`, `DefaultJson`,
+Never introduce opaque carriers or identity escapes: `ExtraJson`, `DefaultJson`,
 `RetJson`, `ArgsJson`, `EntryChainJson`, `SchemaKeyOrderJson`,
 `GenericParamIds`, `ChainJson`, `SignatureJson`, `ExtendsId`, `isVirtual`, or
 `isAbstract`.