@lmzhen/dsh-evolution-merge 0.29.0 → 0.30.0

package/lib/index.js

@@ -1,9 +1,44 @@
 import { join } from "node:path";
 import z from "@deepseek-ai/schemastery";
-import { screen, selectCandidates } from "@lmzhen/dsh-evolution-merge-engine";
+import { pairKeyOf, screen, selectCandidates, toEngineCandidate } from "@lmzhen/dsh-evolution-merge-engine";
 import { DEFAULT_SKILL_LIMITS, authorityFrom, contentHash, createSubagentChannel, evolutionHome, evolutionIoAdapter, executeUnitUndo, isPresent, newRunRegistry, newSkillLibrary, parseFrontmatter, planUnitUndoAcross, policyStageLimits, probeAbsent, probeList, probePresent, probeText, probeUnknown, scanContentThreats, supportRefs, transactIo, validateFrontmatter, validateSupportPath } from "@lmzhen/dsh-evolution-core";
 import { HOST_ROUTES, json, methodNotAllowed, registerHostRoutes } from "@lmzhen/dsh-evolution-core/http-routes";
 import { createHash } from "node:crypto";
+//#region lib/types/adapters/select.js
+/** Host selector correction: engine selector does not route judge errors to candidates. */
+function selectWithErrors(report) {
+	const base = selectCandidates(report);
+	const doc = report.reportDoc ?? report;
+	const rows = Array.isArray(doc.pairs_final) ? doc.pairs_final : [];
+	const errors = /* @__PURE__ */ new Set();
+	for (const row of rows) {
+		if (row.error !== true) continue;
+		const a = typeof row.a === "string" ? row.a : "";
+		const b = typeof row.b === "string" ? row.b : "";
+		if (a !== "" && b !== "") errors.add(pairKeyOf(a, b));
+	}
+	const candidates = base.candidates.filter((candidate) => !errors.has(pairKeyOf(candidate.a, candidate.b)));
+	const skipped = base.skipped.filter((item) => !errors.has(item.pairKey));
+	const reportOnly = base.reportOnly.filter((row) => {
+		const value = row;
+		if (typeof value.a !== "string" || typeof value.b !== "string") return true;
+		return !errors.has(pairKeyOf(value.a, value.b));
+	});
+	for (const row of rows) {
+		if (row.error !== true) continue;
+		const a = typeof row.a === "string" ? row.a : "";
+		const b = typeof row.b === "string" ? row.b : "";
+		if (a === "" || b === "") continue;
+		candidates.push(toEngineCandidate(row, typeof row.reason === "string" ? row.reason : "judge-error"));
+	}
+	return {
+		...base,
+		candidates,
+		skipped,
+		reportOnly
+	};
+}
+//#endregion
 //#region lib/types/adapters/engine-screen.js
 /**
 * G3 screen adapter: cards -> corpus snapshot -> EnginePort.screen.
@@ -97,24 +132,27 @@ function createEngineRunner(llm, route) {
 * The data layer keeps four states; the user face collapses verify/fuse into one retry
 * queue and keeps the stage as a chip. The API queue must never expose the raw state.
 */
-const MERGE_STATE_VERSION = 1;
+const MERGE_STATE_VERSION = 2;
 const MERGE_PAIR_STATES = [
 	"verify",
 	"pending",
+	"approved",
 	"fuse",
 	"skipped"
 ];
 const MERGE_QUEUES = [
+	"verify",
 	"pending",
-	"retry",
+	"fuse",
 	"skipped"
 ];
 /** User-facing queue of one data state. verify/fuse share retry, not two tabs. */
 function queueOf(state) {
 	switch (state) {
+		case "verify": return "verify";
 		case "pending": return "pending";
-		case "verify":
-		case "fuse": return "retry";
+		case "approved":
+		case "fuse": return "fuse";
 		case "skipped": return "skipped";
 	}
 }
