@lmzhen/dsh-evolution-merge 0.28.0 → 0.30.0

package/lib/index.js

@@ -1,8 +1,130 @@
+import { join } from "node:path";
 import z from "@deepseek-ai/schemastery";
-import { DEFAULT_SKILL_LIMITS, affinity, authorityFrom, contentHash, createSubagentChannel, evolutionHome, evolutionIoAdapter, executeUnitUndo, isPresent, newRunRegistry, newSkillLibrary, parseFrontmatter, planUnitUndoAcross, policyStageLimits, probeAbsent, probeList, probePresent, probeText, probeUnknown, scanContentThreats, supportRefs, transactIo, validateFrontmatter, validateSupportPath, vocabulary } from "@lmzhen/dsh-evolution-core";
+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 { join } from "node:path";
 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.
+*
+* The vendor engine reads a corpus from disk; host cards are content. This module
+* writes only SKILL.md support-free snapshots under the run directory. It does not
+* decide candidates: the Q02 selector is injected so engine/report-map stays the
+* single source of that policy.
+*/
+function safeName(name, index) {
+	const cleaned = name.replace(/[^A-Za-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "");
+	return (cleaned === "" ? "skill-" + String(index) : cleaned) + "__" + String(index);
+}
+/** Write the exact card bodies as a support-free corpus snapshot and return its root. */
+async function snapshotCards(io, home, runId, cards) {
+	const root = join(home, "merge", "runs", runId, "corpus");
+	for (let index = 0; index < cards.length; index += 1) {
+		const card = cards[index];
+		if (card === void 0) continue;
+		await io.writeText(join(root, safeName(card.name, index), "SKILL.md"), card.body);
+	}
+	return root;
+}
+function createEngineScreening(deps) {
+	return async (cards, runId, signal) => {
+		const corpusDir = await snapshotCards(deps.io, deps.home, runId, cards);
+		const outDir = join(deps.home, "merge", "runs", runId, "engine");
+		const result = await deps.engine.screen({
+			corpusDir,
+			outDir,
+			...deps.cfg === void 0 ? {} : { cfg: deps.cfg },
+			...deps.runner === void 0 ? {} : { runner: deps.runner },
+			signal
+		});
+		if (!result.ok) throw new Error("engine screen failed: " + result.error.code + (result.error.stage === void 0 ? "" : " @" + result.error.stage) + (result.error.detail === void 0 ? "" : ": " + result.error.detail));
+		const selection = deps.select(result.report);
+		if (deps.onSelection !== void 0) await deps.onSelection(selection, runId);
+		return Object.assign(selection.candidates.slice(), selection.candidatePairs === void 0 ? {} : { candidatePairs: selection.candidatePairs });
+	};
+}
+//#endregion
+//#region lib/types/adapters/model-runner.js
+function append(chunk, text) {
+	if (chunk.type === "text-delta" || chunk.type === "text") return text + (chunk.text ?? "");
+	if (chunk.type === "finish" && chunk.reason?.kind === "error") throw new Error("model call failed: " + (chunk.reason.failure?.message ?? "unknown"));
+	return text;
+}
+function createEngineRunner(llm, route) {
+	return async (prompt) => {
+		const selection = route();
+		let text = "";
+		if (llm.stream !== void 0) {
+			for await (const chunk of llm.stream({
+				provider: selection.provider,
+				model: selection.model,
+				messages: [{
+					role: "user",
+					content: [{
+						type: "text",
+						text: prompt
+					}]
+				}],
+				temperature: 0
+			})) text = append(chunk, text);
+			return text;
+		}
+		if (llm.prepareCall === void 0) throw new Error("llm service has neither stream nor prepareCall");
+		const call = await llm.prepareCall({
+			provider: selection.provider,
+			model: selection.model,
+			temperature: 0
+		});
+		for await (const chunk of call.stream({
+			...call.config,
+			messages: [{
+				role: "user",
+				content: [{
+					type: "text",
+					text: prompt
+				}]
+			}]
+		})) text = append(chunk, text);
+		return text;
+	};
+}
+//#endregion
 //#region lib/types/contracts.js
 /**
 * Frozen merge-domain vocabulary. No io, no host, no imports from the plugin shell.
@@ -10,24 +132,27 @@ import { createHash } from "node:crypto";
 * 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";
 	}
 }
@@ -36,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;
 	}
@@ -55,36 +181,56 @@ function rowIdOf(key) {
 }
 function emptyMergeState() {
 	return {
-		schemaVersion: 1,
+		schemaVersion: 2,
 		rows: []
 	};
 }
 /** One record can be retried only when the failure says so and names a stage. */
+const MERGE_MAX_ATTEMPTS = 3;
 function canRetry(record) {
 	if (record.state === "skipped") return false;
+	if ((record.attempts ?? 0) >= 3) return false;
 	if (record.failure === void 0) return record.state !== "pending";
 	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 {
@@ -92,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;
@@ -147,7 +317,7 @@ async function loadMergeState(io, home) {
 		return {
 			ok: false,
 			state: {
-				schemaVersion: 1,
+				schemaVersion: 2,
 				rows: []
 			}
 		};
@@ -156,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 }
@@ -169,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);
 	});
