@lmzhen/dsh-evolution-merge 0.45.0 → 0.47.0

package/lib/index.js

@@ -1273,7 +1273,7 @@ function parseV4State(raw) {
 * 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
+* through pairLedger 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.
 */
@@ -1357,96 +1357,6 @@ async function loadStateSchema(io, home) {
 		return null;
 	}
 }
-/** G3-5 runtime write API: only createVerify/createSkipped/transition. v2 writes are rejected. */
-async function transactRows(_io, _home, _fn) {
-	throw new Error("legacy-writer-removed");
-}
-/** The ONE write point. The callback returns the whole row set, not a delta. */
-async function mutateMergeState(_io, _home, _now, _fn) {
-	throw new Error("legacy-writer-removed");
-}
-async function upsertRow(io, home, now, row, expect = "any", cas) {
-	return await mutateMergeState(io, home, now, (rows) => {
-		const index = rows.findIndex((item) => item.pairKey === row.pairKey);
-		const current = index < 0 ? void 0 : rows[index];
-		if (cas !== void 0 && (cas === null && current !== void 0 || cas !== null && current?.updatedAt !== cas)) return {
-			rows,
-			result: {
-				ok: false,
-				current: current ?? row
-			}
-		};
-		if (current !== void 0 && expect !== "any" && (expect === "absent" || queueOf(current.state) !== expect)) return {
-			rows,
-			result: {
-				ok: false,
-				current
-			}
-		};
-		if (current === void 0 && expect !== "any" && expect !== "absent" && expect !== "verify") return {
-			rows,
-			result: {
-				ok: false,
-				current: row
-			}
-		};
-		const normalized = {
-			...row,
-			queue: queueOf(row.state)
-		};
-		const next = [...rows];
-		if (current === void 0) next.push(normalized);
-		else next[index] = {
-			...normalized,
-			createdAt: current.createdAt
-		};
-		return {
-			rows: next,
-			result: { ok: true }
-		};
-	});
-}
-async function moveRow(io, home, now, id, patch) {
-	return await mutateMergeState(io, home, now, (rows) => {
-		const index = rows.findIndex((item) => item.id === id);
-		if (index < 0) return {
-			rows,
-			result: void 0
-		};
-		const current = rows[index];
-		const state = patch.state ?? current.state;
-		const next = {
-			...current,
-			state,
-			queue: queueOf(state),
-			updatedAt: new Date(now()).toISOString(),
-			...patch.failure === void 0 ? {} : { failure: patch.failure },
-			...patch.runId === void 0 ? {} : { runId: patch.runId },
-			...patch.unitId === void 0 ? {} : { unitId: patch.unitId },
-			...patch.origin === void 0 ? {} : { origin: patch.origin },
-			...patch.attempts === void 0 ? {} : { attempts: patch.attempts }
-		};
-		const copy = [...rows];
-		copy[index] = next;
-		return {
-			rows: copy,
-			result: next
-		};
-	});
-}
-/** G3-5 v3-aware drop: only terminal events. */
-async function dropRowV3(_io, _home, _id, _event, _unitId = "unknown") {
-	throw new Error("legacy-writer-removed");
-}
-async function dropRow(io, home, now, id) {
-	return await mutateMergeState(io, home, now, (rows) => {
-		const next = rows.filter((item) => item.id !== id);
-		return {
-			rows: next,
-			result: next.length !== rows.length
-		};
-	});
-}
 async function rowsOf(io, home, queue) {
 	const loaded = await loadMergeState(io, home);
 	return queue === void 0 ? loaded.state.rows : loaded.state.rows.filter((row) => row.queue === queue);
@@ -2924,7 +2834,7 @@ const emptyCounts = {
 	},
 	expired: 0
 };