@@ -123,6 +161,7 @@ function stageOf(state) {
 	switch (state) {
 		case "verify": return "verify";
 		case "pending": return "decide";
+		case "approved":
 		case "fuse": return "author";
 		case "skipped": return null;
 	}
@@ -142,7 +181,7 @@ function rowIdOf(key) {
 }
 function emptyMergeState() {
 	return {
-		schemaVersion: 1,
+		schemaVersion: 2,
 		rows: []
 	};
 }
@@ -155,25 +194,43 @@ function canRetry(record) {
 	return record.failure.retryable && record.failure.retryFrom !== "none";
 }
 //#endregion
-//#region lib/types/state.js
-/**
-* The one merge-state ledger: <home>/merge/merge-state.json.
-*
-* Reads are pure projections (no write, no reconciliation side effect). Every write goes
-* through mutateMergeState and a single transactIo, so there is no second file and no
-* incremental writer. A row's queue is always derived from its state on read; a hand-edited
-* mismatch is repaired by the next write, never by a GET.
-*/
-function mergeStatePath(home) {
-	return join(home, "merge", "merge-state.json");
+//#region lib/types/domain/migrate-v1.js
+function migrateV1Row(row) {
+	const queue = row.state === "pending" ? "pending" : row.state === "skipped" ? "skipped" : row.state === "fuse" ? "fuse" : "verify";
+	return {
+		schemaVersion: 2,
+		id: row.id,
+		pairKey: row.pairKey,
+		a: row.a,
+		b: row.b,
+		state: row.state,
+		queue,
+		...row.failure === void 0 ? {} : { failure: row.failure },
+		...row.decision === void 0 ? {} : { decision: row.decision },
+		...row.runId === void 0 ? {} : { runId: row.runId },
+		...row.unitId === void 0 ? {} : { unitId: row.unitId },
+		...row.origin === void 0 ? {} : { origin: row.origin },
+		...row.attempts === void 0 ? {} : { attempts: row.attempts },
+		...row.stagingRef === void 0 ? {} : { stagingRef: row.stagingRef },
+		...row.stagingExpiresAt === void 0 ? {} : { stagingExpiresAt: row.stagingExpiresAt },
+		createdAt: row.createdAt,
+		updatedAt: row.updatedAt
+	};
 }
-function isState(value) {
-	return typeof value === "string" && MERGE_PAIR_STATES.includes(value);
+//#endregion
+//#region lib/types/domain/ledger.js
+/** Pure v2 ledger normalization/projection. No IO. */
+function isRow(value) {
+	const row = value;
+	return typeof row.id === "string" && typeof row.pairKey === "string" && typeof row.a === "string" && typeof row.b === "string" && typeof row.state === "string" && typeof row.createdAt === "string" && typeof row.updatedAt === "string";
 }
-function parseState(raw) {
+function parseLedger(raw) {
 	if (raw === null) return {
 		ok: true,
-		rows: []
+		ledger: {
+			schemaVersion: 2,
+			rows: []
+		}
 	};
 	let parsed;
 	try {
@@ -181,52 +238,76 @@ function parseState(raw) {
 	} catch {
 		return {
 			ok: false,
-			rows: []
+			ledger: {
+				schemaVersion: 2,
+				rows: []
+			},
+			note: "invalid json"
 		};
 	}
 	const body = parsed;
 	if (!Array.isArray(body.rows)) return {
 		ok: false,
-		rows: []
+		ledger: {
+			schemaVersion: 2,
+			rows: []
+		},
+		note: "rows missing"
 	};
 	const rows = [];
 	let skipped = 0;
 	for (const value of body.rows) {
-		const row = value;
-		if (typeof row.id !== "string" || typeof row.pairKey !== "string" || typeof row.a !== "string" || typeof row.b !== "string") {
-			skipped += 1;
+		if (body.schemaVersion === 1) {
+			const legacy = value;
+			if (typeof legacy.id !== "string" || typeof legacy.pairKey !== "string" || typeof legacy.a !== "string" || typeof legacy.b !== "string" || typeof legacy.state !== "string" || typeof legacy.createdAt !== "string" || typeof legacy.updatedAt !== "string") {
+				skipped += 1;
+				continue;
+			}
+			const row = migrateV1Row(legacy);
+			rows.push(row);
 			continue;
 		}
-		if (!isState(row.state) || typeof row.createdAt !== "string" || typeof row.updatedAt !== "string") {
+		if (!isRow(value)) {
 			skipped += 1;
 			continue;
 		}
-		const normalized = {
-			id: row.id,
-			pairKey: row.pairKey,
-			a: row.a,
-			b: row.b,
-			state: row.state,
-			queue: queueOf(row.state),
-			createdAt: row.createdAt,
-			updatedAt: row.updatedAt,
-			...row.failure === void 0 ? {} : { failure: row.failure },
-			...row.decision === void 0 ? {} : { decision: row.decision },
-			...typeof row.runId === "string" ? { runId: row.runId } : {},
-			...typeof row.unitId === "string" ? { unitId: row.unitId } : {},
-			...row.origin === "agent" || row.origin === "human" ? { origin: row.origin } : {},
-			...typeof row.attempts === "number" ? { attempts: row.attempts } : {}
-		};
-		rows.push(normalized);
+		rows.push(value);
 	}
-	const versionNote = typeof body.schemaVersion === "number" && body.schemaVersion !== 1 ? "the index declares schemaVersion " + String(body.schemaVersion) + " while this build writes " + String(1) : void 0;
-	const note = versionNote === void 0 ? skipped === 0 ? void 0 : String(skipped) + " invalid row(s) skipped" : skipped === 0 ? versionNote : versionNote + "; " + String(skipped) + " invalid row(s) skipped";
+	const note = skipped === 0 ? void 0 : String(skipped) + " invalid row(s) skipped";
 	return {
 		ok: true,
-		rows,
+		ledger: {
+			schemaVersion: 2,
+			rows
+		},
 		...note === void 0 ? {} : { note }
 	};
 }
+//#endregion
+//#region lib/types/state.js
+/**
+* The one merge-state ledger: <home>/merge/merge-state.json.
+*
+* Reads are pure projections (no write, no reconciliation side effect). Every write goes
+* through mutateMergeState and a single transactIo, so there is no second file and no
+* incremental writer. A row's queue is always derived from its state on read; a hand-edited
+* mismatch is repaired by the next write, never by a GET.
+*/
+function mergeStatePath(home) {
+	return join(home, "merge", "merge-state.json");
+}
+function parseState(raw) {
+	const parsed = parseLedger(raw);
+	if (!parsed.ok) return {
+		ok: false,
+		rows: []
+	};
+	return {
+		ok: true,
+		rows: parsed.ledger.rows,
+		...parsed.note === void 0 ? {} : { note: parsed.note }
+	};
+}
 /** Pure read: never writes, never deletes a row. */
 async function loadMergeState(io, home) {
 	let raw = null;
@@ -236,7 +317,7 @@ async function loadMergeState(io, home) {
 		return {
 			ok: false,
 			state: {
-				schemaVersion: 1,
+				schemaVersion: 2,
 				rows: []
 			}
 		};
@@ -245,7 +326,7 @@ async function loadMergeState(io, home) {
 	return {
 		ok: parsed.ok,
 		state: {
-			schemaVersion: 1,
+			schemaVersion: 2,
 			rows: parsed.rows
 		},
 		...parsed.note === void 0 ? {} : { note: parsed.note }
@@ -258,7 +339,7 @@ async function mutateMergeState(io, home, now, fn) {
 		const out = fn(parseState(current).rows);
 		result = out.result;
 		return JSON.stringify({
-			schemaVersion: 1,
+			schemaVersion: 2,
 			rows: out.rows
 		}, null, 2);
 	});
@@ -325,135 +406,374 @@ async function rowsOf(io, home, queue) {
 	return queue === void 0 ? loaded.state.rows : loaded.state.rows.filter((row) => row.queue === queue);
 }
 //#endregion
-//#region lib/types/coordinator.js
+//#region lib/types/staging.js
 /**
-* Pure merge transition table. No io, no run shell, no subagents.
+* Staging is a run ARTIFACT, not a queue: <home>/merge/runs/<runId>/.
 *
-* Every transition returns the whole next row (or a drop), so the caller can persist it
-* through mutateMergeState in one transaction. Invalid transitions are refused by name;
-* a caller never "repairs" a row by guessing which state the operator meant.
+* createStaging writes a sibling .partial tree first and renames it into place; the .stage
+* marker is the last write inside the partial. A directory without that marker is a
+* half-created artifact and reads as unknown, never as "empty".
 */
-function invalid(event, state) {
-	return {
-		ok: false,
-		code: "invalid-transition",
-		message: "cannot apply " + event.type + " to " + (state ?? "no row")
-	};
+const STAGING_SCHEMA_VERSION = 1;
+function stageKeyOf(runId, pairKey) {
+	return runId + "/pairs/" + createHash("sha256").update(pairKey).digest("hex").slice(0, 16);
 }
-/** 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.attempts === void 0 ? {} : { attempts: row.attempts },
-		...row.stagingRef === void 0 ? {} : { stagingRef: row.stagingRef },
-		...row.stagingExpiresAt === void 0 ? {} : { stagingExpiresAt: row.stagingExpiresAt }
-	};
+function stagingRoot(home, runId) {
+	return join(home, "merge", "runs", runId);
 }
-function next(row, at, state, patch = {}) {
-	return {
-		ok: true,
-		row: {
-			...base(row, at),
-			state,
-			queue: queueOf(state),
-			...patch
-		}
-	};
+/** Relative support paths only; the staging tree must never escape its run directory. */
+function safeRelative$2(path) {
+	if (path === "" || path.startsWith("/") || path.startsWith("\\") || path.includes("\0")) return false;
+	return path.replace(/\\/g, "/").split("/").every((part) => part !== "" && part !== "." && part !== "..");
 }
-function transition(current, event) {
-	if (event.type === "candidate") {
-		if (current !== void 0) return {
-			ok: true,
-			row: current
+function manifestText(manifest) {
+	return JSON.stringify(manifest, null, 2) + "\n";
+}
+async function createStaging(io, home, input) {
+	const final = stagingRoot(home, input.runId);
+	if (await io.exists(final)) return {
+		ok: false,
+		message: "staging already exists for run " + input.runId
+	};
+	const names = /* @__PURE__ */ new Set();
+	for (const source of input.sources) {
+		if (names.has(source.name)) return {
+			ok: false,
+			message: "duplicate source " + source.name
 		};
-		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: "retry",
-				createdAt: event.at,
-				updatedAt: event.at
-			}
+		names.add(source.name);
+		for (const file of source.files) if (!safeRelative$2(file.path)) return {
+			ok: false,
+			message: "unsafe support path: " + file.path
 		};
 	}
-	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 partial = final + ".partial";
+	try {
+		await io.remove(partial);
+		for (const source of input.sources) {
+			const dir = join(partial, "sources", source.name);
+			await io.writeText(join(dir, "SKILL.md"), source.body);
+			for (const file of source.files) await io.writeText(join(dir, ...file.path.split("/")), file.content);
+		}
+		const at = input.now();
+		const manifest = {
+			schemaVersion: 1,
+			runId: input.runId,
+			target: input.target,
+			...input.mode === void 0 ? {} : { mode: input.mode },
+			sources: input.sources.map((source) => source.name),
+			promptVersion: input.promptVersion,
+			createdAt: at,
+			expiresAt: at + Math.max(0, input.ttlDays) * 864e5
 		};
-		const key = pairKey(event.a, event.b);
+		await io.writeText(join(partial, "manifest.json"), manifestText(manifest));
+		await io.writeText(join(partial, ".stage"), "");
+		await io.rename(partial, final);
 		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
-			}
+			path: final,
+			manifest
+		};
+	} catch (error) {
+		try {
+			await io.remove(partial);
+		} catch {}
+		return {
+			ok: false,
+			message: "staging create failed: " + (error instanceof Error ? error.message : String(error))
 		};
-	}
-	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 }
-			}) : next(current, event.at, "fuse", {
-				...event.decision === void 0 ? {} : { decision: event.decision },
-				...event.stagingRef === void 0 ? {} : { stagingRef: event.stagingRef },
-				...event.stagingExpiresAt === void 0 ? {} : { stagingExpiresAt: event.stagingExpiresAt }
-			});
-		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, "fuse", { ...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-fail": return current.state === "fuse" ? next(current, event.at, "fuse", {
-			failure: event.failure,
-			attempts: (current.attempts ?? 0) + 1
-		}) : invalid(event, current.state);
-		case "round2-success": return current.state === "fuse" ? {
-			ok: true,
-			row: null
-		} : invalid(event, current.state);
-		case "restore": return current.state === "skipped" ? next(current, event.at, "verify") : invalid(event, current.state);
 	}
 }
-//#endregion
-//#region lib/types/status.js
-function countRows(rows) {
-	const counts = {
-		pending: 0,
-		retry: 0,
+async function readStaging(io, home, runId) {
+	const path = stagingRoot(home, runId);
+	if (!await io.exists(path)) return probeAbsent();
+	if (!await io.exists(join(path, ".stage"))) return probeUnknown("staging " + runId + " has no .stage marker (half-created)");
+	const probe = await probeText(io, join(path, "manifest.json"));
+	if (!isPresent(probe)) return probe;
+	try {
+		const parsed = JSON.parse(probe.value);
+		if (parsed.schemaVersion !== 1 || parsed.runId !== runId || typeof parsed.target !== "string" || !Array.isArray(parsed.sources)) return probeUnknown("staging manifest has an unexpected shape");
+		return probePresent({
+			path,
+			manifest: parsed
+		});
+	} catch (error) {
+		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;
+	const manifest = Object.assign({}, view.value.manifest, { target }, mode === void 0 ? {} : { 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;
+	try {
+		runs = await io.list(join(home, "merge", "runs"));
+	} catch {
+		return {
+			removed: [],
+			kept: [],
+			unknown: []
+		};
+	}
+	const removed = [];
+	const kept = [];
+	const unknown = [];
+	for (const runId of runs.sort()) {
+		if (keep.has(runId)) {
+			kept.push(runId);
+			continue;
+		}
+		const view = await readStaging(io, home, runId);
+		if (view.kind === "unknown") {
+			unknown.push(runId);
+			continue;
+		}
+		if (view.kind !== "present" || view.value.manifest.expiresAt > now) {
+			kept.push(runId);
+			continue;
+		}
+		try {
+			await io.remove(stagingRoot(home, runId));
+			removed.push(runId);
+		} catch {
+			unknown.push(runId);
+		}
+	}
+	return {
+		removed,
+		kept,
+		unknown
+	};
+}
+//#endregion
+//#region lib/types/commit-receipt.js
+/**
+* Commit receipt: <run>/commit.json, written immediately after a successful commit.
+* It is the idempotency/recovery marker — merge resume and run start read it before
+* replaying a commit. Receipt write failure must not turn a landed commit into a failure;
+* the caller reports the warning instead.
+*/
+function commitReceiptPath(home, runId) {
+	return join(stagingRoot(home, runId), "commit.json");
+}
+function durableReceiptDir(home, parentRunId) {
+	return join(home, "merge", "receipts", parentRunId);
+}
+function durableReceiptPath(home, parentRunId, stageKey) {
+	const leaf = stageKey.split("/").pop() ?? stageKey;
+	return join(durableReceiptDir(home, parentRunId), leaf + ".json");
+}
+function parseReceipt(raw) {
+	if (raw === null) return null;
+	try {
+		const parsed = JSON.parse(raw);
+		if (typeof parsed.runId !== "string" || typeof parsed.unitId !== "string" || typeof parsed.target !== "string" || typeof parsed.create !== "boolean" || !Array.isArray(parsed.sources) || !Array.isArray(parsed.archived) || typeof parsed.at !== "number") return null;
+		return parsed;
+	} catch {
+		return null;
+	}
+}
+async function writeCommitReceipt(io, home, receipt) {
+	const path = commitReceiptPath(home, receipt.runId);
+	await io.writeText(path, JSON.stringify(receipt, null, 2) + "\n");
+	const parent = receipt.parentRunId ?? receipt.runId.split("/pairs/")[0] ?? receipt.runId;
+	await io.writeText(durableReceiptPath(home, parent, receipt.runId), JSON.stringify({
+		...receipt,
+		parentRunId: parent
+	}, null, 2) + "\n");
+	return path;
+}
+async function readCommitReceipts(io, home) {
+	const root = join(home, "merge", "receipts");
+	const out = [];
+	let runs;
+	try {
+		runs = await io.list(root);
+	} catch {
+		return out;
+	}
+	for (const run of runs.sort()) {
+		const dir = join(root, run);
+		let files;
+		try {
+			files = await io.list(dir);
+		} catch {
+			continue;
+		}
+		for (const file of files.sort()) {
+			if (!file.endsWith(".json")) continue;
+			const receipt = parseReceipt(await io.readText(join(dir, file)));
+			if (receipt !== null) out.push(receipt);
+		}
+	}
+	return out;
+}
+async function readCommitReceipt(io, home, runId, target) {
+	const direct = parseReceipt(await io.readText(commitReceiptPath(home, runId)));
+	if (direct !== null && (target === void 0 || direct.target === target)) return direct;
+	try {
+		const names = await io.list(durableReceiptDir(home, runId));
+		for (const name of names.sort()) {
+			const receipt = parseReceipt(await io.readText(join(durableReceiptDir(home, runId), name)));
+			if (receipt !== null && (target === void 0 || receipt.target === target)) return receipt;
+		}
+	} catch {}
+	return null;
+}
+//#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 mutateMergeState in one 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
+		}
+	};
+}
+function transition(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 }
+			}) : 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 }
+			});
+		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 "restore": return current.state === "skipped" ? next(current, event.at, "verify") : invalid(event, current.state);
+	}
+}
+//#endregion
+//#region lib/types/status.js
+function countRows(rows) {
+	const counts = {
+		verify: 0,
+		pending: 0,
+		fuse: 0,
 		skipped: 0
 	};
 	for (const row of rows) counts[queueOf(row.state)] += 1;
@@ -466,7 +786,7 @@ function describe(row) {
 }
 function formatStatus(rows) {
 	const counts = countRows(rows);
-	const lines = ["merge: pending " + String(counts.pending) + ", retry " + String(counts.retry) + ", skipped " + String(counts.skipped)];
+	const lines = ["merge: verify " + String(counts.verify) + ", pending " + String(counts.pending) + ", fuse " + String(counts.fuse) + ", skipped " + String(counts.skipped)];
 	for (const row of rows) lines.push("- " + describe(row));
 	return lines.join("\n");
 }
@@ -500,22 +820,33 @@ function toRowView(row) {
 		...row.attempts === void 0 ? {} : { attempts: row.attempts },
 		...row.origin === void 0 ? {} : { origin: row.origin },
 		...row.stagingExpiresAt === void 0 ? {} : { stagingExpiresAt: row.stagingExpiresAt },
+		...row.expired === void 0 ? {} : { expired: row.expired },
+		...row.reason === void 0 ? {} : { reason: row.reason },
+		summary: [
+			row.a + " + " + row.b,
+			row.decision?.rationale ?? row.reason ?? "",
+			row.failure?.message ?? ""
+		],
 		actions: row.state === "pending" ? ["/evolution merge approve " + row.id, "/evolution merge reject " + row.id] : row.state === "skipped" ? ["/evolution merge skipped --restore " + row.id] : ["/evolution merge resume " + row.id]
 	};
 }
 function buildMergeView(rows, commands, latestRun, approval) {
 	const counts = countRows(rows);
 	return {
-		schemaVersion: 1,
+		schemaVersion: 2,
 		counts,
 		tabs: [
+			{
+				queue: "verify",
+				count: counts.verify
+			},
 			{
 				queue: "pending",
 				count: counts.pending
 			},
 			{
-				queue: "retry",
-				count: counts.retry
+				queue: "fuse",
+				count: counts.fuse
 			},
 			{
 				queue: "skipped",
@@ -554,8 +885,70 @@ function toRunFact(run) {
 	};
 }
 //#endregion
+//#region lib/types/domain/markdown.js
+/** Minimal safe Markdown renderer for the read-only body route. */
+function escapeHtml(text) {
+	return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+}
+function renderMarkdown(source) {
+	const fence = String.fromCharCode(96, 96, 96);
+	const lines = source.split(/\r?\n/);
+	const out = [];
+	let inCode = false;
+	let inList = false;
+	for (const line of lines) {
+		if (line.startsWith(fence)) {
+			if (inCode) {
+				out.push("</code></pre>");
+				inCode = false;
+			} else {
+				out.push("<pre><code>");
+				inCode = true;
+			}
+			continue;
+		}
+		if (inCode) {
+			out.push(escapeHtml(line));
+			continue;
+		}
+		const heading = /^(#{1,6})\s+(.*)$/.exec(line);
+		if (heading !== null) {
+			if (inList) {
+				out.push("</ul>");
+				inList = false;
+			}
+			const level = heading[1]?.length ?? 1;
+			out.push("<h" + String(level) + ">" + escapeHtml(heading[2] ?? "") + "</h" + String(level) + ">");
+			continue;
+		}
+		if (/^[-*]\s+/.test(line)) {
+			if (!inList) {
+				out.push("<ul>");
+				inList = true;
+			}
+			out.push("<li>" + escapeHtml(line.replace(/^[-*]\s+/, "")) + "</li>");
+			continue;
+		}
+		if (inList) {
+			out.push("</ul>");
+			inList = false;
+		}
+		out.push(line.trim() === "" ? "" : "<p>" + escapeHtml(line) + "</p>");
+	}
+	if (inList) out.push("</ul>");
+	if (inCode) out.push("</code></pre>");
+	return out.join("\n");
+}
+//#endregion
 //#region lib/types/merge-routes.js
-const MERGE_ROUTES = HOST_ROUTES.merge;
+const MERGE_PATHS = HOST_ROUTES.merge;
+const MERGE_BASE = MERGE_PATHS.view.slice(0, -4);
+const MERGE_ROUTES = {
+	view: MERGE_PATHS.view,
+	rows: MERGE_PATHS.rows,
+	body: MERGE_PATHS.body ?? MERGE_BASE + "body",
+	history: MERGE_PATHS.history ?? MERGE_BASE + "history"
+};
 function makeMergeRoutes(deps, _audit) {
 	const absent = () => json(503, {
 		ok: false,
@@ -593,12 +986,12 @@ function makeMergeRoutes(deps, _audit) {
 				const source = deps.getSource();
 				if (source === void 0) return absent();
 				const query = url(request).searchParams;
-				const queue = query.get("queue") ?? "retry";
-				if (queue !== "pending" && queue !== "retry" && queue !== "skipped") return json(400, {
+				const queue = query.get("queue") ?? "verify";
+				if (queue !== "verify" && queue !== "pending" && queue !== "fuse" && queue !== "skipped") return json(400, {
 					ok: false,
 					error: {
 						code: "bad-queue",
-						message: "queue must be pending/retry/skipped"
+						message: "queue must be verify/pending/fuse/skipped"
 					}
 				});
 				const cursor = Number.parseInt(query.get("cursor") ?? "0", 10);
@@ -610,7 +1003,7 @@ function makeMergeRoutes(deps, _audit) {
 			}
 		},
 		{
-			path: MERGE_ROUTES.run,
+			path: MERGE_ROUTES.body,
 			methods: ["GET"],
 			requestBody: "buffered",
 			fetch: async (request) => {
@@ -618,29 +1011,35 @@ function makeMergeRoutes(deps, _audit) {
 				if (denied !== null) return denied;
 				const source = deps.getSource();
 				if (source === void 0) return absent();
-				const id = url(request).searchParams.get("id");
-				if (id === null || id === "") return json(400, {
+				const query = url(request).searchParams;
+				const id = query.get("id");
+				const side = query.get("side");
+				if (id === null || id === "" || side !== "a" && side !== "b") return json(400, {
 					ok: false,
 					error: {
-						code: "missing-id",
-						message: "id is required"
+						code: "bad-body-query",
+						message: "id and side=a|b are required"
 					}
 				});
-				const run = await source.run(id);
-				return run === void 0 ? json(404, {
+				const content = await source.body(id, side);
+				return content === null ? json(404, {
 					ok: false,
 					error: {
-						code: "run-not-found",
-						message: "merge run not found: " + id
+						code: "body-not-found",
+						message: "merge body not found: " + id
 					}
 				}) : json(200, {
 					ok: true,
-					data: toRunFact(run)
+					data: {
+						content,
+						markdown: true,
+						html: renderMarkdown(content)
+					}
 				});
 			}
 		},
 		{
-			path: MERGE_ROUTES.runs,
+			path: MERGE_ROUTES.history,
 			methods: ["GET"],
 			requestBody: "buffered",
 			fetch: async (request) => {
@@ -648,11 +1047,9 @@ function makeMergeRoutes(deps, _audit) {
 				if (denied !== null) return denied;
 				const source = deps.getSource();
 				if (source === void 0) return absent();
-				const query = url(request).searchParams;
-				const limit = Number.parseInt(query.get("limit") ?? "20", 10);
 				return json(200, {
 					ok: true,
-					data: { items: (await source.runs(query.get("cursor") ?? void 0, Number.isFinite(limit) ? limit : 20)).map(toRunFact) }
+					data: { items: await source.history() }
 				});
 			}
 		}
@@ -660,12 +1057,12 @@ function makeMergeRoutes(deps, _audit) {
 }
 //#endregion
 //#region lib/types/commands.js
-const USAGE = "usage: /evolution merge scan | pair <a> <b> | status [id] | report [id] | cancel [id] | runs | doctor | pending | approve <id> | reject <id> | resume [id] [--clear <id>] | skipped [--restore <id>] | undo <target> --run <id>";
+const USAGE = "usage: /evolution merge scan | pair [--force] <a> <b> | status [id] | report [id] | cancel [id] | runs | doctor | pending [--expired] | candidates [--retry] | approve <id> | reject <id> | resume [id] [--retry] [--clear <id>] | skipped [--restore <id>] | discard <id> | undo <target> --run <id>";
 function flags(args, allowed) {
 	const values = /* @__PURE__ */ new Map();
 	for (let index = 0; index < args.length; index += 1) {
 		const token = args[index];
-		if (!token.startsWith("--")) continue;
+		if (!token.startsWith("--") || token === "--force" || token === "--expired" || token === "--retry") continue;
 		const name = token.slice(2);
 		if (!allowed.includes(name)) return {
 			values,
@@ -681,8 +1078,12 @@ function flags(args, allowed) {
 	}
 	return { values };
 }
+function switches(args) {
+	return new Set(args.filter((token) => token === "--force" || token === "--expired" || token === "--retry").map((token) => token.slice(2)));
+}
 function positional(args) {
-	return args.filter((token, index) => !token.startsWith("--") && !(index > 0 && args[index - 1].startsWith("--")));
+	const filtered = args.filter((token) => token !== "--force" && token !== "--expired" && token !== "--retry");
+	return filtered.filter((token, index) => !token.startsWith("--") && !(index > 0 && filtered[index - 1].startsWith("--")));
 }
 function parseMergeCommand(argv) {
 	const [verb, ...rest] = argv;
@@ -692,6 +1093,7 @@ function parseMergeCommand(argv) {
 		help: true
 	};
 	const pos = positional(rest);
+	const marked = switches(rest);
 	switch (verb) {
 		case "scan": return pos.length === 0 ? {
 			ok: true,
@@ -706,7 +1108,8 @@ function parseMergeCommand(argv) {
 			command: {
 				verb: "pair",
 				a: pos[0],
-				b: pos[1]
+				b: pos[1],
+				...marked.has("force") ? { force: true } : {}
 			}
 		} : {
 			ok: false,
@@ -764,7 +1167,21 @@ function parseMergeCommand(argv) {
 		};
 		case "pending": return pos.length === 0 ? {
 			ok: true,
-			command: { verb: "pending" }
+			command: {
+				verb: "pending",
+				...marked.has("expired") ? { expired: true } : {}
+			}
+		} : {
+			ok: false,
+			code: "usage",
+			message: USAGE
+		};
+		case "candidates": return pos.length === 0 ? {
+			ok: true,
+			command: {
+				verb: "candidates",
+				...marked.has("retry") ? { retry: true } : {}
+			}
 		} : {
 			ok: false,
 			code: "usage",
@@ -810,7 +1227,8 @@ function parseMergeCommand(argv) {
 				command: {
 					verb: "resume",
 					...pos[0] === void 0 ? {} : { id: pos[0] },
-					...clear === void 0 ? {} : { clear }
+					...clear === void 0 ? {} : { clear },
+					...marked.has("retry") ? { retry: true } : {}
 				}
 			};
 		}
@@ -835,6 +1253,17 @@ function parseMergeCommand(argv) {
 				}
 			};
 		}
+		case "discard": return pos.length === 1 ? {
+			ok: true,
+			command: {
+				verb: "discard",
+				id: pos[0]
+			}
+		} : {
+			ok: false,
+			code: "usage",
+			message: USAGE
+		};
 		case "undo": {
 			const parsed = flags(rest, ["run"]);
 			if (parsed.error !== void 0) return {
@@ -861,7 +1290,7 @@ function parseMergeCommand(argv) {
 		default: return {
 			ok: false,
 			code: "usage",
-			message: "unknown merge command: " + verb + "\nusage: /evolution merge scan | pair <a> <b> | status [id] | report [id] | cancel [id] | runs | doctor | pending | approve <id> | reject <id> | resume [id] [--clear <id>] | skipped [--restore <id>] | undo <target> --run <id>"
+			message: "unknown merge command: " + verb + "\nusage: /evolution merge scan | pair [--force] <a> <b> | status [id] | report [id] | cancel [id] | runs | doctor | pending [--expired] | candidates [--retry] | approve <id> | reject <id> | resume [id] [--retry] [--clear <id>] | skipped [--restore <id>] | discard <id> | undo <target> --run <id>"
 		};
 	}
 }
@@ -879,7 +1308,15 @@ async function handleReadOnlyMergeCommand(command, io, home) {
 		}
 		return formatStatus(loaded.state.rows);
 	}
-	if (command.verb === "pending") return formatQueue((await loadMergeState(io, home)).state.rows, "pending");
+	if (command.verb === "pending") {
+		const loaded = await loadMergeState(io, home);
+		const rows = command.expired === true ? loaded.state.rows.filter((row) => row.expired !== void 0) : loaded.state.rows;
+		return command.expired === true ? formatStatus(rows) : formatQueue(rows, "pending");
+	}
+	if (command.verb === "candidates") {
+		const loaded = await loadMergeState(io, home);
+		return formatQueue(command.retry === true ? loaded.state.rows.filter((row) => row.state === "approved") : loaded.state.rows, command.retry === true ? "fuse" : "verify");
+	}
 	if (command.verb === "skipped") return formatQueue((await loadMergeState(io, home)).state.rows, "skipped");
 	return null;
 }
@@ -887,6 +1324,13 @@ function mergeCommandHelp() {
 	return mergeUsage();
 }
 //#endregion
+//#region lib/types/domain/errors.js
+function formatMergeError(error) {
+	if (error.kind === "parameter") return "merge: " + error.message + " (" + error.code + ")";
+	const detail = "\n" + (error.detail ?? "no additional detail");
+	return "merge failed: " + error.message + " (" + error.code + ")" + detail + "\nnext: fix the target or rerun after the cause is gone";
+}
+//#endregion
 //#region lib/types/merge-command.js
 function createReadOnlyMergeService(io, home) {
 	return { async execute(command) {
@@ -918,7 +1362,11 @@ async function runMergeCommand(service, rawInput, invocation) {
 	} catch (error) {
 		return {
 			ok: false,
-			text: "merge 命令失败：" + (error instanceof Error ? error.message : String(error)) + "\n运行 /evolution merge status 查看状态。"
+			text: formatMergeError({
+				kind: "runtime",
+				code: "merge-command-failed",
+				message: error instanceof Error ? error.message : String(error)
+			})
 		};
 	}
 }
@@ -959,11 +1407,58 @@ function isSkippedPair(keys, a, b) {
 	return keys.has(pairKey(a, b));
 }
 //#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 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/scan-run.js
 /**
 * The scan pair loop. Registry/report lifecycle stays in withMergeRun; this module owns
 * candidate → round1 → pending/fuse → commit transitions and returns the report draft.
 */
+const isAborted = (signal) => signal.aborted;
 function at(now) {
 	return new Date(now()).toISOString();
 }
@@ -995,8 +1490,9 @@ async function runScan(options) {
 	const candidates = await options.ports.screening(options.signal);
 	const before = await loadMergeState(options.io, options.home);
 	const queueBefore = {
+		verify: 0,
 		pending: 0,
-		retry: 0,
+		fuse: 0,
 		skipped: 0
 	};
 	for (const row of before.state.rows) queueBefore[row.queue] += 1;
@@ -1012,11 +1508,11 @@ async function runScan(options) {
 	const remaining = [];
 	let stopReason = "completed";
 	for (let index = 0; index < candidates.length; index += 1) {
-		if (options.signal.aborted) {
+		if (isAborted(options.signal)) {
 			stopReason = "cancelled";
 			remaining.push(...candidates.slice(index).map((candidate) => ({
 				pairKey: pairKey(candidate.a, candidate.b),
-				queue: "retry"
+				queue: "verify"
 			})));
 			break;
 		}
@@ -1024,7 +1520,7 @@ async function runScan(options) {
 			stopReason = "timeout";
 			remaining.push(...candidates.slice(index).map((candidate) => ({
 				pairKey: pairKey(candidate.a, candidate.b),
-				queue: "retry"
+				queue: "verify"
 			})));
 			break;
 		}
@@ -1051,7 +1547,7 @@ async function runScan(options) {
 				pairKey: pairKey(candidate.a, candidate.b),
 				a: candidate.a,
 				b: candidate.b,
-				queue: "retry",
+				queue: "verify",
 				candidate,
 				outcome: "failed",
 				archived: [],
@@ -1068,6 +1564,14 @@ async function runScan(options) {
 				failure: failureOf("decide", error)
 			};
 		}
+		if (isAborted(options.signal)) {
+			stopReason = "cancelled";
+			remaining.push(...candidates.slice(index).map((candidate) => ({
+				pairKey: pairKey(candidate.a, candidate.b),
+				queue: "verify"
+			})));
+			break;
+		}
 		if (round1.kind === "failed") {
 			const next = transition(row, {
 				type: "round1-fail",
@@ -1090,6 +1594,11 @@ async function runScan(options) {
 			if (next.ok && next.row !== null) {
 				row = next.row;
 				await upsertRow(options.io, options.home, options.now, row);
+				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 }));
 			totals.kept += 1;
@@ -1105,8 +1614,8 @@ async function runScan(options) {
 				type: "round1-merge",
 				approval: "on",
 				decision: round1.decision,
-				...round1.stagingRef === void 0 ? {} : { stagingRef: round1.stagingRef },
-				...round1.stagingExpiresAt === void 0 ? {} : { stagingExpiresAt: round1.stagingExpiresAt },
+				...round1.sourceRevision === void 0 ? {} : { sourceRevision: round1.sourceRevision },
+				...round1.targetRevision === void 0 ? {} : { targetRevision: round1.targetRevision },
 				at: at(options.now)
 			});
 			if (next.ok && next.row !== null) {
@@ -1135,6 +1644,22 @@ async function runScan(options) {
 		}
 		row = fuse.row;
 		await upsertRow(options.io, options.home, options.now, row);
+		if (isAborted(options.signal)) {
+			const cancelled = transition(row, {
+				type: "round2-cancel",
+				at: at(options.now)
+			});
+			if (cancelled.ok && cancelled.row !== null) {
+				row = cancelled.row;
+				await upsertRow(options.io, options.home, options.now, row);
+			}
+			stopReason = "cancelled";
+			remaining.push(...candidates.slice(index).map((candidate) => ({
+				pairKey: pairKey(candidate.a, candidate.b),
+				queue: "fuse"
+			})));
+			break;
+		}
 		await stage("author", {
 			done: index,
 			total: candidates.length
@@ -1207,7 +1732,7 @@ function mergeReportDigestPath(home, runId) {
 function isReport(value) {
 	if (typeof value !== "object" || value === null) return false;
 	const report = value;
-	return report.schemaVersion === 1 && report.kind === "merge" && typeof report.runId === "string" && typeof report.command === "string" && typeof report.startedAt === "number" && typeof report.endedAt === "number" && Array.isArray(report.pairs) && typeof report.totals === "object" && Array.isArray(report.notes);
+	return report.schemaVersion === 2 && report.kind === "merge" && typeof report.runId === "string" && typeof report.command === "string" && typeof report.startedAt === "number" && typeof report.endedAt === "number" && Array.isArray(report.pairs) && typeof report.totals === "object" && Array.isArray(report.notes);
 }
 function digest(report) {
 	const lines = [];
@@ -1254,8 +1779,9 @@ function emptyDraft(reason) {
 		scope: {
 			candidatePairs: 0,
 			queueBefore: {
+				verify: 0,
 				pending: 0,
-				retry: 0,
+				fuse: 0,
 				skipped: 0
 			}
 		},
@@ -1272,6 +1798,7 @@ function emptyDraft(reason) {
 async function withMergeRun(options) {
 	const handle = await options.registry.begin("merge", {
 		command: options.command,
+		mergeStatus: "running",
 		...options.total === void 0 ? {} : { total: options.total }
 	});
 	const startedAt = handle.startedAt;
@@ -1280,64 +1807,77 @@ async function withMergeRun(options) {
 		done: 0,
 		total: options.total
 	});
-	let draft;
-	try {
-		draft = await options.body({
+	const finish = async () => {
+		let draft;
+		try {
+			draft = await options.body({
+				runId: handle.id,
+				startedAt,
+				signal: handle.signal,
+				stage
+			});
+		} catch (error) {
+			draft = emptyDraft("run body failed: " + (error instanceof Error ? error.message : String(error)));
+		}
+		const report = {
+			schemaVersion: 2,
 			runId: handle.id,
+			kind: "merge",
+			command: options.command,
 			startedAt,
-			signal: handle.signal,
-			stage
-		});
-	} catch (error) {
-		draft = emptyDraft("run body failed: " + (error instanceof Error ? error.message : String(error)));
-	}
-	const report = {
-		schemaVersion: 1,
-		runId: handle.id,
-		kind: "merge",
-		command: options.command,
-		startedAt,
-		endedAt: options.now(),
-		stopReason: draft.stopReason,
-		approval: options.approval,
-		scope: draft.scope,
-		pairs: draft.pairs,
-		totals: draft.totals,
-		notes: draft.notes,
-		...draft.remaining === void 0 ? {} : { remaining: draft.remaining }
-	};
-	let reportPath;
-	try {
-		reportPath = await writeMergeReport(options.io, options.home, report);
-	} catch (error) {
+			endedAt: options.now(),
+			stopReason: draft.stopReason,
+			approval: options.approval,
+			scope: draft.scope,
+			pairs: draft.pairs,
+			totals: draft.totals,
+			notes: draft.notes,
+			...draft.remaining === void 0 ? {} : { remaining: draft.remaining }
+		};
+		let reportPath;
+		try {
+			reportPath = await writeMergeReport(options.io, options.home, report);
+		} catch (error) {
+			await options.registry.settle(handle.id, {
+				state: "failed",
+				failure: "report write failed: " + (error instanceof Error ? error.message : String(error))
+			});
+			return {
+				ok: false,
+				runId: handle.id,
+				message: "report write failed"
+			};
+		}
+		const runState = report.stopReason === "completed" ? "succeeded" : report.stopReason === "cancelled" ? "cancelled" : "failed";
+		const mergeStatus = report.pairs.some((pair) => pair.outcome === "pending") ? "awaiting-approval" : runState;
 		await options.registry.settle(handle.id, {
-			state: "failed",
-			failure: "report write failed: " + (error instanceof Error ? error.message : String(error))
+			state: runState,
+			resultRef: reportPath,
+			mergeStatus,
+			...runState === "failed" ? { failure: "merge " + report.stopReason } : {}
 		});
+		if (report.stopReason === "completed") return {
+			ok: true,
+			runId: handle.id,
+			reportPath,
+			report
+		};
 		return {
 			ok: false,
 			runId: handle.id,
-			message: "report write failed"
+			message: "merge " + report.stopReason,
+			reportPath
 		};
-	}
-	const runState = report.stopReason === "completed" ? "succeeded" : report.stopReason === "cancelled" ? "cancelled" : "failed";
-	await options.registry.settle(handle.id, {
-		state: runState,
-		resultRef: reportPath,
-		...runState === "failed" ? { failure: "merge " + report.stopReason } : {}
-	});
-	if (report.stopReason === "completed") return {
-		ok: true,
-		runId: handle.id,
-		reportPath,
-		report
-	};
-	return {
-		ok: false,
-		runId: handle.id,
-		message: "merge " + report.stopReason,
-		reportPath
 	};
+	if (options.detached === true) {
+		finish().catch(() => {});
+		return {
+			ok: true,
+			accepted: true,
+			runId: handle.id
+		};
+	}
+	return await finish();
 }
 //#endregion
 //#region lib/types/scan-command.js
@@ -1352,6 +1892,7 @@ async function runScanCommand(options) {
 			mergeApproval: options.approval
 		},
 		now: options.now,
+		...options.detached === void 0 ? {} : { detached: options.detached },
 		async body(ctx) {
 			const ports = options.makePorts === void 0 ? options.ports : options.makePorts(ctx.runId);
 			if (ports === void 0) throw new Error("scan requires ports or makePorts");
@@ -1431,7 +1972,17 @@ async function recordRound2Outcome(io, home, now, row, outcome) {
 		if (transition(row, {
 			type: "round2-success",
 			at
-		}).ok) await dropRow(io, home, now, row.id);
+		}).ok) {
+			await dropRow(io, home, now, row.id);
+			const target = outcome.target?.actual ?? outcome.target?.requested ?? row.decision?.target;
+			await recordPair(io, home, {
+				pairKey: row.pairKey,
+				runId: row.runId ?? "merge",
+				result: "merged",
+				...target === void 0 ? {} : { target },
+				...outcome.unitId === void 0 ? {} : { reportRef: outcome.unitId }
+			});
+		}
 		return {
 			merged: true,
 			pair: {
@@ -1460,7 +2011,15 @@ async function recordRound2Outcome(io, home, now, row, outcome) {
 		failure,
 		at
 	});
-	if (next.ok && next.row !== null) await upsertRow(io, home, now, next.row);
+	if (next.ok && next.row !== null) {
+		await upsertRow(io, home, now, next.row);
+		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: {
@@ -1525,8 +2084,9 @@ async function runApproveCommand(options) {
 				scope: {
 					candidatePairs: 1,
 					queueBefore: {
+						verify: 0,
 						pending: 0,
-						retry: 1,
+						fuse: 1,
 						skipped: 0
 					}
 				},
@@ -1547,276 +2107,112 @@ async function runApproveCommand(options) {
 					kept: 0,
 					pending: 0,
 					failed: 1
-				}
-			};
-		}
-	});
-}
-//#endregion
-//#region lib/types/resume-command.js
-async function runResumeCommand(options) {
-	const row = (await loadMergeState(options.io, options.home)).state.rows.find((item) => item.id === options.rowId);
-	if (row === void 0) return {
-		ok: false,
-		message: "merge row not found: " + options.rowId
-	};
-	if (row.state === "verify") return await runScanCommand({
-		io: options.io,
-		home: options.home,
-		registry: options.registry,
-		approval: true,
-		platformWrite: options.platformWrite,
-		now: options.now,
-		...options.makePorts === void 0 ? { ports: {
-			...options.ports,
-			screening: () => Promise.resolve([{
-				a: row.a,
-				b: row.b
-			}])
-		} } : { makePorts: (runId) => {
-			const makePorts = options.makePorts;
-			if (makePorts === void 0) throw new Error("resume makePorts disappeared");
-			return {
-				...makePorts(runId),
-				screening: () => Promise.resolve([{
-					a: row.a,
-					b: row.b
-				}])
-			};
-		} },
-		...options.timeoutMinutes === void 0 ? {} : { timeoutMinutes: options.timeoutMinutes }
-	});
-	if (row.state !== "fuse") return {
-		ok: false,
-		message: "row is not resumable from state " + row.state
-	};
-	const decision = row.decision;
-	if (decision === void 0) return {
-		ok: false,
-		message: "fuse row has no decision"
-	};
-	return await withMergeRun({
-		io: options.io,
-		home: options.home,
-		registry: options.registry,
-		command: "resume",
-		approval: {
-			platformWrite: options.platformWrite,
-			mergeApproval: true
-		},
-		now: options.now,
-		async body(ctx) {
-			await ctx.stage("author", {
-				done: 0,
-				total: 1
-			});
-			let outcome;
-			try {
-				outcome = options.round2WithRun === void 0 ? await options.ports.round2(row, decision, ctx.signal) : await options.round2WithRun(row, decision, ctx.signal, ctx.runId);
-			} catch (error) {
-				outcome = {
-					kind: "failed",
-					failure: {
-						stage: "author",
-						code: "merge-failed",
-						message: error instanceof Error ? error.message : String(error),
-						retryable: true,
-						retryFrom: "agent2"
-					}
-				};
-			}
-			const record = await recordRound2Outcome(options.io, options.home, options.now, row, outcome);
-			return {
-				stopReason: record.merged ? "completed" : "failed",
-				scope: {
-					candidatePairs: 1,
-					queueBefore: {
-						pending: 0,
-						retry: 1,
-						skipped: 0
-					}
-				},
-				pairs: [record.pair],
-				totals: record.merged ? {
-					merged: 1,
-					kept: 0,
-					pending: 0,
-					failed: 0
-				} : {
-					merged: 0,
-					kept: 0,
-					pending: 0,
-					failed: 1
-				},
-				notes: []
-			};
-		}
-	});
-}
-//#endregion
-//#region lib/types/staging.js
-/**
-* Staging is a run ARTIFACT, not a queue: <home>/merge/runs/<runId>/.
-*
-* createStaging writes a sibling .partial tree first and renames it into place; the .stage
-* marker is the last write inside the partial. A directory without that marker is a
-* half-created artifact and reads as unknown, never as "empty".
-*/
-const STAGING_SCHEMA_VERSION = 1;
-function stageKeyOf(runId, pairKey) {
-	return runId + "/pairs/" + createHash("sha256").update(pairKey).digest("hex").slice(0, 16);
-}
-function stagingRoot(home, runId) {
-	return join(home, "merge", "runs", runId);
-}
-/** Relative support paths only; the staging tree must never escape its run directory. */
-function safeRelative$2(path) {
-	if (path === "" || path.startsWith("/") || path.startsWith("\\") || path.includes("\0")) return false;
-	return path.replace(/\\/g, "/").split("/").every((part) => part !== "" && part !== "." && part !== "..");
-}
-function manifestText(manifest) {
-	return JSON.stringify(manifest, null, 2) + "\n";
-}
-async function createStaging(io, home, input) {
-	const final = stagingRoot(home, input.runId);
-	if (await io.exists(final)) return {
-		ok: false,
-		message: "staging already exists for run " + input.runId
-	};
-	const names = /* @__PURE__ */ new Set();
-	for (const source of input.sources) {
-		if (names.has(source.name)) return {
-			ok: false,
-			message: "duplicate source " + source.name
-		};
-		names.add(source.name);
-		for (const file of source.files) if (!safeRelative$2(file.path)) return {
-			ok: false,
-			message: "unsafe support path: " + file.path
-		};
-	}
-	const partial = final + ".partial";
-	try {
-		await io.remove(partial);
-		for (const source of input.sources) {
-			const dir = join(partial, "sources", source.name);
-			await io.writeText(join(dir, "SKILL.md"), source.body);
-			for (const file of source.files) await io.writeText(join(dir, ...file.path.split("/")), file.content);
-		}
-		const at = input.now();
-		const manifest = {
-			schemaVersion: 1,
-			runId: input.runId,
-			target: input.target,
-			...input.mode === void 0 ? {} : { mode: input.mode },
-			sources: input.sources.map((source) => source.name),
-			promptVersion: input.promptVersion,
-			createdAt: at,
-			expiresAt: at + Math.max(0, input.ttlDays) * 864e5
-		};
-		await io.writeText(join(partial, "manifest.json"), manifestText(manifest));
-		await io.writeText(join(partial, ".stage"), "");
-		await io.rename(partial, final);
-		return {
-			ok: true,
-			path: final,
-			manifest
-		};
-	} catch (error) {
-		try {
-			await io.remove(partial);
-		} catch {}
-		return {
-			ok: false,
-			message: "staging create failed: " + (error instanceof Error ? error.message : String(error))
-		};
-	}
-}
-async function readStaging(io, home, runId) {
-	const path = stagingRoot(home, runId);
-	if (!await io.exists(path)) return probeAbsent();
-	if (!await io.exists(join(path, ".stage"))) return probeUnknown("staging " + runId + " has no .stage marker (half-created)");
-	const probe = await probeText(io, join(path, "manifest.json"));
-	if (!isPresent(probe)) return probe;
-	try {
-		const parsed = JSON.parse(probe.value);
-		if (parsed.schemaVersion !== 1 || parsed.runId !== runId || typeof parsed.target !== "string" || !Array.isArray(parsed.sources)) return probeUnknown("staging manifest has an unexpected shape");
-		return probePresent({
-			path,
-			manifest: parsed
-		});
-	} catch (error) {
-		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;
-	const manifest = Object.assign({}, view.value.manifest, { target }, mode === void 0 ? {} : { 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));
+				}
+			};
+		}
+	});
 }
 //#endregion
-//#region lib/types/commit-receipt.js
-/**
-* Commit receipt: <run>/commit.json, written immediately after a successful commit.
-* It is the idempotency/recovery marker — merge resume and run start read it before
-* replaying a commit. Receipt write failure must not turn a landed commit into a failure;
-* the caller reports the warning instead.
-*/
-function commitReceiptPath(home, runId) {
-	return join(stagingRoot(home, runId), "commit.json");
-}
-function durableReceiptDir(home, parentRunId) {
-	return join(home, "merge", "receipts", parentRunId);
-}
-function durableReceiptPath(home, parentRunId, stageKey) {
-	const leaf = stageKey.split("/").pop() ?? stageKey;
-	return join(durableReceiptDir(home, parentRunId), leaf + ".json");
-}
-function parseReceipt(raw) {
-	if (raw === null) return null;
-	try {
-		const parsed = JSON.parse(raw);
-		if (typeof parsed.runId !== "string" || typeof parsed.unitId !== "string" || typeof parsed.target !== "string" || typeof parsed.create !== "boolean" || !Array.isArray(parsed.sources) || !Array.isArray(parsed.archived) || typeof parsed.at !== "number") return null;
-		return parsed;
-	} catch {
-		return null;
-	}
-}
-async function writeCommitReceipt(io, home, receipt) {
-	const path = commitReceiptPath(home, receipt.runId);
-	await io.writeText(path, JSON.stringify(receipt, null, 2) + "\n");
-	const parent = receipt.parentRunId ?? receipt.runId.split("/pairs/")[0] ?? receipt.runId;
-	await io.writeText(durableReceiptPath(home, parent, receipt.runId), JSON.stringify({
-		...receipt,
-		parentRunId: parent
-	}, null, 2) + "\n");
-	return path;
-}
-async function readCommitReceipt(io, home, runId, target) {
-	const direct = parseReceipt(await io.readText(commitReceiptPath(home, runId)));
-	if (direct !== null && (target === void 0 || direct.target === target)) return direct;
-	try {
-		const names = await io.list(durableReceiptDir(home, runId));
-		for (const name of names.sort()) {
-			const receipt = parseReceipt(await io.readText(join(durableReceiptDir(home, runId), name)));
-			if (receipt !== null && (target === void 0 || receipt.target === target)) return receipt;
+//#region lib/types/resume-command.js
+async function runResumeCommand(options) {
+	const row = (await loadMergeState(options.io, options.home)).state.rows.find((item) => item.id === options.rowId);
+	if (row === void 0) return {
+		ok: false,
+		message: "merge row not found: " + options.rowId
+	};
+	if (row.state === "verify") return await runScanCommand({
+		io: options.io,
+		home: options.home,
+		registry: options.registry,
+		approval: true,
+		platformWrite: options.platformWrite,
+		now: options.now,
+		...options.makePorts === void 0 ? { ports: {
+			...options.ports,
+			screening: () => Promise.resolve([{
+				a: row.a,
+				b: row.b
+			}])
+		} } : { makePorts: (runId) => {
+			const makePorts = options.makePorts;
+			if (makePorts === void 0) throw new Error("resume makePorts disappeared");
+			return {
+				...makePorts(runId),
+				screening: () => Promise.resolve([{
+					a: row.a,
+					b: row.b
+				}])
+			};
+		} },
+		...options.timeoutMinutes === void 0 ? {} : { timeoutMinutes: options.timeoutMinutes }
+	});
+	if (row.state !== "fuse" && row.state !== "approved") return {
+		ok: false,
+		message: "row is not resumable from state " + row.state
+	};
+	const decision = row.decision;
+	if (decision === void 0) return {
+		ok: false,
+		message: "fuse row has no decision"
+	};
+	return await withMergeRun({
+		io: options.io,
+		home: options.home,
+		registry: options.registry,
+		command: "resume",
+		approval: {
+			platformWrite: options.platformWrite,
+			mergeApproval: true
+		},
+		now: options.now,
+		async body(ctx) {
+			await ctx.stage("author", {
+				done: 0,
+				total: 1
+			});
+			let outcome;
+			try {
+				outcome = options.round2WithRun === void 0 ? await options.ports.round2(row, decision, ctx.signal) : await options.round2WithRun(row, decision, ctx.signal, ctx.runId);
+			} catch (error) {
+				outcome = {
+					kind: "failed",
+					failure: {
+						stage: "author",
+						code: "merge-failed",
+						message: error instanceof Error ? error.message : String(error),
+						retryable: true,
+						retryFrom: "agent2"
+					}
+				};
+			}
+			const record = await recordRound2Outcome(options.io, options.home, options.now, row, outcome);
+			return {
+				stopReason: record.merged ? "completed" : "failed",
+				scope: {
+					candidatePairs: 1,
+					queueBefore: {
+						verify: 0,
+						pending: 0,
+						fuse: 1,
+						skipped: 0
+					}
+				},
+				pairs: [record.pair],
+				totals: record.merged ? {
+					merged: 1,
+					kept: 0,
+					pending: 0,
+					failed: 0
+				} : {
+					merged: 0,
+					kept: 0,
+					pending: 0,
+					failed: 1
+				},
+				notes: []
+			};
 		}
-	} catch {}
-	return null;
+	});
 }
 //#endregion
 //#region lib/types/undo-merge.js
@@ -1900,7 +2296,7 @@ async function mergeDoctor(io, home, configuredRoot) {
 		key: "state",
 		label: "合并状态",
 		status: loaded.note === void 0 ? "ok" : "warn",
-		detail: loaded.note ?? "pairs " + String(loaded.state.rows.length) + "；pending " + String(counts.pending) + " / retry " + String(counts.retry) + " / skipped " + String(counts.skipped)
+		detail: loaded.note ?? "pairs " + String(loaded.state.rows.length) + "；verify " + String(counts.verify) + " / pending " + String(counts.pending) + " / fuse " + String(counts.fuse) + " / skipped " + String(counts.skipped)
 	});
 	const modelRoot = configuredRoot !== void 0 && configuredRoot !== "" ? configuredRoot : process.env.SKILL_MERGE_MODELS_ROOT;
 	if (modelRoot === void 0 || modelRoot === "") rows.push({
@@ -2494,6 +2890,17 @@ async function assembleStagedCommit(io, home, runId, port, options) {
 	});
 }
 //#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);
+	await io.writeText(path, JSON.stringify(journal, null, 2));
+	return path;
+}
+//#endregion
 //#region lib/types/commit-execute.js
 async function commitStagedRun(io, home, runId, port, options) {
 	const assembled = await assembleStagedCommit(io, home, runId, port, {
@@ -2504,12 +2911,32 @@ async function commitStagedRun(io, home, runId, port, options) {
 		ok: false,
 		message: assembled.message
 	};
-	const result = await port.commitMerge(assembled.plan);
-	if (!result.ok) return {
-		ok: false,
-		message: result.message,
-		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()
 	};
+	try {
+		await writeJournal(io, home, journal);
+	} catch {}
+	const result = await port.commitMerge(assembled.plan);
+	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
+		};
+	}
 	if (result.unitId === void 0) return {
 		ok: true,
 		plan: assembled.plan,
@@ -2523,11 +2950,20 @@ async function commitStagedRun(io, home, runId, port, options) {
 		target: assembled.plan.target,
 		create: !assembled.plan.targetExists,
 		sources: assembled.plan.sources,
+		...assembled.plan.sources[0] === void 0 ? {} : { pairKey: pairKey(assembled.plan.target, assembled.plan.sources[0]) },
 		archived: result.archived ?? [],
 		at: options.now()
 	};
 	try {
 		await writeCommitReceipt(io, home, receipt);
+		try {
+			await writeJournal(io, home, {
+				...journal,
+				unitId: result.unitId,
+				phase: "committed",
+				updatedAt: new Date(options.now()).toISOString()
+			});
+		} catch {}
 		return {
 			ok: true,
 			plan: assembled.plan,
@@ -2902,11 +3338,12 @@ function createNewChildRound2(options) {
 //#endregion
 //#region lib/types/adapters/library.js
 function skillLibraryPort(skills) {
+	const archivedNames = skills.archivedNames;
 	return {
 		readSkill: (name) => skills.read(name),
 		isArchived: async (name) => {
-			if (typeof skills.archivedNames !== "function") return false;
-			const names = await skills.archivedNames();
+			if (typeof archivedNames !== "function") return false;
+			const names = await archivedNames.call(skills);
 			return names === null ? true : names.includes(name);
 		},
 		commitMerge: (plan) => skills.commitMerge(plan)
@@ -2941,6 +3378,7 @@ function createMergeRuntime(deps) {
 	};
 	return { async execute(command, context) {
 		const parent = context?.parent ?? deps.parent;
+		const detached = deps.detached !== false;
 		if (command.verb === "pair") {
 			const signal = new AbortController().signal;
 			const cards = await deps.cards(signal);
@@ -2948,33 +3386,62 @@ function createMergeRuntime(deps) {
 				a: command.a,
 				b: command.b
 			}];
+			let forced;
+			if (command.force === true) {
+				const key = pairKey(command.a, command.b);
+				forced = (await loadMergeState(deps.io, deps.home)).state.rows.find((row) => row.pairKey === key);
+				if (forced === void 0 || forced.decision === void 0) return {
+					ok: false,
+					text: "pair --force 需要已有决策，找不到该 pair 的 decision: " + key
+				};
+			}
+			const approval = command.force === true ? false : deps.params.mergeApproval;
 			const result = await runScanCommand({
 				...common,
-				approval: deps.params.mergeApproval,
-				makePorts: (runId) => createChannelScanPorts({
-					io: deps.io,
-					home: deps.home,
-					runId,
-					cards,
-					screening: () => Promise.resolve(pair),
-					channel: deps.channel,
-					parent,
-					allow: deps.allow,
-					...deps.cwd === void 0 ? {} : { cwd: deps.cwd },
-					timeoutMs: deps.params.mergePairTimeoutMinutes * 6e4,
-					approval: deps.params.mergeApproval,
-					commitPort: skillLibraryPort(deps.skills),
-					now: deps.now,
-					...stageHooks
-				})
+				approval,
+				...detached ? { detached: true } : {},
+				makePorts: (runId) => {
+					const ports = createChannelScanPorts({
+						io: deps.io,
+						home: deps.home,
+						runId,
+						cards,
+						screening: () => Promise.resolve(pair),
+						channel: deps.channel,
+						parent,
+						allow: deps.allow,
+						...deps.cwd === void 0 ? {} : { cwd: deps.cwd },
+						timeoutMs: deps.params.mergePairTimeoutMinutes * 6e4,
+						approval,
+						commitPort: skillLibraryPort(deps.skills),
+						now: deps.now,
+						...stageHooks
+					});
+					return forced === void 0 ? ports : {
+						...ports,
+						round1: () => Promise.resolve({
+							kind: "merge",
+							decision: forced.decision
+						})
+					};
+				}
 			});
-			return result.ok ? {
-				ok: true,
-				text: "merge pair 完成：merged " + String(result.report.totals.merged) + " / pending " + String(result.report.totals.pending) + " / failed " + String(result.report.totals.failed)
-			} : {
+			if (!result.ok) return {
 				ok: false,
 				text: result.message
 			};
+			if ("accepted" in result) return {
+				ok: true,
+				text: "merge pair 已启动：" + result.runId
+			};
+			if (!("report" in result)) return {
+				ok: false,
+				text: "merge pair started without a report"
+			};
+			return {
+				ok: true,
+				text: "merge pair 完成：merged " + String(result.report.totals.merged) + " / pending " + String(result.report.totals.pending) + " / failed " + String(result.report.totals.failed)
+			};
 		}
 		if (command.verb === "scan") {
 			const signal = new AbortController().signal;
@@ -2985,6 +3452,7 @@ function createMergeRuntime(deps) {
 			const result = await runScanCommand({
 				...common,
 				approval: deps.params.mergeApproval,
+				...detached ? { detached: true } : {},
 				makePorts: (runId) => createChannelScanPorts({
 					io: deps.io,
 					home: deps.home,
@@ -3010,13 +3478,22 @@ function createMergeRuntime(deps) {
 					...stageHooks
 				})
 			});
-			return result.ok ? {
-				ok: true,
-				text: "merge scan 完成：merged " + String(result.report.totals.merged) + " / pending " + String(result.report.totals.pending) + " / failed " + String(result.report.totals.failed)
-			} : {
+			if (!result.ok) return {
 				ok: false,
 				text: result.message
 			};
+			if ("accepted" in result) return {
+				ok: true,
+				text: "merge scan 已启动：" + result.runId
+			};
+			if (!("report" in result)) return {
+				ok: false,
+				text: "merge scan started without a report"
+			};
+			return {
+				ok: true,
+				text: "merge scan 完成：merged " + String(result.report.totals.merged) + " / pending " + String(result.report.totals.pending) + " / failed " + String(result.report.totals.failed)
+			};
 		}
 		if (command.verb === "reject") {
 			const row = (await loadMergeState(deps.io, deps.home)).state.rows.find((item) => item.id === command.id);
@@ -3087,6 +3564,22 @@ function createMergeRuntime(deps) {
 				text: report.value.slice(0, 12e3)
 			};
 		}
+		if (command.verb === "discard") {
+			const row = (await loadMergeState(deps.io, deps.home)).state.rows.find((item) => item.id === command.id);
+			if (row === void 0) return {
+				ok: false,
+				text: "merge row not found: " + command.id
+			};
+			if (row.state !== "pending" && row.state !== "approved" && row.state !== "fuse") return {
+				ok: false,
+				text: "merge row is not discardable: " + command.id
+			};
+			await dropRow(deps.io, deps.home, deps.now, row.id);
+			return {
+				ok: true,
+				text: "已丢弃合并行：" + command.id
+			};
+		}
 		if (command.verb === "undo") {
 			const receipt = await readCommitReceipt(deps.io, deps.home, command.run, command.target);
 			if (receipt === null) return {
@@ -3098,6 +3591,12 @@ function createMergeRuntime(deps) {
 				text: "receipt target is " + receipt.target + ", not " + command.target
 			};
 			const result = await undoMergeReceipt(receipt, skillLibraryUndoPort(deps.skills));
+			if (result.ok && receipt.pairKey !== void 0) await recordPair(deps.io, deps.home, {
+				pairKey: receipt.pairKey,
+				runId: receipt.parentRunId ?? receipt.runId,
+				result: "undone",
+				target: receipt.target
+			});
 			return {
 				ok: result.ok,
 				text: result.message
@@ -3129,7 +3628,7 @@ function createMergeRuntime(deps) {
 				};
 			}
 			const loaded = await loadMergeState(deps.io, deps.home);
-			const row = command.id === void 0 ? loaded.state.rows.find((item) => item.state === "fuse" || item.state === "verify") : loaded.state.rows.find((item) => item.id === command.id);
+			const row = command.id === void 0 ? loaded.state.rows.find((item) => item.state === "fuse" || item.state === "verify" || command.retry === true && item.state === "approved") : loaded.state.rows.find((item) => item.id === command.id);
 			if (row === void 0) return {
 				ok: false,
 				text: "merge row not found: " + (command.id ?? "(auto)")
@@ -3188,13 +3687,22 @@ function createMergeRuntime(deps) {
 					...stageHooks
 				})
 			});
-			return result.ok ? {
-				ok: true,
-				text: "merge resume 完成：merged " + String(result.report.totals.merged)
-			} : {
+			if (!result.ok) return {
 				ok: false,
 				text: result.message
 			};
+			if ("accepted" in result) return {
+				ok: true,
+				text: "merge resume 已启动：" + result.runId
+			};
+			if (!("report" in result)) return {
+				ok: false,
+				text: "merge resume started without a report"
+			};
+			return {
+				ok: true,
+				text: "merge resume 完成：merged " + String(result.report.totals.merged)
+			};
 		}
 		if (command.verb === "approve") {
 			const signal = new AbortController().signal;
@@ -3215,13 +3723,22 @@ function createMergeRuntime(deps) {
 					now: deps.now
 				}) }
 			});
-			return result.ok ? {
-				ok: true,
-				text: "merge approve 完成：merged " + String(result.report.totals.merged)
-			} : {
+			if (!result.ok) return {
 				ok: false,
 				text: result.message
 			};
+			if ("accepted" in result) return {
+				ok: true,
+				text: "merge approve 已启动：" + result.runId
+			};
+			if (!("report" in result)) return {
+				ok: false,
+				text: "merge approve started without a report"
+			};
+			return {
+				ok: true,
+				text: "merge approve 完成：merged " + String(result.report.totals.merged)
+			};
 		}
 		const text = await handleReadOnlyMergeCommand(command, deps.io, deps.home);
 		if (text !== null) return {
@@ -3672,6 +4189,9 @@ function apply(ctx, rawConfig = {}) {
 		if (registry === void 0) return;
 		const io = evolutionIoAdapter(() => registry.provider());
 		const home = evolutionHome();
+		loadMergeState(io, home).then((loaded) => cleanupExpiredStaging(io, home, Date.now(), new Set(loaded.state.rows.map((row) => row.runId).filter((id) => id !== void 0)))).catch((error) => {
+			ctx.logger.warn("merge staging cleanup failed: " + (error instanceof Error ? error.message : String(error)));
+		});
 		const runs = newRunRegistry({
 			io,
 			home,
@@ -3707,8 +4227,11 @@ function apply(ctx, rawConfig = {}) {
 			io,
 			home,
 			engine: { screen },
-			select: selectCandidates,
-			...engineConfig === void 0 ? {} : { cfg: engineConfig },
+			select: selectWithErrors,
+			cfg: {
+				...engineConfig ?? {},
+				judge: "deepseek"
+			},
 			...runner === void 0 ? {} : { runner },
 			async onSelection(selection) {
 				const loaded = await loadMergeState(io, home);
@@ -3736,6 +4259,40 @@ function apply(ctx, rawConfig = {}) {
 			runs() {
 				return Promise.resolve(runs.runs());
 			},
+			async body(id, side) {
+				const row = (await loadMergeState(io, home)).state.rows.find((item) => item.id === id);
+				if (row === void 0) return null;
+				return await skills.read(side === "a" ? row.a : row.b);
+			},
+			async history() {
+				const receipts = await readCommitReceipts(io, home);
+				const items = /* @__PURE__ */ new Map();
+				for (const receipt of receipts) for (const source of receipt.sources) {
+					const key = source + ":" + receipt.runId;
+					if (items.has(key)) continue;
+					items.set(key, {
+						name: source,
+						kind: "merged",
+						reason: "Merged into " + receipt.target,
+						lastVersion: 1,
+						archivedAt: new Date(receipt.at).toISOString(),
+						sourceRunId: receipt.runId
+					});
+				}
+				const archived = await skills.archivedNames?.() ?? [];
+				const seen = new Set([...items.values()].map((item) => item.name));
+				for (const name of archived) {
+					if (seen.has(name)) continue;
+					items.set("archived:" + name, {
+						name,
+						kind: "other",
+						reason: "archived",
+						lastVersion: 1,
+						archivedAt: new Date(Date.now()).toISOString()
+					});
+				}
+				return [...items.values()];
+			},
 			approval() {
 				return params.mergeApproval;
 			},
@@ -3811,4 +4368,4 @@ function apply(ctx, rawConfig = {}) {
 	});
 }
 //#endregion
-export { Config, MERGE_DOCTOR_SCHEMA_VERSION, 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, buildMergeView, buildRound1Prompt, buildRound2Prompt, buildStandbyPrompt, canRetry, commitReceiptPath, commitStagedRun, committedPairs, configureMergePresentation, copyStagedFile, countRows, createChannelScanPorts, createEngineRunner, createEngineScreening, createMergeCommand, createMergeRuntime, createMergeStageTool, createNewChildRound2, createReadOnlyMergeService, createStaging, dropRow, dropStaging, durableReceiptDir, durableReceiptPath, emptyMergeState, engineConfigFromEnv, ensureStaging, formatQueue, formatStatus, handleReadOnlyMergeCommand, hasBlockingFinding, inject, isSkippedPair, listStagedFiles, loadMergeState, makeMergeRoutes, mergeCommandHelp, mergeDoctor, mergeReportDigestPath, mergeReportPath, mergeRunIdsToSupersede, mergeStatePath, mergeUsage, moveRow, mutateMergeState, pageQueue, pairKey, parseDecision, parseMergeCommand, queueOf, readCommitReceipt, readMergeReport, readStagedFile, readStagedTree, readStaging, recordRound2Outcome, rejectPending, resolveMergeParams, resolveTargetName, rewriteFrontmatterName, rowIdOf, rowsOf, runApproveCommand, runAuthoring, runMergeCommand, runNewChildAuthoring, runPairCommand, runResumeCommand, runRound1OverChannel, runScan, runScanCommand, setStagingTarget, skillLibraryPort, skillLibraryUndoPort, skippedPairKeys, snapshotCards, stageKeyOf, stageOf, stagingRoot, subagentChannelAdapter, supersedeMergeRuns, toRowView, toRunFact, transition, undoMergeReceipt, upsertRow, validateStagedTree, withMergeRun, writeCommitReceipt, writeMergeReport, writeStagedFile };
+export { Config, MERGE_DOCTOR_SCHEMA_VERSION, 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, buildMergeView, buildRound1Prompt, buildRound2Prompt, buildStandbyPrompt, canRetry, cleanupExpiredStaging, commitReceiptPath, commitStagedRun, committedPairs, configureMergePresentation, copyStagedFile, countRows, createChannelScanPorts, createEngineRunner, createEngineScreening, createMergeCommand, createMergeRuntime, createMergeStageTool, createNewChildRound2, createReadOnlyMergeService, createStaging, dropRow, dropStaging, durableReceiptDir, durableReceiptPath, emptyMergeState, engineConfigFromEnv, ensureStaging, formatQueue, formatStatus, handleReadOnlyMergeCommand, hasBlockingFinding, inject, isSkippedPair, listStagedFiles, loadMergeState, makeMergeRoutes, mergeCommandHelp, mergeDoctor, mergeReportDigestPath, mergeReportPath, mergeRunIdsToSupersede, mergeStatePath, mergeUsage, moveRow, mutateMergeState, pageQueue, pairKey, parseDecision, parseMergeCommand, queueOf, readCommitReceipt, readCommitReceipts, readMergeReport, readStagedFile, readStagedTree, readStaging, recordRound2Outcome, rejectPending, resolveMergeParams, resolveTargetName, rewriteFrontmatterName, rowIdOf, rowsOf, runApproveCommand, runAuthoring, runMergeCommand, runNewChildAuthoring, runPairCommand, runResumeCommand, runRound1OverChannel, runScan, runScanCommand, setStagingTarget, skillLibraryPort, skillLibraryUndoPort, skippedPairKeys, snapshotCards, stageKeyOf, stageOf, stagingRoot, subagentChannelAdapter, supersedeMergeRuns, toRowView, toRunFact, transition, undoMergeReceipt, upsertRow, validateStagedTree, withMergeRun, writeCommitReceipt, writeMergeReport, writeStagedFile };