@neocompose/cli 0.43.0 → 0.44.0

package/dist/neo.mjs

@@ -372,10 +372,6 @@ var init_auth_api_base_url = __esm({
 // src/token-store.ts
 var token_store_exports = {};
 __export(token_store_exports, {
-  NEO_CONFIG_HOME_ENV_VAR: () => NEO_CONFIG_HOME_ENV_VAR,
-  NEO_CREDENTIAL_NAMESPACE_ENV_VAR: () => NEO_CREDENTIAL_NAMESPACE_ENV_VAR,
-  NEO_TOKEN_ENV_VAR: () => NEO_TOKEN_ENV_VAR,
-  credentialsDir: () => credentialsDir,
   deleteCredential: () => deleteCredential,
   keychainAccount: () => keychainAccount,
   loadCredential: () => loadCredential,
@@ -1047,7 +1043,9 @@ var init_args = __esm({
       "generate-ids",
       "help",
       "passWithNoTests",
-      "no-verify"
+      "no-verify",
+      "fix",
+      "yes"
     ]);
     KNOWN_FLAGS = /* @__PURE__ */ new Set([
       "accept-bump",
@@ -1059,6 +1057,7 @@ var init_args = __esm({
       "dir",
       "dry-run",
       "file",
+      "fix",
       "force",
       "force-recompile",
       "function",
@@ -1091,6 +1090,7 @@ var init_args = __esm({
       "this-value",
       "token-stdin",
       "version",
+      "yes",
       "reporter",
       "outputFile",
       "output-file",
@@ -22462,7 +22462,7 @@ function reportVariantTypePositions(uri, type, diagnostics, root = "nested") {
       severity: "error",
       source: "neo-project",
       code: "variant-type-position",
-      message: variantTypePositionMessage(type.name, root)
+      message: variantTypePositionMessage(type.name)
     });
     return;
   }
@@ -22470,7 +22470,7 @@ function reportVariantTypePositions(uri, type, diagnostics, root = "nested") {
     reportVariantTypePositions(uri, argument2, diagnostics);
   }
 }
-function variantTypePositionMessage(typeName, root) {
+function variantTypePositionMessage(typeName) {
   if (isNeoVariantFolderTypeName(typeName)) {
     return `'${typeName}' is reference-only: it declares variant folders as top-level globals and is never a member, entry, parameter, or generic binding type.`;
   }
@@ -37229,7 +37229,6 @@ function memberFromDocument(record3, members, owners, classNames, context) {
         "returnTypeInfo"
       ),
       script: isAbstract || getterSource === null ? null : propertyScript(
-        record3,
         common.owner,
         classNames,
         getterSource,
@@ -37280,7 +37279,7 @@ function memberFromDocument(record3, members, owners, classNames, context) {
       ...signature,
       ...bodyModeValue === "ui" ? { bodyMode: "ui" } : {},
       ...uiActionValue === null ? {} : { uiAction: jsonValue(uiActionValue, record3, "uiAction") },
-      script: isAbstract || code === null ? null : functionScript(record3, common.owner, classNames, code)
+      script: isAbstract || code === null ? null : functionScript(common.owner, classNames, code)
     };
   }
   if (kind === MEMBER_KIND.FunctionRef) {
@@ -37887,8 +37886,8 @@ function memberModifier(overrideOf, modifier) {
   if (modifier === "static") return "static";
   return "virtual";
 }
-function propertyScript(record3, owner, classNames, getterSource, setterSource) {
-  const path = scriptPath(record3, owner, classNames);
+function propertyScript(owner, classNames, getterSource, setterSource) {
+  const path = scriptPath(owner, classNames);
   const sourceText = [
     "get {",
     getterSource,
@@ -37905,8 +37904,8 @@ function propertyScript(record3, owner, classNames, getterSource, setterSource)
     source: zeroSpan(path)
   };
 }
-function functionScript(record3, owner, classNames, sourceText) {
-  const path = scriptPath(record3, owner, classNames);
+function functionScript(owner, classNames, sourceText) {
+  const path = scriptPath(owner, classNames);
   return {
     kind: "function",
     path,
@@ -37914,7 +37913,7 @@ function functionScript(record3, owner, classNames, sourceText) {
     source: zeroSpan(path)
   };
 }
-function scriptPath(record3, ownerValue, classNames) {
+function scriptPath(ownerValue, classNames) {
   const owner = isRecord2(ownerValue) ? ownerValue : {};
   const sharedMember = owner.kind === "sharedClassMember" && Array.isArray(owner.members) ? owner.members.find(isRecord2) : void 0;
   let ownerClassId;
@@ -42725,36 +42724,36 @@ var MemberKind;
 var init_member_kind_enum = __esm({
   "../src/models/members/member-kind-enum.ts"() {
     "use strict";
-    MemberKind = /* @__PURE__ */ ((MemberKind16) => {
-      MemberKind16[MemberKind16["Null"] = 0] = "Null";
-      MemberKind16[MemberKind16["Bool"] = 1] = "Bool";
-      MemberKind16[MemberKind16["Int"] = 2] = "Int";
-      MemberKind16[MemberKind16["String"] = 3] = "String";
-      MemberKind16[MemberKind16["Float"] = 4] = "Float";
-      MemberKind16[MemberKind16["Dictionary"] = 5] = "Dictionary";
-      MemberKind16[MemberKind16["List"] = 6] = "List";
-      MemberKind16[MemberKind16["Class"] = 7] = "Class";
-      MemberKind16[MemberKind16["Enum"] = 8] = "Enum";
-      MemberKind16[MemberKind16["Lookup"] = 9] = "Lookup";
-      MemberKind16[MemberKind16["NSProperty"] = 10] = "NSProperty";
-      MemberKind16[MemberKind16["Sprite"] = 11] = "Sprite";
-      MemberKind16[MemberKind16["Audio"] = 12] = "Audio";
-      MemberKind16[MemberKind16["Function"] = 13] = "Function";
-      MemberKind16[MemberKind16["Vector2"] = 14] = "Vector2";
-      MemberKind16[MemberKind16["Vector2Int"] = 15] = "Vector2Int";
-      MemberKind16[MemberKind16["Vector3"] = 16] = "Vector3";
-      MemberKind16[MemberKind16["Vector3Int"] = 17] = "Vector3Int";
-      MemberKind16[MemberKind16["DialogueLookup"] = 18] = "DialogueLookup";
-      MemberKind16[MemberKind16["Color"] = 19] = "Color";
-      MemberKind16[MemberKind16["Decimal"] = 20] = "Decimal";
-      MemberKind16[MemberKind16["Generic"] = 21] = "Generic";
-      MemberKind16[MemberKind16["Interface"] = 22] = "Interface";
-      MemberKind16[MemberKind16["NSFunction"] = 23] = "NSFunction";
-      MemberKind16[MemberKind16["FunctionRef"] = 24] = "FunctionRef";
-      MemberKind16[MemberKind16["NSDelegate"] = 25] = "NSDelegate";
-      MemberKind16[MemberKind16["NSAction"] = 26] = "NSAction";
-      MemberKind16[MemberKind16["Variant"] = 27] = "Variant";
-      return MemberKind16;
+    MemberKind = /* @__PURE__ */ ((MemberKind13) => {
+      MemberKind13[MemberKind13["Null"] = 0] = "Null";
+      MemberKind13[MemberKind13["Bool"] = 1] = "Bool";
+      MemberKind13[MemberKind13["Int"] = 2] = "Int";
+      MemberKind13[MemberKind13["String"] = 3] = "String";
+      MemberKind13[MemberKind13["Float"] = 4] = "Float";
+      MemberKind13[MemberKind13["Dictionary"] = 5] = "Dictionary";
+      MemberKind13[MemberKind13["List"] = 6] = "List";
+      MemberKind13[MemberKind13["Class"] = 7] = "Class";
+      MemberKind13[MemberKind13["Enum"] = 8] = "Enum";
+      MemberKind13[MemberKind13["Lookup"] = 9] = "Lookup";
+      MemberKind13[MemberKind13["NSProperty"] = 10] = "NSProperty";
+      MemberKind13[MemberKind13["Sprite"] = 11] = "Sprite";
+      MemberKind13[MemberKind13["Audio"] = 12] = "Audio";
+      MemberKind13[MemberKind13["Function"] = 13] = "Function";
+      MemberKind13[MemberKind13["Vector2"] = 14] = "Vector2";
+      MemberKind13[MemberKind13["Vector2Int"] = 15] = "Vector2Int";
+      MemberKind13[MemberKind13["Vector3"] = 16] = "Vector3";
+      MemberKind13[MemberKind13["Vector3Int"] = 17] = "Vector3Int";
+      MemberKind13[MemberKind13["DialogueLookup"] = 18] = "DialogueLookup";
+      MemberKind13[MemberKind13["Color"] = 19] = "Color";
+      MemberKind13[MemberKind13["Decimal"] = 20] = "Decimal";
+      MemberKind13[MemberKind13["Generic"] = 21] = "Generic";
+      MemberKind13[MemberKind13["Interface"] = 22] = "Interface";
+      MemberKind13[MemberKind13["NSFunction"] = 23] = "NSFunction";
+      MemberKind13[MemberKind13["FunctionRef"] = 24] = "FunctionRef";
+      MemberKind13[MemberKind13["NSDelegate"] = 25] = "NSDelegate";
+      MemberKind13[MemberKind13["NSAction"] = 26] = "NSAction";
+      MemberKind13[MemberKind13["Variant"] = 27] = "Variant";
+      return MemberKind13;
     })(MemberKind || {});
   }
 });
@@ -51233,135 +51232,11 @@ var init_enum_types = __esm({
   }
 });
 
-// ../src/models/interfaces/interface-types.ts
-function isInterfaceFunctionMember(member) {
-  return member.kind === 1 /* Function */;
-}
-function interfacePropertyIsSettable(member) {
-  return member.accessors === 1 /* GetSet */;
-}
-function containsForbiddenMemberTypeInfo(typeInfo) {
-  if (typeInfo.type === NS_TYPE_UNKNOWN) return true;
-  if (typeInfo.type === 21 /* Generic */) return true;
-  if (typeInfo.type === 6 /* List */ || typeInfo.type === 5 /* Dictionary */ || typeInfo.type === 9 /* Lookup */) {
-    return containsForbiddenMemberTypeInfo(typeInfo.entryTypeInfo);
-  }
-  if (typeInfo.type === 7 /* Class */ && typeInfo.typeArguments) {
-    return Object.values(typeInfo.typeArguments).some(
-      containsForbiddenMemberTypeInfo
-    );
-  }
-  return false;
-}
-function isNeoInterfaceMember(value) {
-  if (typeof value !== "object") return false;
-  if (value === null) return false;
-  const member = value;
-  if (typeof member.id !== "string" || member.id.length === 0) return false;
-  if (!isValidDocsText(member.docsText)) return false;
-  if (member.access !== void 0 && !isMemberAccessKind(member.access))
-    return false;
-  if (member.kind === void 0 || member.kind === 0 /* Property */) {
-    const property2 = value;
-    if (!isNSTypeInfo(property2.typeInfo)) return false;
-    if (containsForbiddenMemberTypeInfo(property2.typeInfo)) return false;
-    return property2.accessors === void 0 || property2.accessors === 0 /* Get */ || property2.accessors === 1 /* GetSet */;
-  }
-  if (member.kind !== 1 /* Function */) return false;
-  const fn = value;
-  if (!isNSFunctionReturnTypeInfo(fn.returnTypeInfo)) return false;
-  if (containsForbiddenMemberTypeInfo(fn.returnTypeInfo)) return false;
-  if (!Array.isArray(fn.argumentTypes)) return false;
-  for (const argumentType of fn.argumentTypes) {
-    if (!isNSFunctionArgumentTypeInfo(argumentType)) return false;
-    if (containsForbiddenMemberTypeInfo(argumentType)) return false;
-  }
-  if (fn.dispatch !== void 0 && fn.dispatch !== 0 /* Synchronous */ && fn.dispatch !== 1 /* Asynchronous */)
-    return false;
-  if (fn.dispatch === 1 /* Asynchronous */ && hasAnyParameterDefault(fn.argumentTypes)) {
-    return false;
-  }
-  return validateParameterDefaults(fn.argumentTypes).length === 0;
-}
-function isInterfaceMembersRecord(value) {
-  if (typeof value !== "object") return false;
-  if (value === null) return false;
-  if (Array.isArray(value)) return false;
-  for (const [key, member] of Object.entries(value)) {
-    if (key.length === 0) return false;
-    if (!isNeoInterfaceMember(member)) return false;
-  }
-  return true;
-}
-function isOptionalStringArray(value) {
-  if (value === void 0) return true;
-  if (!Array.isArray(value)) return false;
-  return value.every((entry) => typeof entry === "string" && entry.length > 0);
-}
-function isNeoInterfaceBase(value) {
-  if (typeof value !== "object") return false;
-  if (value === null) return false;
-  const neoInterface = value;
-  if (typeof neoInterface.name !== "string") return false;
-  if (!isValidDocsText(neoInterface.docsText)) return false;
-  if (!isInterfaceMembersRecord(neoInterface.members)) return false;
-  if (!isOptionalStringArray(neoInterface.memberKeyOrder)) return false;
-  if (!isOptionalStringArray(neoInterface.extendsInterfaceIds)) return false;
-  if (neoInterface.system !== void 0 && !isSystemMetadata(neoInterface.system)) {
-    return false;
-  }
-  return true;
-}
-function isNeoInterfaceProps(value) {
-  if (!isNeoInterfaceBase(value)) return false;
-  if (!isWithId(value)) return false;
-  const neoInterface = value;
-  if (typeof neoInterface.projectId !== "string") return false;
-  if (!isEpochMillis(neoInterface.createdAt)) return false;
-  return isEpochMillis(neoInterface.updatedAt);
-}
-function isNeoInterface(value) {
-  return isNeoInterfaceProps(value);
-}
-function getInterfaceMemberKeyOrder(neoInterface) {
-  const memberKeys = Object.keys(neoInterface.members);
-  const seen = /* @__PURE__ */ new Set();
-  const result = [];
-  for (const memberKey of neoInterface.memberKeyOrder ?? []) {
-    if (!Object.prototype.hasOwnProperty.call(neoInterface.members, memberKey)) {
-      continue;
-    }
-    if (seen.has(memberKey)) continue;
-    seen.add(memberKey);
-    result.push(memberKey);
-  }
-  for (const memberKey of memberKeys) {
-    if (seen.has(memberKey)) continue;
-    seen.add(memberKey);
-    result.push(memberKey);
-  }
-  return result;
-}
-var init_interface_types = __esm({
-  "../src/models/interfaces/interface-types.ts"() {
-    "use strict";
-    init_core();
-    init_neoscript_types();
-    init_docs_text2();
-    init_neoscript_guards();
-    init_parameter_defaults();
-    init_member_kinds();
-  }
-});
-
 // ../src/models/enum/enum-responses.ts
 var init_enum_responses = __esm({
   "../src/models/enum/enum-responses.ts"() {
     "use strict";
-    init_members();
-    init_classes();
     init_enum_types();
-    init_interface_types();
   }
 });
 
@@ -53327,7 +53202,6 @@ var init_add_class_member = __esm({
     init_enum2();
     init_classes();
     init_initial_class_internal_record_relation();
-    init_project_version_types();
   }
 });
 
@@ -53347,8 +53221,6 @@ var init_edit_member_props = __esm({
 var init_delete_member_response = __esm({
   "../src/models/members/delete-member-response.ts"() {
     "use strict";
-    init_member_kinds();
-    init_classes();
   }
 });
 
@@ -57495,12 +57367,131 @@ var init_dialogue_lookup_candidates = __esm({
   }
 });
 
+// ../src/models/interfaces/interface-types.ts
+function isInterfaceFunctionMember(member) {
+  return member.kind === 1 /* Function */;
+}
+function interfacePropertyIsSettable(member) {
+  return member.accessors === 1 /* GetSet */;
+}
+function containsForbiddenMemberTypeInfo(typeInfo) {
+  if (typeInfo.type === NS_TYPE_UNKNOWN) return true;
+  if (typeInfo.type === 21 /* Generic */) return true;
+  if (typeInfo.type === 6 /* List */ || typeInfo.type === 5 /* Dictionary */ || typeInfo.type === 9 /* Lookup */) {
+    return containsForbiddenMemberTypeInfo(typeInfo.entryTypeInfo);
+  }
+  if (typeInfo.type === 7 /* Class */ && typeInfo.typeArguments) {
+    return Object.values(typeInfo.typeArguments).some(
+      containsForbiddenMemberTypeInfo
+    );
+  }
+  return false;
+}
+function isNeoInterfaceMember(value) {
+  if (typeof value !== "object") return false;
+  if (value === null) return false;
+  const member = value;
+  if (typeof member.id !== "string" || member.id.length === 0) return false;
+  if (!isValidDocsText(member.docsText)) return false;
+  if (member.access !== void 0 && !isMemberAccessKind(member.access))
+    return false;
+  if (member.kind === void 0 || member.kind === 0 /* Property */) {
+    const property2 = value;
+    if (!isNSTypeInfo(property2.typeInfo)) return false;
+    if (containsForbiddenMemberTypeInfo(property2.typeInfo)) return false;
+    return property2.accessors === void 0 || property2.accessors === 0 /* Get */ || property2.accessors === 1 /* GetSet */;
+  }
+  if (member.kind !== 1 /* Function */) return false;
+  const fn = value;
+  if (!isNSFunctionReturnTypeInfo(fn.returnTypeInfo)) return false;
+  if (containsForbiddenMemberTypeInfo(fn.returnTypeInfo)) return false;
+  if (!Array.isArray(fn.argumentTypes)) return false;
+  for (const argumentType of fn.argumentTypes) {
+    if (!isNSFunctionArgumentTypeInfo(argumentType)) return false;
+    if (containsForbiddenMemberTypeInfo(argumentType)) return false;
+  }
+  if (fn.dispatch !== void 0 && fn.dispatch !== 0 /* Synchronous */ && fn.dispatch !== 1 /* Asynchronous */)
+    return false;
+  if (fn.dispatch === 1 /* Asynchronous */ && hasAnyParameterDefault(fn.argumentTypes)) {
+    return false;
+  }
+  return validateParameterDefaults(fn.argumentTypes).length === 0;
+}
+function isInterfaceMembersRecord(value) {
+  if (typeof value !== "object") return false;
+  if (value === null) return false;
+  if (Array.isArray(value)) return false;
+  for (const [key, member] of Object.entries(value)) {
+    if (key.length === 0) return false;
+    if (!isNeoInterfaceMember(member)) return false;
+  }
+  return true;
+}
+function isOptionalStringArray(value) {
+  if (value === void 0) return true;
+  if (!Array.isArray(value)) return false;
+  return value.every((entry) => typeof entry === "string" && entry.length > 0);
+}
+function isNeoInterfaceBase(value) {
+  if (typeof value !== "object") return false;
+  if (value === null) return false;
+  const neoInterface = value;
+  if (typeof neoInterface.name !== "string") return false;
+  if (!isValidDocsText(neoInterface.docsText)) return false;
+  if (!isInterfaceMembersRecord(neoInterface.members)) return false;
+  if (!isOptionalStringArray(neoInterface.memberKeyOrder)) return false;
+  if (!isOptionalStringArray(neoInterface.extendsInterfaceIds)) return false;
+  if (neoInterface.system !== void 0 && !isSystemMetadata(neoInterface.system)) {
+    return false;
+  }
+  return true;
+}
+function isNeoInterfaceProps(value) {
+  if (!isNeoInterfaceBase(value)) return false;
+  if (!isWithId(value)) return false;
+  const neoInterface = value;
+  if (typeof neoInterface.projectId !== "string") return false;
+  if (!isEpochMillis(neoInterface.createdAt)) return false;
+  return isEpochMillis(neoInterface.updatedAt);
+}
+function isNeoInterface(value) {
+  return isNeoInterfaceProps(value);
+}
+function getInterfaceMemberKeyOrder(neoInterface) {
+  const memberKeys = Object.keys(neoInterface.members);
+  const seen = /* @__PURE__ */ new Set();
+  const result = [];
+  for (const memberKey of neoInterface.memberKeyOrder ?? []) {
+    if (!Object.prototype.hasOwnProperty.call(neoInterface.members, memberKey)) {
+      continue;
+    }
+    if (seen.has(memberKey)) continue;
+    seen.add(memberKey);
+    result.push(memberKey);
+  }
+  for (const memberKey of memberKeys) {
+    if (seen.has(memberKey)) continue;
+    seen.add(memberKey);
+    result.push(memberKey);
+  }
+  return result;
+}
+var init_interface_types = __esm({
+  "../src/models/interfaces/interface-types.ts"() {
+    "use strict";
+    init_core();
+    init_neoscript_types();
+    init_docs_text2();
+    init_neoscript_guards();
+    init_parameter_defaults();
+    init_member_kinds();
+  }
+});
+
 // ../src/models/interfaces/interface-responses.ts
 var init_interface_responses = __esm({
   "../src/models/interfaces/interface-responses.ts"() {
     "use strict";
-    init_member_kinds();
-    init_classes();
     init_interface_types();
   }
 });
@@ -58005,7 +57996,6 @@ var init_dialogue_db_response_types = __esm({
     init_dialogue_types();
     init_dialogue_group_types();
     init_priority_types();
-    init_localization_types();
   }
 });
 
@@ -66101,6 +66091,17 @@ function initializerReferencesAnyIdentifier(source, names) {
   }
   return false;
 }
+function compilationProjectContext(args, members = args.members) {
+  return {
+    project: args.project,
+    projectFiles: args.projectFiles ?? [],
+    members: [...members],
+    classes: [...args.classes],
+    enums: [...args.enums],
+    interfaces: [...args.interfaces ?? []],
+    ...args.compilationProject === void 0 ? {} : { compilationProject: args.compilationProject }
+  };
+}
 function compileNSPropertyBodies(args) {
   if (args.member.kind !== 10 /* NSProperty */) return;
   if (isMemberNSPropertyContractBase(args.member)) return;
@@ -66120,16 +66121,10 @@ function compileNSPropertyBodies(args) {
     const getter = compileUnit2(
       "getter",
       () => compileNSGetter(code, {
-        project: args.project,
-        projectFiles: args.projectFiles ?? [],
-        members: [...members],
-        classes: [...args.classes],
-        enums: [...args.enums],
-        interfaces: [...args.interfaces ?? []],
+        ...compilationProjectContext(args, members),
         constructors: args.constructors ?? [],
         variants: args.variants ?? [],
         variantFolders: args.variantFolders ?? [],
-        ...args.compilationProject === void 0 ? {} : { compilationProject: args.compilationProject },
         thisClass: args.thisClass,
         returnTypeInfo,
         implicitMemberAccess: true,
@@ -66159,16 +66154,10 @@ function compileNSPropertyBodies(args) {
     const setter = compileUnit2(
       "setter",
       () => compileNSSetter(setterCode, {
-        project: args.project,
-        projectFiles: args.projectFiles ?? [],
-        members: [...members],
-        classes: [...args.classes],
-        enums: [...args.enums],
-        interfaces: [...args.interfaces ?? []],
+        ...compilationProjectContext(args, members),
         constructors: args.constructors ?? [],
         variants: args.variants ?? [],
         variantFolders: args.variantFolders ?? [],
-        ...args.compilationProject === void 0 ? {} : { compilationProject: args.compilationProject },
         thisClass: args.thisClass,
         valueTypeInfo: returnTypeInfo,
         implicitMemberAccess: true,
@@ -66212,16 +66201,10 @@ function compileNSFunctionBody(args) {
     const action2 = compileUnit2(
       "function",
       () => compileNSFunction("", {
-        project: args.project,
-        projectFiles: args.projectFiles ?? [],
-        members: [...members],
-        classes: [...args.classes],
-        enums: [...args.enums],
-        interfaces: [...args.interfaces ?? []],
+        ...compilationProjectContext(args, members),
         constructors: args.constructors ?? [],
         variants: args.variants ?? [],
         variantFolders: args.variantFolders ?? [],
-        ...args.compilationProject === void 0 ? {} : { compilationProject: args.compilationProject },
         thisClass: args.thisClass,
         functionName: args.member.name,
         implicitMemberAccess: true,
@@ -66261,16 +66244,10 @@ function compileNSFunctionBody(args) {
   const action = compileUnit2(
     "function",
     () => compileNSFunction(code, {
-      project: args.project,
-      projectFiles: args.projectFiles ?? [],
-      members: [...members],
-      classes: [...args.classes],
-      enums: [...args.enums],
-      interfaces: [...args.interfaces ?? []],
+      ...compilationProjectContext(args, members),
       constructors: args.constructors ?? [],
       variants: args.variants ?? [],
       variantFolders: args.variantFolders ?? [],
-      ...args.compilationProject === void 0 ? {} : { compilationProject: args.compilationProject },
       thisClass: args.thisClass,
       functionName: args.member.name,
       implicitMemberAccess: true,
@@ -66300,16 +66277,10 @@ function compileMemberInitializerBody(args) {
     compiled = compileUnit2(
       "getter",
       () => compileNSInitializer(defaultValue.init.code, {
-        project: args.project,
-        projectFiles: args.projectFiles ?? [],
-        members: [...members],
-        classes: [...args.classes],
-        enums: [...args.enums],
-        interfaces: [...args.interfaces ?? []],
+        ...compilationProjectContext(args, members),
         constructors: args.constructors ?? [],
         variants: args.variants ?? [],
         variantFolders: args.variantFolders ?? [],
-        ...args.compilationProject === void 0 ? {} : { compilationProject: args.compilationProject },
         returnTypeInfo,
         initializerName: args.member.name,
         argumentTypes: initializerArgumentTypes(
@@ -66363,12 +66334,7 @@ function compileValueRowInitializerBody(args) {
     compiled = compileUnit2(
       "getter",
       () => compileNSInitializer(container.init.code, {
-        project: args.project,
-        projectFiles: args.projectFiles ?? [],
-        members: [...args.members],
-        classes: [...args.classes],
-        enums: [...args.enums],
-        interfaces: [...args.interfaces ?? []],
+        ...compilationProjectContext(args),
         constructors: args.constructors ?? [],
         variants: args.variants ?? [],
         variantFolders: args.variantFolders ?? [],
@@ -66379,7 +66345,6 @@ function compileValueRowInitializerBody(args) {
           args.initializerOwnerClass,
           args.constructors ?? []
         ),
-        ...args.compilationProject === void 0 ? {} : { compilationProject: args.compilationProject },
         ...args.storedConstructionReplay === true ? { storedConstructionReplay: true } : {}
       })
     );
@@ -66446,14 +66411,8 @@ function compileConstructorRecord(args) {
   const action = compileUnit2(
     "function",
     () => compileNSConstructor(code, {
-      project: args.project,
-      projectFiles: args.projectFiles ?? [],
-      members: [...args.members],
-      classes: [...args.classes],
-      enums: [...args.enums],
-      interfaces: [...args.interfaces ?? []],
+      ...compilationProjectContext(args),
       constructors: args.constructors,
-      ...args.compilationProject === void 0 ? {} : { compilationProject: args.compilationProject },
       thisClass: owner,
       argumentTypes,
       constructorName: owner.name
@@ -66490,14 +66449,8 @@ function compileConstructorBaseArguments(args, owner) {
       return compileUnit2(
         "getter",
         () => compileNSInitializer(baseArgument.code, {
-          project: args.project,
-          projectFiles: args.projectFiles ?? [],
-          members: [...args.members],
-          classes: [...args.classes],
-          enums: [...args.enums],
-          interfaces: [...args.interfaces ?? []],
+          ...compilationProjectContext(args),
           constructors: args.constructors,
-          ...args.compilationProject === void 0 ? {} : { compilationProject: args.compilationProject },
           returnTypeInfo,
           argumentTypes,
           initializerName: `${owner.name} base argument ${baseArgument.name}`
@@ -66617,14 +66570,8 @@ function compileConstructorBaseInitializerFields(args, owner) {
     return compileUnit2(
       "getter",
       () => compileNSInitializer(field.code, {
-        project: args.project,
-        projectFiles: args.projectFiles ?? [],
-        members: [...args.members],
-        classes: [...args.classes],
-        enums: [...args.enums],
-        interfaces: [...args.interfaces ?? []],
+        ...compilationProjectContext(args),
         constructors: args.constructors,
-        ...args.compilationProject === void 0 ? {} : { compilationProject: args.compilationProject },
         returnTypeInfo,
         argumentTypes: args.constructor.argumentTypes,
         initializerName: `${owner.name} base initializer ${field.name}`
@@ -67893,7 +67840,6 @@ var init_constructor_argument_ownership = __esm({
       childrenByContainerId;
       edgesByOwnerValueId;
       referenceCountByTargetValueId;
-      classesById;
       membersById;
       constructorsById;
       contextualRootMembersByValueId;
@@ -67908,9 +67854,6 @@ var init_constructor_argument_ownership = __esm({
         this.valuesById = rows;
         this.document = { ...document, values: [...rows.values()] };
         this.contextualRootMembersByValueId = contextualRootMembersByValueId;
-        this.classesById = new Map(
-          document.classes.map((schemaClass2) => [schemaClass2.id, schemaClass2])
-        );
         this.membersById = new Map(
           document.members.map((member) => [member.id, member])
         );
@@ -69927,7 +69870,21 @@ function invalidateEvaluatorIndexes(ctx) {
 function trackedRowForValueReference(value, ctx) {
   if (typeof value !== "object" || value === null) return null;
   const indexes = evaluatorIndexes(ctx);
-  return indexes.rowByValueReference.get(value) ?? indexes.baseRowByValueReference?.get(value) ?? ctx.vm.databaseVM?.rowForValueReference?.(value) ?? null;
+  const indexed = indexes.rowByValueReference.get(value) ?? indexes.baseRowByValueReference?.get(value) ?? ctx.vm.databaseVM?.rowForValueReference?.(value) ?? null;
+  if (indexed !== null) return indexed;
+  if (value !== ctx.thisValue || typeof ctx.thisValueRowId !== "string") {
+    return null;
+  }
+  return evalValueById(
+    ctx,
+    ctx.thisValueRowId,
+    ctx.__runtimeSessionValues,
+    ctx.__valueOverlay
+  );
+}
+function bindThisValue(ctx, thisValue) {
+  const rowId = thisValue === ctx.thisValue ? ctx.thisValueRowId : trackedRowForValueReference(thisValue, ctx)?.id;
+  return { ...ctx, thisValue, thisValueRowId: rowId };
 }
 function assertStoredReplayMutableValue(value, ctx, label) {
   if (ctx.storedConstructionReplay !== true) return;
@@ -71651,8 +71608,7 @@ function dispatchNSSetter(target, value, scope, ctx, writes) {
   evaluateNSSetter(
     setter,
     {
-      ...ctx,
-      thisValue: receiver,
+      ...bindThisValue(ctx, receiver),
       __setterCallStack: innerStack
     },
     value,
@@ -72233,7 +72189,7 @@ function evalPointer(pointer, scope, ctx) {
       try {
         return executeCompiledFunction(
           action,
-          { ...ctx, thisValue: innerThis },
+          bindThisValue(ctx, innerThis),
           args,
           runtimeSignature.returnTypeInfo.type === NS_TYPE_VOID,
           runtimeSignature
@@ -72476,7 +72432,7 @@ function invokeDelegateValue(value, args, ctx, callSiteId, ownerReceiver) {
       const runtimeSignature = receiver === null ? signature : substituteCallableSignatureForReceiver(signature, receiver, ctx);
       return executeCompiledFunction(
         action,
-        { ...ctx, thisValue: receiver },
+        bindThisValue(ctx, receiver),
         args,
         runtimeSignature.returnTypeInfo.type === NS_TYPE_VOID,
         runtimeSignature
@@ -73146,8 +73102,7 @@ function dispatchNSGetterById(memberId, receiver, ctx) {
   const innerStack = new Set(stack);
   innerStack.add(memberId);
   return evaluateNSGetter(getter, {
-    ...ctx,
-    thisValue: receiver,
+    ...bindThisValue(ctx, receiver),
     __getterCallStack: innerStack
   });
 }
@@ -75683,7 +75638,7 @@ function runDeclaredConstructorChain(args) {
   args.applyBaseInitializerBlock(record3, args.argumentValues, args.thisValue);
   executeCompiledFunction(
     record3.action,
-    { ...ctx, thisValue: args.thisValue },
+    bindThisValue(ctx, args.thisValue),
     args.argumentValues,
     true
   );
@@ -75758,7 +75713,7 @@ function evaluateBaseInitializerFields(args) {
     });
     const value = executeCompiledFunction(
       getter,
-      { ...ctx, thisValue: args.thisValue },
+      bindThisValue(ctx, args.thisValue),
       args.argumentValues,
       false
     );
@@ -75999,9 +75954,7 @@ function evaluateInitializerInContext(init, member, ctx, createdValues, argument
   const closeFrame = pushConstructionFrame(ctx, `${member.name} initializer`);
   let result;
   try {
-    const initializerCtx = ctx.thisValue === null ? ctx : Object.assign({}, ctx, {
-      thisValue: null
-    });
+    const initializerCtx = ctx.thisValue === null ? ctx : bindThisValue(ctx, null);
     result = evaluateNSGetterWithEffects(
       compiled,
       initializerCtx,
@@ -81136,6 +81089,7 @@ var init_evaluateInitializer = __esm({
   "../src/view-models/neoscript-evaluator/evaluateInitializer.ts"() {
     "use strict";
     init_deep_clone_plain_data();
+    init_collections();
     init_instance_provenance();
     init_members();
     init_project2();
@@ -81625,24 +81579,17 @@ var init_project_record_migrations = __esm({
 var project_document_read_exports = {};
 __export(project_document_read_exports, {
   DOCUMENT_MANIFEST_PAGE_SIZE: () => DOCUMENT_MANIFEST_PAGE_SIZE,
-  DOCUMENT_SNAPSHOT_FETCH_CHUNK_SIZE: () => DOCUMENT_SNAPSHOT_FETCH_CHUNK_SIZE,
-  DOCUMENT_SNAPSHOT_FETCH_CONCURRENCY: () => DOCUMENT_SNAPSHOT_FETCH_CONCURRENCY,
-  appendProjectRecordToBuckets: () => appendProjectRecordToBuckets,
   assembleProjectDocumentRaw: () => assembleProjectDocumentRaw,
-  emptyProjectRecordBuckets: () => emptyProjectRecordBuckets,
   fetchProjectDocumentPartitionRecords: () => fetchProjectDocumentPartitionRecords,
   fetchProjectDocumentRawChunked: () => fetchProjectDocumentRawChunked,
   fetchProjectDocumentSnapshots: () => fetchProjectDocumentSnapshots,
   readArrayField: () => readArrayField,
-  readField: () => readField,
-  readOptionalArrayField: () => readOptionalArrayField,
   readProjectDocument: () => readProjectDocument,
   readProjectDocumentContentHashHeads: () => readProjectDocumentContentHashHeads,
   readProjectDocumentManifestPage: () => readProjectDocumentManifestPage,
   readProjectDocumentManifestPageRecords: () => readProjectDocumentManifestPageRecords,
   readProjectDocumentManifestRecords: () => readProjectDocumentManifestRecords,
   readProjectDocumentRevisionMarker: () => readProjectDocumentRevisionMarker,
-  readStoredMembersField: () => readStoredMembersField,
   withStoredValueBase: () => withStoredValueBase
 });
 async function fetchProjectDocumentRawChunked(runner, options = {}) {
@@ -86460,7 +86407,6 @@ var init_root_source = __esm({
     init_projection();
     init_instance_provenance();
     init_value_sources();
-    init_root_value_paths();
     init_source_format();
     init_stored_value_placements();
     ROOT_PROJECT_FIELDS2 = [
@@ -87095,16 +87041,6 @@ var init_animation_clips = __esm({
         const member = this.envBindingMember(env, paramId);
         return isMemberClass(member) ? member.classId : null;
       }
-      classDescendsFrom(classId, baseClassId) {
-        const visited = /* @__PURE__ */ new Set();
-        let current = this.classById.get(classId);
-        while (current !== void 0 && !visited.has(current.id)) {
-          if (current.id === baseClassId) return true;
-          visited.add(current.id);
-          current = current.extendsClassId ? this.classById.get(current.extendsClassId) : void 0;
-        }
-        return false;
-      }
       /**
        * P48 §1 and §7's segment rules, for every segment the document holds.
        *
@@ -87580,13 +87516,6 @@ var init_animation_clips = __esm({
         };
         return isMemberClass(resolvedEntryMember) ? resolvedEntryMember.classId : void 0;
       }
-      requireSingleLookupField(parent, classId, memberId, label) {
-        const value = this.scalarField(parent, classId, memberId);
-        if (!Array.isArray(value) || value.length !== 1 || typeof value[0] !== "string") {
-          throw new Error(`${label} must reference exactly one child.`);
-        }
-        return value[0];
-      }
       requirePositiveIntegerField(parent, classId, memberId, label) {
         const value = this.requireIntegerField(parent, classId, memberId, label);
         if (value < 1) throw new Error(`${label} must be at least 1.`);
@@ -87655,10 +87584,6 @@ var init_animation_clips = __esm({
         const bindingMember = binding?.kind === "member" ? this.memberById.get(binding.memberId) : void 0;
         return isMemberClass(bindingMember) ? bindingMember.classId : null;
       }
-      requireClassMember(value) {
-        if (!isMemberClass(value)) throw new Error("Expected Class member.");
-        return value;
-      }
       field(classId, requiredMemberId) {
         const entry = mergeStoredInstanceSchema(
           classId,
@@ -87958,6 +87883,12 @@ var init_variant_value_graph = __esm({
 });
 
 // ../src/database/project-version-intents.ts
+var project_version_intents_exports = {};
+__export(project_version_intents_exports, {
+  ProjectVersionIntentType: () => ProjectVersionIntentType,
+  createProjectVersionIntent: () => createProjectVersionIntent,
+  isKnownProjectVersionIntentType: () => isKnownProjectVersionIntentType
+});
 function createProjectVersionIntent(type, details) {
   if (details === void 0) {
     return {
@@ -88717,7 +88648,7 @@ function storedConstructionEmitters(state, manifest) {
     if (!isObjectRecord2(record3.data)) continue;
     if (!isObjectRecord2(record3.data.value)) continue;
     const constructorArgs = record3.data.constructorArgs;
-    const hasInstanceProvenance = carriesStoredInstanceProvenance(record3.data);
+    const hasInstanceProvenance = isVirtualInstanceRootShape(record3.data);
     if (constructorArgs !== void 0 && constructorArgs !== null && !hasInstanceProvenance) {
       continue;
     }
@@ -88816,9 +88747,6 @@ function nearestOwnedAncestor(valueId, parents, owners) {
   }
   return null;
 }
-function carriesStoredInstanceProvenance(value) {
-  return isVirtualInstanceRootShape(value);
-}
 function readMaterializedConstructionBuildCacheV2(root, state) {
   try {
     const parsed = JSON.parse(
@@ -89660,7 +89588,7 @@ function withoutFields(value, ignored) {
     Object.entries(value).filter(([field]) => !ignored.has(field))
   );
 }
-var NON_CONTRACT_MEMBER_FIELDS, NS_PROPERTY_BODY_FIELDS, NS_FUNCTION_BODY_FIELDS, collectCompiledClassIds;
+var NON_CONTRACT_MEMBER_FIELDS, NS_PROPERTY_BODY_FIELDS, NS_FUNCTION_BODY_FIELDS;
 var init_neo_script_recompile_scope = __esm({
   "../src/database/neo-script-recompile-scope.ts"() {
     "use strict";
@@ -89700,7 +89628,6 @@ var init_neo_script_recompile_scope = __esm({
       "bodyMode",
       "uiAction"
     ]);
-    collectCompiledClassIds = collectConstructedClassIds;
   }
 });
 
@@ -91134,7 +91061,7 @@ function consumeWorldPlacementSidecarKeys(args) {
   }
   return present;
 }
-var WORLD_PLACEMENT_SIDECAR_KEYS, WORLD_PLACEMENT_SIDECAR_KEY_SET, WORLD_PLACEMENT_ASSET_KIND;
+var WORLD_PLACEMENT_SIDECAR_KEYS, WORLD_PLACEMENT_ASSET_KIND;
 var init_world_content_sidecar_validation = __esm({
   "../src/models/project/world-content-sidecar-validation.ts"() {
     "use strict";
@@ -91150,9 +91077,6 @@ var init_world_content_sidecar_validation = __esm({
       "assetValueId",
       "variantId"
     ];
-    WORLD_PLACEMENT_SIDECAR_KEY_SET = new Set(
-      WORLD_PLACEMENT_SIDECAR_KEYS
-    );
     WORLD_PLACEMENT_ASSET_KIND = /* @__PURE__ */ new Map([
       [NeoWorldSystemClassKind.TileInstance, NeoWorldSystemClassKind.Tile],
       [NeoWorldSystemClassKind.ObjectPlacementTile, NeoWorldSystemClassKind.Object],
@@ -96239,6 +96163,151 @@ function variantRootValueId2(data) {
   if (typeof valueId !== "string" || valueId.length === 0) return null;
   return valueId;
 }
+function planProjectVersionTransaction(changes, atomicGroups) {
+  if (changes.length === 0) {
+    throw new Error("A project-version transaction plan requires changes.");
+  }
+  const changeCosts = changes.map(estimateProjectVersionChangeCost);
+  const groups = normalizeAtomicGroups(changes.length, atomicGroups);
+  let totalEstimatedCost = changeCosts.reduce(
+    addProjectVersionTransactionBudgets,
+    IMMEDIATE_FIXED_COST
+  );
+  if (changes.some(projectVersionChangeCanTriggerWholeGraphValidation)) {
+    totalEstimatedCost = addProjectVersionTransactionBudgets(
+      totalEstimatedCost,
+      WHOLE_GRAPH_VALIDATION_SURCHARGE
+    );
+  }
+  const limitingResource = firstExceededResource(
+    totalEstimatedCost,
+    PROJECT_TRANSACTION_IMMEDIATE_BUDGET
+  );
+  if (limitingResource === null) {
+    return {
+      path: "immediate",
+      limitingResource: null,
+      totalEstimatedCost,
+      chunks: [
+        {
+          firstChangeIndex: 0,
+          changeCount: changes.length,
+          estimatedCost: totalEstimatedCost
+        }
+      ]
+    };
+  }
+  const chunks = [];
+  let firstChangeIndex = 0;
+  let chunkCost = CHUNK_FIXED_COST;
+  let changeCount = 0;
+  for (const group of groups) {
+    const groupCost = changeCosts.slice(group.firstChangeIndex, group.firstChangeIndex + group.changeCount).reduce(addProjectVersionTransactionBudgets, EMPTY_BUDGET);
+    const nativeExceeded = firstExceededResource(
+      addProjectVersionTransactionBudgets(CHUNK_FIXED_COST, groupCost),
+      PROJECT_TRANSACTION_SINGLE_CHANGE_NATIVE_BUDGET
+    );
+    if (nativeExceeded !== null) {
+      throw new Error(
+        `Project-version atomic group starting at change ${group.firstChangeIndex} (${group.changeCount} changes) exceeds the native worker budget for ${nativeExceeded}.`
+      );
+    }
+    const nextCost = addProjectVersionTransactionBudgets(chunkCost, groupCost);
+    const exceeded = firstExceededResource(
+      nextCost,
+      PROJECT_TRANSACTION_WORKER_BUDGET
+    );
+    if (exceeded !== null && changeCount > 0) {
+      chunks.push({ firstChangeIndex, changeCount, estimatedCost: chunkCost });
+      firstChangeIndex = group.firstChangeIndex;
+      changeCount = 0;
+      chunkCost = CHUNK_FIXED_COST;
+    }
+    chunkCost = addProjectVersionTransactionBudgets(chunkCost, groupCost);
+    changeCount += group.changeCount;
+  }
+  if (changeCount > 0) {
+    chunks.push({ firstChangeIndex, changeCount, estimatedCost: chunkCost });
+  }
+  return {
+    path: "asynchronous",
+    limitingResource,
+    totalEstimatedCost,
+    chunks
+  };
+}
+function projectVersionChangeCanTriggerWholeGraphValidation(change) {
+  if (change.recordKind === "enum" || change.recordKind === "member" || change.recordKind === "project" || change.recordKind === "internal-record-relation") {
+    return true;
+  }
+  if (change.recordKind === "class") return change.operation !== "create";
+  if (change.recordKind !== "value") return false;
+  if (change.operation === "delete") return true;
+  return valueChangeCarriesWorldLayerOverride(change);
+}
+function valueChangeCarriesWorldLayerOverride(change) {
+  const nextData = change.nextData;
+  if (nextData === null || typeof nextData !== "object") return false;
+  if (Array.isArray(nextData)) return false;
+  const value = nextData.value;
+  if (value === null || typeof value !== "object") return false;
+  if (Array.isArray(value)) return false;
+  return typeof value.layerOverrideValueId === "string";
+}
+function normalizeAtomicGroups(changeCount, groups) {
+  if (groups === void 0) {
+    return Array.from({ length: changeCount }, (_, firstChangeIndex) => ({
+      firstChangeIndex,
+      changeCount: 1
+    }));
+  }
+  let nextChangeIndex = 0;
+  for (const group of groups) {
+    if (!Number.isSafeInteger(group.firstChangeIndex) || !Number.isSafeInteger(group.changeCount) || group.firstChangeIndex !== nextChangeIndex || group.changeCount < 1) {
+      throw new Error(
+        "Project-version atomic groups must be positive, ordered, and contiguous."
+      );
+    }
+    nextChangeIndex += group.changeCount;
+  }
+  if (nextChangeIndex !== changeCount) {
+    throw new Error(
+      `Project-version atomic groups cover ${nextChangeIndex}/${changeCount} changes.`
+    );
+  }
+  return [...groups];
+}
+function estimateProjectVersionChangeCost(change) {
+  const encoded = canonicalJsonStringify(change);
+  const payloadBytes = new TextEncoder().encode(encoded).byteLength;
+  const hasBase = change.operation !== "create";
+  const counts = changeCountCost(change);
+  return {
+    argumentBytes: payloadBytes + 128,
+    bytesRead: payloadBytes * (hasBase ? 3 : 1) + CHANGE_BYTES_READ_OVERHEAD,
+    bytesWritten: payloadBytes * 2 + CHANGE_BYTES_WRITTEN_OVERHEAD,
+    documentsRead: counts.documentsRead,
+    documentsWritten: counts.documentsWritten,
+    databaseQueries: counts.databaseQueries,
+    // Not metered by Convex: `TransactionMetrics` reports seven dimensions and
+    // this is not one of them, so it cannot be measured the way the others
+    // were. Every index range a change opens is also a database query, so the
+    // measured query count is a strict upper bound on it. Charging exactly
+    // that keeps the dimension a true bound instead of an invented number,
+    // and keeps it dominated by `databaseQueries` rather than silently
+    // becoming the binding constraint on a well-measured plan.
+    indexRanges: counts.databaseQueries,
+    functionsScheduled: 0,
+    scheduledFunctionArgsBytes: 0,
+    returnBytes: payloadBytes + 512
+  };
+}
+function changeCountCost(change) {
+  if (change.recordKind === "value") {
+    return VALUE_CHANGE_COUNT_COSTS[change.operation];
+  }
+  return SCHEMA_CHANGE_COUNT_COSTS[change.operation];
+}
 function addProjectVersionTransactionBudgets(left, right) {
   return {
     argumentBytes: left.argumentBytes + right.argumentBytes,
@@ -96253,7 +96322,15 @@ function addProjectVersionTransactionBudgets(left, right) {
     returnBytes: left.returnBytes + right.returnBytes
   };
 }
-var KIB, MIB, PROJECT_TRANSACTION_CHUNK_PAYLOAD_TARGET_BYTES, PROJECT_TRANSACTION_IMMEDIATE_BUDGET, PROJECT_TRANSACTION_WORKER_BUDGET, PROJECT_TRANSACTION_SINGLE_CHANGE_NATIVE_BUDGET, EMPTY_BUDGET, CHUNK_GRAPH_VALIDATION_RESERVE, CHUNK_FIXED_COST, IMMEDIATE_FIXED_COST, WHOLE_GRAPH_VALIDATION_SURCHARGE, CHANGE_BYTES_READ_OVERHEAD, CHANGE_BYTES_WRITTEN_OVERHEAD;
+function firstExceededResource(cost, target) {
+  for (const resource of Object.keys(
+    EMPTY_BUDGET
+  )) {
+    if (cost[resource] > target[resource]) return resource;
+  }
+  return null;
+}
+var KIB, MIB, PROJECT_TRANSACTION_CHUNK_PAYLOAD_TARGET_BYTES, PROJECT_TRANSACTION_IMMEDIATE_BUDGET, PROJECT_TRANSACTION_WORKER_BUDGET, PROJECT_TRANSACTION_SINGLE_CHANGE_NATIVE_BUDGET, EMPTY_BUDGET, CHUNK_GRAPH_VALIDATION_RESERVE, CHUNK_FIXED_COST, IMMEDIATE_FIXED_COST, WHOLE_GRAPH_VALIDATION_SURCHARGE, VALUE_CHANGE_COUNT_COSTS, SCHEMA_CHANGE_COUNT_COSTS, CHANGE_BYTES_READ_OVERHEAD, CHANGE_BYTES_WRITTEN_OVERHEAD;
 var init_project_version_transaction_planning = __esm({
   "../src/database/project-version-transaction-planning.ts"() {
     "use strict";
@@ -96342,6 +96419,16 @@ var init_project_version_transaction_planning = __esm({
       databaseQueries: 410,
       indexRanges: 410
     };
+    VALUE_CHANGE_COUNT_COSTS = {
+      create: { documentsRead: 3, documentsWritten: 3, databaseQueries: 8 },
+      update: { documentsRead: 6, documentsWritten: 3, databaseQueries: 9 },
+      delete: { documentsRead: 6, documentsWritten: 3, databaseQueries: 14 }
+    };
+    SCHEMA_CHANGE_COUNT_COSTS = {
+      create: { documentsRead: 3, documentsWritten: 5, databaseQueries: 12 },
+      update: { documentsRead: 6, documentsWritten: 5, databaseQueries: 22 },
+      delete: { documentsRead: 6, documentsWritten: 5, databaseQueries: 22 }
+    };
     CHANGE_BYTES_READ_OVERHEAD = 4 * KIB;
     CHANGE_BYTES_WRITTEN_OVERHEAD = 4 * KIB;
   }
@@ -105870,7 +105957,7 @@ function extractProjectSnapshotDerivedEdges(source) {
       payloadJson: canonicalJsonStringify({ referenceKind: "type-name" })
     });
   }
-  for (const targetKey of collectCompiledClassIds(source.data)) {
+  for (const targetKey of collectConstructedClassIds(source.data)) {
     add({
       edgeKind: "compiled-reference",
       targetKey,
@@ -110767,7 +110854,6 @@ function lowerSeedRow(context, member, sourceExpression, source, valueId, path,
       context,
       effectiveClass,
       environment,
-      source,
       path
     );
     const body = {};
@@ -111097,7 +111183,6 @@ function lowerStructuralConstructionRow(context, member, expression, source, val
     context,
     effectiveClass,
     environment,
-    source,
     path
   );
   const parameters = structuralConstructorParameters(
@@ -112227,7 +112312,7 @@ function selectorReferenceReturnClassId(context, expression) {
   const className = astTypeNameV4(returned.typeArguments[0]);
   return className === null ? null : context.classesByName.get(className)?.id ?? null;
 }
-function animationChildOverrideSeedBindings(context, schemaClass2, environment, source, path) {
+function animationChildOverrideSeedBindings(context, schemaClass2, environment, path) {
   if (schemaClass2.system?.worldKind !== "animationChildOverride") {
     return void 0;
   }
@@ -116331,7 +116416,7 @@ function discoverProjectBinariesV4(root, explicit, ignoredPaths = []) {
     });
   }
   const reserved = explicit.map((entry) => entry.symbol);
-  const symbols = assignDeterministicFileSymbols2(candidates, reserved);
+  const symbols = assignDeterministicFileSymbols(candidates, reserved);
   return candidates.map((candidate) => {
     const inspected = inspectBinaryFile(candidate.absolute, candidate.path);
     return { ...inspected, symbol: symbols.get(candidate.stableId) };
@@ -116582,15 +116667,14 @@ function safePathSegment2(value) {
 function normalizeSlash2(value) {
   return value.split(sep2).join("/").replaceAll("\\", "/");
 }
-var SUPPORTED_BINARY_TYPES, REGISTRY_ENTRY2, assignDeterministicFileSymbols2;
+var SUPPORTED_BINARY_TYPES, REGISTRY_ENTRY2;
 var init_project_files = __esm({
   "src/project-source/project-files.ts"() {
     "use strict";
     init_src();
     init_projection();
     init_source_format();
-    init_members();
-    init_project_file_registry();
+    init_project_file_source();
     init_project_file_source();
     SUPPORTED_BINARY_TYPES = /* @__PURE__ */ new Map([
       [".png", { kind: "image", mimeType: "image/png" }],
@@ -116602,7 +116686,6 @@ var init_project_files = __esm({
       [".ogg", { kind: "audio", mimeType: "audio/ogg" }]
     ]);
     REGISTRY_ENTRY2 = /(?:@id\(\s*("(?:[^"\\]|\\.)*")\s*\)\s*)?(?:@settings\(([\s\S]*?)\)\s*)?(NeoImage|NeoAudioClip)\s+([A-Za-z_][A-Za-z0-9_]*)\s*=\s*new\(\s*("(?:[^"\\]|\\.)*")\s*\)\s*;/gy;
-    assignDeterministicFileSymbols2 = assignDeterministicProjectFileSymbols;
   }
 });
 
@@ -116864,6 +116947,14 @@ var init_api = __esm({
 });
 
 // src/convex.ts
+var convex_exports = {};
+__export(convex_exports, {
+  api: () => api2,
+  createConvexClient: () => createConvexClient,
+  createConvexClientForApi: () => createConvexClientForApi,
+  mintConvexJwt: () => mintConvexJwt,
+  resolveConvexUrl: () => resolveConvexUrl
+});
 import { ConvexHttpClient } from "convex/browser";
 import { Buffer as Buffer2 } from "node:buffer";
 async function mintConvexJwt(apiBaseUrl) {
@@ -117650,6 +117741,7 @@ function acceptSourceEquivalentConflictBases(workspace, mainLocale = workspaceMa
     };
     delete next.conflictServerHash;
     delete next.conflictServerData;
+    delete next.conflictFiles;
     workspace.state.records[key] = next;
     accepted += 1;
   }
@@ -118296,7 +118388,6 @@ var init_static_value_seed_records = __esm({
 // src/commands/pull.ts
 var pull_exports = {};
 __export(pull_exports, {
-  deltaRequiresSourceProjectionV4: () => deltaRequiresSourceProjectionV4,
   projectSourcePathsRequiringRewriteV4: () => projectSourcePathsRequiringRewriteV4,
   runPull: () => runPull
 });
@@ -118668,34 +118759,39 @@ async function finishFormat4Pull(args) {
   const serverByPath = new Map(
     (serverResult?.files ?? []).map((file) => [file.path, file])
   );
+  const localRecordFiles = declaringSourcePathsV4(localResult);
+  const serverRecordFiles = serverResult === null ? /* @__PURE__ */ new Map() : declaringSourcePathsV4(serverResult);
   const conflictPaths = /* @__PURE__ */ new Set();
+  const conflictPathsByKey = /* @__PURE__ */ new Map();
   const authoredLocalConflictKeysByPath = /* @__PURE__ */ new Map();
   for (const key of conflictKeys) {
-    const localPath = localResult.recordFiles.get(key);
-    const serverPath = serverResult?.recordFiles.get(key);
-    const path = localPath ?? serverPath ?? workspace.state.records[key]?.file;
-    if (path) conflictPaths.add(path);
-    if (path === void 0 || localPath !== void 0 || serverPath !== void 0) {
-      continue;
+    const paths = [...localRecordFiles.get(key) ?? []];
+    for (const path of serverRecordFiles.get(key) ?? []) {
+      if (!paths.includes(path)) paths.push(path);
     }
-    const keys = authoredLocalConflictKeysByPath.get(path) ?? [];
-    keys.push(key);
-    authoredLocalConflictKeysByPath.set(path, keys);
+    if (paths.length === 0) {
+      const previousPath = workspace.state.records[key]?.file;
+      if (previousPath === void 0) continue;
+      paths.push(previousPath);
+      const keys = authoredLocalConflictKeysByPath.get(previousPath) ?? [];
+      keys.push(key);
+      authoredLocalConflictKeysByPath.set(previousPath, keys);
+    }
+    for (const path of paths) conflictPaths.add(path);
+    conflictPathsByKey.set(key, paths);
   }
   const emittedPaths = /* @__PURE__ */ new Set([
     ...localByPath.keys(),
     ...[...conflictPaths].filter((path) => serverByPath.has(path)),
     ...authoredLocalConflictKeysByPath.keys()
   ]);
-  const localRecordFiles = declaringSourcePathsV4(localResult);
   const rewritePaths = projectSourcePathsRequiringRewriteV4({
     destructive,
     localStatus,
     plans,
     localRecordFiles,
-    serverRecordFiles: serverResult === null ? /* @__PURE__ */ new Map() : declaringSourcePathsV4(serverResult),
+    serverRecordFiles,
     previousRecords: workspace.state.records,
-    conflictPaths,
     emittedPaths,
     mainLocale: workspaceMainLocale(workspace.state.records)
   });
@@ -118703,6 +118799,7 @@ async function finishFormat4Pull(args) {
     for (const path of localRecordFiles.get(key) ?? []) rewritePaths.add(path);
   }
   const resolveSourcePath = createWorkspaceSourcePathResolver(workspace.root);
+  const markedPaths = /* @__PURE__ */ new Set();
   let written = 0;
   for (const path of emittedPaths) {
     const absolute = resolveSourcePath(path);
@@ -118723,8 +118820,10 @@ async function finishFormat4Pull(args) {
       versionId: workspace.config.versionId
     }) : local;
     if (content === void 0) continue;
+    const marked = conflictPaths.has(path) && detectConflictMarkers(content) !== null;
+    if (marked) markedPaths.add(path);
     mkdirSync8(dirname8(absolute), { recursive: true });
-    if (existing !== null && !rewritePaths.has(path)) continue;
+    if (existing !== null && !marked && !rewritePaths.has(path)) continue;
     if (existing !== content) {
       writeFileSync8(absolute, content, "utf8");
       written += 1;
@@ -118757,12 +118856,16 @@ async function finishFormat4Pull(args) {
       continue;
     }
     const file = localResult.recordFiles.get(key) ?? serverResult?.recordFiles.get(key) ?? baseState?.file;
+    const conflictFiles = (conflictPathsByKey.get(key) ?? []).filter(
+      (conflictPath) => markedPaths.has(conflictPath)
+    );
     records2[key] = plan.conflicted ? {
       recordKind,
       recordId,
       contentHash: baseState?.contentHash ?? "",
       data: baseState?.data,
       ...file ? { file } : {},
+      ...conflictFiles.length === 0 ? {} : { conflictFiles },
       conflictServerHash: serverRecord?.contentHash ?? null,
       conflictServerData: plan.serverData
     } : {
@@ -118849,9 +118952,9 @@ async function finishFormat4Pull(args) {
     );
     for (const key of conflictKeys) console.log(`  ${sym.fail} ${key}`);
     for (const tear of staleConflictTears) {
-      const rowLabel = tear.unanchoredValueCount === 1 ? "row" : "rows";
+      const rowLabel2 = tear.unanchoredValueCount === 1 ? "row" : "rows";
       warn(
-        `Conflict ${tear.recordKind} "${tear.recordId}" retained a local base that does not anchor ${tear.unanchoredValueCount} newly pulled descendant value ${rowLabel}. Resolve it with "neo resolve --mine" or "neo resolve --theirs" before pushing.`
+        `Conflict ${tear.recordKind} "${tear.recordId}" retained a local base that does not anchor ${tear.unanchoredValueCount} newly pulled descendant value ${rowLabel2}. Resolve it with "neo resolve --mine" or "neo resolve --theirs" before pushing.`
       );
     }
   }
@@ -119025,7 +119128,7 @@ function projectSourcePathsRequiringRewriteV4(args) {
   if (args.destructive || args.localStatus === null) {
     return new Set(args.emittedPaths);
   }
-  const result = new Set(args.conflictPaths);
+  const result = /* @__PURE__ */ new Set();
   for (const [key, plan] of args.plans) {
     const paths = args.localRecordFiles.get(key) ?? args.serverRecordFiles.get(key);
     if (paths === void 0) continue;
@@ -126391,7 +126494,7 @@ var init_registry2 = __esm({
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
       formatVersion: 4,
       contractVersion: "4.1",
-      cliVersion: "0.43.0",
+      cliVersion: "0.44.0",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -129524,12 +129627,8 @@ var init_test = __esm({
 // src/commands/doctor.ts
 var doctor_exports = {};
 __export(doctor_exports, {
-  NEO_COMPILER_CONTRACT: () => NEO_COMPILER_CONTRACT,
-  NEO_FILE_CONTRACT_VERSION: () => NEO_FILE_CONTRACT_VERSION,
-  NEO_SOURCE_CONTRACT_VERSION: () => NEO_SOURCE_CONTRACT_VERSION,
-  NEO_VSCODE_EXTENSION_CONTRACT_VERSION: () => NEO_VSCODE_EXTENSION_CONTRACT_VERSION,
-  NEO_VSCODE_EXTENSION_ID: () => NEO_VSCODE_EXTENSION_ID,
   inspectNeoDoctor: () => inspectNeoDoctor,
+  planUnprojectedValueRowRepair: () => planUnprojectedValueRowRepair,
   runDoctor: () => runDoctor
 });
 import {
@@ -129762,7 +129861,7 @@ function workspacePath(root, path) {
 function errorMessage3(error) {
   return error instanceof Error ? error.message : String(error);
 }
-async function runDoctor(workspace, json) {
+async function runDoctor(workspace, options) {
   const inspected = inspectNeoDoctor(workspace);
   let errors = [];
   try {
@@ -129781,7 +129880,7 @@ async function runDoctor(workspace, json) {
       compatible: errors.length === 0
     }
   };
-  if (json) {
+  if (options.json) {
     console.log(JSON.stringify(report, null, 2));
     if (!report.ok) process.exitCode = 1;
     return;
@@ -129828,23 +129927,213 @@ async function runDoctor(workspace, json) {
   console.log(
     report.ok ? "Project authoring contracts are compatible." : "Project authoring contracts need attention."
   );
-  if (!report.document.consistent) {
+  if (!report.document.consistent && !options.fix) {
     console.log(
       `${String(report.document.findings.length)} malformed record${report.document.findings.length === 1 ? "" : "s"} in the pulled document \u2014 see \`--json\` for the repair entries.`
     );
   }
   if (!report.ok) process.exitCode = 1;
+  if (options.fix) {
+    await repairUnprojectedValueRows(
+      workspace,
+      report.document.findings,
+      options.yes
+    );
+  }
+}
+function planUnprojectedValueRowRepair(workspace, findings) {
+  const roots = [];
+  const claimed = /* @__PURE__ */ new Set();
+  const unrepairableKinds = /* @__PURE__ */ new Set();
+  for (const finding of findings) {
+    if (finding.kind !== "unprojected-value-row") {
+      unrepairableKinds.add(finding.kind);
+      continue;
+    }
+    const owned = [];
+    for (const valueId of finding.repair.orphanedValueIds) {
+      if (claimed.has(valueId)) continue;
+      claimed.add(valueId);
+      const record3 = workspace.state.records[recordStateKey("value", valueId)];
+      if (record3 === void 0) {
+        throw new Error(
+          `Doctor repair planned value row "${valueId}", which the pulled state does not hold. Run \`neo pull\` and rerun \`neo doctor --fix\`.`
+        );
+      }
+      owned.push(record3);
+    }
+    if (owned.length === 0) continue;
+    roots.push({ valueId: finding.repair.valueId, rows: owned });
+  }
+  return { roots, unrepairableKinds: [...unrepairableKinds].sort() };
 }
-var NEO_COMPILER_CONTRACT, NEO_VSCODE_EXTENSION_ID, NEO_VSCODE_EXTENSION_CONTRACT_VERSION, NEO_SOURCE_CONTRACT_VERSION, NEO_FILE_CONTRACT_VERSION, SOURCE_EXTENSIONS, FILE_CAPABILITIES;
+function rowLabel(count) {
+  return `${String(count)} value row${count === 1 ? "" : "s"}`;
+}
+async function repairUnprojectedValueRows(workspace, findings, yes) {
+  const plan = planUnprojectedValueRowRepair(workspace, findings);
+  if (plan.unrepairableKinds.length > 0) {
+    warn(
+      `No automatic repair exists for ${plan.unrepairableKinds.join(", ")}; repairing unprojected value rows only.`
+    );
+  }
+  if (plan.roots.length === 0) {
+    console.log("Nothing to repair.");
+    return;
+  }
+  const rows = plan.roots.flatMap((root) => root.rows);
+  const pulledHeadTransactionHash = workspace.state.headTransactionHash;
+  if (typeof pulledHeadTransactionHash !== "string") {
+    throw new Error(
+      'This workspace has no recorded project head, so `neo doctor --fix` cannot prove its deletions land on the state the audit read. Run "neo pull", then rerun.'
+    );
+  }
+  const rootLabel = `${String(plan.roots.length)} orphan root${plan.roots.length === 1 ? "" : "s"}`;
+  console.log(
+    `${sym.info} ${rowLabel(rows.length)} across ${rootLabel} will be deleted:`
+  );
+  for (const root of plan.roots.slice(0, REPAIR_ROOT_PREVIEW_LIMIT)) {
+    console.log(
+      `  ${sym.arrow} ${root.valueId} \u2014 ${rowLabel(root.rows.length)}`
+    );
+  }
+  const hidden = plan.roots.length - REPAIR_ROOT_PREVIEW_LIMIT;
+  if (hidden > 0) {
+    note(
+      `  \u2026and ${String(hidden)} more orphan root${hidden === 1 ? "" : "s"}.`
+    );
+  }
+  if (!yes && !isInteractive()) {
+    throw new Error(
+      "neo doctor --fix needs a terminal to confirm the deletion. Re-run with --yes to delete without confirming."
+    );
+  }
+  const confirmed = yes || await promptConfirm({
+    message: `Delete ${rowLabel(rows.length)}?`,
+    fallback: false,
+    defaultValue: false
+  });
+  if (!confirmed) {
+    console.log("Cancelled. No records were deleted.");
+    return;
+  }
+  const { api: api3, createConvexClient: createConvexClient2 } = await Promise.resolve().then(() => (init_convex(), convex_exports));
+  const { createProjectVersionIntent: createProjectVersionIntent2 } = await Promise.resolve().then(() => (init_project_version_intents(), project_version_intents_exports));
+  const changes = rows.map((row) => ({
+    recordKind: "value",
+    recordId: row.recordId,
+    operation: "delete",
+    deleted: true,
+    expectedBaseContentHash: row.contentHash,
+    intent: createProjectVersionIntent2("value.delete", {
+      source: "neo-cli-doctor"
+    })
+  }));
+  const batchSize = immediateCommitBatchSize(changes);
+  const convex = await createConvexClient2(workspace);
+  const progress = spinner(`Deleting ${rowLabel(rows.length)}\u2026`);
+  let deleted = 0;
+  let expectedHeadTransactionHash = pulledHeadTransactionHash;
+  for (let index = 0; index < changes.length; index += batchSize) {
+    const batch = changes.slice(index, index + batchSize);
+    let transactionHash;
+    try {
+      const result = await convex.mutation(
+        api3.serverProjectRecordOperations.commitFromSession,
+        {
+          projectId: workspace.config.projectId,
+          versionId: workspace.config.versionId,
+          operation: "delete",
+          changes: batch,
+          summary: `neo doctor --fix (${rowLabel(batch.length)})`,
+          expectedHeadTransactionHash
+        }
+      );
+      transactionHash = committedTransactionHash(result);
+    } catch (error) {
+      progress.fail(
+        deleted === 0 ? `Failed to delete ${rowLabel(batch.length)}.` : `Failed after deleting ${rowLabel(deleted)}.`
+      );
+      throw repairFailure(error, deleted);
+    }
+    if (transactionHash === null) continue;
+    expectedHeadTransactionHash = transactionHash;
+    deleted += batch.length;
+    progress.update(
+      `Deleting ${rowLabel(rows.length)}\u2026 ${String(deleted)} done`
+    );
+  }
+  progress.succeed(`Deleted ${rowLabel(deleted)} across ${rootLabel}.`);
+  console.log('Run "neo pull" to refresh the working copy.');
+}
+function immediateCommitBatchSize(changes) {
+  let fits = 0;
+  let low = 1;
+  let high = changes.length;
+  while (low <= high) {
+    const size = Math.floor((low + high) / 2);
+    if (planProjectVersionTransaction(changes.slice(0, size)).path === "immediate") {
+      fits = size;
+      low = size + 1;
+    } else {
+      high = size - 1;
+    }
+  }
+  if (fits === 0) {
+    throw new Error(
+      "Deleting a single value row exceeds the immediate transaction budget, so `neo doctor --fix` cannot commit anything. The transaction cost model needs to change before this repair can run."
+    );
+  }
+  return fits;
+}
+function committedTransactionHash(result) {
+  if (!isObjectRecord2(result)) {
+    throw new Error(
+      "Doctor repair committed a deletion but the server returned no transaction envelope."
+    );
+  }
+  if (result.transaction === null) return null;
+  const transactionHash = isObjectRecord2(result.transaction) ? result.transaction.transactionHash : void 0;
+  if (typeof transactionHash !== "string") {
+    throw new Error(
+      "Doctor repair committed a transaction that carries no hash, so the remaining deletions have no fast-forward base."
+    );
+  }
+  return transactionHash;
+}
+function repairFailure(error, deleted) {
+  const applied = deleted === 0 ? "" : ` ${rowLabel(deleted)} were already deleted.`;
+  const code = convexErrorCode(error);
+  if (code === "non-fast-forward" || code === "base-hash-conflict") {
+    return new Error(
+      `neo doctor --fix was refused: the project moved on since this workspace pulled, so the audit is stale.${applied} Run \`neo pull\` to re-derive it, then rerun.`,
+      { cause: error }
+    );
+  }
+  return new Error(
+    `neo doctor --fix could not delete the audited rows: ${errorMessage3(error)}${applied}`,
+    { cause: error }
+  );
+}
+function convexErrorCode(error) {
+  if (!isObjectRecord2(error)) return null;
+  const data = error.data;
+  if (!isObjectRecord2(data)) return null;
+  return typeof data.error === "string" ? data.error : null;
+}
+var NEO_COMPILER_CONTRACT, NEO_VSCODE_EXTENSION_ID, NEO_VSCODE_EXTENSION_CONTRACT_VERSION, NEO_SOURCE_CONTRACT_VERSION, NEO_FILE_CONTRACT_VERSION, SOURCE_EXTENSIONS, FILE_CAPABILITIES, REPAIR_ROOT_PREVIEW_LIMIT;
 var init_doctor = __esm({
   "src/commands/doctor.ts"() {
     "use strict";
     init_src();
     init_workspace();
+    init_ui();
     init_workspace_status();
     init_source_diagnostics();
     init_project_documents();
     init_project_integrity();
+    init_project_version_transaction_planning();
+    init_projection();
     NEO_COMPILER_CONTRACT = "ProjectSourceAnalysisV4";
     NEO_VSCODE_EXTENSION_ID = "neocompose.neo-compose-neoscript";
     NEO_VSCODE_EXTENSION_CONTRACT_VERSION = "0.3.0";
@@ -129860,6 +130149,7 @@ var init_doctor = __esm({
       { extension: ".mp3", kind: "audio", mimeType: "audio/mpeg" },
       { extension: ".ogg", kind: "audio", mimeType: "audio/ogg" }
     ];
+    REPAIR_ROOT_PREVIEW_LIMIT = 20;
   }
 });
 
@@ -129867,8 +130157,6 @@ var init_doctor = __esm({
 var migrate_exports = {};
 __export(migrate_exports, {
   planCollectionMutation: () => planCollectionMutation,
-  resolveAssignTarget: () => resolveAssignTarget,
-  resolveCollectionTarget: () => resolveCollectionTarget,
   resolveWriteTarget: () => resolveWriteTarget,
   runMigrate: () => runMigrate
 });
@@ -130063,8 +130351,8 @@ async function runMigrate(workspace, subcommand, positional, targetRef, json, de
     return;
   }
   if (subcommand === "run") {
-    const client = NeoApiClient.forBaseUrl(workspace.config.apiBaseUrl);
     if (process.argv.includes("--server")) {
+      const client = NeoApiClient.forBaseUrl(workspace.config.apiBaseUrl);
       const result = await client.post(
         `/api/projects/${workspace.config.projectId}/versions/${workspace.config.versionId}/migrations/run`,
         {
@@ -130082,11 +130370,9 @@ async function runMigrate(workspace, subcommand, positional, targetRef, json, de
     }
     await runPendingMigrations(
       workspace,
-      client,
       raw,
       migrations,
-      positional[0] ?? null,
-      json
+      positional[0] ?? null
     );
     return;
   }
@@ -130279,36 +130565,12 @@ function resolveCollectionTarget(write, env, migrationName) {
     `Migration "${migrationName}" mutates a collection through an unsupported target.`
   );
 }
-function resolveAssignTarget(write, instanceValue, migrationName) {
-  if (write.kind !== "assign") {
-    throw new Error(
-      `Migration "${migrationName}" produced a "${write.kind}" write; the current runner only applies plain assignments (this.<Field> = ...).`
-    );
-  }
-  const target = isObjectRecord2(write.target) ? write.target : {};
-  const pointer = isObjectRecord2(target.pointer) ? target.pointer : {};
-  const keyOf = isObjectRecord2(pointer.keyOf) ? pointer.keyOf : {};
-  const receiver = keyOf.pointer;
-  if (!isObjectRecord2(receiver) || receiver.type !== "variable" || receiver.variableId !== "__this__" && receiver.variableId !== "__target__") {
-    throw new Error(
-      `Migration "${migrationName}" assigns to a non-this receiver; the current runner only applies direct this.<Field> assignments.`
-    );
-  }
-  const childKey = readLiteralKey(keyOf.key, migrationName);
-  if (!isObjectRecord2(instanceValue) || typeof instanceValue[childKey] !== "string") {
-    throw new Error(
-      `Migration "${migrationName}" writes "${childKey}" but the instance has no stored value id for that key.`
-    );
-  }
-  return { childKey };
-}
 function migrationTargetClassName(thisClass) {
   if (thisClass === null) return null;
   if (typeof thisClass.name !== "string") return null;
   return thisClass.name;
 }
-async function runPendingMigrations(workspace, client, raw, migrations, onlyRef, dryRunFlagUnused) {
-  void dryRunFlagUnused;
+async function runPendingMigrations(workspace, raw, migrations, onlyRef) {
   const dryRun = process.argv.includes("--dry-run");
   const document = readDocumentArrays(raw);
   const heads = /* @__PURE__ */ new Map();
@@ -132902,19 +133164,20 @@ var init_dev = __esm({
 var resolve_exports = {};
 __export(resolve_exports, {
   resolveMarkers: () => resolveMarkers,
-  runResolve: () => runResolve,
-  workspaceFilePath: () => workspaceFilePath
+  runResolve: () => runResolve
 });
 import { readFileSync as readFileSync19, rmSync as rmSync8, writeFileSync as writeFileSync14 } from "node:fs";
-import { join as join20 } from "node:path";
+import { join as join20, relative as relative8 } from "node:path";
 function runResolve(workspace, side) {
+  const marked = readMarkedProjectSourcesV4(workspace.root);
+  assertRecordConflictsResolveTogetherV4(
+    workspace,
+    new Set(marked.map((file) => file.path))
+  );
   const resolvedRecords = adoptServerConflictBases(workspace);
   let resolvedFiles = 0;
-  for (const filePath of listProjectSourceFilesV4(workspace.root)) {
-    const source = readFileSync19(filePath, "utf8");
-    if (detectConflictMarkers(source) === null) continue;
-    const resolved = resolveMarkers(source, side);
-    writeFileSync14(filePath, resolved, "utf8");
+  for (const file of marked) {
+    writeFileSync14(file.absolutePath, resolveMarkers(file.source, side), "utf8");
     resolvedFiles += 1;
   }
   let resolvedBinaries = 0;
@@ -132953,6 +133216,37 @@ function runResolve(workspace, side) {
     `Resolved ${resolvedFiles} source file(s), ${resolvedRecords} record conflict(s), and ${resolvedBinaries} binary file(s) keeping the "${side}" side. Review with "neo diff", then "neo push".`
   );
 }
+function readMarkedProjectSourcesV4(root) {
+  const files = [];
+  for (const absolutePath of listProjectSourceFilesV4(root)) {
+    const source = readFileSync19(absolutePath, "utf8");
+    if (detectConflictMarkers(source) === null) continue;
+    files.push({
+      path: normalizeWorkspaceSourcePath(relative8(root, absolutePath)),
+      absolutePath,
+      source
+    });
+  }
+  return files;
+}
+function assertRecordConflictsResolveTogetherV4(workspace, markedPaths) {
+  for (const [key, record3] of Object.entries(workspace.state.records)) {
+    const declaringPaths = record3.conflictFiles;
+    if (declaringPaths === void 0) continue;
+    const stillMarked = [];
+    const alreadyResolved = [];
+    for (const declaringPath of declaringPaths) {
+      const path = normalizeWorkspaceSourcePath(declaringPath);
+      if (markedPaths.has(path)) stillMarked.push(path);
+      else alreadyResolved.push(path);
+    }
+    if (stillMarked.length === 0) continue;
+    if (alreadyResolved.length === 0) continue;
+    throw new Error(
+      `The files declaring conflicted record ${key} disagree: ${stillMarked.join(", ")} still holds conflict markers while ${alreadyResolved.join(", ")} does not. Every file that declares one record resolves together \u2014 finish resolving the marked file(s) to the side you already kept, then run "neo resolve".`
+    );
+  }
+}
 function adoptServerConflictBases(workspace) {
   let adopted = 0;
   for (const [key, record3] of Object.entries(workspace.state.records)) {
@@ -132964,6 +133258,7 @@ function adoptServerConflictBases(workspace) {
     };
     delete next.conflictServerHash;
     delete next.conflictServerData;
+    delete next.conflictFiles;
     workspace.state.records[key] = next;
     adopted += 1;
   }
@@ -133005,15 +133300,13 @@ function resolveMarkers(source, side) {
   }
   return output.join("\n");
 }
-function workspaceFilePath(workspace, file) {
-  return join20(workspace.root, file);
-}
 var init_resolve = __esm({
   "src/commands/resolve.ts"() {
     "use strict";
     init_workspace();
     init_workspace_status();
     init_source_diagnostics();
+    init_workspace_source_path();
     init_project_files();
   }
 });
@@ -133064,7 +133357,7 @@ ${h("Working copy")}
   diff      ${d("[--json]")}
   dev       ${d("[--push]")}
   resolve   ${d("[--mine|--theirs]")}
-  doctor    ${d("[--json]  validate contracts and audit the pulled document")}
+  doctor    ${d("[--json] [--fix [--yes]]  validate contracts and audit the pulled document")}
 
 ${h("Branches & releases")}
   branch    ${d("list | create <name> | switch [ref] | delete <ref> | refresh")}
@@ -133150,11 +133443,14 @@ ${h("NSFunction preview")}
     return `${h("neo doctor")} \u2014 validate project authoring contracts
 
 ${h("Usage")}
-  neo doctor ${d("[--json]")}
+  neo doctor ${d("[--json] [--fix [--yes]]")}
 
 Neo validates the format-4 browser compiler, VS Code extension cache envelope,
 tracked source, local .spec.neo compilation, and managed project-file
 capabilities. It does not discover or require .NET.
+
+${h("Repair")}
+  ${d("--fix deletes the value rows the pulled document's unprojected-value-row findings name, after listing them and confirming. --yes skips the prompt. --fix cannot be combined with --json.")}
 `;
   }
   if (command === "dialogue") {
@@ -133211,7 +133507,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.43.0");
+    console.log("0.44.0");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {
@@ -133296,9 +133592,23 @@ async function main() {
       return;
     }
     case "doctor": {
+      assertAllowedFlags(args, /* @__PURE__ */ new Set(["api", "json", "fix", "yes"]));
+      const json = boolFlag(args, "json");
+      const fix = boolFlag(args, "fix");
+      if (fix && json) {
+        throw new NeoCliUsageError(
+          "neo doctor --fix reports and confirms interactively; it has no --json form. Drop --json, or run `neo doctor --json` to read the findings."
+        );
+      }
+      const yes = boolFlag(args, "yes");
+      if (yes && !fix) {
+        throw new NeoCliUsageError(
+          "neo doctor --yes only answers the --fix confirmation. Add --fix, or drop --yes."
+        );
+      }
       const workspace = loadWorkspaceForCommand(args);
       const { runDoctor: runDoctor2 } = await Promise.resolve().then(() => (init_doctor(), doctor_exports));
-      await runDoctor2(workspace, boolFlag(args, "json"));
+      await runDoctor2(workspace, { json, fix, yes });
       return;
     }
     case "branch": {