-const queueOf$3 = (state) => state === "approved" || state === "fuse" ? "fuse" : state === "verify" ? "verify" : state === "pending" ? "pending" : "skipped";
+const queueOf$1 = (state) => state === "approved" || state === "fuse" ? "fuse" : state === "verify" ? "verify" : state === "pending" ? "pending" : "skipped";
 async function readMergeSnapshot(options) {
 	const readAt = (options.now ?? (() => Date.now()))();
 	const hostOnly = options.hostOnly === void 0 ? void 0 : await options.hostOnly().catch((error) => ({
@@ -2976,7 +2886,7 @@ async function readMergeSnapshot(options) {
 	const live = options.live !== void 0 && (ledger?.rows ?? []).some((row) => row.state === "pending" && row.expired === void 0 || row.state === "verify" || row.state === "fuse" || row.state === "approved") ? await options.live().catch(() => void 0) : void 0;
 	for (const row of ledger?.rows ?? []) {
 		const stage = stages.find((item) => item.rowId === row.id) ?? null;
-		const queue = queueOf$3(row.state);
+		const queue = queueOf$1(row.state);
 		const bSide = live !== void 0 && live.managed(row.b) ? "live" : "archive";
 		const bodies = [{
 			rowId: row.id,
@@ -4438,7 +4348,7 @@ function verifyState(row) {
 	if (row.row.verifySubState === "screened") return "running";
 	return "queued";
 }
-function toRowFact$1(row) {
+function toRowFact(row) {
 	const state = row.row;
 	const target = state.state === "pending" || state.state === "approved" || state.state === "fuse" ? {
 		requested: state.target,
@@ -4548,7 +4458,7 @@ function runView(run, readAt, includeResultRef = false) {
 		]
 	};
 }
-function buildFacts$1(snapshot) {
+function buildFacts(snapshot) {
 	const ordered = [...snapshot.runs].sort((a, b) => b.record.startedAt - a.record.startedAt);
 	const active = ordered.find((run) => run.record.state === "running");
 	const last = ordered.find((run) => run.record.state !== "running");
@@ -4597,7 +4507,7 @@ function buildQueuePage(snapshot, queue, expiredOnly, cursor, limit = 50) {
 		queue,
 		expiredOnly,
 		counts: counts(snapshot.rows),
-		rows: page.map(toRowFact$1),
+		rows: page.map(toRowFact),
 		...next === void 0 ? {} : { nextCursor: next },
 		notes: snapshot.notes
 	};
@@ -4638,7 +4548,7 @@ function buildRunDetail(snapshot, runId) {
 			pairKey: pair.pairKey,
 			a: pair.pairKey.split("\0")[0] ?? "",
 			b: pair.pairKey.split("\0")[1] ?? "",
-			outcome: pair.result === "kept" ? "kept" : pair.result === "failed" ? "failed" : pair.result === "cancelled" ? "cancelled" : "merged",
+			outcome: pair.result === "kept" ? "kept" : pair.result === "failed" ? "failed" : pair.result === "cancelled" ? "cancelled" : pair.result === "undone" ? "undone" : "merged",
 			...pair.target === void 0 ? {} : { target: { requested: pair.target } }
 		})),
 		pairsTruncated: false
@@ -5621,240 +5531,14 @@ async function recoverCommitUnits(options) {
 	return reports;
 }
 //#endregion
-//#region lib/types/facts.js
-const queueOf$2 = (row) => row.state === "approved" ? "fuse" : row.queue;
-const isExpired = (row) => row.expired !== void 0;
-function countsOf(rows) {
-	const active = {
-		verify: 0,
-		pending: 0,
-		fuse: 0,
-		skipped: 0
-	};
-	let expired = 0;
-	for (const row of rows) {
-		if (isExpired(row)) {
-			expired += 1;
-			continue;
-		}
-		active[queueOf$2(row)] += 1;
-	}
-	return {
-		active,
-		expired
-	};
-}
-function toRunView(record, readAt, meta = null) {
-	const state = record.state;
-	return {
-		wireVersion: 1,
-		readAt,
-		id: record.id,
-		state,
-		command: record.command ?? "scan",
-		...record.stage === void 0 ? {} : { stage: record.stage },
-		progress: record.progress === void 0 ? null : {
-			done: record.progress.done,
-			total: record.progress.total
-		},
-		startedAt: record.startedAt,
-		...record.endedAt === void 0 ? {} : { endedAt: record.endedAt },
-		...record.failure === void 0 ? {} : { failure: {
-			stage: "settle",
-			code: "run-failed",
-			retryable: false,
-			retryFrom: "none",
-			detail: record.failure
-		} },
-		...record.parentRunId === void 0 ? {} : { parentRunId: record.parentRunId },
-		actions: [
-			{
-				id: "status",
-				command: "/evolution merge status " + record.id,
-				confirm: false,
-				enabled: true
-			},
-			{
-				id: "report",
-				command: "/evolution merge report " + record.id,
-				confirm: false,
-				enabled: record.resultRef !== void 0
-			},
-			{
-				id: "cancel",
-				command: "/evolution merge cancel " + record.id,
-				confirm: false,
-				enabled: state === "running"
-			}
-		]
-	};
-}
-function buildFacts(input) {
-	const ordered = [...input.runs].sort((a, b) => b.startedAt - a.startedAt);
-	const active = ordered.find((run) => run.state === "running");
-	const last = ordered.find((run) => run.state !== "running");
-	const notes = input.notes ?? [];
-	return {
-		wireVersion: 1,
-		readAt: input.readAt,
-		approval: { mergeApproval: input.approval },
-		counts: countsOf(input.rows),
-		active: active === void 0 ? null : toRunView(active, input.readAt, input.runMeta?.get(active.id) ?? null),
-		last: last === void 0 ? null : toRunView(last, input.readAt, input.runMeta?.get(last.id) ?? null),
-		startCommands: {
-			scan: "/evolution merge scan",
-			pair: "/evolution merge pair <a> <b>"
-		},
-		fallback: MERGE_COMMAND_SURFACE.fallback,
-		notes,
-		degraded: notes.length > 0
-	};
-}
-//#endregion
-//#region lib/types/wire-projection.js
-const queueOf$1 = (row) => row.state === "approved" ? "fuse" : row.queue;
-const expiredOf = (row) => row.expired !== void 0;
-/** Host-owned row actions; client only renders/copies them. */
-function actionRefs(row) {
-	const base = "/evolution merge ";
-	const disabled = row.expired === void 0 ? void 0 : "expired";
-	const action = (id, confirm = false, enabled = true) => ({
-		id,
-		command: base + id + " " + row.id,
-		confirm,
-		enabled,
-		...enabled ? {} : { disabledReason: disabled ?? "invalid" }
-	});
-	if (row.state === "pending" && row.expired !== void 0) return [{
-		id: "discard",
-		command: "/evolution merge discard " + row.id,
-		confirm: true,
-		enabled: true
-	}, {
-		id: "pair",
-		command: "/evolution merge pair " + row.a + " " + row.b,
-		confirm: true,
-		enabled: true
-	}];
-	if (row.state === "pending") return [
-		action("approve"),
-		action("reject", true),
-		action("discard", true)
-	];
-	if (row.state === "approved" || row.state === "fuse") {
-		if (row.failure !== void 0 && row.failure.retryable === false) return [{
-			id: "pair",
-			command: "/evolution merge pair " + row.a + " " + row.b,
-			confirm: true,
-			enabled: true
-		}, action("discard", true)];
-		return [
-			{
-				id: "retry-resume",
-				command: "/evolution merge resume --retry " + row.id,
-				confirm: true,
-				enabled: true
-			},
-			action("discard", true),
-			action("status")
-		];
-	}
-	if (row.state === "skipped") return [action("restore", true)];
-	if (row.state === "verify") return [{
-		id: "retry-candidates",
-		command: "/evolution merge candidates --retry " + row.id,
-		confirm: false,
-		enabled: true
-	}];
-	return [action("pair")];
-}
-function toRowFact(row, actions = actionRefs(row)) {
-	return {
-		id: row.id,
-		state: row.state,
-		queue: queueOf$1(row),
-		...row.state === "verify" ? { verifySubState: "queued" } : {},
-		a: row.a,
-		b: row.b,
-		...row.target === void 0 ? {} : { target: {
-			requested: row.target.requested,
-			...row.target.actual === void 0 ? {} : { actual: row.target.actual },
-			...row.target.created === void 0 ? {} : { created: row.target.created }
-		} },
-		...row.state === "pending" ? { summary: {
-			a: null,
-			b: null,
-			rationale: row.decision?.rationale ?? null
-		} } : {},
-		...row.reason === void 0 ? {} : { reason: row.reason },
-		...row.state === "skipped" ? { origin: row.origin ?? "system" } : {},
-		...row.failure === void 0 ? {} : { failure: {
-			stage: row.failure.stage === "screening" ? "screening" : row.failure.stage === "decide" ? "decide" : row.failure.stage === "author" ? "author" : row.failure.stage === "validate" ? "validate" : "commit",
-			code: row.failure.code,
-			retryable: row.failure.retryable,
-			retryFrom: row.failure.retryFrom
-		} },
-		...row.stagingRef === void 0 ? {} : { staging: {
-			state: "kept",
-			...row.stagingExpiresAt === void 0 ? {} : { expiresAt: row.stagingExpiresAt }
-		} },
-		...row.expired === void 0 ? {} : { expired: {
-			kind: row.expired,
-			at: Date.parse(row.updatedAt)
-		} },
-		...row.attempts === void 0 ? {} : { attempts: row.attempts },
-		...row.decision?.confidence === void 0 ? {} : { confidence: row.decision.confidence },
-		...row.state === "skipped" && row.stagingExpiresAt !== void 0 ? { expiresAt: row.stagingExpiresAt } : {},
-		createdAt: Date.parse(row.createdAt),
-		updatedAt: Date.parse(row.updatedAt),
-		actions
-	};
-}
-function toQueuePage(rows, queue, expiredOnly, readAt, limit = 50) {
-	const filtered = rows.filter((row) => queueOf$1(row) === queue && (expiredOnly ? expiredOf(row) : !expiredOf(row)));
-	const page = filtered.slice(0, Math.max(0, Math.min(200, limit)));
-	return {
-		wireVersion: 1,
-		readAt,
-		queue,
-		expiredOnly,
-		counts: countsOf(rows),
-		rows: page.map((row) => toRowFact(row)),
-		...filtered.length > page.length ? { nextCursor: String(page.length) } : {},
-		notes: []
-	};
-}
-function toBodyView(name, side, text, readAt) {
-	return {
-		wireVersion: 1,
-		readAt,
-		name,
-		side,
-		text,
-		markdown: true,
-		truncated: false,
-		totalBytes: Buffer.byteLength(text, "utf8")
-	};
-}
-function toHistoryView(items, readAt) {
-	return {
-		wireVersion: 1,
-		readAt,
-		items: items.map((item) => {
-			const parsed = item.archivedAt === null ? null : typeof item.archivedAt === "number" ? item.archivedAt : Date.parse(item.archivedAt);
-			return {
-				name: item.name,
-				kind: item.kind,
-				reason: item.reason,
-				lastVersion: item.lastVersion,
-				archivedAt: parsed === null || Number.isFinite(parsed) ? parsed : null,
-				...item.sourceRunId === void 0 ? {} : { sourceRunId: item.sourceRunId }
-			};
-		})
-	};
-}
-//#endregion
 //#region lib/types/merge-routes.js
+/**
+* Four read-only merge routes: view / rows / body / history.
+* The host loads one snapshot; these handlers only project wire envelopes.
+* There is no second (legacy rows/runs/history) source: the production constructor has
+* always provided the snapshot, and the legacy branches were the only consumers of
+* facts.ts / wire-projection.ts (W11 D2b).
+*/
 const MERGE_PATHS = HOST_ROUTES.merge;
 const MERGE_BASE = MERGE_PATHS.view.slice(0, -4);
 const MERGE_ROUTES = {
@@ -5870,21 +5554,16 @@ function makeMergeRoutes(deps, _audit) {
 		code: "E-325",
 		message: "merge service is not mounted"
 	});
-	const blocked = (readiness) => json(503, {
+	const blocked = (snapshot) => snapshot.blocked === void 0 ? null : json(503, {
 		wireVersion: 1,
 		code: "merge-state-blocked",
-		readiness
+		readiness: snapshot.blocked.readiness
 	});
 	const hostOnly = (snapshot) => snapshot.hostOnly === void 0 ? null : json(503, {
 		wireVersion: 1,
 		code: "E-323",
 		message: snapshot.hostOnly.detail ?? "host data plane unavailable"
 	});
-	const notReady = async (source) => {
-		if (source.readiness === void 0) return null;
-		const readiness = await source.readiness();
-		return readiness.ok ? null : blocked(readiness);
-	};
 	const bad = (message) => json(400, {
 		wireVersion: 1,
 		code: "merge-bad-query",
@@ -5892,6 +5571,11 @@ function makeMergeRoutes(deps, _audit) {
 	});
 	const get = (request) => request.method === "GET" ? null : methodNotAllowed(["GET"]);
 	const url = (request) => new URL(request.url, "http://local");
+	const snapshotOf = async () => {
+		const source = deps.getSource();
+		return source === void 0 ? null : await source.snapshot();
+	};
+	const unavailable = (snapshot) => snapshot === null ? absent() : blocked(snapshot) ?? hostOnly(snapshot);
 	return [
 		{
 			path: MERGE_ROUTES.view,
@@ -5900,28 +5584,10 @@ function makeMergeRoutes(deps, _audit) {
 			fetch: async (request) => {
 				const denied = get(request);
 				if (denied !== null) return denied;
-				const source = deps.getSource();
-				if (source === void 0) return absent();
-				if (source.snapshot !== void 0) {
-					const snapshot = await source.snapshot();
-					if (snapshot.blocked !== void 0) return json(503, {
-						wireVersion: 1,
-						code: "merge-state-blocked",
-						readiness: snapshot.blocked.readiness
-					});
-					const capability = hostOnly(snapshot);
-					if (capability !== null) return capability;
-					return json(200, buildFacts$1(snapshot));
-				}
-				const readiness = await notReady(source);
-				if (readiness !== null) return readiness;
-				const readAt = Date.now();
-				return json(200, buildFacts({
-					rows: await source.rows?.() ?? [],
-					runs: await source.runs?.(void 0, 20) ?? [],
-					approval: source.approval?.() === true,
-					readAt
-				}));
+				const snapshot = await snapshotOf();
+				const notReady = unavailable(snapshot);
+				if (notReady !== null) return notReady;
+				return json(200, buildFacts(snapshot));
 			}
 		},
 		{
@@ -5931,37 +5597,20 @@ function makeMergeRoutes(deps, _audit) {
 			fetch: async (request) => {
 				const denied = get(request);
 				if (denied !== null) return denied;
-				const source = deps.getSource();
-				if (source === void 0) return absent();
 				const query = url(request).searchParams;
 				const queue = query.get("queue") ?? "verify";
 				if (queue !== "verify" && queue !== "pending" && queue !== "fuse" && queue !== "skipped") return bad("queue must be verify/pending/fuse/skipped");
 				const expiredOnly = query.get("expired") === "1";
 				if (expiredOnly && queue !== "pending") return bad("expired is only allowed for pending");
 				const limit = Number.parseInt(query.get("limit") ?? "50", 10);
-				if (source.snapshot !== void 0) {
-					const snapshot = await source.snapshot();
-					if (snapshot.blocked !== void 0) return json(503, {
-						wireVersion: 1,
-						code: "merge-state-blocked",
-						readiness: snapshot.blocked.readiness
-					});
-					const capability = hostOnly(snapshot);
-					if (capability !== null) return capability;
-					try {
-						return json(200, buildQueuePage(snapshot, queue, expiredOnly, query.get("cursor") ?? void 0, Number.isFinite(limit) ? limit : 50));
-					} catch (error) {
-						return bad(error instanceof Error ? error.message : "queue cursor is stale");
-					}
+				const snapshot = await snapshotOf();
+				const notReady = unavailable(snapshot);
+				if (notReady !== null) return notReady;
+				try {
+					return json(200, buildQueuePage(snapshot, queue, expiredOnly, query.get("cursor") ?? void 0, Number.isFinite(limit) ? limit : 50));
+				} catch (error) {
+					return bad(error instanceof Error ? error.message : "queue cursor is stale");
 				}
-				const readiness = await notReady(source);
-				if (readiness !== null) return readiness;
-				const offset = Number.parseInt(query.get("cursor") ?? "0", 10);
-				const page = toQueuePage(await source.rows?.() ?? [], queue, expiredOnly, Date.now(), Number.isFinite(limit) ? limit : 50);
-				return json(200, Number.isFinite(offset) && offset > 0 ? {
-					...page,
-					rows: page.rows.slice(offset)
-				} : page);
 			}
 		},
 		{
@@ -5982,39 +5631,25 @@ function makeMergeRoutes(deps, _audit) {
 					code: "merge-body-not-found",
 					message: "merge body requires id or name"
 				});
-				if (source.snapshot !== void 0) {
-					const snapshot = await source.snapshot();
-					if (snapshot.blocked !== void 0) return json(503, {
-						wireVersion: 1,
-						code: "merge-state-blocked",
-						readiness: snapshot.blocked.readiness
-					});
-					const sideFilter = side === "a" ? "live" : side === "b" ? "archive" : side === "live" || side === "archive" ? side : void 0;
-					const refs = snapshot.bodyRefs.filter((ref) => (id === null || id === "" || ref.rowId === id) && (name === null || name === "" || ref.name === name) && (sideFilter === void 0 || ref.side === sideFilter));
-					if (refs.length === 0) return json(404, {
-						wireVersion: 1,
-						code: "merge-body-not-found",
-						message: "merge body not found"
-					});
-					if (refs.length > 1) return bad("merge body is ambiguous; pass id, name and side");
-					const row = snapshot.rows.find((item) => item.row.id === refs[0].rowId);
-					if (row?.stage?.state === "lost" || row?.stage?.state === "expired") return json(404, {
-						wireVersion: 1,
-						code: "merge-body-not-found",
-						message: "merge stage is lost"
-					});
-					const ref = refs[0];
-					return json(200, buildBodyView(snapshot, ref, (source.bodyRef === void 0 ? null : await source.bodyRef(ref)) ?? ""));
-				}
-				const readiness = await notReady(source);
-				if (readiness !== null) return readiness;
-				if (id === null || id === "" || side !== "a" && side !== "b") return bad("id and side=a|b are required");
-				const content = await source.body?.(id, side) ?? null;
-				return content === null ? json(200, {
+				const snapshot = await source.snapshot();
+				const notReady = blocked(snapshot);
+				if (notReady !== null) return notReady;
+				const sideFilter = side === "a" ? "live" : side === "b" ? "archive" : side === "live" || side === "archive" ? side : void 0;
+				const refs = snapshot.bodyRefs.filter((ref) => (id === null || id === "" || ref.rowId === id) && (name === null || name === "" || ref.name === name) && (sideFilter === void 0 || ref.side === sideFilter));
+				if (refs.length === 0) return json(404, {
+					wireVersion: 1,
+					code: "merge-body-not-found",
+					message: "merge body not found"
+				});
+				if (refs.length > 1) return bad("merge body is ambiguous; pass id, name and side");
+				const row = snapshot.rows.find((item) => item.row.id === refs[0].rowId);
+				if (row?.stage?.state === "lost" || row?.stage?.state === "expired") return json(404, {
 					wireVersion: 1,
-					code: "merge-body-missing",
-					message: "merge body not found: " + id
-				}) : json(200, toBodyView(id, side === "a" ? "live" : "archive", content, Date.now()));
+					code: "merge-body-not-found",
+					message: "merge stage is lost"
+				});
+				const ref = refs[0];
+				return json(200, buildBodyView(snapshot, ref, (source.bodyRef === void 0 ? null : await source.bodyRef(ref)) ?? ""));
 			}
 		},
 		{
@@ -6024,20 +5659,11 @@ function makeMergeRoutes(deps, _audit) {
 			fetch: async (request) => {
 				const denied = get(request);
 				if (denied !== null) return denied;
-				const source = deps.getSource();
-				if (source === void 0) return absent();
-				if (source.snapshot !== void 0) {
-					const snapshot = await source.snapshot();
-					if (snapshot.blocked !== void 0) return json(503, {
-						wireVersion: 1,
-						code: "merge-state-blocked",
-						readiness: snapshot.blocked.readiness
-					});
-					return json(200, buildHistoryView(snapshot));
-				}
-				const readiness = await notReady(source);
-				if (readiness !== null) return readiness;
-				return json(200, toHistoryView(await source.history?.() ?? [], Date.now()));
+				const snapshot = await snapshotOf();
+				if (snapshot === null) return absent();
+				const notReady = blocked(snapshot);
+				if (notReady !== null) return notReady;
+				return json(200, buildHistoryView(snapshot));
 			}
 		},
 		{
@@ -6351,13 +5977,13 @@ async function handleReadOnlyMergeCommand(command, io, home, cards, runs, approv
 		...live === void 0 ? {} : { live }
 	});
 	if (snapshot.blocked !== void 0) throw new Error(snapshot.blocked.code + ": " + snapshot.blocked.message);
-	const rows = snapshot.rows.map(toRowFact$1);
+	const rows = snapshot.rows.map(toRowFact);
 	if (command.verb === "status") {
 		if (command.id !== void 0) {
 			const row = rows.find((item) => item.id === command.id);
 			return row === void 0 ? "merge row not found: " + command.id : formatSnapshotStatus([row]);
 		}
-		return formatFacts(buildFacts$1(snapshot));
+		return formatFacts(buildFacts(snapshot));
 	}
 	if (command.verb === "pending") {
 		const live = command.expired === true ? rows.filter((row) => row.expired !== void 0) : rows.filter((row) => row.queue === "pending" && row.expired === void 0);
@@ -11674,25 +11300,6 @@ function apply(ctx, rawConfig = {}) {
 			},
 			async bodyRef(ref) {
 				return await resolveBody(io, home, ref, async () => ref.side === "archive" ? await skills.readArchived(ref.name) : await skills.read(ref.name));
-			},
-			approval() {
-				return getParams().mergeApproval;
-			},
-			readiness() {
-				return ready;
-			},
-			commands() {
-				return [
-					"merge scan",
-					"merge doctor",
-					"merge status",
-					"merge pending",
-					"merge skipped",
-					"merge report",
-					"merge runs",
-					"merge cancel",
-					"merge reconcile"
-				];
 			}
 		};
 		doctorFact = async () => {
@@ -11779,4 +11386,4 @@ function apply(ctx, rawConfig = {}) {
 	});
 }
 //#endregion
-export { Config, MERGE_DOCTOR_SCHEMA_VERSION, MERGE_LIFECYCLE_VERBS, MERGE_MAX_ATTEMPTS, MERGE_PAIR_STATES, MERGE_PARAM_DEFAULTS, MERGE_PROMPT_VERSION, MERGE_QUEUES, MERGE_ROUTES, MERGE_STAGE_TOOL_NAME, MERGE_STATE_VERSION, STAGING_SCHEMA_VERSION, STANDBY_PROMPT, StageToolRegistry, apply, applyStageTool, approvePending, assembleStagedCommit, buildCommitPlan, buildRound1Prompt, buildRound2Prompt, buildStandbyPrompt, busyTarget, canRetry, cleanupExpiredStaging, commitReceiptPath, commitStagedRun, committedPairs, configureMergePresentation, copyStagedFile, countRows, createChannelScanPorts, createEngineRunner, createEngineScreening, createMergeCommand, createMergeRuntime, createMergeStageTool, createNewChildRound2, createReadOnlyMergeService, createStageForCards, createStaging, dropRow, dropRowV3, dropStaging, durableReceiptDir, durableReceiptPath, emptyMergeState, engineConfigFromRoot, ensureStaging, forcedDecisionFor, formatFacts, formatQueue, formatRunDetail, formatRunsView, formatSnapshotQueue, formatSnapshotStatus, formatStatus, handleReadOnlyMergeCommand, hasBlockingFinding, inject, isSkippedPair, listStagedFiles, liveRowFactsOf, loadMergeState, loadStateSchema, makeMergeRoutes, manifestFilesOf, mergeCommandHelp, mergeDoctor, mergeDoctorAvailability, mergeDoctorFact, mergeReportDigestPath, mergeReportPath, mergeRunIdsToSupersede, mergeStatePath, mergeUsage, missingManifestFile, moveRow, mutateMergeState, pairKey, parseAuthoringManifest, parseDecision, parseMergeCommand, pendingExpiry, persistedExpiry, promptHashOf, queueOf, readCommitReceipt, readCommitReceipts, readMergeReport, readStagedFile, readStagedTree, readStaging, recordRound2Outcome, rejectPending, resolveMergeParams, resolveTargetName, retryMergeReport, rewriteFrontmatterName, rowIdOf, rowsOf, runApproveCommand, runAuthoring, runMergeCommand, runNewChildAuthoring, runPairCommand, runResumeCommand, runRound1OverChannel, runScan, runScanCommand, setStagingTarget, skillLibraryPort, skillLibraryUndoPort, skippedPairKeys, snapshotCards, sourceBlock, stageKeyOf, stageOf, stagingRoot, subagentChannelAdapter, supersedeMergeRuns, transactRows, transitionLegacyForProjection, undoMergeReceipt, unitFor, upsertRow, validateStagedTree, withMergeRun, writeCommitReceipt, writeMergeReport, writeStagedFile };
+export { Config, MERGE_DOCTOR_SCHEMA_VERSION, MERGE_LIFECYCLE_VERBS, MERGE_MAX_ATTEMPTS, MERGE_PAIR_STATES, MERGE_PARAM_DEFAULTS, MERGE_PROMPT_VERSION, MERGE_QUEUES, MERGE_ROUTES, MERGE_STAGE_TOOL_NAME, MERGE_STATE_VERSION, STAGING_SCHEMA_VERSION, STANDBY_PROMPT, StageToolRegistry, apply, applyStageTool, approvePending, assembleStagedCommit, buildCommitPlan, buildRound1Prompt, buildRound2Prompt, buildStandbyPrompt, busyTarget, canRetry, cleanupExpiredStaging, commitReceiptPath, commitStagedRun, committedPairs, configureMergePresentation, copyStagedFile, countRows, createChannelScanPorts, createEngineRunner, createEngineScreening, createMergeCommand, createMergeRuntime, createMergeStageTool, createNewChildRound2, createReadOnlyMergeService, createStageForCards, createStaging, dropStaging, durableReceiptDir, durableReceiptPath, emptyMergeState, engineConfigFromRoot, ensureStaging, forcedDecisionFor, formatFacts, formatQueue, formatRunDetail, formatRunsView, formatSnapshotQueue, formatSnapshotStatus, formatStatus, handleReadOnlyMergeCommand, hasBlockingFinding, inject, isSkippedPair, listStagedFiles, liveRowFactsOf, loadMergeState, loadStateSchema, makeMergeRoutes, manifestFilesOf, mergeCommandHelp, mergeDoctor, mergeDoctorAvailability, mergeDoctorFact, mergeReportDigestPath, mergeReportPath, mergeRunIdsToSupersede, mergeStatePath, mergeUsage, missingManifestFile, pairKey, parseAuthoringManifest, parseDecision, parseMergeCommand, pendingExpiry, persistedExpiry, promptHashOf, queueOf, readCommitReceipt, readCommitReceipts, readMergeReport, readStagedFile, readStagedTree, readStaging, recordRound2Outcome, rejectPending, resolveMergeParams, resolveTargetName, retryMergeReport, rewriteFrontmatterName, rowIdOf, rowsOf, runApproveCommand, runAuthoring, runMergeCommand, runNewChildAuthoring, runPairCommand, runResumeCommand, runRound1OverChannel, runScan, runScanCommand, setStagingTarget, skillLibraryPort, skillLibraryUndoPort, skippedPairKeys, snapshotCards, sourceBlock, stageKeyOf, stageOf, stagingRoot, subagentChannelAdapter, supersedeMergeRuns, transitionLegacyForProjection, undoMergeReceipt, unitFor, validateStagedTree, withMergeRun, writeCommitReceipt, writeMergeReport, writeStagedFile };

package/lib/types/index.js

@@ -331,11 +331,6 @@ export function apply(ctx, rawConfig = {}) {
                     } });
             },
             async bodyRef(ref) { return await resolveBody(io, home, ref, async () => ref.side === 'archive' ? await skills.readArchived(ref.name) : await skills.read(ref.name)); },
-            approval() { return getParams().mergeApproval; },
-            readiness() { return ready; },
-            commands() {
-                return ['merge scan', 'merge doctor', 'merge status', 'merge pending', 'merge skipped', 'merge report', 'merge runs', 'merge cancel', 'merge reconcile'];
-            },
         };
         doctorFact = async () => {
             const current = source;