@lmzhen/dsh-evolution-merge 0.30.1 → 0.30.3

package/lib/index.js

@@ -1,7 +1,7 @@
-import { join } from "node:path";
+import { join, resolve, sep } from "node:path";
 import z from "@deepseek-ai/schemastery";
 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 { DEFAULT_SKILL_LIMITS, authorityFrom, contentHash, createSubagentChannel, evolutionHome, evolutionIoAdapter, executeUnitUndo, isPresent, newRunRegistry, newSkillLibrary, parseFrontmatter, planUnitUndoAcross, policyStageLimits, probeAbsent, probeList, probePresent, probeText, probeUnknown, scanContentThreats, skillsRoot, supportRefs, transactIo, validateFrontmatter, validateSupportPath } from "@lmzhen/dsh-evolution-core";
 import { HOST_ROUTES, json, methodNotAllowed, registerHostRoutes } from "@lmzhen/dsh-evolution-core/http-routes";
 import { createHash } from "node:crypto";
 //#region lib/types/adapters/select.js
@@ -345,22 +345,37 @@ async function mutateMergeState(io, home, now, fn) {
 	});
 	return result;
 }
-async function upsertRow(io, home, now, row) {
-	await mutateMergeState(io, home, now, (rows) => {
+async function upsertRow(io, home, now, row, expect = "any") {
+	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 (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 (index < 0) next.push(normalized);
+		if (current === void 0) next.push(normalized);
 		else next[index] = {
 			...normalized,
-			createdAt: rows[index]?.createdAt ?? normalized.createdAt
+			createdAt: current.createdAt
 		};
 		return {
 			rows: next,
-			result: void 0
+			result: { ok: true }
 		};
 	});
 }
@@ -563,6 +578,152 @@ async function cleanupExpiredStaging(io, home, now, keep = /* @__PURE__ */ new S
 	};
 }
 //#endregion
+//#region lib/types/domain/commit-journal.js
+/** What a restart may do with the last durable phase. */
+function recoveryFor(journal) {
+	switch (journal.phase) {
+		case "prepared": return "retry-commit";
+		case "target-written": return "rollback-target";
+		case "sources-archived": return "rollback-sources";
+		case "committed":
+		case "rolled-back":
+		case "failed": return "none";
+	}
+}
+//#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-snapshot.js
+/** Pre-commit snapshot: enough to restore the target and archived sources after a crash. */
+function snapshotPath(home, runId) {
+	return join(home, "merge", "snapshots", runId.replace(/[^A-Za-z0-9_-]+/g, "_") + ".json");
+}
+async function writeCommitSnapshot(io, home, runId, plan, now, port) {
+	if (!isSafeSkillName(plan.target) || plan.sources.some((name) => !isSafeSkillName(name))) throw new Error("unsafe skill name in commit plan: " + plan.target);
+	const readSupport = port?.readSupportFiles === void 0 ? void 0 : (name) => port.readSupportFiles?.(name) ?? Promise.resolve([]);
+	const targetSupport = readSupport === void 0 || !plan.targetExists ? [] : await readSupport(plan.target);
+	const sourceSupport = [];
+	if (readSupport !== void 0) for (const name of plan.sources) for (const file of await readSupport(name)) sourceSupport.push({
+		name,
+		path: file.path,
+		content: file.content
+	});
+	const snapshot = {
+		runId,
+		target: plan.target,
+		create: !plan.targetExists,
+		sources: plan.sources,
+		targetBody: plan.expectedTargetBody,
+		sourceBodies: plan.expectedSourceBodies.map((item) => ({
+			name: item.name,
+			body: item.body
+		})),
+		...targetSupport.length === 0 ? {} : { targetSupport },
+		...plan.supportFiles.length === 0 ? {} : { targetSupportAfter: plan.supportFiles },
+		...sourceSupport.length === 0 ? {} : { sourceSupport },
+		at: new Date(now).toISOString()
+	};
+	await io.writeText(snapshotPath(home, runId), JSON.stringify(snapshot, null, 2));
+	return snapshot;
+}
+async function readCommitSnapshot(io, home, runId) {
+	const raw = await io.readText(snapshotPath(home, runId));
+	if (raw === null) return null;
+	try {
+		return JSON.parse(raw);
+	} catch {
+		return null;
+	}
+}
+function isSafeSkillName(name) {
+	return /^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(name) && name !== "." && name !== "..";
+}
+function skillFilePath(root, name, path) {
+	if (!isSafeSkillName(name) || path.startsWith("/") || path.includes("..")) throw new Error("unsafe skill file: " + name + "/" + path);
+	const base = resolve(root, name);
+	const file = resolve(base, path);
+	if (!file.startsWith(base + sep)) throw new Error("skill file escapes skill: " + name + "/" + path);
+	return file;
+}
+function skillBodyPath(root, name) {
+	if (!isSafeSkillName(name)) throw new Error("unsafe skill name: " + name);
+	const base = resolve(root);
+	const path = resolve(base, name, "SKILL.md");
+	if (!path.startsWith(base + sep)) throw new Error("skill path escapes root: " + name);
+	return path;
+}
+//#endregion
+//#region lib/types/commit-recovery.js
+/** Startup replay for non-terminal commit journals. */
+async function recoverCommitJournals(io, home, now, skillRoot, restoreSource) {
+	const dir = join(home, "merge", "journals");
+	if (!await io.exists(dir)) return [];
+	const files = (await io.list(dir)).filter((name) => name.endsWith(".json"));
+	const reports = [];
+	for (const file of files) {
+		let journal;
+		try {
+			journal = JSON.parse(await io.readText(join(dir, file)) ?? "");
+		} catch {
+			continue;
+		}
+		const recovery = recoveryFor(journal);
+		if (recovery === "none") continue;
+		const snapshot = await readCommitSnapshot(io, home, journal.runId);
+		let action = "report-only";
+		let ok = true;
+		if (recovery === "retry-commit") action = "no-host-write";
+		else if (snapshot === null) {
+			action = "snapshot-missing";
+			ok = false;
+		} else try {
+			if (recovery === "rollback-sources") {
+				let restoredArchived = restoreSource !== void 0;
+				if (restoreSource !== void 0) {
+					for (const source of snapshot.sourceBodies) if (!await restoreSource(source.name)) restoredArchived = false;
+				}
+				if (!restoredArchived) for (const source of snapshot.sourceBodies) await io.writeText(skillBodyPath(skillRoot, source.name), source.body);
+			}
+			if (snapshot.create && snapshot.targetBody === null) try {
+				await io.remove(skillBodyPath(skillRoot, snapshot.target));
+			} catch {}
+			else if (snapshot.targetBody !== null) await io.writeText(skillBodyPath(skillRoot, snapshot.target), snapshot.targetBody);
+			const oldPaths = new Set((snapshot.targetSupport ?? []).map((file) => file.path));
+			for (const file of snapshot.targetSupport ?? []) await io.writeText(skillFilePath(skillRoot, snapshot.target, file.path), file.content);
+			for (const file of snapshot.targetSupportAfter ?? []) if (!oldPaths.has(file.path)) try {
+				await io.remove(skillFilePath(skillRoot, snapshot.target, file.path));
+			} catch {}
+			for (const file of snapshot.sourceSupport ?? []) await io.writeText(skillFilePath(skillRoot, file.name, file.path), file.content);
+			action = recovery === "rollback-sources" ? "restored-sources-and-target" : "restored-target";
+		} catch (error) {
+			action = "restore-failed: " + (error instanceof Error ? error.message : String(error));
+			ok = false;
+		}
+		await writeJournal(io, home, {
+			...journal,
+			phase: ok ? "rolled-back" : "failed",
+			updatedAt: new Date(now).toISOString()
+		});
+		reports.push({
+			runId: journal.runId,
+			phase: journal.phase,
+			action,
+			ok
+		});
+	}
+	await io.writeText(join(home, "merge", "recovery.json"), JSON.stringify(reports, null, 2));
+	return reports;
+}
+//#endregion
 //#region lib/types/commit-receipt.js
 /**
 * Commit receipt: <run>/commit.json, written immediately after a successful commit.
@@ -743,11 +904,15 @@ function transition(current, event) {
 			return event.approval === "on" ? next(current, event.at, "pending", {
 				...event.decision === void 0 ? {} : { decision: event.decision },
 				...event.stagingRef === void 0 ? {} : { stagingRef: event.stagingRef },
-				...event.stagingExpiresAt === void 0 ? {} : { stagingExpiresAt: event.stagingExpiresAt }
+				...event.stagingExpiresAt === void 0 ? {} : { stagingExpiresAt: event.stagingExpiresAt },
+				...event.sourceRevision === void 0 ? {} : { sourceRevision: event.sourceRevision },
+				...event.targetRevision === void 0 ? {} : { targetRevision: event.targetRevision }
 			}) : next(current, event.at, "approved", {
 				...event.decision === void 0 ? {} : { decision: event.decision },
 				...event.stagingRef === void 0 ? {} : { stagingRef: event.stagingRef },
-				...event.stagingExpiresAt === void 0 ? {} : { stagingExpiresAt: event.stagingExpiresAt }
+				...event.stagingExpiresAt === void 0 ? {} : { stagingExpiresAt: event.stagingExpiresAt },
+				...event.sourceRevision === void 0 ? {} : { sourceRevision: event.sourceRevision },
+				...event.targetRevision === void 0 ? {} : { targetRevision: event.targetRevision }
 			});
 		case "round1-fail": return current.state === "verify" ? next(current, event.at, "verify", {
 			failure: event.failure,
@@ -764,10 +929,23 @@ function transition(current, event) {
 			ok: true,
 			row: null
 		} : invalid(event, current.state);
+		case "target-taken":
+		case "source-changed": return current.state === "pending" || current.state === "approved" || current.state === "fuse" ? next(current, event.at, current.state, { expired: event.type }) : invalid(event, current.state);
 		case "restore": return current.state === "skipped" ? next(current, event.at, "verify") : invalid(event, current.state);
 	}
 }
 //#endregion
+//#region lib/types/presentation-budget.js
+/** Tool-result budget: keep the head and tail, mark what was omitted. */
+function fitToolText(text, max = 8e3) {
+	if (text.length <= max) return text;
+	const marker = "\n... [truncated " + String(text.length - max) + " chars] ...\n";
+	const keep = Math.max(0, max - marker.length);
+	const head = Math.ceil(keep * .7);
+	const tail = keep - head;
+	return text.slice(0, head) + marker + (tail === 0 ? "" : text.slice(-tail));
+}
+//#endregion
 //#region lib/types/status.js
 function countRows(rows) {
 	const counts = {
@@ -788,12 +966,12 @@ function formatStatus(rows) {
 	const counts = countRows(rows);
 	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");
+	return fitToolText(lines.join("\n"));
 }
 function formatQueue(rows, queue) {
 	const selected = rows.filter((row) => queueOf(row.state) === queue);
 	if (selected.length === 0) return "merge " + queue + ": empty";
-	return ["merge " + queue + ": " + String(selected.length)].concat(selected.map((row) => "- " + describe(row))).join("\n");
+	return fitToolText(["merge " + queue + ": " + String(selected.length)].concat(selected.map((row) => "- " + describe(row))).join("\n"));
 }
 //#endregion
 //#region lib/types/routes.js
@@ -811,6 +989,9 @@ function toRowView(row) {
 		createdAt: row.createdAt,
 		...row.decision?.target === void 0 ? {} : { target: row.decision.target },
 		...row.decision?.confidence === void 0 ? {} : { confidence: row.decision.confidence },
+		...row.decision?.aSummary === void 0 ? {} : { aSummary: row.decision.aSummary },
+		...row.decision?.bSummary === void 0 ? {} : { bSummary: row.decision.bSummary },
+		...row.decision?.rationale === void 0 ? {} : { rationale: row.decision.rationale },
 		...row.failure === void 0 ? {} : { failure: {
 			stage: row.failure.stage,
 			code: row.failure.code,
@@ -823,9 +1004,9 @@ function toRowView(row) {
 		...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 ?? ""
+			row.decision?.aSummary ?? "未提供技能1摘要",
+			row.decision?.bSummary ?? "未提供技能2摘要",
+			row.decision?.rationale ?? row.reason ?? "未提供融合原因"
 		],
 		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]
 	};
@@ -1539,7 +1720,8 @@ async function runScan(options) {
 			});
 			if (!created.ok || created.row === null) throw new Error(created.ok ? "candidate row missing" : created.message);
 			row = created.row;
-			await upsertRow(options.io, options.home, options.now, row);
+			const placed = await upsertRow(options.io, options.home, options.now, row, "verify");
+			if (!placed.ok) throw new Error("pair already in " + placed.current.state);
 		} catch (error) {
 			totals.failed += 1;
 			pairs.push({
@@ -1711,7 +1893,7 @@ async function runScan(options) {
 		},
 		pairs,
 		totals,
-		notes: [],
+		notes: [...options.notes ?? []],
 		...remaining.length === 0 ? {} : { remaining }
 	};
 }
@@ -1905,7 +2087,8 @@ async function runScanCommand(options) {
 				ports,
 				stage: ctx.stage,
 				startedAt: ctx.startedAt,
-				...options.timeoutMinutes === void 0 ? {} : { timeoutMinutes: options.timeoutMinutes }
+				...options.timeoutMinutes === void 0 ? {} : { timeoutMinutes: options.timeoutMinutes },
+				...options.notes === void 0 ? {} : { notes: options.notes }
 			});
 		}
 	});
