agentera 3.0.0-dev.25 → 3.0.0-dev.26

package/dist/state/entityCutover.js

@@ -2,7 +2,6 @@ import { createHash, randomUUID } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
 import { dumpYamlMapping, loadYamlMapping } from "../core/yaml.js";
-import { writeFileAtomic } from "../upgrade/atomicWriter.js";
 import { canonicalRecordJson } from "./archiveDiscovery.js";
 import { verifyEntityCutoverGitSource } from "./entityCutoverGit.js";
 import { canonicalEntityEnvelopeBytes, validateEntityState } from "./entityStorage.js";
@@ -12,12 +11,10 @@ import { validateRealProjectRoot } from "./projectRoot.js";
 import { readProjectFileSnapshot } from "./safeProjectFile.js";
 import { acquireWriterLock } from "./write/lock.js";
 export const MIGRATION_ROOT = ".agentera/migrations/entities";
-export const MIGRATION_STAGING = `${MIGRATION_ROOT}/staging`;
 export const FORWARD_MANIFEST = `${MIGRATION_ROOT}/forward.yaml`;
 export const ENTITY_MODE_MARKER = ".agentera/state-mode.yaml";
-const STAGING_PROJECT = `${MIGRATION_STAGING}/project`;
 const MANIFEST_SCHEMA = "agentera.entityCutoverManifest.v1";