@@ -236,11 +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/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));
+}
+/** 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,
-		retry: 0,
+		fuse: 0,
 		skipped: 0
 	};
 	for (const row of rows) counts[queueOf(row.state)] += 1;
@@ -253,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");
 }
@@ -274,29 +807,55 @@ function toRowView(row) {
 		queue: queueOf(row.state),
 		stage: stageOf(row.state),
 		label: row.a + " + " + row.b,
-		updatedAt: row.updatedAt
+		updatedAt: row.updatedAt,
+		createdAt: row.createdAt,
+		...row.decision?.target === void 0 ? {} : { target: row.decision.target },
+		...row.decision?.confidence === void 0 ? {} : { confidence: row.decision.confidence },
+		...row.failure === void 0 ? {} : { failure: {
+			stage: row.failure.stage,
+			code: row.failure.code,
+			message: row.failure.message,
+			retryable: row.failure.retryable
+		} },
+		...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) {
+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",
 				count: counts.skipped
 			}
 		],
-		commands
+		commands,
+		...latestRun === void 0 ? {} : { latestRun },
+		...approval === void 0 ? {} : { approval }
 	};
 }
 function pageQueue(rows, queue, cursor = 0, limit = 50) {
@@ -326,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,
@@ -348,9 +969,10 @@ function makeMergeRoutes(deps, _audit) {
 				if (denied !== null) return denied;
 				const source = deps.getSource();
 				if (source === void 0) return absent();
+				const latestMerge = (await source.runs(void 0, 20)).find((run) => run.kind === "merge");
 				return json(200, {
 					ok: true,
-					data: buildMergeView(await source.rows(), source.commands())
+					data: buildMergeView(await source.rows(), source.commands(), latestMerge === void 0 ? void 0 : toRunFact(latestMerge), source.approval?.())
 				});
 			}
 		},
@@ -364,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);
@@ -381,7 +1003,7 @@ function makeMergeRoutes(deps, _audit) {
 			}
 		},
 		{
-			path: MERGE_ROUTES.run,
+			path: MERGE_ROUTES.body,
 			methods: ["GET"],
 			requestBody: "buffered",
 			fetch: async (request) => {
@@ -389,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) => {
@@ -419,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() }
 				});
 			}
 		}
@@ -431,12 +1057,12 @@ function makeMergeRoutes(deps, _audit) {
 }
 //#endregion
 //#region lib/types/commands.js
-const USAGE = "usage: 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,
@@ -452,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;
@@ -463,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,
@@ -477,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,
@@ -525,17 +1157,31 @@ function parseMergeCommand(argv) {
 			code: "usage",
 			message: USAGE
 		};
-		case "doctor": return pos.length === 0 ? {
+		case "doctor": return pos.length === 0 ? {
+			ok: true,
+			command: { verb: "doctor" }
+		} : {
+			ok: false,
+			code: "usage",
+			message: USAGE
+		};
+		case "pending": return pos.length === 0 ? {
 			ok: true,
-			command: { verb: "doctor" }
+			command: {
+				verb: "pending",
+				...marked.has("expired") ? { expired: true } : {}
+			}
 		} : {
 			ok: false,
 			code: "usage",
 			message: USAGE
 		};
-		case "pending": return pos.length === 0 ? {
+		case "candidates": return pos.length === 0 ? {
 			ok: true,
-			command: { verb: "pending" }
+			command: {
+				verb: "candidates",
+				...marked.has("retry") ? { retry: true } : {}
+			}
 		} : {
 			ok: false,
 			code: "usage",
@@ -581,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 } : {}
 				}
 			};
 		}
@@ -606,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 {
@@ -632,7 +1290,7 @@ function parseMergeCommand(argv) {
 		default: return {
 			ok: false,
 			code: "usage",
-			message: "unknown merge command: " + verb + "\nusage: 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>"
 		};
 	}
 }
@@ -650,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;
 }
@@ -658,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) {
@@ -671,35 +1344,43 @@ function createReadOnlyMergeService(io, home) {
 		};
 	} };
 }
+async function runMergeCommand(service, rawInput, invocation) {
+	const tokens = rawInput.trim().split(/\s+/).filter(Boolean);
+	if (tokens[0] === "merge" || tokens[0] === "/merge" || tokens[0] === "evolution" || tokens[0] === "/evolution") tokens.shift();
+	if (tokens[0] === "merge") tokens.shift();
+	const parsed = parseMergeCommand(tokens);
+	if (!parsed.ok) return {
+		ok: false,
+		text: parsed.message
+	};
+	if (parsed.help === true) return {
+		ok: true,
+		text: mergeUsage()
+	};
+	try {
+		return await service.execute(parsed.command, invocation?.agent === void 0 ? {} : { parent: invocation.agent });
+	} catch (error) {
+		return {
+			ok: false,
+			text: formatMergeError({
+				kind: "runtime",
+				code: "merge-command-failed",
+				message: error instanceof Error ? error.message : String(error)
+			})
+		};
+	}
+}
 function createMergeCommand(service) {
 	return {
 		name: "merge",
-		description: "技能自动合并：扫描、待批准、重跑、报告与 undo",
+		description: "技能自动合并：扫描、待批准、重跑、报告与 undo（兼容别名；请用 /evolution merge）",
 		input: { hint: mergeUsage() },
 		async handler(invocation) {
-			const tokens = invocation.rawInput.trim().split(/\s+/).filter(Boolean);
-			if (tokens[0] === "merge" || tokens[0] === "/merge") tokens.shift();
-			const parsed = parseMergeCommand(tokens);
-			if (!parsed.ok) return {
-				kind: "error",
-				text: parsed.message
-			};
-			if (parsed.help === true) return {
-				kind: "success",
-				text: mergeUsage()
+			const result = await runMergeCommand(service, invocation.rawInput, invocation);
+			return {
+				kind: result.ok ? "success" : "error",
+				text: result.text
 			};
-			try {
-				const result = await service.execute(parsed.command, { ...invocation.agent === void 0 ? {} : { parent: invocation.agent } });
-				return {
-					kind: result.ok ? "success" : "error",
-					text: result.text
-				};
-			} catch (error) {
-				return {
-					kind: "error",
-					text: "merge 命令失败：" + (error instanceof Error ? error.message : String(error)) + "\n运行 /merge status 查看状态。"
-				};
-			}
 		}
 	};
 }
@@ -726,97 +1407,50 @@ function isSkippedPair(keys, a, b) {
 	return keys.has(pairKey(a, b));
 }
 //#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.attempts === void 0 ? {} : { attempts: row.attempts }
-	};
-}
-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: "retry",
-				createdAt: event.at,
-				updatedAt: event.at
-			}
-		};
+//#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;
 	}
-	if (event.type === "source-gone") return {
-		ok: true,
-		row: null
-	};
-	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 }) : next(current, event.at, "fuse", event.decision === void 0 ? {} : { decision: event.decision });
-		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);
+	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
@@ -824,6 +1458,7 @@ function transition(current, event) {
 * 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();
 }
@@ -852,14 +1487,15 @@ function pairOf(row, candidate, outcome, extra = {}) {
 }
 async function runScan(options) {
 	const stage = options.stage ?? (async () => {});
+	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;
-	const candidates = await options.ports.screening(options.signal);
 	const startedAt = options.startedAt ?? options.now();
 	const timeoutMs = (options.timeoutMinutes ?? 0) > 0 ? options.timeoutMinutes * 6e4 : 0;
 	const pairs = [];
@@ -872,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;
 		}
@@ -884,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;
 		}
@@ -911,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: [],
@@ -928,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",
@@ -950,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;
@@ -965,6 +1614,8 @@ async function runScan(options) {
 				type: "round1-merge",
 				approval: "on",
 				decision: round1.decision,
+				...round1.sourceRevision === void 0 ? {} : { sourceRevision: round1.sourceRevision },
+				...round1.targetRevision === void 0 ? {} : { targetRevision: round1.targetRevision },
 				at: at(options.now)
 			});
 			if (next.ok && next.row !== null) {
@@ -979,6 +1630,8 @@ async function runScan(options) {
 			type: "round1-merge",
 			approval: "off",
 			decision: round1.decision,
+			...round1.stagingRef === void 0 ? {} : { stagingRef: round1.stagingRef },
+			...round1.stagingExpiresAt === void 0 ? {} : { stagingExpiresAt: round1.stagingExpiresAt },
 			at: at(options.now)
 		});
 		if (!fuse.ok || fuse.row === null) {
@@ -991,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
@@ -1037,7 +1706,7 @@ async function runScan(options) {
 	return {
 		stopReason,
 		scope: {
-			candidatePairs: candidates.length,
+			candidatePairs: candidates.candidatePairs ?? candidates.length,
 			queueBefore
 		},
 		pairs,
@@ -1063,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 = [];
@@ -1110,8 +1779,9 @@ function emptyDraft(reason) {
 		scope: {
 			candidatePairs: 0,
 			queueBefore: {
+				verify: 0,
 				pending: 0,
-				retry: 0,
+				fuse: 0,
 				skipped: 0
 			}
 		},
@@ -1128,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;
@@ -1136,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
@@ -1208,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");
@@ -1287,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: {
@@ -1316,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: {
@@ -1381,8 +2084,9 @@ async function runApproveCommand(options) {
 				scope: {
 					candidatePairs: 1,
 					queueBefore: {
+						verify: 0,
 						pending: 0,
-						retry: 1,
+						fuse: 1,
 						skipped: 0
 					}
 				},
@@ -1442,7 +2146,7 @@ async function runResumeCommand(options) {
 		} },
 		...options.timeoutMinutes === void 0 ? {} : { timeoutMinutes: options.timeoutMinutes }
 	});
-	if (row.state !== "fuse") return {
+	if (row.state !== "fuse" && row.state !== "approved") return {
 		ok: false,
 		message: "row is not resumable from state " + row.state
 	};
@@ -1487,8 +2191,9 @@ async function runResumeCommand(options) {
 				scope: {
 					candidatePairs: 1,
 					queueBefore: {
+						verify: 0,
 						pending: 0,
-						retry: 1,
+						fuse: 1,
 						skipped: 0
 					}
 				},
@@ -1497,136 +2202,17 @@ async function runResumeCommand(options) {
 					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 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);
+					failed: 0
+				} : {
+					merged: 0,
+					kept: 0,
+					pending: 0,
+					failed: 1
+				},
+				notes: []
+			};
 		}
-		const at = input.now();
-		const manifest = {
-			schemaVersion: 1,
-			runId: input.runId,
-			target: input.target,
-			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)));
-	}
-}
-//#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");
-}
-async function writeCommitReceipt(io, home, receipt) {
-	const path = commitReceiptPath(home, receipt.runId);
-	await io.writeText(path, JSON.stringify(receipt, null, 2) + "\n");
-	return path;
-}
-async function readCommitReceipt(io, home, runId) {
-	const raw = await io.readText(commitReceiptPath(home, runId));
-	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;
-	}
+	});
 }
 //#endregion
 //#region lib/types/undo-merge.js
@@ -1695,267 +2281,6 @@ function skillLibraryUndoPort(skills) {
 	};
 }
 //#endregion
-//#region lib/types/ladder.js
-/**
-* L0–L2 candidate gate. This is a CANDIDATE classifier, not a content quality judge.
-* Routing follows the frozen table: L0 -1 stops; L0 1/0 → L1; L1 -1 stops; L1 0/1 → L2;
-* L2 1 → agent1; L2 0 → agent1 (undecided); L2 -1 → skipped.
-*/
-var GateCache = class GateCache {
-	entries = /* @__PURE__ */ new Map();
-	get(key) {
-		return this.entries.get(key);
-	}
-	put(key, value) {
-		this.entries.set(key, value);
-	}
-	get size() {
-		return this.entries.size;
-	}
-	toObject() {
-		return Object.fromEntries(this.entries);
-	}
-	static fromObject(value) {
-		const cache = new GateCache();
-		if (typeof value !== "object" || value === null) return cache;
-		for (const [key, entry] of Object.entries(value)) {
-			if (typeof entry !== "object" || entry === null) continue;
-			const verdict = entry;
-			if (verdict.verdict === 1 || verdict.verdict === 0 || verdict.verdict === -1) cache.put(key, {
-				level: verdict.level === "L0" || verdict.level === "L1" || verdict.level === "L2" ? verdict.level : "L2",
-				verdict: verdict.verdict,
-				reason: typeof verdict.reason === "string" ? verdict.reason : "",
-				evidence: Array.isArray(verdict.evidence) ? verdict.evidence : [],
-				cached: true
-			});
-		}
-		return cache;
-	}
-};
-function gateCacheKey(level, payload, model) {
-	return createHash("sha256").update(JSON.stringify({
-		level,
-		payload,
-		model
-	})).digest("hex");
-}
-function payloadFor(level, candidate, facts) {
-	const a = facts.get(candidate.a);
-	const b = facts.get(candidate.b);
-	if (a === void 0 || b === void 0) throw new Error("candidate names are not in the fact set");
-	const base = {
-		level,
-		skill_a: {
-			name: a.name,
-			description: a.description
-		},
-		skill_b: {
-			name: b.name,
-			description: b.description
-		},
-		scores: { jaccard_summary: candidate.score ?? null },
-		schema: {
-			verdict: "1 | 0 | -1",
-			reason: "<=80 chars"
-		}
-	};
-	if (level === "L0") return JSON.stringify(base);
-	const withHead = {
-		...base,
-		skill_a: {
-			...base.skill_a,
-			head: a.body.slice(0, 2400)
-		},
-		skill_b: {
-			...base.skill_b,
-			head: b.body.slice(0, 2400)
-		}
-	};
-	if (level === "L1") return JSON.stringify(withHead);
-	return JSON.stringify({
-		...withHead,
-		skill_a: {
-			...withHead.skill_a,
-			body_excerpt: a.body.slice(0, 4e3)
-		},
-		skill_b: {
-			...withHead.skill_b,
-			body_excerpt: b.body.slice(0, 4e3)
-		}
-	});
-}
-const SYSTEM$1 = "Judge whether two skill documents describe the same reusable capability. Shared vocabulary or a shared preamble is not duplication. Return only strict JSON: {\"verdict\":1|0|-1,\"reason\":\"...\"}";
-function extractJson$1(text) {
-	const body = /\`\`\`(?:json)?\s*([\s\S]*?)\`\`\`/i.exec(text)?.[1] ?? text;
-	const start = body.indexOf("{");
-	if (start < 0) return void 0;
-	let depth = 0;
-	for (let index = start; index < body.length; index += 1) if (body[index] === "{") depth += 1;
-	else if (body[index] === "}") {
-		depth -= 1;
-		if (depth === 0) try {
-			return JSON.parse(body.slice(start, index + 1));
-		} catch {
-			return;
-		}
-	}
-}
-function parseVerdict(level, raw, cached = false) {
-	const value = typeof raw === "string" ? extractJson$1(raw) : raw;
-	if (typeof value !== "object" || value === null) return void 0;
-	const record = value;
-	const verdict = record.verdict === 1 || record.verdict === "1" ? 1 : record.verdict === 0 || record.verdict === "0" ? 0 : record.verdict === -1 || record.verdict === "-1" ? -1 : void 0;
-	if (verdict === void 0) return void 0;
-	return {
-		level,
-		verdict,
-		reason: typeof record.reason === "string" ? record.reason.slice(0, 80) : "",
-		evidence: Array.isArray(record.evidence) ? record.evidence.filter((item) => typeof item === "object" && item !== null).map((item) => {
-			const entry = item;
-			return {
-				path: typeof entry.path === "string" ? entry.path : "",
-				line: typeof entry.line === "number" ? entry.line : -1,
-				quote: typeof entry.quote === "string" ? entry.quote.slice(0, 120) : ""
-			};
-		}) : [],
-		cached
-	};
-}
-/** Deterministic 10% L0 audit selection from the run seed + pair key. */
-function selectedForAudit(pairKey, seed, rate = .1) {
-	const digest = createHash("sha256").update(seed + "\0" + pairKey).digest();
-	return digest[0] !== void 0 && digest[0] < Math.round(Math.max(0, Math.min(1, rate)) * 256);
-}
-async function runLadder(options) {
-	const facts = new Map(options.facts.map((fact) => [fact.name, fact]));
-	const verdicts = [];
-	let calls = 0;
-	let level = options.startLevel ?? "L0";
-	for (;;) {
-		let payload;
-		try {
-			payload = payloadFor(level, options.candidate, facts);
-		} catch (error) {
-			return {
-				route: "error",
-				verdicts,
-				calls,
-				error: error instanceof Error ? error.message : String(error)
-			};
-		}
-		const key = gateCacheKey(level, payload, options.modelName);
-		const cached = options.cache?.get(key);
-		let verdict;
-		if (cached !== void 0) verdict = {
-			...cached,
-			level,
-			cached: true
-		};
-		else try {
-			calls += 1;
-			const raw = await options.model.callJson({
-				system: SYSTEM$1,
-				user: payload,
-				maxTokens: 500,
-				signal: options.signal
-			});
-			verdict = parseVerdict(level, raw);
-			if (verdict !== void 0) options.cache?.put(key, verdict);
-		} catch (error) {
-			return {
-				route: "error",
-				verdicts,
-				calls,
-				error: error instanceof Error ? error.message : String(error)
-			};
-		}
-		if (verdict === void 0) return {
-			route: "error",
-			verdicts,
-			calls,
-			error: "invalid gate JSON"
-		};
-		verdicts.push(verdict);
-		if (level === "L0") {
-			if (verdict.verdict === -1) return {
-				route: "keep",
-				verdicts,
-				calls,
-				droppedAt: "L0"
-			};
-			level = "L1";
-			continue;
-		}
-		if (level === "L1") {
-			if (verdict.verdict === -1) return {
-				route: "keep",
-				verdicts,
-				calls,
-				droppedAt: "L1"
-			};
-			level = "L2";
-			continue;
-		}
-		if (verdict.verdict === 1) return {
-			route: "merge",
-			verdicts,
-			calls
-		};
-		if (verdict.verdict === 0) return {
-			route: "undecided",
-			verdicts,
-			calls
-		};
-		return {
-			route: "keep",
-			verdicts,
-			calls,
-			droppedAt: "L2"
-		};
-	}
-}
-//#endregion
-//#region lib/types/gate-cache.js
-/**
-* File-backed gate cache: <home>/merge/gate-cache.json.
-* Reads are three-state; a malformed file is reported, not overwritten. Writes are one
-* transact so two runs cannot interleave a partial cache.
-*/
-const GATE_CACHE_VERSION = 1;
-function gateCachePath(home) {
-	return join(home, "merge", "gate-cache.json");
-}
-async function loadGateCache(io, home) {
-	const probe = await probeText(io, gateCachePath(home));
-	if (probe.kind === "absent") return { cache: new GateCache() };
-	if (probe.kind === "unknown") return {
-		cache: new GateCache(),
-		note: probe.reason
-	};
-	try {
-		const parsed = JSON.parse(probe.value);
-		if (parsed.schemaVersion !== 1 || typeof parsed.entries !== "object" || parsed.entries === null) return {
-			cache: new GateCache(),
-			note: "gate cache has an unexpected shape"
-		};
-		return { cache: GateCache.fromObject(parsed.entries) };
-	} catch (error) {
-		return {
-			cache: new GateCache(),
-			note: "gate cache is not JSON: " + (error instanceof Error ? error.message : String(error))
-		};
-	}
-}
-async function saveGateCache(io, home, cache) {
-	await transactIo(io, gateCachePath(home), () => JSON.stringify({
-		schemaVersion: 1,
-		entries: cache.toObject()
-	}, null, 2) + "\n");
-}
-function hasGateCache(cache) {
-	return cache.size > 0;
-}
-//#endregion
 //#region lib/types/doctor.js
 /**
 * Merge doctor rows: state, pending, gate cache and staging are each probed read-only.
@@ -1963,7 +2288,7 @@ function hasGateCache(cache) {
 * operator can act on. This module never repairs or writes.
 */
 const MERGE_DOCTOR_SCHEMA_VERSION = 3;
-async function mergeDoctor(io, home) {
+async function mergeDoctor(io, home, configuredRoot) {
 	const rows = [];
 	const loaded = await loadMergeState(io, home);
 	const counts = countRows(loaded.state.rows);
@@ -1971,15 +2296,26 @@ async function mergeDoctor(io, home) {
 		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 cache = await loadGateCache(io, home);
-	rows.push({
-		key: "gate-cache",
-		label: "闸门缓存",
-		status: cache.note === void 0 ? "ok" : "warn",
-		detail: cache.note ?? String(cache.cache.size) + " 条"
+	const modelRoot = configuredRoot !== void 0 && configuredRoot !== "" ? configuredRoot : process.env.SKILL_MERGE_MODELS_ROOT;
+	if (modelRoot === void 0 || modelRoot === "") rows.push({
+		key: "models",
+		label: "合并模型",
+		status: "warn",
+		detail: "未设置 SKILL_MERGE_MODELS_ROOT；合并扫描会 fail loud"
 	});
+	else {
+		const int8 = join(modelRoot, "potion-multilingual-128M-int8");
+		const pca = join(modelRoot, "potion-multilingual-128M-pca64-int8");
+		const ok = await io.exists(int8) && await io.exists(pca);
+		rows.push({
+			key: "models",
+			label: "合并模型",
+			status: ok ? "ok" : "warn",
+			detail: ok ? modelRoot : "缺少 int8/pca64：" + modelRoot
+		});
+	}
 	const runsDir = join(home, "merge", "runs");
 	const listed = await probeList(io, runsDir);
 	rows.push({
@@ -2075,45 +2411,73 @@ function parseDecision(text, pair) {
 }
 //#endregion
 //#region lib/types/prompts.js
-const MERGE_PROMPT_VERSION = "merge-pair/v1";
-const ROUND1_SYSTEM = "You decide whether two skill documents describe the same reusable capability. Shared vocabulary or a shared preamble is not duplication. Return only strict JSON.";
-const ROUND2_SYSTEM = "You write the merged skill into the staging tree through the merge_stage tool. Never modify the live skill tree. Follow the supplied decision exactly.";
+const MERGE_PROMPT_VERSION = "merge-b/v1";
+const STANDBY_PROMPT = "You are a merge worker. Wait for instructions.";
+function sourcePath(name) {
+	return "sources/" + name;
+}
+function mergedPath(target) {
+	return "merged/" + target;
+}
+function wireDecision(decision) {
+	return {
+		shouldMerge: decision.shouldMerge,
+		mode: decision.mode,
+		target: decision.target,
+		sources: decision.sources,
+		rationale: decision.rationale,
+		confidence: decision.confidence,
+		a_summary: decision.aSummary,
+		b_summary: decision.bSummary
+	};
+}
 function buildRound1Prompt(candidate, cards) {
-	const byName = new Map(cards.map((card) => [card.name, card]));
-	const a = byName.get(candidate.a);
-	const b = byName.get(candidate.b);
 	return [
-		ROUND1_SYSTEM,
+		"你是技能合并决策 agent。第 1 轮只做判断，不要写文件、不要修改任何源目录。",
 		"",
-		"Return JSON: {\"should_merge\":true|false,\"mode\":\"merge-into-existing\"|\"create-umbrella\"|\"keep\",\"target\":\"<name>\",\"sources\":[\"<name>\",\"<name>\"],\"rationale\":\"<=120 chars\",\"confidence\":0..1}",
-		"If not enough evidence, set should_merge=false and mode=\"keep\".",
+		"在当前工作目录下用 merge_stage 的 list/read 完整阅读两个源技能：",
+		"- A: " + sourcePath(candidate.a) + "（name=" + candidate.a + "）",
+		"- B: " + sourcePath(candidate.b) + "（name=" + candidate.b + "）",
+		"包含 SKILL.md 与 references/templates/scripts 等支撑文件。",
 		"",
-		"skill_a: " + JSON.stringify({
-			name: candidate.a,
-			description: a?.description ?? "",
-			body: (a?.body ?? "").slice(0, 6e3)
-		}),
-		"skill_b: " + JSON.stringify({
-			name: candidate.b,
-			description: b?.description ?? "",
-			body: (b?.body ?? "").slice(0, 6e3)
-		})
+		"判断规则：",
+		"1) 两者是否语义等价/互补到值得合并，而不是词面相似；",
+		"2) 合并后是否更容易发现和使用，而不是变成更大的巨技能；",
+		"3) 若合并会破坏触发面/生命周期/可发现性，应输出 keep。",
+		"",
+		"只输出一个 JSON（不要 markdown 围栏）：",
+		"{\"should_merge\":true|false,\"mode\":\"merge-into-existing|create-umbrella|keep\",\"target\":\"kebab-case\",\"sources\":[\"源技能名\"],\"rationale\":\"<=150字\",\"confidence\":0.0,\"a_summary\":\"A 的一句话摘要\",\"b_summary\":\"B 的一句话摘要\"}"
 	].join("\n");
 }
-function buildRound2Prompt(row, decision) {
-	return [
-		ROUND2_SYSTEM,
+function buildRound2Prompt(row, decision, mode = "continue") {
+	const decisionJson = JSON.stringify(wireDecision(decision));
+	const head = [
+		"现在执行第 2 轮：把两个技能融合成一个完整、可用的技能，直接在当前工作目录的 merged/ 下写文件。",
+		"不要修改 " + sourcePath(row.a) + " 或 " + sourcePath(row.b) + "（只读源副本）；不要访问工作目录以外的路径。",
+		""
+	];
+	const body = [
+		"决策结果：" + decisionJson,
+		"目标技能名：" + decision.target,
 		"",
-		"decision: " + JSON.stringify(decision),
-		"pair: " + JSON.stringify({
-			a: row.a,
-			b: row.b
-		}),
-		"target: " + JSON.stringify(decision.target),
+		"工作方式：",
+		"- 用 merge_stage 的 list/read/write/copy 创建 " + mergedPath(decision.target) + "/SKILL.md 与需要的 references/templates/scripts；",
+		"- 可以复制源文件作为草稿基础，然后逐段修改；可以多轮读写；",
+		"- 保留两源独特内容，不编造事实，不留下 TODO/占位符；",
+		"- SKILL.md 以合法 YAML frontmatter 开头，name 等于目标名，description 不超过 60 字符；",
+		"- 正文与支撑文件的引用必须成对，路径只允许 references/templates/scripts/assets 下的相对路径。",
 		"",
-		"Use merge_stage: list/read the source copies, write merged/" + decision.target + "/SKILL.md and any support files, then copy required support files. Do not write outside merged/" + decision.target + "/.",
-		"When the staged target is complete, reply with one short sentence. Do not return a JSON plan."
-	].join("\n");
+		"完成后只输出一个 JSON（不要 markdown 围栏）：",
+		"{\"target\":\"" + decision.target + "\",\"files\":[\"SKILL.md\",\"references/...\"],\"changelog\":[\"一条变更\"],\"notes\":\"可选的一句话\"}"
+	];
+	return (mode === "fresh" ? [
+		"基于已持久化的 decision。",
+		...head,
+		...body
+	] : [...head, ...body]).join("\n");
+}
+function buildStandbyPrompt() {
+	return STANDBY_PROMPT;
 }
 //#endregion
 //#region lib/types/channel-port.js
@@ -2131,7 +2495,7 @@ async function runRound1OverChannel(options, candidate, signal) {
 	const opened = await options.channel.open({
 		parent: options.parent,
 		label: "merge-round1",
-		promptText: buildRound1Prompt(candidate, options.cards),
+		promptText: STANDBY_PROMPT,
 		kind: "reviewer",
 		allow: options.allow,
 		...options.cwd === void 0 ? {} : { cwd: options.cwd },
@@ -2173,6 +2537,60 @@ async function runRound1OverChannel(options, candidate, signal) {
 				failure: {
 					stage: "decide",
 					code: opened.turn.stopReason,
+					message: "standby did not complete",
+					retryable: true,
+					retryFrom: "agent1"
+				}
+			},
+			dispose
+		};
+	}
+	try {
+		options.onChildOpened?.(opened.childId);
+	} catch (error) {
+		await dispose();
+		return {
+			outcome: {
+				kind: "failed",
+				failure: {
+					stage: "decide",
+					code: "child-bind",
+					message: String(error),
+					retryable: true,
+					retryFrom: "agent1"
+				}
+			},
+			dispose
+		};
+	}
+	const round1 = await options.channel.continueTurn(opened.childId, buildRound1Prompt(candidate, options.cards), {
+		timeoutMs: options.timeoutMs,
+		signal
+	});
+	if (round1.kind !== "ok") {
+		await dispose();
+		return {
+			outcome: {
+				kind: "failed",
+				failure: {
+					stage: "decide",
+					code: round1.kind,
+					message: round1.kind === "unavailable" ? round1.reason : "round1 aborted",
+					retryable: round1.kind !== "aborted",
+					retryFrom: round1.kind === "aborted" ? "none" : "agent1"
+				}
+			},
+			dispose
+		};
+	}
+	if (round1.turn.stopReason !== "completed") {
+		await dispose();
+		return {
+			outcome: {
+				kind: "failed",
+				failure: {
+					stage: "decide",
+					code: round1.turn.stopReason,
 					message: "round1 did not complete",
 					retryable: true,
 					retryFrom: "agent1"
@@ -2181,7 +2599,7 @@ async function runRound1OverChannel(options, candidate, signal) {
 			dispose
 		};
 	}
-	const parsed = parseDecision(opened.turn.text, candidate);
+	const parsed = parseDecision(round1.turn.text, candidate);
 	if (!parsed.ok) {
 		await dispose();
 		return {
@@ -2395,9 +2813,10 @@ function buildCommitPlan(input) {
 		ok: false,
 		message: "create flag disagrees with the live target"
 	};
-	if (input.sourceBodies.length === 0) return {
+	const sources = input.sourceBodies.filter((source) => source.name !== input.target);
+	if (sources.length === 0) return {
 		ok: false,
-		message: "a merge needs at least one source"
+		message: "a merge needs at least one source different from the target"
 	};
 	const body = rewriteFrontmatterName(input.mergedBody, input.target);
 	return {
@@ -2405,11 +2824,11 @@ function buildCommitPlan(input) {
 		plan: {
 			target: input.target,
 			targetExists: !input.create,
-			sources: input.sourceBodies.map((source) => source.name),
+			sources: sources.map((source) => source.name),
 			body,
 			supportFiles: input.mergedFiles,
 			expectedTargetBody: input.targetCurrent,
-			expectedSourceBodies: input.sourceBodies,
+			expectedSourceBodies: sources,
 			origin: input.origin,
 			summary: input.summary
 		}
@@ -2428,7 +2847,25 @@ async function assembleStagedCommit(io, home, runId, port, options) {
 		ok: false,
 		message: "merged tree is not readable for run " + runId
 	};
-	const targetCurrent = await port.readSkill(staging.value.manifest.target);
+	const requested = staging.value.manifest.target;
+	let target = requested;
+	let targetCurrent = await port.readSkill(requested);
+	const requestedArchived = targetCurrent === null && await port.isArchived?.(requested) === true;
+	if (staging.value.manifest.mode === "create-umbrella" && (targetCurrent !== null || requestedArchived)) {
+		target = requested;
+		for (let suffix = 2; suffix <= 99; suffix += 1) {
+			const candidate = requested + "-v" + String(suffix);
+			if (await port.readSkill(candidate) === null && await port.isArchived?.(candidate) !== true) {
+				target = candidate;
+				targetCurrent = null;
+				break;
+			}
+		}
+		if (target === requested) return {
+			ok: false,
+			message: "no free umbrella target for " + requested
+		};
+	}
 	const sources = [];
 	for (const name of staging.value.manifest.sources) {
 		const body = await port.readSkill(name);
@@ -2442,7 +2879,7 @@ async function assembleStagedCommit(io, home, runId, port, options) {
 		});
 	}
 	return buildCommitPlan({
-		target: staging.value.manifest.target,
+		target,
 		create: targetCurrent === null,
 		mergedBody: tree.value.body,
 		mergedFiles: tree.value.files,
@@ -2453,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, {
@@ -2463,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,
@@ -2477,15 +2945,25 @@ async function commitStagedRun(io, home, runId, port, options) {
 	};
 	const receipt = {
 		runId,
+		parentRunId: runId.split("/pairs/")[0] ?? runId,
 		unitId: result.unitId,
 		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,
@@ -2504,26 +2982,40 @@ async function commitStagedRun(io, home, runId, port, options) {
 //#endregion
 //#region lib/types/authoring-flow.js
 async function runAuthoring(options) {
-	const created = await createStaging(options.io, options.home, {
-		runId: options.runId,
-		target: options.target,
-		sources: options.cards.map((card) => ({
-			name: card.name,
-			body: card.body,
-			files: []
-		})),
-		promptVersion: "merge-pair/v1",
-		ttlDays: 7,
-		now: options.now
-	});
-	if (!created.ok) return {
+	const targetCard = options.cards.find((card) => card.name === options.target);
+	if (targetCard?.protectionUnknown === true || targetCard?.protectedBy === "pinned") return {
 		ok: false,
-		message: created.message
+		message: "target is pinned: " + options.target
 	};
+	const stageKey = options.stageKey ?? options.runId;
+	if (options.reuseStaging === true) {
+		if (!await setStagingTarget(options.io, options.home, stageKey, options.target, options.mode)) return {
+			ok: false,
+			message: "staging missing or unreadable: " + stageKey
+		};
+	} else {
+		const created = await createStaging(options.io, options.home, {
+			runId: stageKey,
+			target: options.target,
+			...options.mode === void 0 ? {} : { mode: options.mode },
+			sources: options.cards.map((card) => ({
+				name: card.name,
+				body: card.body,
+				files: card.files ?? []
+			})),
+			promptVersion: "merge-b/v1",
+			ttlDays: 7,
+			now: options.now
+		});
+		if (!created.ok) return {
+			ok: false,
+			message: created.message
+		};
+	}
 	try {
 		await options.author({
 			home: options.home,
-			runId: options.runId
+			runId: stageKey
 		});
 	} catch (error) {
 		return {
@@ -2531,7 +3023,7 @@ async function runAuthoring(options) {
 			message: "author failed: " + (error instanceof Error ? error.message : String(error))
 		};
 	}
-	const tree = await readStagedTree(options.io, options.home, options.runId);
+	const tree = await readStagedTree(options.io, options.home, stageKey);
 	if (tree.kind !== "present") return {
 		ok: false,
 		message: "staged tree is not readable: " + (tree.kind === "unknown" ? tree.reason : "absent")
@@ -2542,7 +3034,7 @@ async function runAuthoring(options) {
 		message: "staged tree failed the rule gate",
 		findings
 	};
-	const commit = await commitStagedRun(options.io, options.home, options.runId, options.commitPort, {
+	const commit = await commitStagedRun(options.io, options.home, stageKey, options.commitPort, {
 		origin: "subagent",
 		summary: options.summary,
 		now: options.now
@@ -2564,30 +3056,67 @@ function createChannelScanPorts(options) {
 	return {
 		screening: options.screening,
 		async round1(candidate, signal) {
+			const stageKey = stageKeyOf(options.runId, pairKey(candidate.a, candidate.b));
+			const staged = await ensureStaging(options.io, options.home, {
+				runId: stageKey,
+				target: candidate.a + "-" + candidate.b,
+				sources: options.cards.filter((card) => card.name === candidate.a || card.name === candidate.b).map((card) => ({
+					name: card.name,
+					body: card.body,
+					files: card.files ?? []
+				})),
+				promptVersion: "merge-b/v1",
+				ttlDays: 7,
+				now: options.now
+			});
+			if (!staged.ok) return {
+				kind: "failed",
+				failure: {
+					stage: "decide",
+					code: "staging-create",
+					message: staged.message,
+					retryable: true,
+					retryFrom: "agent1"
+				}
+			};
 			const result = await runRound1OverChannel({
 				channel: options.channel,
 				parent: options.parent,
 				cards: options.cards,
 				allow: options.allow,
-				...options.cwd === void 0 ? {} : { cwd: options.cwd },
-				timeoutMs: options.timeoutMs
+				cwd: stagingRoot(options.home, stageKey),
+				timeoutMs: options.timeoutMs,
+				onChildOpened: (childId) => options.onChild?.({
+					runId: stageKey,
+					childId,
+					expectedChildId: childId,
+					phase: "decide"
+				})
 			}, candidate, signal);
-			if (result.outcome.kind === "merge") if (options.approval) await result.dispose();
+			if (result.outcome.kind !== "merge") await dropStaging(options.io, options.home, stageKey);
+			else if (options.approval) await result.dispose();
 			else {
-				sessions.set(pairKey(candidate.a, candidate.b), result);
+				sessions.set(pairKey(candidate.a, candidate.b), {
+					result,
+					stageKey
+				});
 				if (result.childId !== void 0) options.onChild?.({
-					runId: options.runId,
+					runId: stageKey,
 					childId: result.childId,
 					expectedChildId: result.childId,
 					phase: "author"
 				});
 			}
-			return result.outcome;
+			return result.outcome.kind === "merge" ? {
+				...result.outcome,
+				stagingRef: stageKey,
+				stagingExpiresAt: options.now() + 7 * 864e5
+			} : result.outcome;
 		},
 		async round2(row, decision, signal) {
 			const key = pairKey(row.a, row.b);
-			const session = sessions.get(key);
-			if (session === void 0) return {
+			const entry = sessions.get(key);
+			if (entry === void 0) return {
 				kind: "failed",
 				failure: {
 					stage: "author",
@@ -2603,13 +3132,16 @@ function createChannelScanPorts(options) {
 					io: options.io,
 					home: options.home,
 					runId: options.runId,
+					stageKey: entry.stageKey,
+					reuseStaging: true,
 					target: decision.target,
+					mode: decision.mode,
 					cards: options.cards,
 					commitPort: options.commitPort,
 					now: options.now,
 					summary: "merge " + row.a + " + " + row.b,
 					author: async () => {
-						await session.author?.(row, decision, signal);
+						await entry.result.author?.(row, decision, signal);
 						return "authored";
 					}
 				});
@@ -2623,20 +3155,20 @@ function createChannelScanPorts(options) {
 						retryFrom: "agent2"
 					}
 				};
-				const receipt = authored.commit.ok ? authored.commit.receipt : void 0;
+				const receipt = authored.commit.receipt;
 				return {
 					kind: "merged",
 					...receipt?.unitId === void 0 ? {} : { unitId: receipt.unitId },
 					archived: receipt?.archived ?? [],
 					target: {
 						requested: decision.target,
-						actual: decision.target,
+						actual: authored.commit.plan.target,
 						created: receipt?.create ?? false
 					}
 				};
 			} finally {
-				await session.dispose();
-				if (session.childId !== void 0) options.onChildClosed?.(session.childId);
+				await entry.result.dispose();
+				if (entry.result.childId !== void 0) options.onChildClosed?.(entry.result.childId);
 			}
 		}
 	};
@@ -2644,35 +3176,51 @@ function createChannelScanPorts(options) {
 //#endregion
 //#region lib/types/new-child-authoring.js
 async function runNewChildAuthoring(options, row, decision, signal) {
-	const staging = await createStaging(options.io, options.home, {
-		runId: options.runId,
-		target: decision.target,
-		sources: options.cards.map((card) => ({
-			name: card.name,
-			body: card.body,
-			files: []
-		})),
-		promptVersion: "merge-pair/v1",
-		ttlDays: 7,
-		now: options.now
-	});
-	if (!staging.ok) return {
+	const targetCard = options.cards.find((card) => card.name === decision.target);
+	if (targetCard?.protectionUnknown === true || targetCard?.protectedBy === "pinned") return {
 		kind: "failed",
 		failure: {
 			stage: "author",
-			code: "staging-create",
-			message: staging.message,
-			retryable: true,
-			retryFrom: "agent2"
+			code: "target-pinned",
+			message: "target is pinned: " + decision.target,
+			retryable: false,
+			retryFrom: "none"
 		}
 	};
+	const stageKey = row.stagingRef ?? stageKeyOf(options.runId, pairKey(row.a, row.b));
+	if ((await readStaging(options.io, options.home, stageKey)).kind === "present") await setStagingTarget(options.io, options.home, stageKey, decision.target, decision.mode);
+	else {
+		const staging = await createStaging(options.io, options.home, {
+			runId: stageKey,
+			target: decision.target,
+			mode: decision.mode,
+			sources: options.cards.filter((card) => card.name === row.a || card.name === row.b).map((card) => ({
+				name: card.name,
+				body: card.body,
+				files: card.files ?? []
+			})),
+			promptVersion: "merge-b/v1",
+			ttlDays: 7,
+			now: options.now
+		});
+		if (!staging.ok) return {
+			kind: "failed",
+			failure: {
+				stage: "author",
+				code: "staging-create",
+				message: staging.message,
+				retryable: true,
+				retryFrom: "agent2"
+			}
+		};
+	}
 	const opened = await options.channel.open({
 		parent: options.parent,
 		label: "merge-round2",
-		promptText: buildRound2Prompt(row, decision),
+		promptText: STANDBY_PROMPT,
 		kind: "maintainer",
 		allow: options.allow,
-		...options.cwd === void 0 ? {} : { cwd: options.cwd },
+		cwd: stagingRoot(options.home, stageKey),
 		timeoutMs: options.timeoutMs,
 		signal
 	});
@@ -2687,7 +3235,7 @@ async function runNewChildAuthoring(options, row, decision, signal) {
 		}
 	};
 	options.onChild?.({
-		runId: options.runId,
+		runId: stageKey,
 		childId: opened.childId,
 		expectedChildId: opened.childId,
 		phase: "author"
@@ -2698,12 +3246,36 @@ async function runNewChildAuthoring(options, row, decision, signal) {
 			failure: {
 				stage: "author",
 				code: opened.turn.stopReason,
+				message: "standby did not complete",
+				retryable: true,
+				retryFrom: "agent2"
+			}
+		};
+		const turn = await options.channel.continueTurn(opened.childId, buildRound2Prompt(row, decision, "fresh"), {
+			timeoutMs: options.timeoutMs,
+			signal
+		});
+		if (turn.kind !== "ok") return {
+			kind: "failed",
+			failure: {
+				stage: "author",
+				code: turn.kind,
+				message: turn.kind === "unavailable" ? turn.reason : "round2 aborted",
+				retryable: turn.kind !== "aborted",
+				retryFrom: turn.kind === "aborted" ? "none" : "agent2"
+			}
+		};
+		if (turn.turn.stopReason !== "completed") return {
+			kind: "failed",
+			failure: {
+				stage: "author",
+				code: turn.turn.stopReason,
 				message: "round2 did not complete",
 				retryable: true,
 				retryFrom: "agent2"
 			}
 		};
-		const tree = await readStagedTree(options.io, options.home, options.runId);
+		const tree = await readStagedTree(options.io, options.home, stageKey);
 		if (tree.kind !== "present") return {
 			kind: "failed",
 			failure: {
@@ -2724,7 +3296,7 @@ async function runNewChildAuthoring(options, row, decision, signal) {
 				retryFrom: "agent2"
 			}
 		};
-		const commit = await commitStagedRun(options.io, options.home, options.runId, options.commitPort, {
+		const commit = await commitStagedRun(options.io, options.home, stageKey, options.commitPort, {
 			origin: "subagent",
 			summary: "merge " + row.a + " + " + row.b,
 			now: options.now
@@ -2746,7 +3318,7 @@ async function runNewChildAuthoring(options, row, decision, signal) {
 			archived: receipt?.archived ?? [],
 			target: {
 				requested: decision.target,
-				actual: decision.target,
+				actual: commit.plan.target,
 				created: receipt?.create ?? false
 			}
 		};
@@ -2766,8 +3338,14 @@ 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 archivedNames !== "function") return false;
+			const names = await archivedNames.call(skills);
+			return names === null ? true : names.includes(name);
+		},
 		commitMerge: (plan) => skills.commitMerge(plan)
 	};
 }
@@ -2800,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);
@@ -2807,48 +3386,86 @@ 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;
 			const cards = await deps.cards(signal);
-			const skipped = skippedPairKeys((await loadMergeState(deps.io, deps.home)).state.rows, deps.params.mergeSkippedTtlDays, deps.now());
+			const loadedState = await loadMergeState(deps.io, deps.home);
+			const skipped = skippedPairKeys(loadedState.state.rows, deps.params.mergeSkippedTtlDays, deps.now());
+			const held = new Set(loadedState.state.rows.filter((row) => row.queue === "pending" || !canRetry(row)).map((row) => row.pairKey));
 			const result = await runScanCommand({
 				...common,
 				approval: deps.params.mergeApproval,
+				...detached ? { detached: true } : {},
 				makePorts: (runId) => createChannelScanPorts({
 					io: deps.io,
 					home: deps.home,
 					runId,
 					cards,
 					screening: async (turnSignal) => {
-						return (deps.screeningForRun === void 0 ? await deps.screening(cards, turnSignal) : await deps.screeningForRun(cards, runId, turnSignal)).filter((candidate) => !skipped.has(pairKey(candidate.a, candidate.b)));
+						const raw = await deps.screeningForRun(cards, runId, turnSignal);
+						const filtered = raw.filter((candidate) => {
+							const key = pairKey(candidate.a, candidate.b);
+							return !skipped.has(key) && !held.has(key);
+						});
+						const candidatePairs = raw.candidatePairs;
+						return candidatePairs === void 0 ? filtered : Object.assign(filtered, { candidatePairs });
 					},
 					channel: deps.channel,
 					parent,
@@ -2861,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);
@@ -2891,7 +3517,7 @@ function createMergeRuntime(deps) {
 		}
 		if (command.verb === "doctor") return {
 			ok: true,
-			text: (await mergeDoctor(deps.io, deps.home)).map((row) => row.key + " [" + row.status + "] " + row.label + "：" + row.detail).join("\n")
+			text: (await mergeDoctor(deps.io, deps.home, deps.params.mergeModelsRoot)).map((row) => row.key + " [" + row.status + "] " + row.label + "：" + row.detail).join("\n")
 		};
 		if (command.verb === "report" || command.verb === "runs" || command.verb === "cancel") {
 			const registry = deps.registry;
@@ -2938,8 +3564,24 @@ 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);
+			const receipt = await readCommitReceipt(deps.io, deps.home, command.run, command.target);
 			if (receipt === null) return {
 				ok: false,
 				text: "merge run has no commit receipt: " + command.run
@@ -2949,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
@@ -2980,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)")
@@ -3039,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;
@@ -3066,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 {
@@ -3088,7 +3754,8 @@ const MERGE_PARAM_DEFAULTS = {
 	mergeApproval: false,
 	mergeSkippedTtlDays: 0,
 	mergeRunTimeoutMinutes: 0,
-	mergePairTimeoutMinutes: 15
+	mergePairTimeoutMinutes: 15,
+	mergeModelsRoot: ""
 };
 const KEYS = new Set(Object.keys(MERGE_PARAM_DEFAULTS));
 function materialize(value) {
@@ -3110,6 +3777,11 @@ function resolveMergeParams(input = {}) {
 		mergeApproval: approval,
 		mergeSkippedTtlDays: record.mergeSkippedTtlDays === void 0 ? MERGE_PARAM_DEFAULTS.mergeSkippedTtlDays : nonNegative("mergeSkippedTtlDays", record.mergeSkippedTtlDays),
 		mergeRunTimeoutMinutes: record.mergeRunTimeoutMinutes === void 0 ? MERGE_PARAM_DEFAULTS.mergeRunTimeoutMinutes : nonNegative("mergeRunTimeoutMinutes", record.mergeRunTimeoutMinutes),
+		mergeModelsRoot: record.mergeModelsRoot === void 0 ? MERGE_PARAM_DEFAULTS.mergeModelsRoot : (() => {
+			const value = materialize(record.mergeModelsRoot);
+			if (typeof value !== "string") throw new Error("mergeModelsRoot must be a string");
+			return value;
+		})(),
 		mergePairTimeoutMinutes: record.mergePairTimeoutMinutes === void 0 ? MERGE_PARAM_DEFAULTS.mergePairTimeoutMinutes : (() => {
 			const value = nonNegative("mergePairTimeoutMinutes", record.mergePairTimeoutMinutes);
 			if (value === 0) throw new Error("mergePairTimeoutMinutes must be > 0");
@@ -3118,81 +3790,6 @@ function resolveMergeParams(input = {}) {
 	};
 }
 //#endregion
-//#region lib/types/screening.js
-/**
-* Deterministic candidate screening: name prefilter + lexical affinity.
-*
-* The semantic proposer (C3) is a separate port; this module is the zero-cost floor that
-* must work without a model. It reuses core `vocabulary`/`affinity` so drift/dedup and
-* merge screening share one tokenizer.
-*/
-/** Shannon entropy over characters; a cheap prefilter signal, not a name-quality judge. */
-function nameEntropy(name) {
-	if (name === "") return 0;
-	const counts = /* @__PURE__ */ new Map();
-	for (const char of name) counts.set(char, (counts.get(char) ?? 0) + 1);
-	let entropy = 0;
-	for (const count of counts.values()) {
-		const p = count / name.length;
-		entropy -= p * Math.log2(p);
-	}
-	return entropy;
-}
-const MIN_NAME_ENTROPY = 1.5;
-const MIN_NAME_LENGTH = 6;
-function prefilter(cards) {
-	return cards.filter((card) => {
-		const name = card.name.trim();
-		if (name.length < MIN_NAME_LENGTH) return false;
-		if (nameEntropy(name) < MIN_NAME_ENTROPY) return false;
-		return card.body.trim() !== "" || card.description.trim() !== "";
-	});
-}
-function sortedPair(a, b) {
-	return a < b ? [a, b] : [b, a];
-}
-function lexicalCandidates(cards, options = {}) {
-	const bodyGate = options.bodyGate ?? .9;
-	const summaryGate = options.summaryGate ?? .5;
-	const minAffinity = options.minAffinity ?? .3;
-	const eligible = prefilter(cards);
-	const vectors = eligible.map((card) => ({
-		card,
-		summary: vocabulary(card.description),
-		body: vocabulary(card.body)
-	}));
-	const candidates = [];
-	for (let i = 0; i < vectors.length; i += 1) for (let j = i + 1; j < vectors.length; j += 1) {
-		const left = vectors[i];
-		const right = vectors[j];
-		if (left === void 0 || right === void 0) continue;
-		const summary = affinity(left.summary, right.summary);
-		const body = affinity(left.body, right.body);
-		const arms = [];
-		if (body >= bodyGate) arms.push("body");
-		if (summary >= summaryGate && body >= minAffinity) arms.push("summary");
-		if (arms.length === 0) continue;
-		const [a, b] = sortedPair(left.card.name, right.card.name);
-		candidates.push({
-			a,
-			b,
-			score: Math.max(body, summary),
-			arms,
-			source: "lexical"
-		});
-	}
-	candidates.sort((left, right) => (right.score ?? 0) - (left.score ?? 0) || left.a.localeCompare(right.a) || left.b.localeCompare(right.b));
-	const capped = options.maxCandidates === void 0 ? candidates : candidates.slice(0, options.maxCandidates);
-	return {
-		candidates: capped,
-		stats: {
-			skills: cards.length,
-			filtered: cards.length - eligible.length,
-			candidates: capped.length
-		}
-	};
-}
-//#endregion
 //#region lib/types/adapters/channel.js
 function convert(outcome) {
 	if (outcome.kind !== "ok") return outcome;
@@ -3230,313 +3827,6 @@ function subagentChannelAdapter(channel) {
 	};
 }
 //#endregion
-//#region lib/types/adapters/model.js
-function append(chunk, text) {
-	if (chunk.type === "text-delta" || chunk.type === "text") return text + (chunk.text ?? "");
-	if (chunk.type === "finish" && chunk.reason?.kind === "error") throw new Error("model call failed: " + (chunk.reason.failure?.message ?? "unknown"));
-	return text;
-}
-function createModelPort(llm, route) {
-	return { async callJson(request) {
-		const selection = route();
-		let text = "";
-		if (llm.stream !== void 0) {
-			for await (const chunk of llm.stream({
-				provider: selection.provider,
-				model: selection.model,
-				system: request.system,
-				messages: [{
-					role: "user",
-					content: [{
-						type: "text",
-						text: request.user
-					}]
-				}],
-				maxTokens: request.maxTokens,
-				temperature: 0,
-				signal: request.signal
-			})) text = append(chunk, text);
-			return text;
-		}
-		if (llm.prepareCall === void 0) throw new Error("llm service has neither stream nor prepareCall");
-		const call = await llm.prepareCall({
-			provider: selection.provider,
-			model: selection.model,
-			maxTokens: request.maxTokens,
-			temperature: 0
-		}, request.signal);
-		for await (const chunk of call.stream({
-			...call.config,
-			system: request.system,
-			messages: [{
-				role: "user",
-				content: [{
-					type: "text",
-					text: request.user
-				}]
-			}],
-			signal: request.signal
-		})) text = append(chunk, text);
-		return text;
-	} };
-}
-//#endregion
-//#region lib/types/propose.js
-const SYSTEM = "You propose skill pairs that may be merged. Return only a JSON object: {\"pairs\":[{\"a\":\"skill-a\",\"b\":\"skill-b\",\"reason\":\"one sentence\"}]}. Use only supplied skill names. Do not decide whether a merge is good.";
-function parsePairs(raw, known, cap) {
-	let value = raw;
-	if (typeof raw === "string") try {
-		value = JSON.parse(raw);
-	} catch {
-		return [];
-	}
-	if (typeof value !== "object" || value === null) return [];
-	const pairs = value.pairs;
-	if (!Array.isArray(pairs)) return [];
-	const out = [];
-	const seen = /* @__PURE__ */ new Set();
-	for (const item of pairs) {
-		if (out.length >= cap) break;
-		const pair = item;
-		if (typeof pair.a !== "string" || typeof pair.b !== "string") continue;
-		const a = pair.a.trim();
-		const b = pair.b.trim();
-		if (a === b || !known.has(a) || !known.has(b)) continue;
-		const [first, second] = a < b ? [a, b] : [b, a];
-		const key = first + "\0" + second;
-		if (seen.has(key)) continue;
-		seen.add(key);
-		out.push({
-			a: first,
-			b: second,
-			source: "proposed",
-			...typeof pair.reason === "string" && pair.reason.trim() !== "" ? { reason: pair.reason.trim() } : {}
-		});
-	}
-	return out;
-}
-async function proposePairs(cards, port, options) {
-	const shardSize = Math.max(2, options.shardSize ?? 60);
-	const cap = Math.max(0, options.maxPairs ?? 200);
-	const known = new Set(cards.map((card) => card.name));
-	const candidates = [];
-	const degraded = [];
-	let shards = 0;
-	for (let start = 0; start < cards.length && candidates.length < cap; start += shardSize) {
-		const shard = cards.slice(start, start + shardSize);
-		if (shard.length < 2) continue;
-		shards += 1;
-		try {
-			const raw = await port.callJson({
-				system: SYSTEM,
-				user: JSON.stringify(shard.map((card) => ({
-					name: card.name,
-					description: card.description.slice(0, 400),
-					body: card.body.slice(0, 600)
-				}))),
-				maxTokens: 1200,
-				signal: options.signal
-			});
-			candidates.push(...parsePairs(raw, known, cap - candidates.length));
-		} catch (error) {
-			degraded.push("proposal shard failed: " + (error instanceof Error ? error.message : String(error)));
-		}
-	}
-	return {
-		candidates,
-		shards,
-		degraded
-	};
-}
-//#endregion
-//#region lib/types/gate-filter.js
-function withGate(candidate, verdicts, auditOverride) {
-	const last = verdicts[verdicts.length - 1];
-	if (last === void 0) return candidate;
-	return {
-		...candidate,
-		gate: {
-			level: last.level,
-			verdict: last.verdict,
-			reason: last.reason,
-			...last.cached ? { cached: true } : {},
-			...auditOverride ? { auditOverride: true } : {}
-		}
-	};
-}
-async function filterCandidates(candidates, options) {
-	const kept = [];
-	const dropped = [];
-	const errors = [];
-	let calls = 0;
-	for (const candidate of candidates) {
-		const first = await runLadder({
-			level: "L0",
-			candidate,
-			facts: options.facts,
-			model: options.model,
-			modelName: options.modelName,
-			signal: options.signal,
-			...options.cache === void 0 ? {} : { cache: options.cache }
-		});
-		calls += first.calls;
-		if (first.route === "error") {
-			errors.push({
-				candidate,
-				message: first.error ?? "gate error"
-			});
-			continue;
-		}
-		if (first.route !== "keep" || first.droppedAt !== "L0") {
-			if (first.route === "merge" || first.route === "undecided") kept.push({
-				candidate: withGate(candidate, first.verdicts, false),
-				verdicts: first.verdicts,
-				auditOverride: false
-			});
-			else dropped.push({
-				candidate,
-				verdicts: first.verdicts,
-				auditOverride: false
-			});
-			continue;
-		}
-		if (!selectedForAudit(pairKey(candidate.a, candidate.b), options.runSeed, options.auditRate ?? .1)) {
-			dropped.push({
-				candidate,
-				verdicts: first.verdicts,
-				auditOverride: false
-			});
-			continue;
-		}
-		const audit = await runLadder({
-			level: "L0",
-			startLevel: "L2",
-			candidate,
-			facts: options.facts,
-			model: options.model,
-			modelName: options.modelName,
-			signal: options.signal,
-			...options.cache === void 0 ? {} : { cache: options.cache }
-		});
-		calls += audit.calls;
-		if (audit.route === "merge" || audit.route === "undecided") {
-			const all = [...first.verdicts, ...audit.verdicts];
-			kept.push({
-				candidate: withGate(candidate, all, true),
-				verdicts: all,
-				auditOverride: true
-			});
-		} else if (audit.route === "error") errors.push({
-			candidate,
-			message: audit.error ?? "audit gate error"
-		});
-		else dropped.push({
-			candidate,
-			verdicts: [...first.verdicts, ...audit.verdicts],
-			auditOverride: true
-		});
-	}
-	return {
-		kept,
-		dropped,
-		errors,
-		calls
-	};
-}
-//#endregion
-//#region lib/types/screening-port.js
-/**
-* The real screening port: lexical floor + optional C3 proposal + optional L0–L2 gate.
-* Each stage is independently testable; this file only composes their frozen contracts.
-*/
-async function buildScreeningCandidates(options) {
-	const lexical = lexicalCandidates(options.cards, options.lexical);
-	const merged = /* @__PURE__ */ new Map();
-	for (const candidate of lexical.candidates) merged.set(pairKey(candidate.a, candidate.b), candidate);
-	const degraded = [];
-	let proposed = 0;
-	let shards = 0;
-	if (options.propose !== void 0) {
-		const proposal = await proposePairs(options.cards, options.propose.model, {
-			signal: options.signal,
-			...options.propose.shardSize === void 0 ? {} : { shardSize: options.propose.shardSize },
-			...options.propose.maxPairs === void 0 ? {} : { maxPairs: options.propose.maxPairs }
-		});
-		proposed = proposal.candidates.length;
-		shards = proposal.shards;
-		degraded.push(...proposal.degraded);
-		for (const candidate of proposal.candidates) {
-			const key = pairKey(candidate.a, candidate.b);
-			const existing = merged.get(key);
-			if (existing === void 0) {
-				merged.set(key, candidate);
-				continue;
-			}
-			const arms = [...new Set([...existing.arms ?? [], ...candidate.arms ?? []])];
-			merged.set(key, {
-				...existing,
-				...candidate.reason === void 0 || existing.reason !== void 0 ? {} : { reason: candidate.reason },
-				...arms.length === 0 ? {} : { arms }
-			});
-		}
-	}
-	let candidates = [...merged.values()].sort((left, right) => (right.score ?? 0) - (left.score ?? 0) || left.a.localeCompare(right.a) || left.b.localeCompare(right.b));
-	let kept = candidates.length;
-	let dropped = 0;
-	let gateCalls = 0;
-	let gateErrors = 0;
-	if (options.gate !== void 0) {
-		const facts = options.cards.map((card) => ({
-			name: card.name,
-			description: card.description,
-			body: card.body
-		}));
-		const filtered = await filterCandidates(candidates, {
-			facts,
-			model: options.gate.model,
-			modelName: options.gate.modelName,
-			signal: options.signal,
-			runSeed: options.gate.runSeed,
-			...options.gate.cache === void 0 ? {} : { cache: options.gate.cache },
-			...options.gate.auditRate === void 0 ? {} : { auditRate: options.gate.auditRate }
-		});
-		candidates = filtered.kept.map((decision) => decision.candidate);
-		kept = filtered.kept.length;
-		dropped = filtered.dropped.length;
-		gateCalls = filtered.calls;
-		gateErrors = filtered.errors.length;
-		for (const error of filtered.errors) degraded.push("gate error: " + error.candidate.a + " + " + error.candidate.b + ": " + error.message);
-	}
-	return {
-		candidates,
-		stats: {
-			lexical: lexical.candidates.length,
-			proposed,
-			candidates: merged.size,
-			kept,
-			dropped,
-			gateCalls,
-			gateErrors,
-			shards
-		},
-		degraded
-	};
-}
-/** Build the run-scoped screening function; the run id seeds the 10% audit. */
-function createScreeningForRun(options) {
-	const gate = options.gate === void 0 ? void 0 : {
-		...options.gate,
-		runSeed: options.runSeed
-	};
-	return async (signal) => (await buildScreeningCandidates({
-		cards: options.cards,
-		signal,
-		...options.lexical === void 0 ? {} : { lexical: options.lexical },
-		...options.propose === void 0 ? {} : { propose: options.propose },
-		...gate === void 0 ? {} : { gate }
-	})).candidates;
-}
-//#endregion
 //#region lib/types/stage-tool-registry.js
 var StageToolRegistry = class {
 	bindings = /* @__PURE__ */ new Map();
@@ -3769,7 +4059,7 @@ function operation(args) {
 function createMergeStageTool(io, home, context) {
 	return {
 		name: MERGE_STAGE_TOOL_NAME,
-		description: "Read source copies and write the merged skill into the staging tree. Write/copy are only allowed in the author phase.",
+		description: "Read source copies and write the merged skill into the staging tree. list/read use area=sources|merged plus source (for sources); write/copy paths are relative to merged/<target> (for example path=SKILL.md, from=SKILL.md, to=references/x.md). Write/copy are only allowed in the author phase.",
 		parameters: {
 			type: "object",
 			properties: {
@@ -3855,8 +4145,21 @@ const Config = z.object({
 	mergeApproval: z.boolean().default(false).volatile(),
 	mergeSkippedTtlDays: z.number().min(0).default(0).volatile(),
 	mergeRunTimeoutMinutes: z.number().min(0).default(0).volatile(),
-	mergePairTimeoutMinutes: z.number().min(1).default(15)
+	mergePairTimeoutMinutes: z.number().min(1).default(15),
+	mergeModelsRoot: z.string().default("")
 });
+function engineConfigFromEnv(configuredRoot) {
+	const root = configuredRoot !== void 0 && configuredRoot !== "" ? configuredRoot : process.env.SKILL_MERGE_MODELS_ROOT;
+	if (root === void 0 || root === "") return void 0;
+	return {
+		models_dir: "",
+		offline: true,
+		auto_provision: false,
+		embed_backend: "local",
+		embedder_model: join(root, "potion-multilingual-128M-int8"),
+		embedder_model_last: join(root, "potion-multilingual-128M-pca64-int8")
+	};
+}
 /** Suppress the platform auto form; the registry renders the merge card instead. */
 function configureMergePresentation(ctx) {
 	ctx.inject(["settings"], (scope) => {
@@ -3870,6 +4173,15 @@ const inject = [];
 function apply(ctx, rawConfig = {}) {
 	configureMergePresentation(ctx);
 	const params = resolveMergeParams(rawConfig);
+	let mergeRun;
+	const mergeService = { async run(rawInput, invocation) {
+		return mergeRun === void 0 ? {
+			ok: false,
+			text: "merge 未就绪：evolutionIo 尚未挂载"
+		} : mergeRun(rawInput, invocation);
+	} };
+	const mergeContext = ctx;
+	if (typeof mergeContext.provide === "function") mergeContext.provide("evolutionMerge", mergeService);
 	let source;
 	registerHostRoutes(ctx, (audit) => makeMergeRoutes({ getSource: () => source }, audit));
 	ctx.inject(["commands", "evolutionIo"], (scope) => {
@@ -3877,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,
@@ -3904,9 +4219,36 @@ function apply(ctx, rawConfig = {}) {
 		});
 		const channel = subagentChannelAdapter(createSubagentChannel(ctx));
 		const stage = new StageToolRegistry();
+		const engineConfig = engineConfigFromEnv(params.mergeModelsRoot);
 		const llm = ctx.get("llm");
 		const defaultModel = ctx.get("agentDefaultModel");
-		const modelPort = llm === void 0 || defaultModel === void 0 ? void 0 : createModelPort(llm, () => defaultModel.currentSelection());
+		const runner = llm === void 0 || defaultModel === void 0 ? void 0 : createEngineRunner(llm, () => defaultModel.currentSelection());
+		const engineScreening = createEngineScreening({
+			io,
+			home,
+			engine: { screen },
+			select: selectWithErrors,
+			cfg: {
+				...engineConfig ?? {},
+				judge: "deepseek"
+			},
+			...runner === void 0 ? {} : { runner },
+			async onSelection(selection) {
+				const loaded = await loadMergeState(io, home);
+				const at = (/* @__PURE__ */ new Date()).toISOString();
+				for (const skipped of selection.skipped) {
+					if (loaded.state.rows.some((row) => row.pairKey === skipped.pairKey)) continue;
+					const next = transition(void 0, {
+						type: "gate-keep",
+						a: skipped.a,
+						b: skipped.b,
+						...skipped.reason === void 0 ? {} : { reason: skipped.reason },
+						at
+					});
+					if (next.ok && next.row !== null) await upsertRow(io, home, () => Date.now(), next.row);
+				}
+			}
+		});
 		source = {
 			rows() {
 				return loadMergeState(io, home).then((loaded) => loaded.state.rows);
@@ -3917,6 +4259,43 @@ 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;
+			},
 			commands() {
 				return [
 					"merge scan",
@@ -3932,7 +4311,7 @@ function apply(ctx, rawConfig = {}) {
 		};
 		const commands = scope.get("commands");
 		if (commands === void 0) return;
-		const command = createMergeCommand(createMergeRuntime({
+		const runtime = createMergeRuntime({
 			io,
 			home,
 			registry: runs,
@@ -3947,31 +4326,24 @@ function apply(ctx, rawConfig = {}) {
 			async cards(signal) {
 				const listed = await skills.list({ withContent: true });
 				if (signal.aborted) return [];
-				return listed.map((item) => ({
-					name: item.name,
-					description: item.description,
-					body: item.content ?? ""
+				return Promise.all(listed.map(async (item) => {
+					const probe = await skills.listSupportFiles(item.name);
+					const paths = probe.kind === "present" ? probe.value : [];
+					const files = await Promise.all(paths.map(async (path) => ({
+						path,
+						content: await skills.readSupportFile(item.name, path) ?? ""
+					})));
+					return {
+						name: item.name,
+						description: item.description,
+						body: item.content ?? "",
+						files,
+						protectedBy: item.protectedBy,
+						protectionUnknown: item.protectionUnknown
+					};
 				}));
 			},
-			screening(cards) {
-				return Promise.resolve(lexicalCandidates(cards).candidates);
-			},
-			...modelPort === void 0 ? {} : { async screeningForRun(cards, runId, signal) {
-				const cache = await loadGateCache(io, home);
-				const candidates = await createScreeningForRun({
-					cards,
-					runSeed: runId,
-					propose: { model: modelPort },
-					gate: {
-						model: modelPort,
-						modelName: defaultModel?.currentSelection().model ?? "",
-						runSeed: runId,
-						cache: cache.cache
-					}
-				})(signal);
-				await saveGateCache(io, home, cache.cache).catch(() => {});
-				return candidates;
-			} },
+			screeningForRun: engineScreening,
 			stage: {
 				bind: (context) => {
 					stage.bind(context.childId, context);
@@ -3980,7 +4352,9 @@ function apply(ctx, rawConfig = {}) {
 					stage.unbind(childId);
 				}
 			}
-		}));
+		});
+		mergeRun = (rawInput, invocation) => runMergeCommand(runtime, rawInput, invocation);
+		const command = createMergeCommand(runtime);
 		scope.effect(() => commands.register(command), "evolution-merge: command");
 		ctx.inject(["tools"], (toolScope) => {
 			const tools = toolScope.get("tools");
@@ -3994,4 +4368,4 @@ function apply(ctx, rawConfig = {}) {
 	});
 }
 //#endregion
-export { Config, GATE_CACHE_VERSION, GateCache, MERGE_DOCTOR_SCHEMA_VERSION, MERGE_PAIR_STATES, MERGE_PARAM_DEFAULTS, MERGE_PROMPT_VERSION, MERGE_QUEUES, MERGE_ROUTES, MERGE_STAGE_TOOL_NAME, MERGE_STATE_VERSION, STAGING_SCHEMA_VERSION, StageToolRegistry, apply, applyStageTool, approvePending, assembleStagedCommit, buildCommitPlan, buildMergeView, buildRound1Prompt, buildRound2Prompt, buildScreeningCandidates, canRetry, commitReceiptPath, commitStagedRun, committedPairs, configureMergePresentation, copyStagedFile, countRows, createChannelScanPorts, createMergeCommand, createMergeRuntime, createMergeStageTool, createModelPort, createNewChildRound2, createReadOnlyMergeService, createScreeningForRun, createStaging, dropRow, emptyMergeState, filterCandidates, formatQueue, formatStatus, gateCacheKey, gateCachePath, handleReadOnlyMergeCommand, hasBlockingFinding, hasGateCache, inject, isSkippedPair, lexicalCandidates, listStagedFiles, loadGateCache, loadMergeState, makeMergeRoutes, mergeCommandHelp, mergeDoctor, mergeReportDigestPath, mergeReportPath, mergeRunIdsToSupersede, mergeStatePath, mergeUsage, moveRow, mutateMergeState, nameEntropy, pageQueue, pairKey, parseDecision, parseMergeCommand, parseVerdict, prefilter, proposePairs, queueOf, readCommitReceipt, readMergeReport, readStagedFile, readStagedTree, readStaging, recordRound2Outcome, rejectPending, resolveMergeParams, resolveTargetName, rewriteFrontmatterName, rowIdOf, rowsOf, runApproveCommand, runAuthoring, runLadder, runNewChildAuthoring, runPairCommand, runResumeCommand, runRound1OverChannel, runScan, runScanCommand, saveGateCache, selectedForAudit, skillLibraryPort, skillLibraryUndoPort, skippedPairKeys, 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 };