@@ -2372,6 +2555,12 @@ function parseDecision(text, pair) {
 	const target = typeof record.target === "string" ? record.target.trim() : "";
 	const sources = Array.isArray(record.sources) ? record.sources.filter((item) => typeof item === "string").map((item) => item.trim()).filter(Boolean) : [];
 	const rationale = typeof record.rationale === "string" ? record.rationale.trim() : "";
+	const aSummary = typeof record.aSummary === "string" ? record.aSummary.trim() : typeof record.a_summary === "string" ? record.a_summary.trim() : "";
+	const bSummary = typeof record.bSummary === "string" ? record.bSummary.trim() : typeof record.b_summary === "string" ? record.b_summary.trim() : "";
+	const summaries = {
+		...aSummary === "" ? {} : { aSummary },
+		...bSummary === "" ? {} : { bSummary }
+	};
 	if (!shouldMerge || mode === "keep") return {
 		ok: true,
 		decision: {
@@ -2379,7 +2568,8 @@ function parseDecision(text, pair) {
 			mode: "keep",
 			target,
 			sources,
-			rationale
+			rationale,
+			...summaries
 		}
 	};
 	if (target === "") return {
@@ -2405,6 +2595,7 @@ function parseDecision(text, pair) {
 			target,
 			sources,
 			rationale,
+			...summaries,
 			...typeof record.confidence === "number" ? { confidence: record.confidence } : {}
 		}
 	};
@@ -2890,17 +3081,6 @@ 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, {
@@ -2911,12 +3091,21 @@ async function commitStagedRun(io, home, runId, port, options) {
 		ok: false,
 		message: assembled.message
 	};
+	try {
+		await writeCommitSnapshot(io, home, runId, assembled.plan, options.now(), port);
+	} catch (error) {
+		return {
+			ok: false,
+			message: "commit snapshot failed; refusing to write: " + (error instanceof Error ? error.message : String(error)),
+			plan: assembled.plan
+		};
+	}
 	const journal = {
 		runId,
 		target: assembled.plan.target,
 		create: !assembled.plan.targetExists,
 		sources: assembled.plan.sources,
-		phase: "prepared",
+		phase: "sources-archived",
 		updatedAt: new Date(options.now()).toISOString()
 	};
 	try {
@@ -2937,6 +3126,14 @@ async function commitStagedRun(io, home, runId, port, options) {
 			plan: assembled.plan
 		};
 	}
+	const committed = {
+		...journal,
+		phase: "committed",
+		updatedAt: new Date(options.now()).toISOString()
+	};
+	try {
+		await writeJournal(io, home, committed);
+	} catch {}
 	if (result.unitId === void 0) return {
 		ok: true,
 		plan: assembled.plan,
@@ -2956,14 +3153,6 @@ async function commitStagedRun(io, home, runId, port, options) {
 	};
 	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,
@@ -3050,6 +3239,17 @@ async function runAuthoring(options) {
 	};
 }
 //#endregion
+//#region lib/types/revision.js
+/** Stable source revision for a pair: names sorted, body hashed in that order. */
+function sourceRevisionOf(cards, a, b) {
+	const byName = new Map(cards.map((card) => [card.name, card]));
+	const names = [a, b].sort();
+	const first = byName.get(names[0] ?? "");
+	const second = byName.get(names[1] ?? "");
+	if (first === void 0 || second === void 0) return void 0;
+	return contentHash(first.name + "\0" + first.body + "\0" + second.name + "\0" + second.body);
+}
+//#endregion
 //#region lib/types/scan-ports.js
 function createChannelScanPorts(options) {
 	const sessions = /* @__PURE__ */ new Map();
@@ -3107,10 +3307,12 @@ function createChannelScanPorts(options) {
 					phase: "author"
 				});
 			}
+			const sourceRevision = result.outcome.kind === "merge" ? sourceRevisionOf(options.cards, candidate.a, candidate.b) : void 0;
 			return result.outcome.kind === "merge" ? {
 				...result.outcome,
 				stagingRef: stageKey,
-				stagingExpiresAt: options.now() + 7 * 864e5
+				stagingExpiresAt: options.now() + 7 * 864e5,
+				...sourceRevision === void 0 ? {} : { sourceRevision }
 			} : result.outcome;
 		},
 		async round2(row, decision, signal) {
@@ -3346,7 +3548,16 @@ function skillLibraryPort(skills) {
 			const names = await archivedNames.call(skills);
 			return names === null ? true : names.includes(name);
 		},
-		commitMerge: (plan) => skills.commitMerge(plan)
+		commitMerge: (plan) => skills.commitMerge(plan),
+		async readSupportFiles(name) {
+			if (typeof skills.listSupportFiles !== "function") return [];
+			const probe = await skills.listSupportFiles(name);
+			if (probe.kind !== "present") return [];
+			return await Promise.all(probe.value.map(async (path) => ({
+				path,
+				content: await skills.readSupportFile(name, path) ?? ""
+			})));
+		}
 	};
 }
 //#endregion