-const MARKER_BYTES = dumpYamlMapping({ schemaVersion: "agentera.stateMode.v1", mode: "entities", cutover: "one_way_git" });
+const MARKER_BYTES = dumpYamlMapping({ schemaVersion: "agentera.stateMode.v1", mode: "entities" });
 const SHA256 = /^[a-f0-9]{64}$/;
 export class EntityCutoverError extends Error {
     constructor(message) {
@@ -43,144 +40,105 @@ function safeTarget(value) {
 function markerSnapshot(project) {
     return readProjectFileSnapshot(validateRealProjectRoot(project), ENTITY_MODE_MARKER);
 }
-function manifestBytes(manifest) {
-    return dumpYamlMapping(manifest);
-}
-function parseForwardManifest(bytes) {
+function parseHistoricalForwardManifest(bytes) {
     const value = loadYamlMapping(bytes.toString("utf8"));
     if (!exactKeys(value, ["schemaVersion", "phase", "source", "targets", "marker"])
         || value.schemaVersion !== MANIFEST_SCHEMA
-        || !["publishing_entities", "entities_published"].includes(String(value.phase))
-        || !mapping(value.source)
-        || !exactKeys(value.source, ["head", "source_fingerprint", "preview_digest"])
-        || typeof value.source.head !== "string"
-        || !/^[a-f0-9]{40,64}$/.test(value.source.head)
-        || typeof value.source.source_fingerprint !== "string"
-        || !SHA256.test(value.source.source_fingerprint)
-        || typeof value.source.preview_digest !== "string"
-        || !SHA256.test(value.source.preview_digest)
+        || value.phase !== "entities_published"
         || !mapping(value.marker)
-        || !exactKeys(value.marker, ["path", "sha256"])
         || value.marker.path !== ENTITY_MODE_MARKER
-        || value.marker.sha256 !== hash(MARKER_BYTES)
+        || typeof value.marker.sha256 !== "string"
+        || !SHA256.test(value.marker.sha256)
         || !Array.isArray(value.targets)) {
-        throw new EntityCutoverError(`forward cutover manifest '${FORWARD_MANIFEST}' is invalid`);
+        throw new EntityCutoverError(`historical cutover manifest '${FORWARD_MANIFEST}' is invalid`);
     }
     const targets = value.targets.map((raw) => {
         if (!mapping(raw) || !exactKeys(raw, ["path", "sha256"]) || typeof raw.path !== "string" || !safeTarget(raw.path) || typeof raw.sha256 !== "string" || !SHA256.test(raw.sha256)) {
-            throw new EntityCutoverError(`forward cutover manifest '${FORWARD_MANIFEST}' has an invalid target`);
+            throw new EntityCutoverError(`historical cutover manifest '${FORWARD_MANIFEST}' has an invalid target`);
         }
         return { path: raw.path, sha256: raw.sha256 };
     });
-    if (new Set(targets.map(({ path: target }) => target)).size !== targets.length
-        || canonicalRecordJson([...targets].sort((a, b) => a.path.localeCompare(b.path))) !== canonicalRecordJson(targets)) {
-        throw new EntityCutoverError(`forward cutover manifest '${FORWARD_MANIFEST}' targets must be unique and sorted`);
-    }
-    return {
-        schemaVersion: MANIFEST_SCHEMA,
-        phase: value.phase,
-        source: value.source,
-        targets,
-        marker: value.marker,
-    };
+    return { schemaVersion: MANIFEST_SCHEMA, phase: "entities_published", targets, marker: value.marker };
 }
-function loadForwardManifest(project) {
+function loadHistoricalForwardManifest(project) {
     const observed = readProjectFileSnapshot(validateRealProjectRoot(project), FORWARD_MANIFEST);
     if (observed.kind === "missing")
         return null;
     if (observed.kind !== "file")
-        throw new EntityCutoverError(`forward cutover manifest '${FORWARD_MANIFEST}' is unsafe`);
-    return parseForwardManifest(observed.bytes);
+        throw new EntityCutoverError(`historical cutover manifest '${FORWARD_MANIFEST}' is unsafe`);
+    return parseHistoricalForwardManifest(observed.bytes);
 }
 function targetsForPlan(plan) {
     const targets = plan.entries.map((entry) => {
         const target = entry.proposed_target;
         if (!target || typeof target.id !== "string" || typeof entry.artifact !== "string" || !safeTarget(target.path))
-            throw new EntityCutoverError(`migration source '${entry.source_identity}' has no safe canonical target`);
-        const id = target.id;
-        const artifact = entry.artifact;
-        const bytes = canonicalEntityEnvelopeBytes({ id, artifact, record: entry.record });
-        const sha256 = hash(bytes);
-        if (entry.target_sha256 !== sha256)
-            throw new EntityCutoverError(`migration source '${entry.source_identity}' target digest is not deterministic`);
-        return { path: target.path, sha256 };
+            throw new EntityCutoverError(`first unresolved path '${entry.source_paths[0] ?? ".agentera"}': source has no safe canonical target`);
+        const bytes = canonicalEntityEnvelopeBytes({ id: target.id, artifact: entry.artifact, record: entry.record });
+        if (entry.target_sha256 !== hash(bytes))
+            throw new EntityCutoverError(`first unresolved path '${target.path}': converted entity bytes are not deterministic`);
+        return { path: target.path, sha256: hash(bytes) };
     }).sort((a, b) => a.path.localeCompare(b.path));
     if (new Set(targets.map(({ path: target }) => target)).size !== targets.length)
-        throw new EntityCutoverError("entity cutover target paths are not unique");
+        throw new EntityCutoverError("first unresolved path '.agentera/entities': converted target paths are not unique");
     return targets;
 }
 function assertPlanReady(plan, sourceRoot) {
+    const blocker = plan.diagnostics[0];
     if (plan.counts.blockers > 0)
-        throw new EntityCutoverError(`entity migration inventory has ${plan.counts.blockers} blocker(s); repair the read-only preview before upgrade`);
+        throw new EntityCutoverError(`first unresolved path '${blocker?.path ?? ".agentera"}': ${blocker?.message ?? `${plan.counts.blockers} migration blocker(s)`}`);
     const invalid = validateEntityMigrationTargets(plan.project, plan.entries, sourceRoot)[0];
     if (invalid)
-        throw new EntityCutoverError(`mapped record '${invalid.sourceIdentity}' is invalid: ${invalid.message}`);
+        throw new EntityCutoverError(`first unresolved path '${invalid.path}': ${invalid.message}`);
 }
 function listFiles(project, relativeRoot) {
     const absoluteRoot = path.join(project, relativeRoot);
     if (!fs.existsSync(absoluteRoot))
         return [];
-    const rootStat = fs.lstatSync(absoluteRoot);
-    if (!rootStat.isDirectory() || rootStat.isSymbolicLink() || fs.realpathSync(absoluteRoot) !== absoluteRoot)
-        throw new EntityCutoverError(`cutover path '${relativeRoot}' must be a real project directory`);
     const found = [];
     const visit = (directory) => {
+        const stat = fs.lstatSync(directory);
+        if (!stat.isDirectory() || stat.isSymbolicLink() || fs.realpathSync(directory) !== directory)
+            throw new EntityCutoverError(`first unresolved path '${path.relative(project, directory)}': expected a real project directory`);
         for (const entry of fs.readdirSync(directory, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name))) {
             const absolute = path.join(directory, entry.name);
             const relative = path.relative(project, absolute).split(path.sep).join("/");
             if (entry.isSymbolicLink())
-                throw new EntityCutoverError(`cutover path '${relative}' must not be a symbolic link`);
-            if (entry.isDirectory()) {
-                if (fs.realpathSync(absolute) !== absolute)
-                    throw new EntityCutoverError(`cutover directory '${relative}' is unsafe`);
+                throw new EntityCutoverError(`first unresolved path '${relative}': symbolic links are not import targets`);
+            if (entry.isDirectory())
                 visit(absolute);
-            }
             else if (entry.isFile())
                 found.push(relative);
             else
-                throw new EntityCutoverError(`cutover path '${relative}' must be a regular file or directory`);
+                throw new EntityCutoverError(`first unresolved path '${relative}': expected a regular file`);
         }
     };
     visit(absoluteRoot);
     return found.sort();
 }
-function validateExistingCanonicalTargets(project, targets, requireAll) {
+function validateExistingTargets(project, targets) {
     const expected = new Map(targets.map((target) => [target.path, target]));
     for (const relative of listFiles(project, ".agentera/entities")) {
-        const target = expected.get(relative);
-        if (!target)
-            throw new EntityCutoverError(`canonical entity '${relative}' is outside the bounded forward manifest`);
+        if (!expected.has(relative))
+            throw new EntityCutoverError(`first unresolved path '${relative}': entity is not part of the converted v2 input`);
     }
     for (const target of targets) {
         const observed = readProjectFileSnapshot(validateRealProjectRoot(project), target.path);
-        if (observed.kind === "missing") {
-            if (requireAll)
-                throw new EntityCutoverError(`canonical entity '${target.path}' is missing after entity publication`);
+        if (observed.kind === "missing")
             continue;
-        }
         if (observed.kind !== "file" || hash(observed.bytes) !== target.sha256)
-            throw new EntityCutoverError(`canonical entity '${target.path}' diverges from the bounded forward manifest`);
-    }
-}
-function assertManifestMatchesPlan(manifest, plan, head, targets) {
-    if ((head !== null && manifest.source.head !== head)
-        || manifest.source.source_fingerprint !== plan.source_fingerprint
-        || manifest.source.preview_digest !== plan.preview_digest
-        || canonicalRecordJson(manifest.targets) !== canonicalRecordJson(targets)) {
-        throw new EntityCutoverError("forward cutover manifest does not match the current Git-pinned migration source");
+            throw new EntityCutoverError(`first unresolved path '${target.path}': existing target is not an exact converted match`);
     }
 }
 function validateActiveEntityCutover(project, markerBytes, sourceRoot) {
-    const targets = loadEntityCutoverTargetsForMarker(project, markerBytes);
     const result = validateEntityState(project, sourceRoot);
-    if (!result.valid)
-        throw new EntityCutoverError(`active entity state is invalid: ${result.issues.map(({ message }) => message).join("; ")}`);
+    if (!result.valid || result.entityCount === 0)
+        throw new EntityCutoverError(`active entity state is invalid: ${result.entityCount === 0 ? "no canonical entities were published" : result.issues.map(({ message }) => message).join("; ")}`);
+    const targets = loadEntityCutoverTargetsForMarker(project, markerBytes);
     const byPath = new Map(result.entities.map((entity) => [entity.relativePath, entity]));
     for (const target of targets) {
         const entity = byPath.get(target.path);
-        if (!entity || entity.classification !== "valid" || (target.id && entity.id !== target.id) || (target.artifact && entity.artifact !== target.artifact)) {
+        if (!entity || entity.classification !== "valid" || (target.id && entity.id !== target.id) || (target.artifact && entity.artifact !== target.artifact))
             throw new EntityCutoverError(`active entity target '${target.path}' is missing or invalid`);
-        }
     }
     return result.entityCount;
 }
@@ -189,50 +147,47 @@ export function loadEntityCutoverTargetsForMarker(projectRoot, bytes) {
     const marker = loadYamlMapping(bytes.toString("utf8"));
     if (marker.schemaVersion !== "agentera.stateMode.v1" || marker.mode !== "entities")
         throw new EntityCutoverError("state marker is not valid entity authority");
+    if (marker.cutover === undefined && marker.migration_id === undefined)
+        return [];
     if (marker.cutover === "one_way_git") {
-        const manifest = loadForwardManifest(project);
-        if (!manifest || manifest.phase !== "entities_published" || manifest.marker.sha256 !== hash(bytes))
-            throw new EntityCutoverError("one-way entity marker has no matching completed forward manifest");
+        const manifest = loadHistoricalForwardManifest(project);
+        if (!manifest || manifest.marker.sha256 !== hash(bytes))
+            throw new EntityCutoverError("historical one-way entity marker has no matching completed manifest");
         return manifest.targets;
     }
     if (typeof marker.migration_id === "string")
         return loadLegacyEntityCutoverTargets(project, bytes);
-    throw new EntityCutoverError("entity marker has no supported one-way or historical cutover binding");
+    throw new EntityCutoverError("entity marker has no supported cutover binding");
 }
-function inspect(projectRoot, sourceRoot, requireGit, writerLockHeld = false) {
+function inspect(projectRoot, sourceRoot, requireGit, writerLockHeld = false, activeUpgradeLockPaths = []) {
     const project = validateRealProjectRoot(projectRoot).path;
     const marker = markerSnapshot(project);
     if (marker.kind === "file")
         return { inspection: { phase: "active", entityCount: validateActiveEntityCutover(project, marker.bytes, sourceRoot) } };
     if (marker.kind !== "missing")
-        throw new EntityCutoverError(`state marker '${ENTITY_MODE_MARKER}' is unsafe`);
+        throw new EntityCutoverError(`first unresolved path '${ENTITY_MODE_MARKER}': marker path is unsafe`);
     const plan = planEntityMigration(project, sourceRoot);
     assertPlanReady(plan, sourceRoot);
     const targets = targetsForPlan(plan);
-    const manifest = loadForwardManifest(project);
-    if (manifest)
-        assertManifestMatchesPlan(manifest, plan, null, targets);
-    validateExistingCanonicalTargets(project, targets, manifest?.phase === "entities_published");
-    if (!manifest && listFiles(project, ".agentera/entities").length > 0)
-        throw new EntityCutoverError("canonical entity state exists without the bounded forward manifest");
+    validateExistingTargets(project, targets);
     let head;
     if (requireGit) {
-        const allowedPaths = new Set([FORWARD_MANIFEST, ENTITY_MODE_MARKER]);
-        if (manifest)
-            for (const target of targets)
-                allowedPaths.add(target.path);
-        const binding = verifyEntityCutoverGitSource(project, plan, { paths: allowedPaths, prefixes: [MIGRATION_STAGING, ...(writerLockHeld ? [".agentera/.writer.lock"] : [])] });
+        const allowedPaths = new Set([FORWARD_MANIFEST, ENTITY_MODE_MARKER, ...targets.map(({ path: target }) => target)]);
+        for (const activeLockPath of activeUpgradeLockPaths) {
+            const relative = path.relative(project, path.resolve(activeLockPath));
+            if (relative !== "" && !relative.startsWith(`..${path.sep}`) && !path.isAbsolute(relative))
+                allowedPaths.add(relative.split(path.sep).join("/"));
+        }
+        const binding = verifyEntityCutoverGitSource(project, plan, { paths: allowedPaths, prefixes: writerLockHeld ? [".agentera/.writer.lock"] : [] });
         head = binding.head;
-        if (manifest)
-            assertManifestMatchesPlan(manifest, plan, head, targets);
     }
-    return { inspection: { phase: manifest?.phase ?? "ready", entityCount: targets.length }, plan, ...(head ? { head } : {}) };
+    return { inspection: { phase: "ready", entityCount: targets.length }, plan, ...(head ? { head } : {}) };
 }
-export function inspectEntityCutoverForUpgrade(projectRoot, sourceRoot, requireGit = false) {
-    return inspect(projectRoot, sourceRoot, requireGit).inspection;
+export function inspectEntityCutoverForUpgrade(projectRoot, sourceRoot, requireGit = false, activeUpgradeLockPaths = []) {
+    return inspect(projectRoot, sourceRoot, requireGit, false, activeUpgradeLockPaths).inspection;
 }
-export function prepareEntityCutoverForUpgrade(projectRoot, sourceRoot) {
-    const current = inspect(projectRoot, sourceRoot, true);
+export function prepareEntityCutoverForUpgrade(projectRoot, sourceRoot, activeUpgradeLockPaths = []) {
+    const current = inspect(projectRoot, sourceRoot, true, false, activeUpgradeLockPaths);
     if (current.inspection.phase === "active" || !current.plan || !current.head)
         throw new EntityCutoverError("entity authority is already active; no cutover preparation is available");
     return { project: current.plan.project, sourceRoot, head: current.head, sourceFingerprint: current.plan.source_fingerprint, previewDigest: current.plan.preview_digest };
@@ -245,18 +200,9 @@ function ensureDirectory(project, relativeDirectory) {
             fs.mkdirSync(current, { mode: 0o700 });
         const stat = fs.lstatSync(current);
         if (!stat.isDirectory() || stat.isSymbolicLink() || fs.realpathSync(current) !== current)
-            throw new EntityCutoverError(`cutover directory '${path.relative(project, current)}' is unsafe`);
+            throw new EntityCutoverError(`first unresolved path '${path.relative(project, current)}': target directory is unsafe`);
     }
 }
-function removeStaging(project) {
-    const staging = path.join(project, MIGRATION_STAGING);
-    if (!fs.existsSync(staging))
-        return;
-    const stat = fs.lstatSync(staging);
-    if (!stat.isDirectory() || stat.isSymbolicLink() || fs.realpathSync(staging) !== staging)
-        throw new EntityCutoverError(`known cutover staging '${MIGRATION_STAGING}' is unsafe and was not removed`);
-    fs.rmSync(staging, { recursive: true });
-}
 function writeDurable(file, bytes) {
     const fd = fs.openSync(file, fs.constants.O_WRONLY | fs.constants.O_CREAT | fs.constants.O_EXCL | (fs.constants.O_NOFOLLOW ?? 0), 0o600);
     try {
@@ -267,121 +213,79 @@ function writeDurable(file, bytes) {
         fs.closeSync(fd);
     }
 }
-function buildStaging(project, sourceRoot, plan, manifest) {
-    removeStaging(project);
-    ensureDirectory(project, STAGING_PROJECT);
-    for (const entry of plan.entries) {
-        const target = entry.proposed_target;
-        if (typeof target.id !== "string" || typeof entry.artifact !== "string")
-            throw new EntityCutoverError(`migration source '${entry.source_identity}' has no canonical identity`);
-        const id = target.id;
-        const artifact = entry.artifact;
-        const staged = path.join(project, STAGING_PROJECT, target.path);
-        ensureDirectory(project, path.relative(project, path.dirname(staged)).split(path.sep).join("/"));
-        writeDurable(staged, canonicalEntityEnvelopeBytes({ id, artifact, record: entry.record }));
-    }
-    const validation = validateEntityState(path.join(project, STAGING_PROJECT), sourceRoot);
-    if (!validation.valid || validation.entityCount !== manifest.targets.length)
-        throw new EntityCutoverError(`staged entity graph is invalid (${validation.entityCount}/${manifest.targets.length})`);
-    writeDurable(path.join(project, MIGRATION_STAGING, "forward.yaml"), manifestBytes(manifest));
-    fault("staging_built");
-}
-function publishForwardManifest(project) {
-    ensureDirectory(project, MIGRATION_ROOT);
-    const target = path.join(project, FORWARD_MANIFEST);
-    if (fs.existsSync(target))
-        throw new EntityCutoverError(`forward cutover manifest '${FORWARD_MANIFEST}' already exists`);
-    fs.renameSync(path.join(project, MIGRATION_STAGING, "forward.yaml"), target);
-    fault("manifest_published");
+function fault(phase) {
+    if (process.env.NODE_ENV === "test" && process.env.AGENTERA_FAULT_INJECT_ENTITY_MIGRATION_AFTER_PHASE === phase)
+        throw new EntityCutoverError(`simulated entity import interruption after ${phase}`);
 }
-function publishCanonicalTargets(project, manifest) {
-    for (const target of manifest.targets) {
-        const canonical = path.join(project, target.path);
+function publishTargets(project, plan) {
+    for (const entry of plan.entries.slice().sort((a, b) => a.proposed_target.path.localeCompare(b.proposed_target.path))) {
+        const target = entry.proposed_target;
+        const bytes = canonicalEntityEnvelopeBytes({ id: target.id, artifact: entry.artifact, record: entry.record });
         const observed = readProjectFileSnapshot(validateRealProjectRoot(project), target.path);
         if (observed.kind === "file") {
-            if (hash(observed.bytes) !== target.sha256)
-                throw new EntityCutoverError(`canonical entity '${target.path}' diverges from the bounded forward manifest`);
+            if (hash(observed.bytes) !== hash(bytes))
+                throw new EntityCutoverError(`first unresolved path '${target.path}': existing target is not an exact converted match`);
             continue;
         }
         if (observed.kind !== "missing")
-            throw new EntityCutoverError(`canonical entity '${target.path}' is unsafe`);
-        ensureDirectory(project, path.relative(project, path.dirname(canonical)).split(path.sep).join("/"));
-        fs.renameSync(path.join(project, STAGING_PROJECT, target.path), canonical);
+            throw new EntityCutoverError(`first unresolved path '${target.path}': target is unsafe`);
+        ensureDirectory(project, path.relative(project, path.dirname(path.join(project, target.path))).split(path.sep).join("/"));
+        try {
+            writeDurable(path.join(project, target.path), bytes);
+        }
+        catch (error) {
+            throw new EntityCutoverError(`first unresolved path '${target.path}': ${error.message}`);
+        }
         fault("entity_published");
     }
 }
-function validatePublishedGraph(project, sourceRoot, manifest) {
-    validateExistingCanonicalTargets(project, manifest.targets, true);
-    const validation = validateEntityState(project, sourceRoot);
-    if (!validation.valid || validation.entityCount !== manifest.targets.length)
-        throw new EntityCutoverError(`published entity graph is invalid (${validation.entityCount}/${manifest.targets.length})`);
-}
 function publishMarker(project) {
     const existing = markerSnapshot(project);
     if (existing.kind === "file") {
         if (!existing.bytes.equals(Buffer.from(MARKER_BYTES)))
-            throw new EntityCutoverError(`state marker '${ENTITY_MODE_MARKER}' has unexpected bytes`);
+            throw new EntityCutoverError(`first unresolved path '${ENTITY_MODE_MARKER}': marker has unexpected bytes`);
         return;
     }
     if (existing.kind !== "missing")
-        throw new EntityCutoverError(`state marker '${ENTITY_MODE_MARKER}' is unsafe`);
+        throw new EntityCutoverError(`first unresolved path '${ENTITY_MODE_MARKER}': marker path is unsafe`);
     ensureDirectory(project, ".agentera");
     const temporary = path.join(project, `.agentera/.state-mode-${randomUUID()}.tmp`);
     try {
         writeDurable(temporary, MARKER_BYTES);
+        fault("before_marker");
         if (fs.existsSync(path.join(project, ENTITY_MODE_MARKER)))
-            throw new EntityCutoverError(`state marker '${ENTITY_MODE_MARKER}' appeared during publication`);
+            throw new EntityCutoverError(`first unresolved path '${ENTITY_MODE_MARKER}': marker appeared during publication`);
         fs.renameSync(temporary, path.join(project, ENTITY_MODE_MARKER));
     }
     finally {
         fs.rmSync(temporary, { force: true });
     }
 }
-function fault(phase) {
-    if (process.env.NODE_ENV === "test" && process.env.AGENTERA_FAULT_INJECT_ENTITY_MIGRATION_AFTER_PHASE === phase)
-        throw new EntityCutoverError(`simulated entity cutover interruption after ${phase}`);
-}
-export function applyPreparedEntityCutover(prepared) {
-    const before = inspect(prepared.project, prepared.sourceRoot, true);
+export function applyPreparedEntityCutover(prepared, activeUpgradeLockPaths = []) {
+    const before = inspect(prepared.project, prepared.sourceRoot, true, false, activeUpgradeLockPaths);
     if (before.inspection.phase === "active")
         return { status: "complete", phase: "active", idempotent: true, mutation_performed: false, entity_count: before.inspection.entityCount };
     if (!before.plan || before.head !== prepared.head || before.plan.source_fingerprint !== prepared.sourceFingerprint || before.plan.preview_digest !== prepared.previewDigest)
-        throw new EntityCutoverError("Git-pinned entity cutover preparation changed before apply");
+        throw new EntityCutoverError("first unresolved path '.agentera': converted input changed before apply");
     const lock = acquireWriterLock(prepared.project, 2000);
     try {
-        const current = inspect(prepared.project, prepared.sourceRoot, true, true);
+        const current = inspect(prepared.project, prepared.sourceRoot, true, true, activeUpgradeLockPaths);
         if (current.inspection.phase === "active")
             return { status: "complete", phase: "active", idempotent: true, mutation_performed: false, entity_count: current.inspection.entityCount };
         const plan = current.plan;
         if (current.head !== prepared.head || plan.source_fingerprint !== prepared.sourceFingerprint || plan.preview_digest !== prepared.previewDigest)
-            throw new EntityCutoverError("Git-pinned entity cutover source changed before its first publication effect");
-        const targets = targetsForPlan(plan);
-        let manifest = loadForwardManifest(prepared.project);
-        if (!manifest) {
-            manifest = { schemaVersion: MANIFEST_SCHEMA, phase: "publishing_entities", source: { head: current.head, source_fingerprint: plan.source_fingerprint, preview_digest: plan.preview_digest }, targets, marker: { path: ENTITY_MODE_MARKER, sha256: hash(MARKER_BYTES) } };
-            buildStaging(prepared.project, prepared.sourceRoot, plan, manifest);
-            publishForwardManifest(prepared.project);
-        }
-        else if (manifest.phase === "publishing_entities") {
-            buildStaging(prepared.project, prepared.sourceRoot, plan, manifest);
-        }
-        if (manifest.phase === "publishing_entities") {
-            publishCanonicalTargets(prepared.project, manifest);
-            validatePublishedGraph(prepared.project, prepared.sourceRoot, manifest);
-            manifest = { ...manifest, phase: "entities_published" };
-            writeFileAtomic(path.join(prepared.project, FORWARD_MANIFEST), manifestBytes(manifest));
-        }
-        else {
-            validatePublishedGraph(prepared.project, prepared.sourceRoot, manifest);
+            throw new EntityCutoverError("first unresolved path '.agentera': converted input changed before its first effect");
+        publishTargets(prepared.project, plan);
+        const validation = validateEntityState(prepared.project, prepared.sourceRoot);
+        if (!validation.valid || validation.entityCount !== plan.entries.length) {
+            const issue = validation.issues[0];
+            throw new EntityCutoverError(`first unresolved path '${issue?.path ?? ".agentera/entities"}': converted entity graph is invalid (${validation.entityCount}/${plan.entries.length})${issue ? `: ${issue.message}` : ""}`);
         }
-        removeStaging(prepared.project);
-        fault("entities_published");
         publishMarker(prepared.project);
         const marker = markerSnapshot(prepared.project);
         if (marker.kind !== "file")
-            throw new EntityCutoverError("entity authority marker was not published");
-        const entityCount = validateActiveEntityCutover(prepared.project, marker.bytes, prepared.sourceRoot);
-        return { status: "complete", phase: "active", idempotent: false, mutation_performed: true, entity_count: entityCount };
+            throw new EntityCutoverError(`first unresolved path '${ENTITY_MODE_MARKER}': marker was not published`);
+        return { status: "complete", phase: "active", idempotent: false, mutation_performed: true, entity_count: validateActiveEntityCutover(prepared.project, marker.bytes, prepared.sourceRoot) };
     }
     finally {
         lock.release();

package/dist/state/entityCutover.js.map

@@ -1 +1 @@
-{"version":3,"file":"entityCutover.js","sourceRoot":"","sources":["../../src/state/entityCutover.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"entityCutover.js","sourceRoot":"","sources":["../../src/state/entityCutover.ts"],"names":[],"mappings":"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"}

package/dist/state/entityStorage.js

@@ -409,18 +409,20 @@ function discoverFile(projectRoot, file, pathArtifact, boundary, model, issues,
 }
 export function discoverEntities(projectRoot, sourceRoot) {
     const root = path.resolve(projectRoot);
-    const model = authority(sourceRoot);
+    const resolvedSourceRoot = path.resolve(sourceRoot ?? resolveSourceRoot());
+    const origin = { projectRoot: root, sourceRoot: resolvedSourceRoot };
+    const model = authority(resolvedSourceRoot);
     const storageRoot = path.join(root, model.entityRoot);
     const entities = [];
     const issues = [];
     const unsafePrefix = noSymlinkPrefix(root, storageRoot);
     if (unsafePrefix)
-        return { entities: [unsafeEntity(root, unsafePrefix)], issues: [unsafeIssue(root, unsafePrefix)], validArtifactValues: model.artifacts };
+        return { origin, entities: [unsafeEntity(root, unsafePrefix)], issues: [unsafeIssue(root, unsafePrefix)], validArtifactValues: model.artifacts };
     if (!fs.existsSync(storageRoot))
-        return { entities, issues, validArtifactValues: model.artifacts };
+        return { origin, entities, issues, validArtifactValues: model.artifacts };
     if (!fs.statSync(storageRoot).isDirectory()) {
         issues.push({ code: "malformed_entity", path: relative(root, storageRoot), message: `entity root '${relative(root, storageRoot)}' is not a directory`, recovery: recovery(root, `replace '${relative(root, storageRoot)}' with a directory`) });
-        return { entities, issues, validArtifactValues: model.artifacts };
+        return { origin, entities, issues, validArtifactValues: model.artifacts };
     }
     for (const artifactEntry of listDirectories(storageRoot)) {
         const artifactPath = path.join(storageRoot, artifactEntry.name);
@@ -455,7 +457,7 @@ export function discoverEntities(projectRoot, sourceRoot) {
                     issues.push({ code: "malformed_entity", path: relative(root, file), message: `entity path '${relative(root, file)}' is not a canonical YAML file`, recovery: recovery(root, `remove '${relative(root, file)}' or replace it with <ten-lowercase-letter-id>.yaml`) });
                     continue;
                 }
-                entities.push(discoverFile(root, file, artifactEntry.name, boundaryEntry.name, model, issues, sourceRoot));
+                entities.push(discoverFile(root, file, artifactEntry.name, boundaryEntry.name, model, issues, resolvedSourceRoot));
             }
         }
     }
@@ -483,7 +485,18 @@ export function discoverEntities(projectRoot, sourceRoot) {
     const rank = { duplicate: 0, malformed: 1, unsafe: 2, valid: 3 };
     entities.sort((left, right) => rank[left.classification] - rank[right.classification] || left.relativePath.localeCompare(right.relativePath));
     issues.sort(diagnosticSort);
-    return { entities, issues, validArtifactValues: model.artifacts };
+    return { origin, entities, issues, validArtifactValues: model.artifacts };
+}
+export function assertEntityDiscoveryOrigin(projectRoot, sourceRoot, discovery) {
+    const expected = {
+        projectRoot: path.resolve(projectRoot),
+        sourceRoot: path.resolve(sourceRoot ?? resolveSourceRoot()),
+    };
+    const actualProjectRoot = discovery.origin?.projectRoot ?? "<missing>";
+    const actualSourceRoot = discovery.origin?.sourceRoot ?? "<missing>";
+    if (actualProjectRoot === expected.projectRoot && actualSourceRoot === expected.sourceRoot)
+        return;
+    throw new Error(`supplied entity discovery origin does not match this request (expected project '${expected.projectRoot}' and source authority '${expected.sourceRoot}', received project '${actualProjectRoot}' and source authority '${actualSourceRoot}'); call discoverEntities with this request's project and source roots, then retry`);
 }
 function relationTargets(entity, relation) {
     const value = entity.record?.[relation.field];
@@ -493,7 +506,8 @@ function relationTargets(entity, relation) {
         return [];
     return Array.isArray(value) && value.every((item) => typeof item === "string") ? value : null;
 }
-function validateEntityDiscovery(projectRoot, sourceRoot, discovery, boundIssues = true) {
+export function validateEntityDiscovery(projectRoot, sourceRoot, discovery, boundIssues = true) {
+    assertEntityDiscoveryOrigin(projectRoot, sourceRoot, discovery);
     const model = authority(sourceRoot);
     const issues = [...discovery.issues];
     const byId = new Map();
@@ -656,7 +670,12 @@ export function validateCanonicalEntityTargets(projectRoot, targets, sourceRoot)
         for (const target of duplicates)
             issues.push({ code: "duplicate_id", path: target.path, id: target.id, artifact: target.artifact, boundary: target.boundary, message: `entity ID '${target.id}' appears ${duplicates.length} times across proposed canonical targets`, recovery: recovery(projectRoot, `repair migration identity allocation for '${target.sourceIdentity}'`) });
     }
-    const validation = validateEntityDiscovery(projectRoot, sourceRoot, { entities, issues, validArtifactValues: model.artifacts }, false);
+    const validation = validateEntityDiscovery(projectRoot, sourceRoot, {
+        origin: { projectRoot: path.resolve(projectRoot), sourceRoot: path.resolve(sourceRoot ?? resolveSourceRoot()) },
+        entities,
+        issues,
+        validArtifactValues: model.artifacts,
+    }, false);
     return validation.issues.map((issue) => ({ sourceIdentity: sourceByPath.get(issue.path) ?? issue.id ?? issue.path, path: issue.path, message: issue.message }));
 }
 function generatedId(model) {