@lmzhen/dsh-evolution-merge 0.47.0 → 0.49.0

package/lib/index.js

@@ -148,12 +148,6 @@ const MERGE_PAIR_STATES = [
 	"fuse",
 	"skipped"
 ];
-const MERGE_QUEUES = [
-	"verify",
-	"pending",
-	"fuse",
-	"skipped"
-];
 /** User-facing queue of one data state. verify/fuse share retry, not two tabs. */
 function queueOf(state) {
 	switch (state) {
@@ -1346,17 +1340,6 @@ async function loadMergeState(io, home) {
 		...parsed.note === void 0 ? {} : { note: parsed.note }
 	};
 }
-/** Schema probe for doctor; the only other reader of mergeStatePath. */
-async function loadStateSchema(io, home) {
-	try {
-		const raw = await io.readText(mergeStatePath(home));
-		if (raw === null) return null;
-		const parsed = JSON.parse(raw);
-		return typeof parsed.schemaVersion === "number" ? parsed.schemaVersion : null;
-	} catch {
-		return null;
-	}
-}
 async function rowsOf(io, home, queue) {
 	const loaded = await loadMergeState(io, home);
 	return queue === void 0 ? loaded.state.rows : loaded.state.rows.filter((row) => row.queue === queue);
@@ -1619,7 +1602,7 @@ function v3State(body) {
 		rows
 	};
 }
-async function readJournal$1(io, home) {
+async function readJournal(io, home) {
 	const raw = await readTextOrNull(io, migrationJournalPath(home));
 	if (raw === null) return null;
 	try {
@@ -1696,7 +1679,7 @@ async function readStateReadiness(io, home) {
 	if (version === 3) {
 		const state = v3State(body);
 		if (state === null) return blocked("merge-state-needs-repair", "v3 state has an invalid row");
-		const journal = await readJournal$1(io, home);
+		const journal = await readJournal(io, home);
 		const report = await readReport(io, home);
 		const marker = readMarker(body);
 		if (body.migration !== void 0 && marker === null) return blocked("merge-state-needs-repair", "migration marker is invalid");
@@ -1755,7 +1738,7 @@ async function ensureMergeStateReady(io, home, fence) {
 						outcome = blocked("merge-state-needs-repair", "v3 state has an invalid row");
 						return current;
 					}
-					const journal = await readJournal$1(io, home);
+					const journal = await readJournal(io, home);
 					if (journal !== null) {
 						outcome = await completeJournal(io, home, journal, current);
 						return current;
@@ -2000,15 +1983,6 @@ async function readStaging(io, home, runId) {
 		return probeUnknown("staging manifest is not JSON: " + (error instanceof Error ? error.message : String(error)));
 	}
 }
-async function ensureStaging(io, home, input) {
-	const existing = await readStaging(io, home, input.runId);
-	if (existing.kind === "present") return {
-		ok: true,
-		path: stagingRoot(home, input.runId),
-		manifest: existing.value.manifest
-	};
-	return createStaging(io, home, input);
-}
 async function setStagingTarget(io, home, stageKey, target, mode) {
 	const view = await readStaging(io, home, stageKey);
 	if (view.kind !== "present") return false;
@@ -2016,9 +1990,6 @@ async function setStagingTarget(io, home, stageKey, target, mode) {
 	await io.writeText(join(stagingRoot(home, stageKey), "manifest.json"), JSON.stringify(manifest, null, 2) + "\n");
 	return true;
 }
-async function dropStaging(io, home, stageKey) {
-	await io.remove(stagingRoot(home, stageKey));
-}
 /** Remove expired run-level staging trees; `keep` names runs a live row still points at. */
 async function cleanupExpiredStaging(io, home, now, keep = /* @__PURE__ */ new Set()) {
 	let runs;
@@ -2175,6 +2146,7 @@ async function adoptLegacyProduction(io, home) {
 		wrote
 	};
 }
+/** Production stage-tree facade. These wrappers keep the low-level tree module private to StageAggregate. */
 async function createStageTree(io, home, input) {
 	return await createStaging(io, home, input);
 }
@@ -2447,61 +2419,6 @@ async function readPairLedgerV4(io, home) {
 	};
 }
 //#endregion
-//#region lib/types/domain/pair-index.js
-function parsePairIndex(raw) {
-	const index = /* @__PURE__ */ new Map();
-	if (raw === null) return index;
-	let parsed;
-	try {
-		parsed = JSON.parse(raw);
-	} catch {
-		return index;
-	}
-	const body = parsed;
-	if (!Array.isArray(body.entries)) return index;
-	for (const value of body.entries) {
-		const entry = value;
-		if (typeof entry.pairKey !== "string" || typeof entry.runId !== "string" || typeof entry.result !== "string") continue;
-		if (![
-			"merged",
-			"kept",
-			"failed",
-			"cancelled",
-			"undone"
-		].includes(entry.result)) continue;
-		index.set(entry.pairKey, entry);
-	}
-	return index;
-}
-function serializePairIndex(index) {
-	return JSON.stringify({
-		schemaVersion: 1,
-		entries: [...index.values()]
-	}, null, 2);
-}
-//#endregion
-//#region lib/types/domain/pair-index-store.js
-/** Durable pairKey index at <home>/merge/pair-index.json. */
-function pairIndexPath(home) {
-	return join(home, "merge", "pair-index.json");
-}
-async function loadPairIndex(io, home) {
-	let raw = null;
-	try {
-		raw = await io.readText(pairIndexPath(home));
-	} catch {
-		return /* @__PURE__ */ new Map();
-	}
-	return parsePairIndex(raw);
-}
-async function recordPair(io, home, entry) {
-	await transactIo(io, pairIndexPath(home), (current) => {
-		const index = parsePairIndex(current);
-		index.set(entry.pairKey, entry);
-		return serializePairIndex(index);
-	});
-}
-//#endregion
 //#region lib/types/domain/run-coordinator.js
 /** 1b-1 additive types for the merge run lifecycle; no writer is active in this phase. */
 function runMetaPath(home, runId) {
@@ -2908,19 +2825,18 @@ async function readMergeSnapshot(options) {
 		});
 		bodyRefs.push(...bodies);
 	}
-	const pairIndex = await loadPairIndex(options.io, options.home);
 	const runs = [];
 	for (const record of options.runs) {
 		const meta = await readRunMeta(options.io, options.home, record.id);
-		const pairs = [...pairIndex.values()].filter((item) => item.runId === record.id).map((item) => ({
-			pairKey: item.pairKey,
-			runId: item.runId,
-			result: item.result,
-			...item.target === void 0 ? {} : { target: item.target }
-		}));
 		const reportPath = mergeReportPath(options.home, record.id);
 		const probe = await readMergeReport(options.io, options.home, record.id);
 		const report = probe.kind === "present" ? probe.value : null;
+		const pairs = (report?.pairs ?? []).map((pair) => ({
+			pairKey: pair.pairKey,
+			runId: record.id,
+			result: pair.outcome,
+			...pair.target === void 0 ? {} : { target: pair.target.requested }
+		}));
 		runs.push({
 			record,
 			meta,
@@ -2992,8 +2908,9 @@ async function readMergeSnapshot(options) {
 	})).digest("hex");
 	const notes = [...options.notes ?? []];
 	if (historyDegraded) notes.push("history archive port unavailable; receipts only");
-	const ledgerConflicts = [...pairIndex.values()].filter((entry) => (entry.result === "merged" || entry.result === "undone") && rows.some((item) => item.row.pairKey === entry.pairKey && (item.row.state === "verify" || item.row.state === "pending" || item.row.state === "approved" || item.row.state === "fuse")));
-	if (ledgerConflicts.length > 0) notes.push("ledger-conflict: pair-index says completed but the ledger still has it active (" + String(ledgerConflicts.length) + ")");
+	const activePairKeys = new Set(rows.filter((item) => item.row.state === "verify" || item.row.state === "pending" || item.row.state === "approved" || item.row.state === "fuse").map((item) => item.row.pairKey));
+	const ledgerConflicts = runs.flatMap((run) => run.pairs).filter((entry) => (entry.result === "merged" || entry.result === "undone") && activePairKeys.has(entry.pairKey));
+	if (ledgerConflicts.length > 0) notes.push("ledger-conflict: a run says completed but the ledger still has it active (" + String(ledgerConflicts.length) + ")");
 	return {
 		wireVersion: 1,
 		schemaVersion: 4,
@@ -3205,34 +3122,10 @@ var MergeUnitTransactions = class {
 			await this.options.onPhase?.(phase);
 		};
 		try {
-			if (this.options.fence !== void 0) {
-				fenceLease = await this.options.fence.acquire();
-				lock = fenceLease.lock;
-				this.options.onLock?.("tree");
-			} else {
-				const fallbackLease = await new HomeAuthority({
-					home: this.options.home,
-					waitMs: this.options.waitMs ?? 5e3
-				}).lease("tree").catch(() => void 0);
-				if (fallbackLease === void 0) return {
-					ok: false,
-					code: "unit-fence-failed",
-					message: "tree lock unavailable"
-				};
-				fenceLease = {
-					lock: leaseAsTreeLock(fallbackLease),
-					release: async () => {
-						await fallbackLease.release();
-					}
-				};
-				lock = fenceLease.lock;
-				this.options.onLock?.("tree");
-			}
-			if (!await lock.assertHeld()) return {
-				ok: false,
-				code: "unit-fence-failed",
-				message: "tree fence lost"
-			};
+			const acquired = await this.acquireTreeFence();
+			fenceLease = acquired.fenceLease;
+			lock = acquired.lock;
+			this.options.onLock?.("tree");
 			stage = "claim";
 			claim = await this.options.claim.acquire(stored.plan.target, stored.plan.runId);
 			this.options.onLock?.("claim");
@@ -3368,6 +3261,82 @@ var MergeUnitTransactions = class {
 			await lease.release();
 		}
 	}
+	/** Acquire the one tree fence (or a HomeAuthority fallback) and prove it is held. */
+	async acquireTreeFence() {
+		let fenceLease;
+		if (this.options.fence !== void 0) fenceLease = await this.options.fence.acquire();
+		else {
+			const fallbackLease = await new HomeAuthority({
+				home: this.options.home,
+				waitMs: this.options.waitMs ?? 5e3
+			}).lease("tree").catch(() => void 0);
+			if (fallbackLease === void 0) throw new Error("tree lock unavailable");
+			fenceLease = {
+				lock: leaseAsTreeLock(fallbackLease),
+				release: async () => {
+					await fallbackLease.release();
+				}
+			};
+		}
+		if (!await fenceLease.lock.assertHeld()) throw new Error("tree fence lost");
+		return {
+			fenceLease,
+			lock: fenceLease.lock
+		};
+	}
+	/** Finish the idempotent support writes from the prepared snapshot, or name the drift. */
+	async completeSupport(snapshot, journal) {
+		let liveSupport = await Promise.all(snapshot.supportAfter.map(async (file) => ({
+			path: file.path,
+			content: await this.options.backend.readSupportFile(snapshot.target, file.path)
+		})));
+		const supportMatches = () => liveSupport.every((file) => file.content === (snapshot.supportAfter.find((item) => item.path === file.path)?.content ?? null));
+		if (supportMatches()) return { ok: true };
+		if (![
+			"support-pending",
+			"sources-archived",
+			"unit-written"
+		].includes(journal.phase) || this.options.backend.restoreSupportFile === void 0) return {
+			ok: false,
+			message: "support file live hash does not match the prepared support; manual recovery required"
+		};
+		for (const file of snapshot.supportAfter) await this.options.backend.restoreSupportFile(snapshot.target, file.path, file.content);
+		liveSupport = await Promise.all(snapshot.supportAfter.map(async (file) => ({
+			path: file.path,
+			content: await this.options.backend.readSupportFile(snapshot.target, file.path)
+		})));
+		return supportMatches() ? { ok: true } : {
+			ok: false,
+			message: "support file could not be completed from the prepared snapshot"
+		};
+	}
+	/** The complete evidence record both settlement paths write. */
+	async evidenceFor(unitId, snapshot, journal, targetAfter) {
+		const checkpoints = journal.checkpoints ?? [];
+		return {
+			schemaVersion: 1,
+			unitId,
+			runId: snapshot.runId,
+			planDigest: snapshot.planDigest,
+			state: "complete",
+			target: {
+				before: snapshot.targetBefore,
+				after: targetAfter,
+				supportDigest: createHash("sha256").update(JSON.stringify(snapshot.supportAfter)).digest("hex"),
+				created: !snapshot.targetExists
+			},
+			sources: snapshot.sourceBefore.map((source) => ({
+				name: source.name,
+				before: source.body,
+				after: null,
+				archived: checkpoints.some((item) => item.source === source.name),
+				absorbedInto: snapshot.target
+			})),
+			mutations: 0,
+			...snapshot.validationPlan === void 0 ? {} : { validationPlan: snapshot.validationPlan },
+			at: this.now()
+		};
+	}
 	async finalize(unitId) {
 		return await this.withRecoveryFence(async () => this.finalizeUnlocked(unitId));
 	}
@@ -3412,55 +3381,13 @@ var MergeUnitTransactions = class {
 			code: "unit-rollback-blocked",
 			message: "source is still live: " + liveSource.name
 		};
-		let liveSupport = await Promise.all(snapshot.supportAfter.map(async (file) => ({
-			path: file.path,
-			content: await this.options.backend.readSupportFile(snapshot.target, file.path)
-		})));
-		const supportMatches = () => liveSupport.every((file) => file.content === (snapshot.supportAfter.find((item) => item.path === file.path)?.content ?? null));
-		if (!supportMatches()) {
-			if (![
-				"support-pending",
-				"sources-archived",
-				"unit-written"
-			].includes(journal.phase) || this.options.backend.restoreSupportFile === void 0) return {
-				ok: false,
-				code: "unit-rollback-blocked",
-				message: "support file live hash does not match the prepared support; manual recovery required"
-			};
-			for (const file of snapshot.supportAfter) await this.options.backend.restoreSupportFile(snapshot.target, file.path, file.content);
-			liveSupport = await Promise.all(snapshot.supportAfter.map(async (file) => ({
-				path: file.path,
-				content: await this.options.backend.readSupportFile(snapshot.target, file.path)
-			})));
-			if (!supportMatches()) return {
-				ok: false,
-				code: "unit-rollback-blocked",
-				message: "support file could not be completed from the prepared snapshot"
-			};
-		}
-		const evidence = {
-			schemaVersion: 1,
-			unitId,
-			runId: snapshot.runId,
-			planDigest: snapshot.planDigest,
-			state: "complete",
-			target: {
-				before: snapshot.targetBefore,
-				after: await this.options.backend.readSkill(snapshot.target) ?? "",
-				supportDigest: createHash("sha256").update(JSON.stringify(snapshot.supportAfter)).digest("hex"),
-				created: !snapshot.targetExists
-			},
-			sources: snapshot.sourceBefore.map((source) => ({
-				name: source.name,
-				before: source.body,
-				after: null,
-				archived: checkpoints.some((item) => item.source === source.name),
-				absorbedInto: snapshot.target
-			})),
-			mutations: 0,
-			...snapshot.validationPlan === void 0 ? {} : { validationPlan: snapshot.validationPlan },
-			at: this.now()
+		const support = await this.completeSupport(snapshot, journal);
+		if (!support.ok) return {
+			ok: false,
+			code: "unit-rollback-blocked",
+			message: support.message
 		};
+		const evidence = await this.evidenceFor(unitId, snapshot, journal, await this.options.backend.readSkill(snapshot.target) ?? "");
 		if (receipt?.evidenceSha256 !== void 0 && unitEvidenceDigest(evidence) !== receipt.evidenceSha256) return {
 			ok: false,
 			code: "unit-rollback-blocked",
@@ -3522,55 +3449,13 @@ var MergeUnitTransactions = class {
 			code: "unit-rollback-blocked",
 			message: "source is still live: " + liveSource.name
 		};
-		let liveSupport = await Promise.all(snapshot.supportAfter.map(async (file) => ({
-			path: file.path,
-			content: await this.options.backend.readSupportFile(snapshot.target, file.path)
-		})));
-		const supportMatches = () => liveSupport.every((file) => file.content === (snapshot.supportAfter.find((item) => item.path === file.path)?.content ?? null));
-		if (!supportMatches()) {
-			if (![
-				"support-pending",
-				"sources-archived",
-				"unit-written"
-			].includes(journal.phase) || this.options.backend.restoreSupportFile === void 0) return {
-				ok: false,
-				code: "unit-rollback-blocked",
-				message: "support file live hash does not match the prepared support; manual recovery required"
-			};
-			for (const file of snapshot.supportAfter) await this.options.backend.restoreSupportFile(snapshot.target, file.path, file.content);
-			liveSupport = await Promise.all(snapshot.supportAfter.map(async (file) => ({
-				path: file.path,
-				content: await this.options.backend.readSupportFile(snapshot.target, file.path)
-			})));
-			if (!supportMatches()) return {
-				ok: false,
-				code: "unit-rollback-blocked",
-				message: "support file could not be completed from the prepared snapshot"
-			};
-		}
-		const evidence = {
-			schemaVersion: 1,
-			unitId,
-			runId: snapshot.runId,
-			planDigest: snapshot.planDigest,
-			state: "complete",
-			target: {
-				before: snapshot.targetBefore,
-				after: targetAfter,
-				supportDigest: createHash("sha256").update(JSON.stringify(snapshot.supportAfter)).digest("hex"),
-				created: !snapshot.targetExists
-			},
-			sources: snapshot.sourceBefore.map((source) => ({
-				name: source.name,
-				before: source.body,
-				after: null,
-				archived: checkpoints.some((item) => item.source === source.name),
-				absorbedInto: snapshot.target
-			})),
-			mutations: 0,
-			...snapshot.validationPlan === void 0 ? {} : { validationPlan: snapshot.validationPlan },
-			at: this.now()
+		const support = await this.completeSupport(snapshot, journal);
+		if (!support.ok) return {
+			ok: false,
+			code: "unit-rollback-blocked",
+			message: support.message
 		};
+		const evidence = await this.evidenceFor(unitId, snapshot, journal, targetAfter);
 		await writeUnitEvidence(this.options.io, this.options.home, evidence);
 		await writeUnitJournal(this.options.io, this.options.home, {
 			...journal,
@@ -3602,33 +3487,10 @@ var MergeUnitTransactions = class {
 		let lock;
 		let claim;
 		try {
-			if (this.options.fence !== void 0) {
-				fenceLease = await this.options.fence.acquire();
-				lock = fenceLease.lock;
-			} else {
-				const fallbackLease = await new HomeAuthority({
-					home: this.options.home,
-					waitMs: this.options.waitMs ?? 5e3
-				}).lease("tree").catch(() => void 0);
-				if (fallbackLease === void 0) return {
-					ok: false,
-					code: "unit-fence-failed",
-					message: "tree lock unavailable"
-				};
-				fenceLease = {
-					lock: leaseAsTreeLock(fallbackLease),
-					release: async () => {
-						await fallbackLease.release();
-					}
-				};
-				lock = fenceLease.lock;
-			}
+			const acquired = await this.acquireTreeFence();
+			fenceLease = acquired.fenceLease;
+			lock = acquired.lock;
 			this.options.onLock?.("tree");
-			if (!await lock.assertHeld()) return {
-				ok: false,
-				code: "unit-fence-failed",
-				message: "tree fence lost"
-			};
 			claim = await this.options.claim.acquire(snapshot.target, snapshot.runId);
 			this.options.onLock?.("claim");
 			const currentTarget = await this.options.backend.readSkill(snapshot.target);
@@ -4668,78 +4530,6 @@ const ALLOWED = [
 		evidence: "none",
 		activeRuns: 0
 	},
-	{
-		row: "fuse",
-		run: "none",
-		staging: "none",
-		journal: "none",
-		evidence: "none",
-		activeRuns: 0,
-		recovery: true
-	},
-	{
-		row: "fuse",
-		run: "failed",
-		staging: "none",
-		journal: "none",
-		evidence: "none",
-		activeRuns: 0,
-		recovery: true
-	},
-	{
-		row: "fuse",
-		run: "orphan",
-		staging: "none",
-		journal: "none",
-		evidence: "none",
-		activeRuns: 0,
-		recovery: true
-	},
-	{
-		row: "fuse",
-		run: "running",
-		staging: "none",
-		journal: "none",
-		evidence: "none",
-		activeRuns: 1,
-		recovery: true
-	},
-	{
-		row: "fuse",
-		run: "none",
-		staging: "missing",
-		journal: "none",
-		evidence: "none",
-		activeRuns: 0,
-		recovery: true
-	},
-	{
-		row: "fuse",
-		run: "failed",
-		staging: "missing",
-		journal: "none",
-		evidence: "none",
-		activeRuns: 0,
-		recovery: true
-	},
-	{
-		row: "fuse",
-		run: "orphan",
-		staging: "missing",
-		journal: "none",
-		evidence: "none",
-		activeRuns: 0,
-		recovery: true
-	},
-	{
-		row: "fuse",
-		run: "running",
-		staging: "missing",
-		journal: "none",
-		evidence: "none",
-		activeRuns: 1,
-		recovery: true
-	},
 	{
 		row: "fuse",
 		run: "running",
@@ -4774,7 +4564,7 @@ const ALLOWED = [
 	}
 ];
 function same(a, b) {
-	return a.row === b.row && a.run === b.run && a.staging === b.staging && a.journal === b.journal && a.evidence === b.evidence && a.activeRuns === b.activeRuns && (b.recovery ?? false) === (a.recovery ?? false);
+	return a.row === b.row && a.run === b.run && a.staging === b.staging && a.journal === b.journal && a.evidence === b.evidence && a.activeRuns === b.activeRuns;
 }
 function validateArtifacts(state) {
 	if (state.activeRuns > 1) return {
@@ -4794,7 +4584,7 @@ function validateArtifacts(state) {
 		ok: false,
 		reason: "skipped-running"
 	};
-	if (state.row === "fuse" && state.staging === "missing" && state.recovery !== true) return {
+	if (state.row === "fuse" && state.staging === "missing") return {
 		ok: false,
 		reason: "fuse-lost-staging"
 	};
@@ -4812,35 +4602,12 @@ function validateArtifacts(state) {
 	};
 }
 //#endregion
-//#region lib/types/domain/commit-journal-store.js
-/** Durable commit journal: <home>/merge/journals/<run>.json. */
-function journalPath(home, runId) {
-	return join(home, "merge", "journals", runId.replace(/[^A-Za-z0-9_-]+/g, "_") + ".json");
-}
-async function writeJournal(io, home, journal) {
-	const path = journalPath(home, journal.runId);
-	const content = JSON.stringify(journal, null, 2);
-	if (io.transact !== void 0) await io.transact(path, () => content);
-	else await io.writeText(path, content);
-	return path;
-}
-async function readJournal(io, home, runId) {
-	const raw = await io.readText(journalPath(home, runId));
-	if (raw === null) return null;
-	try {
-		return JSON.parse(raw);
-	} catch {
-		return null;
-	}
-}
-//#endregion
 //#region lib/types/doctor.js
 /**
 * Merge doctor rows: state, pending, gate cache and staging are each probed read-only.
 * A missing file is an empty feature, not a failure; an unreadable file is a warning the
 * operator can act on. This module never repairs or writes.
 */
-const MERGE_DOCTOR_SCHEMA_VERSION = 3;
 /** Compose the one-line global-doctor fact from buildDoctorView + the last reconcile report. */
 function mergeDoctorFact(view, report) {
 	const counts = view.counts;
@@ -4889,13 +4656,6 @@ async function mergeDoctor(io, home, configuredRoot) {
 		status: snapshot.blocked === void 0 || !hasState ? "ok" : "warn",
 		detail: snapshot.blocked === void 0 ? "pairs " + String(snapshot.rows.length) + "；verify " + String(counts.verify) + " / pending " + String(counts.pending) + " / fuse " + String(counts.fuse) + " / skipped " + String(counts.skipped) + " / expired " + String(snapshot.doctor.counts.expired) : snapshot.blocked.code + ": " + snapshot.blocked.message
 	});
-	const recoveryRuns = /* @__PURE__ */ new Set();
-	try {
-		const raw = await io.readText(join(home, "merge", "recovery.json"));
-		if (raw !== null) {
-			for (const report of JSON.parse(raw)) if (report.ok === true && report.runId !== void 0) recoveryRuns.add(report.runId);
-		}
-	} catch {}
 	const invalid = [];
 	if (snapshot.blocked !== void 0) invalid.push({
 		id: "state",
@@ -4908,15 +4668,14 @@ async function mergeDoctor(io, home, configuredRoot) {
 		const run = runId === void 0 ? "none" : row.state === "pending" ? "awaiting-approval" : "running";
 		const staging = item.stage === null ? row.state === "fuse" ? "missing" : "none" : item.stage.state === "present" || item.stage.state === "reserved" ? "kept" : row.state === "fuse" ? "missing" : "none";
 		const receipt = runId === void 0 ? null : await readCommitReceipt(io, home, runId);
-		const phase = receipt !== null ? await readUnitJournal(io, home, receipt.unitId) : runId === void 0 ? null : await readJournal(io, home, runId);
+		const phase = receipt === null ? null : await readUnitJournal(io, home, receipt.unitId);
 		const result = validateArtifacts({
 			row: artifactRow,
 			run,
 			staging,
 			journal: phase === null ? "none" : phase.phase === "prepared" || phase.phase === "target-pending" ? "prepared" : phase.phase === "target-written" || phase.phase === "sources-archived" || phase.phase === "support-pending" || phase.phase === "source-archiving" ? "committing" : phase.phase === "committed" ? "committed" : phase.phase === "rolled-back" ? "rolled-back" : "failed",
 			evidence: receipt === null ? "none" : "receipt",
-			activeRuns: run === "running" || run === "awaiting-approval" ? 1 : 0,
-			...runId !== void 0 && recoveryRuns.has(runId) ? { recovery: true } : {}
+			activeRuns: run === "running" || run === "awaiting-approval" ? 1 : 0
 		});
 		if (!result.ok) invalid.push({
 			id: row.id,
@@ -5059,26 +4818,6 @@ async function mergeDoctor(io, home, configuredRoot) {
 		status: "ok",
 		detail: stagingRoot(home, "<runId>")
 	});
-	try {
-		const raw = await io.readText(join(home, "merge", "recovery.json"));
-		if (raw !== null) {
-			const reports = JSON.parse(raw);
-			const failed = reports.filter((report) => report.ok !== true);
-			rows.push({
-				key: "recovery",
-				label: "提交恢复",
-				status: failed.length === 0 ? "ok" : "warn",
-				detail: failed.length === 0 ? String(reports.length) + " 条恢复报告，无待处理" : String(failed.length) + " 条待处理：" + failed.map((report) => (report.runId ?? "?") + "=" + (report.action ?? "?")).join(", ")
-			});
-		}
-	} catch {
-		rows.push({
-			key: "recovery",
-			label: "提交恢复",
-			status: "unknown",
-			detail: "无法读取 merge/recovery.json"
-		});
-	}
 	return rows;
 }
 //#endregion
@@ -5135,6 +4874,48 @@ async function resolveBody(io, home, ref, rowBody) {
 	return await rowBody();
 }
 //#endregion
+//#region lib/types/domain/state-migrate.js
+/**
+* Migrate v1/v2/v3 merge state to v4. v4 is a no-op; forward-only/needs-repair are reported
+* before attempting anything, so a newer state is never overwritten.
+* @param io - the evolution IO seam.
+* @param home - the evolution home.
+* @param fence - optional home write fence used by the host.
+* @returns the migration outcome.
+*/
+async function migrateMergeStateToV4(io, home, fence) {
+	const v4 = await readV4Readiness(io, home);
+	if (v4.ok) return {
+		ok: true,
+		migrated: false
+	};
+	if (v4.code === "merge-state-forward-only" || v4.code === "merge-state-needs-repair") return {
+		ok: false,
+		code: v4.code,
+		message: v4.message
+	};
+	const v3 = await ensureMergeStateReady(io, home, fence);
+	if (!v3.ok) return {
+		ok: false,
+		code: v3.code,
+		message: v3.message
+	};
+	const normalized = await normalizePairLedger(io, home);
+	if (!normalized.ok) return {
+		ok: false,
+		code: "merge-state-needs-repair",
+		message: normalized.message ?? "v3->v4 normalize failed"
+	};
+	return normalized.backupRef === void 0 ? {
+		ok: true,
+		migrated: normalized.migrated
+	} : {
+		ok: true,
+		migrated: normalized.migrated,
+		backupRef: normalized.backupRef
+	};
+}
+//#endregion
 //#region lib/types/domain/evidence-hash.js
 /** Canonical evidence JSON hash shared with core unit receipts. */
 function canonical(value) {
@@ -5275,13 +5056,6 @@ async function projectRecoveredUnit(options) {
 		await options.onPhase?.("stage-drop");
 		await dropStage(options.io, options.home, stageRowId);
 	}
-	await options.onPhase?.("pair-index");
-	await recordPair(options.io, options.home, {
-		pairKey,
-		runId: options.runId,
-		result: "merged",
-		target
-	});
 	await options.onPhase?.("run-meta");
 	const meta = await readRunMeta(options.io, options.home, options.runId);
 	await writeRunMeta(options.io, options.home, {
@@ -5996,9 +5770,6 @@ async function handleReadOnlyMergeCommand(command, io, home, cards, runs, approv
 	}
 	return formatSnapshotQueue(rows.filter((row) => row.queue === "skipped"), "skipped");
 }
-function mergeCommandHelp() {
-	return mergeUsage();
-}
 //#endregion
 //#region lib/types/merge-command.js
 function createReadOnlyMergeService(io, home) {
@@ -6052,10 +5823,6 @@ function createMergeCommand(service, version = MERGE_PACKAGE_VERSION) {
 }
 //#endregion
 //#region lib/types/skipped.js
-/**
-* Skipped filtering: a pair the operator marked as not-worth-merging stays out of automatic
-* screening until mergeSkippedTtlDays expires. Explicit /merge pair ignores this set.
-*/
 function skippedPairKeys(rows, ttlDays, now) {
 	const keys = /* @__PURE__ */ new Set();
 	for (const row of rows) {
@@ -6069,9 +5836,6 @@ function skippedPairKeys(rows, ttlDays, now) {
 	}
 	return keys;
 }
-function isSkippedPair(keys, a, b) {
-	return keys.has(pairKey(a, b));
-}
 //#endregion
 //#region lib/types/domain/engine-criteria.js
 function criteriaFrom(level, verdict, action) {
@@ -6324,11 +6088,6 @@ async function runScan(options) {
 				continue;
 			}
 			row = projected;
-			await recordPair(options.io, options.home, {
-				pairKey: row.pairKey,
-				runId: row.runId ?? "merge",
-				result: "kept"
-			});
 			pairs.push(pairOf(row, candidate, "kept", {
 				...round1.decision === void 0 ? {} : { decision: round1.decision },
 				...round1.usage === void 0 ? {} : { usage: round1.usage }
@@ -6538,15 +6297,7 @@ async function runScan(options) {
 			if (await pairLedger(options.io, options.home).transact((tx) => {
 				const current = tx.rows().find((item) => item.id === row.id);
 				return current === void 0 ? false : tx.remove(row.id, "superseded", void 0, current.version).ok;
-			})) {
-				await dropStage(options.io, options.home, row.id, row.stagingRef);
-				await recordPair(options.io, options.home, {
-					pairKey: row.pairKey,
-					runId: row.runId ?? "merge",
-					result: "failed",
-					...row.decision?.target === void 0 ? {} : { target: row.decision.target }
-				});
-			}
+			})) await dropStage(options.io, options.home, row.id, row.stagingRef);
 			pairs.push(pairOf(row, candidate, "failed", {
 				decision: mergeDecision,
 				failure: failed,
@@ -7048,12 +6799,22 @@ async function recordRound2Outcome(io, home, now, row, outcome, deferProjection
 		...outcome.criteria === void 0 ? {} : { criteria: outcome.criteria },
 		...outcome.validationIssues === void 0 ? {} : { validation: { issues: outcome.validationIssues } }
 	};
+	const pair = (outcomeName, extra = {}, withDecision = true) => ({
+		id: row.id,
+		pairKey: row.pairKey,
+		a: row.a,
+		b: row.b,
+		queue: row.queue,
+		...withDecision && row.decision !== void 0 ? { decision: row.decision } : {},
+		outcome: outcomeName,
+		archived: [],
+		...extra
+	});
 	if (outcome.kind === "merged") {
 		const unitRef = {
 			unitId: outcome.unitId ?? "unknown",
 			evidenceSha256: outcome.evidenceSha256 ?? "unknown"
 		};
-		const target = outcome.target?.actual ?? outcome.target?.requested ?? row.decision?.target;
 		const finalize = async () => {
 			if (!(await pairLedger(io, home, fence).transact((tx) => {
 				const current = tx.rows().find((item) => item.id === row.id);
@@ -7064,50 +6825,28 @@ async function recordRound2Outcome(io, home, now, row, outcome, deferProjection
 				} : tx.remove(row.id, "committed", unitRef, current.version);
 			})).ok) throw new Error("row changed before commit record: " + row.id);
 			await dropStage(io, home, row.id);
-			await recordPair(io, home, {
-				pairKey: row.pairKey,
-				runId: row.runId ?? "merge",
-				result: "merged",
-				...target === void 0 ? {} : { target },
-				...outcome.unitId === void 0 ? {} : { reportRef: outcome.unitId }
-			});
 		};
 		if (deferProjection) return {
 			merged: true,
 			finalize,
-			pair: {
-				id: row.id,
-				pairKey: row.pairKey,
-				a: row.a,
-				b: row.b,
-				queue: row.queue,
-				...row.decision === void 0 ? {} : { decision: row.decision },
-				outcome: "merged",
-				archived: outcome.archived ?? [],
+			pair: pair("merged", {
 				...outcome.lengths === void 0 ? {} : { lengths: outcome.lengths },
 				...outcome.unitId === void 0 ? {} : { unitId: outcome.unitId },
 				...outcome.target === void 0 ? {} : { target: outcome.target },
 				...reportExtra
-			}
+			})
 		};
 		await finalize();
 		return {
 			merged: true,
-			pair: {
-				id: row.id,
-				pairKey: row.pairKey,
-				a: row.a,
-				b: row.b,
-				queue: row.queue,
-				...row.decision === void 0 ? {} : { decision: row.decision },
-				outcome: "merged",
-				archived: outcome.archived ?? [],
+			pair: pair("merged", {
+				...outcome.archived === void 0 ? {} : { archived: outcome.archived },
 				...outcome.lengths === void 0 ? {} : { lengths: outcome.lengths },
 				...reportExtra,
 				...outcome.unitId === void 0 ? {} : { unitId: outcome.unitId },
 				...outcome.target === void 0 ? {} : { target: outcome.target },
 				...outcome.validationPlan === void 0 ? {} : { validationPlan: outcome.validationPlan }
-			}
+			})
 		};
 	}
 	const failure = outcome.failure ?? {
@@ -7130,18 +6869,10 @@ async function recordRound2Outcome(io, home, now, row, outcome, deferProjection
 		})) await dropStage(io, home, row.id);
 		return {
 			merged: false,
-			pair: {
-				id: row.id,
-				pairKey: row.pairKey,
-				a: row.a,
-				b: row.b,
-				queue: row.queue,
-				...row.decision === void 0 ? {} : { decision: row.decision },
-				outcome: "failed",
-				archived: [],
+			pair: pair("failed", {
 				failure,
 				...reportExtra
-			}
+			})
 		};
 	}
 	const cas = casExpiredHook(failure.code);
@@ -7163,33 +6894,17 @@ async function recordRound2Outcome(io, home, now, row, outcome, deferProjection
 		await dropStage(io, home, row.id);
 		return {
 			merged: false,
-			pair: {
-				id: row.id,
-				pairKey: row.pairKey,
-				a: row.a,
-				b: row.b,
-				queue: row.queue,
-				...row.decision === void 0 ? {} : { decision: row.decision },
-				outcome: "failed",
-				archived: [],
+			pair: pair("failed", {
 				failure: terminalFailure,
 				...reportExtra
-			}
+			})
 		};
 	}
 	if (failure.code === "commit-failed" || failure.code === "validation-failed") {
 		if (await pairLedger(io, home, fence).transact((tx) => {
 			const current = tx.rows().find((item) => item.id === row.id);
 			return current === void 0 ? false : tx.remove(row.id, "superseded", void 0, current.version).ok;
-		})) {
-			await dropStage(io, home, row.id, row.stagingRef);
-			await recordPair(io, home, {
-				pairKey: row.pairKey,
-				runId: row.runId ?? "merge",
-				result: "failed",
-				...row.decision?.target === void 0 ? {} : { target: row.decision.target }
-			});
-		}
+		})) await dropStage(io, home, row.id, row.stagingRef);
 	}
 	if (failure.code === "source-gone") {
 		if (await pairLedger(io, home, fence).transact((tx) => {
@@ -7198,16 +6913,7 @@ async function recordRound2Outcome(io, home, now, row, outcome, deferProjection
 		})) await dropStage(io, home, row.id, row.stagingRef);
 		return {
 			merged: false,
-			pair: {
-				id: row.id,
-				pairKey: row.pairKey,
-				a: row.a,
-				b: row.b,
-				queue: row.queue,
-				outcome: "failed",
-				archived: [],
-				failure
-			}
+			pair: pair("failed", { failure }, false)
 		};
 	}
 	if (await pairLedger(io, home, fence).transact((tx) => {
@@ -7220,42 +6926,21 @@ async function recordRound2Outcome(io, home, now, row, outcome, deferProjection
 		return moved.ok && moved.row !== null ? v4ToLegacy(moved.row) : null;
 	}) === null) return {
 		merged: false,
-		pair: {
-			id: row.id,
-			pairKey: row.pairKey,
-			a: row.a,
-			b: row.b,
-			queue: row.queue,
-			outcome: "failed",
-			archived: [],
+		pair: pair("failed", {
 			failure: {
 				...failure,
 				code: "row-changed",
 				message: "row changed before failure record"
 			},
 			...reportExtra
-		}
+		}, false)
 	};
-	await recordPair(io, home, {
-		pairKey: row.pairKey,
-		runId: row.runId ?? "merge",
-		result: "failed",
-		...row.decision?.target === void 0 ? {} : { target: row.decision.target }
-	});
 	return {
 		merged: false,
-		pair: {
-			id: row.id,
-			pairKey: row.pairKey,
-			a: row.a,
-			b: row.b,
-			queue: row.queue,
-			...row.decision === void 0 ? {} : { decision: row.decision },
-			outcome: "failed",
-			archived: [],
+		pair: pair("failed", {
 			failure,
 			...reportExtra
-		}
+		})
 	};
 }
 //#endregion
@@ -7704,14 +7389,6 @@ async function runUndoSteps(options) {
 			};
 		}
 		if (await readUndoReceipt(options.io, options.home, options.runId, pairKey) !== null) {
-			await markPhase("pair-index");
-			await options.onPhase?.("pair-index", pairKey);
-			await recordPair(options.io, options.home, {
-				pairKey,
-				runId: options.runId,
-				result: "undone",
-				target: receipt.target
-			});
 			await markPhase("run-meta");
 			await options.onPhase?.("run-meta", pairKey);
 			await settleRun(options.io, options.home, options.runId, pairKey, allPairKeys, options.now());
@@ -7738,14 +7415,6 @@ async function runUndoSteps(options) {
 				restoredSourceHashes: Object.fromEntries(checked.evidence.sources.map((source) => [source.name, contentHash(source.before)])),
 				at: options.now()
 			});
-			await markPhase("pair-index");
-			await options.onPhase?.("pair-index", pairKey);
-			await recordPair(options.io, options.home, {
-				pairKey,
-				runId: options.runId,
-				result: "undone",
-				target: receipt.target
-			});
 			await markPhase("run-meta");
 			await options.onPhase?.("run-meta", pairKey);
 			await settleRun(options.io, options.home, options.runId, pairKey, allPairKeys, options.now());
@@ -7805,13 +7474,6 @@ async function runUndoSteps(options) {
 			restoredSourceHashes: Object.fromEntries(checked.evidence.sources.map((source) => [source.name, contentHash(source.before)])),
 			at: options.now()
 		});
-		await options.onPhase?.("pair-index", pairKey);
-		await recordPair(options.io, options.home, {
-			pairKey,
-			runId: options.runId,
-			result: "undone",
-			target: receipt.target
-		});
 		await options.onPhase?.("run-meta", pairKey);
 		await settleRun(options.io, options.home, options.runId, pairKey, allPairKeys, options.now());
 		undone.push(pairKey);
@@ -8042,9 +7704,6 @@ function buildRound2Prompt(row, decision, mode = "continue") {
 		...body
 	] : [...head, ...body]).join("\n");
 }
-function buildStandbyPrompt() {
-	return STANDBY_PROMPT;
-}
 //#endregion
 //#region lib/types/channel-port.js
 async function runRound1OverChannel(options, candidate, signal) {
@@ -8552,14 +8211,6 @@ async function commitStagedRun(io, home, runId, port, options) {
 		message: "target is blocked by curator: " + assembled.plan.target,
 		plan: assembled.plan
 	};
-	const journal = {
-		runId,
-		target: assembled.plan.target,
-		create: !assembled.plan.targetExists,
-		sources: assembled.plan.sources,
-		phase: "prepared",
-		updatedAt: new Date(options.now()).toISOString()
-	};
 	let result;
 	let evidenceSha256$1;
 	let warning;
@@ -8589,9 +8240,6 @@ async function commitStagedRun(io, home, runId, port, options) {
 			...options.sourceRevisions === void 0 ? {} : { sourceRevisions: options.sourceRevisions },
 			...options.supportDigest === void 0 ? {} : { supportDigest: options.supportDigest }
 		};
-		try {
-			await writeJournal(io, home, journal);
-		} catch {}
 		const prepared = await transaction.prepare(unitPlan);
 		if (!prepared.ok) return {
 			ok: false,
@@ -8599,21 +8247,12 @@ async function commitStagedRun(io, home, runId, port, options) {
 			plan: assembled.plan
 		};
 		const committed = await transaction.commit(prepared.prepared, options.signal === void 0 ? void 0 : { signal: options.signal });
-		if (!committed.ok) {
-			try {
-				await writeJournal(io, home, {
-					...journal,
-					phase: "failed",
-					updatedAt: new Date(options.now()).toISOString()
-				});
-			} catch {}
-			return {
-				ok: false,
-				message: committed.message,
-				plan: assembled.plan,
-				...committed.code === "target-changed" || committed.code === "source-changed" || committed.code === "support-changed" ? { code: committed.code } : {}
-			};
-		}
+		if (!committed.ok) return {
+			ok: false,
+			message: committed.message,
+			plan: assembled.plan,
+			...committed.code === "target-changed" || committed.code === "source-changed" || committed.code === "support-changed" ? { code: committed.code } : {}
+		};
 		const unitId = committed.evidence.unitId;
 		if (committed.evidence.unitId !== prepared.prepared.unitId && !prepared.prepared.unitId.startsWith("legacy:")) return {
 			ok: false,
@@ -8634,29 +8273,11 @@ async function commitStagedRun(io, home, runId, port, options) {
 			mutations: committed.evidence.mutations
 		};
 	}
-	if (!result.ok) {
-		try {
-			await writeJournal(io, home, {
-				...journal,
-				phase: "failed",
-				updatedAt: new Date(options.now()).toISOString()
-			});
-		} catch {}
-		return {
-			ok: false,
-			message: result.message,
-			plan: assembled.plan
-		};
-	}
-	const committed = {
-		...journal,
-		phase: "committed",
-		updatedAt: new Date(options.now()).toISOString(),
-		...result.unitId === void 0 ? {} : { unitId: result.unitId }
+	if (!result.ok) return {
+		ok: false,
+		message: result.message,
+		plan: assembled.plan
 	};
-	try {
-		await writeJournal(io, home, committed);
-	} catch {}
 	if (result.unitId === void 0) return {
 		ok: true,
 		plan: assembled.plan,
@@ -8938,32 +8559,38 @@ function missingManifestFile(files, stagedPaths) {
 }
 //#endregion
 //#region lib/types/authoring-flow.js
-async function runAuthoring(options) {
-	if (options.target.includes("/") || options.target.includes(":")) return {
-		ok: false,
+/** The target facts both authoring entries may refuse on before writing anything. */
+async function targetAdmission(target, targetCard, createMode, isBlocked) {
+	if (target.includes("/") || target.includes(":")) return {
 		code: "target-invalid",
-		message: "target must be a bare skill name: " + options.target
+		message: "target must be a bare skill name: " + target
 	};
-	const targetCard = options.cards.find((card) => card.name === options.target);
-	const requestedMode = options.mode ?? (targetCard === void 0 ? "create-umbrella" : "merge-into-existing");
-	const mode = requestedMode === "merge-into-existing" && targetCard === void 0 ? "create-umbrella" : requestedMode;
-	const createMode = mode === "create-umbrella";
 	if (!createMode && targetCard !== void 0) {
 		if (targetCard.managed !== true) return {
-			ok: false,
 			code: "target-not-managed",
-			message: "target is not family-managed: " + options.target
+			message: "target is not family-managed: " + target
 		};
 		if (targetCard.protectionUnknown === true || targetCard.protectedBy != null) return {
-			ok: false,
 			code: "target-protected",
-			message: "target is protected (" + (targetCard.protectedBy ?? "unknown") + "): " + options.target
+			message: "target is protected (" + (targetCard.protectedBy ?? "unknown") + "): " + target
 		};
 	}
-	if (!createMode && await options.isBlocked?.(options.target) === true) return {
-		ok: false,
+	if (!createMode && await isBlocked?.(target) === true) return {
 		code: "target-blocked",
-		message: "target is blocked by curator: " + options.target
+		message: "target is blocked by curator: " + target
+	};
+	return null;
+}
+async function runAuthoring(options) {
+	const targetCard = options.cards.find((card) => card.name === options.target);
+	const requestedMode = options.mode ?? (targetCard === void 0 ? "create-umbrella" : "merge-into-existing");
+	const mode = requestedMode === "merge-into-existing" && targetCard === void 0 ? "create-umbrella" : requestedMode;
+	const createMode = mode === "create-umbrella";
+	const targetRefusal = await targetAdmission(options.target, targetCard, createMode, options.isBlocked);
+	if (targetRefusal !== null) return {
+		ok: false,
+		code: targetRefusal.code,
+		message: targetRefusal.message
 	};
 	const stageKey = options.stageKey ?? options.runId;
 	if (options.reuseStaging === true) {
@@ -9285,46 +8912,15 @@ const STALE_CAUSES = new Set([
 	"target-gone"
 ]);
 async function runNewChildAuthoring(options, row, decision, signal) {
-	if (decision.target.includes("/") || decision.target.includes(":")) return {
-		kind: "failed",
-		failure: {
-			stage: "author",
-			code: "target-invalid",
-			message: "target must be a bare skill name: " + decision.target,
-			retryable: false,
-			retryFrom: "none"
-		}
-	};
 	const targetCard = options.cards.find((card) => card.name === decision.target);
 	const createMode = decision.mode === "create-umbrella";
-	if (!createMode && targetCard !== void 0) {
-		if (targetCard.managed !== true) return {
-			kind: "failed",
-			failure: {
-				stage: "author",
-				code: "target-not-managed",
-				message: "target is not family-managed: " + decision.target,
-				retryable: false,
-				retryFrom: "none"
-			}
-		};
-		if (targetCard.protectionUnknown === true || targetCard.protectedBy != null) return {
-			kind: "failed",
-			failure: {
-				stage: "author",
-				code: "target-protected",
-				message: "target is protected: " + decision.target,
-				retryable: false,
-				retryFrom: "none"
-			}
-		};
-	}
-	if (!createMode && await options.isBlocked?.(decision.target) === true) return {
+	const targetRefusal = await targetAdmission(decision.target, targetCard, createMode, options.isBlocked);
+	if (targetRefusal !== null) return {
 		kind: "failed",
 		failure: {
 			stage: "author",
-			code: "target-blocked",
-			message: "target is blocked by curator: " + decision.target,
+			code: targetRefusal.code,
+			message: targetRefusal.message,
 			retryable: false,
 			retryFrom: "none"
 		}
@@ -10787,143 +10383,6 @@ async function supersedeMergeRuns(registry) {
 	return ids.length;
 }
 //#endregion
-//#region lib/types/coordinator.js
-/**
-* Pure merge transition table. No io, no run shell, no subagents.
-*
-* Every transition returns the whole next row (or a drop), so the caller can persist it
-* through one state transaction. Invalid transitions are refused by name;
-* a caller never "repairs" a row by guessing which state the operator meant.
-*/
-function invalid(event, state) {
-	return {
-		ok: false,
-		code: "invalid-transition",
-		message: "cannot apply " + event.type + " to " + (state ?? "no row")
-	};
-}
-/** Drop fields that must not survive a transition; optional fields stay absent. */
-function base(row, at) {
-	return {
-		id: row.id,
-		pairKey: row.pairKey,
-		a: row.a,
-		b: row.b,
-		state: row.state,
-		queue: row.queue,
-		createdAt: row.createdAt,
-		updatedAt: at,
-		...row.runId === void 0 ? {} : { runId: row.runId },
-		...row.unitId === void 0 ? {} : { unitId: row.unitId },
-		...row.origin === void 0 ? {} : { origin: row.origin },
-		...row.decision === void 0 ? {} : { decision: row.decision },
-		...row.sourceRevision === void 0 ? {} : { sourceRevision: row.sourceRevision },
-		...row.targetRevision === void 0 ? {} : { targetRevision: row.targetRevision },
-		...row.attempts === void 0 ? {} : { attempts: row.attempts },
-		...row.stagingRef === void 0 ? {} : { stagingRef: row.stagingRef },
-		...row.stagingExpiresAt === void 0 ? {} : { stagingExpiresAt: row.stagingExpiresAt },
-		...row.expired === void 0 ? {} : { expired: row.expired },
-		...row.reason === void 0 ? {} : { reason: row.reason },
-		...row.target === void 0 ? {} : { target: row.target }
-	};
-}
-function next(row, at, state, patch = {}) {
-	return {
-		ok: true,
-		row: {
-			...base(row, at),
-			state,
-			queue: queueOf(state),
-			...patch
-		}
-	};
-}
-/** Legacy v2 projection only; runtime writes must use transitionV3/RowTx. */
-function transitionLegacyForProjection(current, event) {
-	if (event.type === "candidate") {
-		if (current !== void 0) return {
-			ok: true,
-			row: current
-		};
-		const key = pairKey(event.a, event.b);
-		return {
-			ok: true,
-			row: {
-				id: rowIdOf(key),
-				pairKey: key,
-				a: event.a,
-				b: event.b,
-				state: "verify",
-				queue: "verify",
-				createdAt: event.at,
-				updatedAt: event.at
-			}
-		};
-	}
-	if (event.type === "source-gone") return {
-		ok: true,
-		row: null
-	};
-	if (event.type === "gate-keep") {
-		if (current !== void 0) return {
-			ok: true,
-			row: current
-		};
-		const key = pairKey(event.a, event.b);
-		return {
-			ok: true,
-			row: {
-				id: rowIdOf(key),
-				pairKey: key,
-				a: event.a,
-				b: event.b,
-				state: "skipped",
-				queue: "skipped",
-				origin: "agent",
-				createdAt: event.at,
-				updatedAt: event.at
-			}
-		};
-	}
-	if (current === void 0) return invalid(event, void 0);
-	switch (event.type) {
-		case "round1-keep": return current.state === "verify" ? next(current, event.at, "skipped", { origin: "agent" }) : invalid(event, current.state);
-		case "round1-merge":
-			if (current.state !== "verify") return invalid(event, current.state);
-			return event.approval === "on" ? next(current, event.at, "pending", {
-				...event.decision === void 0 ? {} : { decision: event.decision },
-				...event.stagingRef === void 0 ? {} : { stagingRef: event.stagingRef },
-				...event.stagingExpiresAt === void 0 ? {} : { stagingExpiresAt: event.stagingExpiresAt },
-				...event.sourceRevision === void 0 ? {} : { sourceRevision: event.sourceRevision },
-				...event.targetRevision === void 0 ? {} : { targetRevision: event.targetRevision }
-			}) : next(current, event.at, "approved", {
-				...event.decision === void 0 ? {} : { decision: event.decision },
-				...event.stagingRef === void 0 ? {} : { stagingRef: event.stagingRef },
-				...event.stagingExpiresAt === void 0 ? {} : { stagingExpiresAt: event.stagingExpiresAt },
-				...event.sourceRevision === void 0 ? {} : { sourceRevision: event.sourceRevision },
-				...event.targetRevision === void 0 ? {} : { targetRevision: event.targetRevision }
-			});
-		case "round1-fail": return current.state === "verify" ? next(current, event.at, "verify", {
-			failure: event.failure,
-			attempts: (current.attempts ?? 0) + 1
-		}) : invalid(event, current.state);
-		case "approve": return current.state === "pending" ? next(current, event.at, "approved", event.runId === void 0 ? {} : { runId: event.runId }) : invalid(event, current.state);
-		case "reject": return current.state === "pending" ? next(current, event.at, "skipped", { origin: "human" }) : invalid(event, current.state);
-		case "round2-cancel": return current.state === "fuse" || current.state === "approved" ? next(current, event.at, "approved") : invalid(event, current.state);
-		case "round2-fail": return current.state === "fuse" || current.state === "approved" ? next(current, event.at, "approved", {
-			failure: event.failure,
-			attempts: (current.attempts ?? 0) + 1
-		}) : invalid(event, current.state);
-		case "round2-success": return current.state === "fuse" || current.state === "approved" ? {
-			ok: true,
-			row: null
-		} : invalid(event, current.state);
-		case "target-taken":
-		case "source-changed": return current.state === "pending" || current.state === "approved" || current.state === "fuse" ? next(current, event.at, current.state, { expired: event.type }) : invalid(event, current.state);
-		case "restore": return current.state === "skipped" ? next(current, event.at, "verify") : invalid(event, current.state);
-	}
-}
-//#endregion
 //#region lib/types/pair-command.js
 async function runPairCommand(options) {
 	return await runScanCommand({
@@ -11044,37 +10503,27 @@ function apply(ctx, rawConfig = {}) {
 		if (registry === void 0) return;
 		const io = evolutionIoAdapter(() => registry.provider());
 		const home = evolutionHome();
+		const homeFence = ctx.get("evolutionMutationAuthority")?.homeFence;
 		const ready = (async () => {
-			const v4 = await readV4Readiness(io, home);
-			if (v4.ok) return {
+			const migration = await migrateMergeStateToV4(io, home, homeFence);
+			if (!migration.ok) return migration;
+			const loaded = await loadMergeState(io, home);
+			return {
 				ok: true,
 				schema: 3,
-				migrated: false,
+				migrated: migration.migrated,
 				state: {
 					schemaVersion: 3,
-					rows: (await loadMergeState(io, home)).state.rows.map(legacyToV3).filter((row) => row !== null)
+					rows: loaded.state.rows.map(legacyToV3).filter((row) => row !== null)
 				},
 				quarantine: [],
 				report: null
 			};
-			const state = await ensureMergeStateReady(io, home, ctx.get("evolutionMutationAuthority")?.homeFence);
-			if (!state.ok) return v4.code === "merge-state-forward-only" || v4.code === "merge-state-needs-repair" ? {
-				ok: false,
-				code: v4.code,
-				message: v4.message
-			} : state;
-			const normalized = await normalizePairLedger(io, home);
-			return normalized.ok ? state : {
-				ok: false,
-				code: "merge-state-needs-repair",
-				message: normalized.message ?? "v4 normalize failed"
-			};
 		})().catch((error) => ({
 			ok: false,
 			code: "merge-state-migration-blocked",
 			message: error instanceof Error ? error.message : String(error)
 		}));
-		const homeFence = ctx.get("evolutionMutationAuthority")?.homeFence;
 		const runs = newRunRegistry({
 			io,
 			home,
@@ -11386,4 +10835,4 @@ function apply(ctx, rawConfig = {}) {
 	});
 }
 //#endregion
-export { Config, MERGE_DOCTOR_SCHEMA_VERSION, MERGE_LIFECYCLE_VERBS, MERGE_MAX_ATTEMPTS, MERGE_PAIR_STATES, MERGE_PARAM_DEFAULTS, MERGE_PROMPT_VERSION, MERGE_QUEUES, MERGE_ROUTES, MERGE_STAGE_TOOL_NAME, MERGE_STATE_VERSION, STAGING_SCHEMA_VERSION, STANDBY_PROMPT, StageToolRegistry, apply, applyStageTool, approvePending, assembleStagedCommit, buildCommitPlan, buildRound1Prompt, buildRound2Prompt, buildStandbyPrompt, busyTarget, canRetry, cleanupExpiredStaging, commitReceiptPath, commitStagedRun, committedPairs, configureMergePresentation, copyStagedFile, countRows, createChannelScanPorts, createEngineRunner, createEngineScreening, createMergeCommand, createMergeRuntime, createMergeStageTool, createNewChildRound2, createReadOnlyMergeService, createStageForCards, createStaging, dropStaging, durableReceiptDir, durableReceiptPath, emptyMergeState, engineConfigFromRoot, ensureStaging, forcedDecisionFor, formatFacts, formatQueue, formatRunDetail, formatRunsView, formatSnapshotQueue, formatSnapshotStatus, formatStatus, handleReadOnlyMergeCommand, hasBlockingFinding, inject, isSkippedPair, listStagedFiles, liveRowFactsOf, loadMergeState, loadStateSchema, makeMergeRoutes, manifestFilesOf, mergeCommandHelp, mergeDoctor, mergeDoctorAvailability, mergeDoctorFact, mergeReportDigestPath, mergeReportPath, mergeRunIdsToSupersede, mergeStatePath, mergeUsage, missingManifestFile, pairKey, parseAuthoringManifest, parseDecision, parseMergeCommand, pendingExpiry, persistedExpiry, promptHashOf, queueOf, readCommitReceipt, readCommitReceipts, readMergeReport, readStagedFile, readStagedTree, readStaging, recordRound2Outcome, rejectPending, resolveMergeParams, resolveTargetName, retryMergeReport, rewriteFrontmatterName, rowIdOf, rowsOf, runApproveCommand, runAuthoring, runMergeCommand, runNewChildAuthoring, runPairCommand, runResumeCommand, runRound1OverChannel, runScan, runScanCommand, setStagingTarget, skillLibraryPort, skillLibraryUndoPort, skippedPairKeys, snapshotCards, sourceBlock, stageKeyOf, stageOf, stagingRoot, subagentChannelAdapter, supersedeMergeRuns, transitionLegacyForProjection, undoMergeReceipt, unitFor, validateStagedTree, withMergeRun, writeCommitReceipt, writeMergeReport, writeStagedFile };
+export { Config, MERGE_LIFECYCLE_VERBS, MERGE_MAX_ATTEMPTS, MERGE_PAIR_STATES, MERGE_PARAM_DEFAULTS, MERGE_PROMPT_VERSION, MERGE_ROUTES, MERGE_STAGE_TOOL_NAME, MERGE_STATE_VERSION, STAGING_SCHEMA_VERSION, STANDBY_PROMPT, StageToolRegistry, apply, applyStageTool, approvePending, assembleStagedCommit, buildCommitPlan, buildRound1Prompt, buildRound2Prompt, busyTarget, canRetry, cleanupExpiredStaging, commitReceiptPath, commitStagedRun, committedPairs, configureMergePresentation, copyStagedFile, countRows, createChannelScanPorts, createEngineRunner, createEngineScreening, createMergeCommand, createMergeRuntime, createMergeStageTool, createNewChildRound2, createReadOnlyMergeService, createStageForCards, createStaging, durableReceiptDir, durableReceiptPath, emptyMergeState, engineConfigFromRoot, forcedDecisionFor, formatFacts, formatQueue, formatRunDetail, formatRunsView, formatSnapshotQueue, formatSnapshotStatus, formatStatus, handleReadOnlyMergeCommand, hasBlockingFinding, inject, listStagedFiles, liveRowFactsOf, loadMergeState, makeMergeRoutes, manifestFilesOf, mergeDoctor, mergeDoctorAvailability, mergeDoctorFact, mergeReportDigestPath, mergeReportPath, mergeRunIdsToSupersede, mergeStatePath, mergeUsage, missingManifestFile, pairKey, parseAuthoringManifest, parseDecision, parseMergeCommand, pendingExpiry, persistedExpiry, promptHashOf, queueOf, readCommitReceipt, readCommitReceipts, readMergeReport, readStagedFile, readStagedTree, readStaging, recordRound2Outcome, rejectPending, resolveMergeParams, resolveTargetName, retryMergeReport, rewriteFrontmatterName, rowIdOf, rowsOf, runApproveCommand, runAuthoring, runMergeCommand, runNewChildAuthoring, runPairCommand, runResumeCommand, runRound1OverChannel, runScan, runScanCommand, setStagingTarget, skillLibraryPort, skillLibraryUndoPort, skippedPairKeys, snapshotCards, sourceBlock, stageKeyOf, stageOf, stagingRoot, subagentChannelAdapter, supersedeMergeRuns, targetAdmission, undoMergeReceipt, unitFor, validateStagedTree, withMergeRun, writeCommitReceipt, writeMergeReport, writeStagedFile };