@@ -3356,6 +3567,16 @@ function skillLibraryPort(skills) {
 * Plugin wiring supplies the channel, model and library; this module keeps the orchestration
 * out of apply() and makes the mutating verbs testable with fakes.
 */
+function forcedDecisionFor(a, b) {
+	const sorted = [a, b].sort();
+	return {
+		shouldMerge: true,
+		mode: "create-umbrella",
+		target: ("merge-" + sorted.join("-")).replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 64),
+		sources: [a, b],
+		rationale: "forced pair merge of " + sorted.join(" and ")
+	};
+}
 function createMergeRuntime(deps) {
 	const readOnly = createReadOnlyMergeService(deps.io, deps.home);
 	const timeout = deps.timeoutMinutes > 0 ? deps.timeoutMinutes : void 0;
@@ -3382,20 +3603,27 @@ function createMergeRuntime(deps) {
 		if (command.verb === "pair") {
 			const signal = new AbortController().signal;
 			const cards = await deps.cards(signal);
+			const cardA = cards.find((card) => card.name === command.a);
+			const cardB = cards.find((card) => card.name === command.b);
+			if (cardA === void 0 || cardB === void 0 || cardA.managed !== true || cardB.managed !== true) return {
+				ok: false,
+				text: "merge pair 仅支持 family-managed 技能: " + command.a + " / " + command.b
+			};
 			const pair = [{
 				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 existing = (await loadMergeState(deps.io, deps.home)).state.rows.find((row) => row.pairKey === pairKey(command.a, command.b));
+			if (existing?.state === "pending") return {
+				ok: false,
+				text: "该 pair 已在待批准队列，先 approve/reject/discard: " + existing.id
+			};
+			if (existing?.state === "approved" || existing?.state === "fuse") return {
+				ok: false,
+				text: "该 pair 已在待合并队列，用 merge resume --retry 复用: " + (existing.runId ?? existing.id)
+			};
+			const forced = command.force === true ? forcedDecisionFor(command.a, command.b) : void 0;
+			const approval = deps.params.mergeApproval;
 			const result = await runScanCommand({
 				...common,
 				approval,
@@ -3421,7 +3649,7 @@ function createMergeRuntime(deps) {
 						...ports,
 						round1: () => Promise.resolve({
 							kind: "merge",
-							decision: forced.decision
+							decision: forced
 						})
 					};
 				}
@@ -3446,12 +3674,15 @@ function createMergeRuntime(deps) {
 		if (command.verb === "scan") {
 			const signal = new AbortController().signal;
 			const cards = await deps.cards(signal);
+			const managed = new Set(cards.filter((card) => card.managed === true).map((card) => card.name));
 			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 held = new Set(loadedState.state.rows.filter((row) => row.queue === "pending" || row.queue === "fuse" || !canRetry(row)).map((row) => row.pairKey));
+			const conflictNotes = loadedState.state.rows.filter((row) => row.state === "pending" || row.state === "approved" || row.state === "fuse" || row.state === "skipped").map((row) => "conflict:" + row.state + ":" + row.pairKey + ":" + row.id);
 			const result = await runScanCommand({
 				...common,
 				approval: deps.params.mergeApproval,
+				notes: conflictNotes,
 				...detached ? { detached: true } : {},
 				makePorts: (runId) => createChannelScanPorts({
 					io: deps.io,
@@ -3462,7 +3693,7 @@ function createMergeRuntime(deps) {
 						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);
+							return managed.has(candidate.a) && managed.has(candidate.b) && !skipped.has(key) && !held.has(key);
 						});
 						const candidatePairs = raw.candidatePairs;
 						return candidatePairs === void 0 ? filtered : Object.assign(filtered, { candidatePairs });
@@ -3561,7 +3792,7 @@ function createMergeRuntime(deps) {
 				text: "report is missing: " + run.resultRef
 			} : {
 				ok: true,
-				text: report.value.slice(0, 12e3)
+				text: "report: " + run.resultRef + "\n" + fitToolText(report.value, 7600)
 			};
 		}
 		if (command.verb === "discard") {
@@ -3707,6 +3938,40 @@ function createMergeRuntime(deps) {
 		if (command.verb === "approve") {
 			const signal = new AbortController().signal;
 			const cards = await deps.cards(signal);
+			const candidate = (await loadMergeState(deps.io, deps.home)).state.rows.find((row) => row.id === command.id);
+			if (candidate !== void 0 && candidate.state === "pending" && candidate.decision !== void 0) {
+				const missingSource = [candidate.a, candidate.b].find((name) => !cards.some((card) => card.name === name && card.managed === true));
+				if (missingSource !== void 0) {
+					await dropRow(deps.io, deps.home, deps.now, candidate.id);
+					return {
+						ok: false,
+						text: "source-gone：" + missingSource + " 已不在 family-managed 技能库，已从 active 队列清除；可 merge skipped --discard 清理"
+					};
+				}
+				const currentRevision = sourceRevisionOf(cards, candidate.a, candidate.b);
+				if (candidate.sourceRevision !== void 0 && currentRevision !== void 0 && currentRevision !== candidate.sourceRevision) {
+					const changed = transition(candidate, {
+						type: "source-changed",
+						at: (/* @__PURE__ */ new Date()).toISOString()
+					});
+					if (changed.ok && changed.row !== null) await upsertRow(deps.io, deps.home, deps.now, changed.row);
+					return {
+						ok: false,
+						text: "source-changed：源技能内容在决策后变化，拒绝照跑；出口：重新 merge pair，或 merge skipped --discard"
+					};
+				}
+				if (candidate.decision.mode === "merge-into-existing" && !cards.some((card) => card.name === candidate.decision?.target)) {
+					const expired = transition(candidate, {
+						type: "target-taken",
+						at: (/* @__PURE__ */ new Date()).toISOString()
+					});
+					if (expired.ok && expired.row !== null) await upsertRow(deps.io, deps.home, deps.now, expired.row);
+					return {
+						ok: false,
+						text: "target-taken：目标 " + candidate.decision.target + " 已不存在，行保留 pending --expired；出口：重新 merge pair，或 merge skipped --discard"
+					};
+				}
+			}
 			const result = await runApproveCommand({
 				...common,
 				rowId: command.id,
@@ -4217,6 +4482,13 @@ function apply(ctx, rawConfig = {}) {
 				...policyStageLimits(policySnapshot?.get?.())
 			}
 		});
+		recoverCommitJournals(io, home, Date.now(), skillsRoot(), async (name) => {
+			return (await skills.restoreFromArchive(name)).ok;
+		}).then((reports) => {
+			if (reports.length > 0) ctx.logger.info("merge commit recovery: " + reports.map((report) => report.runId + "=" + report.action).join(", "));
+		}).catch((error) => {
+			ctx.logger.warn("merge commit recovery failed: " + (error instanceof Error ? error.message : String(error)));
+		});
 		const channel = subagentChannelAdapter(createSubagentChannel(ctx));
 		const stage = new StageToolRegistry();
 		const engineConfig = engineConfigFromEnv(params.mergeModelsRoot);
@@ -4339,7 +4611,8 @@ function apply(ctx, rawConfig = {}) {
 						body: item.content ?? "",
 						files,
 						protectedBy: item.protectedBy,
-						protectionUnknown: item.protectionUnknown
+						protectionUnknown: item.protectionUnknown,
+						managed: item.managed
 					};
 				}));
 			},

package/lib/types/adapters/library.js

@@ -9,6 +9,14 @@ export function skillLibraryPort(skills) {
             return names === null ? true : names.includes(name);
         },
         commitMerge: plan => skills.commitMerge(plan),
+        async readSupportFiles(name) {
+            if (typeof skills.listSupportFiles !== 'function')
+                return [];
+            const probe = await skills.listSupportFiles(name);
+            if (probe.kind !== 'present')
+                return [];
+            return await Promise.all(probe.value.map(async (path) => ({ path, content: await skills.readSupportFile(name, path) ?? '' })));
+        },
     };
 }
 //# sourceMappingURL=library.js.map

package/lib/types/commit-execute.d.ts

@@ -8,6 +8,10 @@ import { type CommitAssemblyPort } from './commit-assembly.ts';
 import { type CommitReceipt } from './commit-receipt.ts';
 export interface CommitPort extends CommitAssemblyPort {
     commitMerge(plan: CommitMergePlan): Promise<CommitMergeResult>;
+    readSupportFiles?(name: string): Promise<readonly {
+        readonly path: string;
+        readonly content: string;
+    }[]>;
 }
 export interface CommitStagedOptions {
     readonly origin: CommitMergePlan['origin'];