@lmzhen/dsh-evolution-merge 0.30.0 → 0.30.2

package/lib/index.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") 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,114 @@ 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) {
+	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
+		})),
+		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 skillBodyPath(home, name) {
+	return join(home, "skills", name, "SKILL.md");
+}
+//#endregion
+//#region lib/types/commit-recovery.js
+/** Startup replay for non-terminal commit journals. */
+async function recoverCommitJournals(io, home, now) {
+	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") for (const source of snapshot.sourceBodies) await io.writeText(skillBodyPath(home, source.name), source.body);
+			if (snapshot.create && snapshot.targetBody === null) try {
+				await io.remove(skillBodyPath(home, snapshot.target));
+			} catch {}
+			else if (snapshot.targetBody !== null) await io.writeText(skillBodyPath(home, snapshot.target), snapshot.targetBody);
+			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.
@@ -764,10 +887,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 +924,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 +947,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 +962,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]
 	};
@@ -1711,7 +1850,7 @@ async function runScan(options) {
 		},
 		pairs,
 		totals,
-		notes: [],
+		notes: [...options.notes ?? []],
 		...remaining.length === 0 ? {} : { remaining }
 	};
 }
@@ -1905,7 +2044,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 +2512,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 +2525,8 @@ function parseDecision(text, pair) {
 			mode: "keep",
 			target,
 			sources,
-			rationale
+			rationale,
+			...summaries
 		}
 	};
 	if (target === "") return {
@@ -2405,6 +2552,7 @@ function parseDecision(text, pair) {
 			target,
 			sources,
 			rationale,
+			...summaries,
 			...typeof record.confidence === "number" ? { confidence: record.confidence } : {}
 		}
 	};
@@ -2890,17 +3038,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 +3048,21 @@ async function commitStagedRun(io, home, runId, port, options) {
 		ok: false,
 		message: assembled.message
 	};
+	try {
+		await writeCommitSnapshot(io, home, runId, assembled.plan, options.now());
+	} 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 {
@@ -2927,7 +3073,6 @@ async function commitStagedRun(io, home, runId, port, options) {
 		try {
 			await writeJournal(io, home, {
 				...journal,
-				phase: "failed",
 				updatedAt: new Date(options.now()).toISOString()
 			});
 		} catch {}
@@ -3050,6 +3195,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 +3263,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) {
@@ -3356,6 +3514,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 +3550,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 +3596,7 @@ function createMergeRuntime(deps) {
 						...ports,
 						round1: () => Promise.resolve({
 							kind: "merge",
-							decision: forced.decision
+							decision: forced
 						})
 					};
 				}
@@ -3446,12 +3621,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 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 +3640,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 +3739,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 +3885,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,
@@ -4192,6 +4404,11 @@ function apply(ctx, rawConfig = {}) {
 		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)));
 		});
+		recoverCommitJournals(io, home, Date.now()).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 runs = newRunRegistry({
 			io,
 			home,
@@ -4339,7 +4556,8 @@ function apply(ctx, rawConfig = {}) {
 						body: item.content ?? "",
 						files,
 						protectedBy: item.protectedBy,
-						protectionUnknown: item.protectionUnknown
+						protectionUnknown: item.protectionUnknown,
+						managed: item.managed
 					};
 				}));
 			},

package/lib/types/commit-execute.js

@@ -2,11 +2,18 @@ import { assembleStagedCommit } from "./commit-assembly.js";
 import { writeCommitReceipt } from "./commit-receipt.js";
 import { pairKey } from "./contracts.js";
 import { writeJournal } from "./domain/commit-journal-store.js";
+import { writeCommitSnapshot } from "./commit-snapshot.js";
 export async function commitStagedRun(io, home, runId, port, options) {
     const assembled = await assembleStagedCommit(io, home, runId, port, { origin: options.origin, summary: options.summary });
     if (!assembled.ok)
         return { ok: false, message: assembled.message };
-    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 writeCommitSnapshot(io, home, runId, assembled.plan, options.now());
+    }
+    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: 'sources-archived', updatedAt: new Date(options.now()).toISOString() };
     try {
         await writeJournal(io, home, journal);
     }
@@ -14,7 +21,7 @@ export async function commitStagedRun(io, home, runId, port, options) {
     const result = await port.commitMerge(assembled.plan);
     if (!result.ok) {
         try {
-            await writeJournal(io, home, { ...journal, phase: 'failed', updatedAt: new Date(options.now()).toISOString() });
+            await writeJournal(io, home, { ...journal, updatedAt: new Date(options.now()).toISOString() });
         }
         catch { }
         return { ok: false, message: result.message, plan: assembled.plan };

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

@@ -0,0 +1,10 @@
+import type { EvolutionIoLike } from '@lmzhen/dsh-evolution-core';
+import type { CommitJournal } from './domain/commit-journal.ts';
+export interface CommitRecoveryReport {
+    readonly runId: string;
+    readonly phase: CommitJournal['phase'];
+    readonly action: string;
+    readonly ok: boolean;
+}
+export declare function recoverCommitJournals(io: EvolutionIoLike, home: string, now: number): Promise<readonly CommitRecoveryReport[]>;
+//# sourceMappingURL=commit-recovery.d.ts.map

package/lib/types/commit-recovery.js

@@ -0,0 +1,61 @@
+/** Startup replay for non-terminal commit journals. */
+import { join } from 'node:path';
+import { recoveryFor } from "./domain/commit-journal.js";
+import { writeJournal } from "./domain/commit-journal-store.js";
+import { readCommitSnapshot, skillBodyPath } from "./commit-snapshot.js";
+export async function recoverCommitJournals(io, home, now) {
+    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') {
+                    for (const source of snapshot.sourceBodies)
+                        await io.writeText(skillBodyPath(home, source.name), source.body);
+                }
+                if (snapshot.create && snapshot.targetBody === null) {
+                    try {
+                        await io.remove(skillBodyPath(home, snapshot.target));
+                    }
+                    catch { /* already gone */ }
+                }
+                else if (snapshot.targetBody !== null) {
+                    await io.writeText(skillBodyPath(home, snapshot.target), snapshot.targetBody);
+                }
+                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;
+}
+//# sourceMappingURL=commit-recovery.js.map

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

@@ -0,0 +1,18 @@
+import type { CommitMergePlan, EvolutionIoLike } from '@lmzhen/dsh-evolution-core';
+export interface CommitSnapshot {
+    readonly runId: string;
+    readonly target: string;
+    readonly create: boolean;
+    readonly sources: readonly string[];
+    readonly targetBody: string | null;
+    readonly sourceBodies: readonly {
+        readonly name: string;
+        readonly body: string;
+    }[];
+    readonly at: string;
+}
+export declare function snapshotPath(home: string, runId: string): string;
+export declare function writeCommitSnapshot(io: EvolutionIoLike, home: string, runId: string, plan: CommitMergePlan, now: number): Promise<CommitSnapshot>;
+export declare function readCommitSnapshot(io: EvolutionIoLike, home: string, runId: string): Promise<CommitSnapshot | null>;
+export declare function skillBodyPath(home: string, name: string): string;
+//# sourceMappingURL=commit-snapshot.d.ts.map

package/lib/types/commit-snapshot.js

@@ -0,0 +1,30 @@
+/** Pre-commit snapshot: enough to restore the target and archived sources after a crash. */
+import { join } from 'node:path';
+export function snapshotPath(home, runId) {
+    return join(home, 'merge', 'snapshots', runId.replace(/[^A-Za-z0-9_-]+/g, '_') + '.json');
+}
+export async function writeCommitSnapshot(io, home, runId, plan, now) {
+    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 })),
+        at: new Date(now).toISOString(),
+    };
+    await io.writeText(snapshotPath(home, runId), JSON.stringify(snapshot, null, 2));
+    return snapshot;
+}
+export 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;
+    }
+}
+export function skillBodyPath(home, name) {
+    return join(home, 'skills', name, 'SKILL.md');
+}
+//# sourceMappingURL=commit-snapshot.js.map

package/lib/types/coordinator.d.ts

@@ -49,6 +49,12 @@ export type MergeEvent = {
 } | {
     readonly type: 'source-gone';
     readonly at: string;
+} | {
+    readonly type: 'target-taken';
+    readonly at: string;
+} | {
+    readonly type: 'source-changed';
+    readonly at: string;
 } | {
     readonly type: 'gate-keep';
     readonly a: string;

package/lib/types/coordinator.js

@@ -122,6 +122,11 @@ export function transition(current, event) {
             return current.state === 'fuse' || current.state === 'approved'
                 ? { ok: true, row: null }
                 : invalid(event, current.state);
+        case 'target-taken':
+        case 'source-changed':
+            return current.state === 'pending' || current.state === 'approved' || current.state === 'fuse'
+                ? next(current, event.at, current.state, { expired: event.type })
+                : invalid(event, current.state);
         case 'restore':
             return current.state === 'skipped'
                 ? next(current, event.at, 'verify')

package/lib/types/decision.js

@@ -37,8 +37,11 @@ export 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: { shouldMerge: false, mode: 'keep', target, sources, rationale } };
+        return { ok: true, decision: { shouldMerge: false, mode: 'keep', target, sources, rationale, ...summaries } };
     }
     if (target === '')
         return { ok: false, code: 'decision-invalid', message: 'merge decision needs target' };
@@ -54,6 +57,7 @@ export function parseDecision(text, pair) {
             target,
             sources,
             rationale,
+            ...summaries,
             ...(typeof record.confidence === 'number' ? { confidence: record.confidence } : {}),
         },
     };

package/lib/types/index.js

@@ -8,6 +8,7 @@ import { authorityFrom, createSubagentChannel, DEFAULT_SKILL_LIMITS, evolutionHo
 import { registerHostRoutes } from '@lmzhen/dsh-evolution-core/http-routes';
 import { loadMergeState, upsertRow } from "./state.js";
 import { cleanupExpiredStaging } from "./staging.js";
+import { recoverCommitJournals } from "./commit-recovery.js";
 import { readCommitReceipts } from "./commit-receipt.js";
 import { transition } from "./coordinator.js";
 import { makeMergeRoutes } from "./merge-routes.js";
@@ -121,6 +122,8 @@ export function apply(ctx, rawConfig = {}) {
         const io = evolutionIoAdapter(() => registry.provider());
         const home = evolutionHome();
         void loadMergeState(io, home).then(loaded => cleanupExpiredStaging(io, home, Date.now(), new Set(loaded.state.rows.map(row => row.runId).filter((id) => id !== undefined)))).catch((error) => { ctx.logger.warn('merge staging cleanup failed: ' + (error instanceof Error ? error.message : String(error))); });
+        void recoverCommitJournals(io, home, Date.now()).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 runs = newRunRegistry({ io, home, warn: (message) => { ctx.logger.warn(message); } });
         void runs.load();
         ctx.effect(() => {
@@ -216,7 +219,7 @@ export function apply(ctx, rawConfig = {}) {
                     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 };
+                    return { name: item.name, description: item.description, body: item.content ?? '', files, protectedBy: item.protectedBy, protectionUnknown: item.protectionUnknown, managed: item.managed };
                 }));
             },
             screeningForRun: engineScreening,

package/lib/types/presentation-budget.d.ts

@@ -0,0 +1,3 @@
+/** Tool-result budget: keep the head and tail, mark what was omitted. */
+export declare function fitToolText(text: string, max?: number): string;
+//# sourceMappingURL=presentation-budget.d.ts.map

package/lib/types/presentation-budget.js

@@ -0,0 +1,11 @@
+/** Tool-result budget: keep the head and tail, mark what was omitted. */
+export function fitToolText(text, max = 8000) {
+    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 * 0.7);
+    const tail = keep - head;
+    return text.slice(0, head) + marker + (tail === 0 ? '' : text.slice(-tail));
+}
+//# sourceMappingURL=presentation-budget.js.map

package/lib/types/revision.d.ts

@@ -0,0 +1,4 @@
+import type { SkillCard } from './skill-card.ts';
+/** Stable source revision for a pair: names sorted, body hashed in that order. */
+export declare function sourceRevisionOf(cards: readonly SkillCard[], a: string, b: string): string | undefined;
+//# sourceMappingURL=revision.d.ts.map

package/lib/types/revision.js

@@ -0,0 +1,12 @@
+import { contentHash } from '@lmzhen/dsh-evolution-core';
+/** Stable source revision for a pair: names sorted, body hashed in that order. */
+export 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 === undefined || second === undefined)
+        return undefined;
+    return contentHash(first.name + '\u0000' + first.body + '\u0000' + second.name + '\u0000' + second.body);
+}
+//# sourceMappingURL=revision.js.map

package/lib/types/routes.d.ts

@@ -18,6 +18,9 @@ export interface MergeRowView {
     readonly createdAt: string;
     readonly target?: string;
     readonly confidence?: number;
+    readonly aSummary?: string;
+    readonly bSummary?: string;
+    readonly rationale?: string;
     readonly failure?: {
         readonly stage: string;
         readonly code: string;

package/lib/types/routes.js

@@ -14,6 +14,9 @@ export function toRowView(row) {
         createdAt: row.createdAt,
         ...(row.decision?.target === undefined ? {} : { target: row.decision.target }),
         ...(row.decision?.confidence === undefined ? {} : { confidence: row.decision.confidence }),
+        ...(row.decision?.aSummary === undefined ? {} : { aSummary: row.decision.aSummary }),
+        ...(row.decision?.bSummary === undefined ? {} : { bSummary: row.decision.bSummary }),
+        ...(row.decision?.rationale === undefined ? {} : { rationale: row.decision.rationale }),
         ...(row.failure === undefined ? {} : {
             failure: { stage: row.failure.stage, code: row.failure.code, message: row.failure.message, retryable: row.failure.retryable },
         }),
@@ -23,9 +26,9 @@ export function toRowView(row) {
         ...(row.expired === undefined ? {} : { expired: row.expired }),
         ...(row.reason === undefined ? {} : { 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]

package/lib/types/runtime.js

@@ -21,6 +21,13 @@ import { mergeDoctor } from "./doctor.js";
 import { createChannelScanPorts } from "./scan-ports.js";
 import { createNewChildRound2 } from "./new-child-authoring.js";
 import { skillLibraryPort } from "./adapters/library.js";
+import { fitToolText } from "./presentation-budget.js";
+import { sourceRevisionOf } from "./revision.js";
+function forcedDecisionFor(a, b) {
+    const sorted = [a, b].sort();
+    const target = ('merge-' + sorted.join('-')).replace(/[^a-zA-Z0-9._-]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 64);
+    return { shouldMerge: true, mode: 'create-umbrella', target, sources: [a, b], rationale: 'forced pair merge of ' + sorted.join(' and ') };
+}
 export function createMergeRuntime(deps) {
     const readOnly = createReadOnlyMergeService(deps.io, deps.home);
     const timeout = deps.timeoutMinutes > 0 ? deps.timeoutMinutes : undefined;
@@ -41,16 +48,21 @@ export 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 === undefined || cardB === undefined || 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 === undefined || forced.decision === undefined) {
-                        return { ok: false, text: 'pair --force 需要已有决策，找不到该 pair 的 decision: ' + key };
-                    }
+                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 approval = command.force === true ? false : deps.params.mergeApproval;
+                const forced = command.force === true ? forcedDecisionFor(command.a, command.b) : undefined;
+                const approval = deps.params.mergeApproval;
                 const result = await runScanCommand({
                     ...common,
                     approval,
@@ -66,7 +78,7 @@ export function createMergeRuntime(deps) {
                             commitPort: skillLibraryPort(deps.skills), now: deps.now,
                             ...stageHooks,
                         });
-                        return forced === undefined ? ports : { ...ports, round1: () => Promise.resolve({ kind: 'merge', decision: forced.decision }) };
+                        return forced === undefined ? ports : { ...ports, round1: () => Promise.resolve({ kind: 'merge', decision: forced }) };
                     },
                 });
                 if (!result.ok)
@@ -80,12 +92,17 @@ export 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 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, home: deps.home, runId, cards,
@@ -93,7 +110,7 @@ export 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 === undefined ? filtered : Object.assign(filtered, { candidatePairs });
@@ -153,7 +170,7 @@ export function createMergeRuntime(deps) {
                     return { ok: false, text: 'report is unreadable: ' + run.resultRef + '：' + report.reason };
                 return report.kind === 'absent'
                     ? { ok: false, text: 'report is missing: ' + run.resultRef }
-                    : { ok: true, text: report.value.slice(0, 12000) };
+                    : { ok: true, text: 'report: ' + run.resultRef + '\n' + fitToolText(report.value, 7600) };
             }
             if (command.verb === 'discard') {
                 const loaded = await loadMergeState(deps.io, deps.home);
@@ -239,6 +256,27 @@ export 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 !== undefined && candidate.state === 'pending' && candidate.decision !== undefined) {
+                    const missingSource = [candidate.a, candidate.b].find(name => !cards.some(card => card.name === name && card.managed === true));
+                    if (missingSource !== undefined) {
+                        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 !== undefined && currentRevision !== undefined && currentRevision !== candidate.sourceRevision) {
+                        const changed = transition(candidate, { type: 'source-changed', at: 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: 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,

package/lib/types/scan-command.d.ts

@@ -17,6 +17,7 @@ export interface RunScanCommandOptions {
     readonly timeoutMinutes?: number;
     readonly now: () => number;
     readonly detached?: boolean;
+    readonly notes?: readonly string[];
 }
 export declare function runScanCommand(options: RunScanCommandOptions): Promise<WithMergeRunResult>;
 //# sourceMappingURL=scan-command.d.ts.map

package/lib/types/scan-command.js

@@ -23,6 +23,7 @@ export async function runScanCommand(options) {
                 stage: ctx.stage,
                 startedAt: ctx.startedAt,
                 ...(options.timeoutMinutes === undefined ? {} : { timeoutMinutes: options.timeoutMinutes }),
+                ...(options.notes === undefined ? {} : { notes: options.notes }),
             });
         },
     });

package/lib/types/scan-ports.js

@@ -2,6 +2,7 @@ import { pairKey } from "./contracts.js";
 import { runRound1OverChannel } from "./channel-port.js";
 import { runAuthoring } from "./authoring-flow.js";
 import { dropStaging, ensureStaging, stageKeyOf, stagingRoot } from "./staging.js";
+import { sourceRevisionOf } from "./revision.js";
 export function createChannelScanPorts(options) {
     const sessions = new Map();
     return {
@@ -42,8 +43,12 @@ export function createChannelScanPorts(options) {
                     }
                 }
             }
+            const sourceRevision = result.outcome.kind === 'merge' ? sourceRevisionOf(options.cards, candidate.a, candidate.b) : undefined;
             return result.outcome.kind === 'merge'
-                ? { ...result.outcome, stagingRef: stageKey, stagingExpiresAt: options.now() + 7 * 86_400_000 }
+                ? {
+                    ...result.outcome, stagingRef: stageKey, stagingExpiresAt: options.now() + 7 * 86_400_000,
+                    ...(sourceRevision === undefined ? {} : { sourceRevision }),
+                }
                 : result.outcome;
         },
         async round2(row, decision, signal) {

package/lib/types/scan-run.d.ts

@@ -43,6 +43,7 @@ export interface RunScanOptions {
         done: number;
         total: number;
     }) => Promise<void>;
+    readonly notes?: readonly string[];
 }
 export declare function runScan(options: RunScanOptions): Promise<MergeRunReportDraft>;
 //# sourceMappingURL=scan-run.d.ts.map

package/lib/types/scan-run.js

@@ -179,7 +179,7 @@ export async function runScan(options) {
         },
         pairs,
         totals,
-        notes: [],
+        notes: [...(options.notes ?? [])],
         ...(remaining.length === 0 ? {} : { remaining }),
     };
 }

package/lib/types/skill-card.d.ts

@@ -8,5 +8,6 @@ export interface SkillCard {
     }[];
     readonly protectedBy?: string | null;
     readonly protectionUnknown?: boolean;
+    readonly managed?: boolean;
 }
 //# sourceMappingURL=skill-card.d.ts.map

package/lib/types/state.d.ts

@@ -22,7 +22,14 @@ export interface MoveRowPatch {
     readonly origin?: MergeRow['origin'];
     readonly attempts?: number;
 }
-export declare function upsertRow(io: EvolutionIoLike, home: string, now: () => number, row: MergeRow): Promise<void>;
+export type UpsertExpect = 'any' | 'absent' | 'verify' | 'pending' | 'fuse' | 'skipped';
+export type UpsertResult = {
+    readonly ok: true;
+} | {
+    readonly ok: false;
+    readonly current: MergeRow;
+};
+export declare function upsertRow(io: EvolutionIoLike, home: string, now: () => number, row: MergeRow, expect?: UpsertExpect): Promise<UpsertResult>;
 export declare function moveRow(io: EvolutionIoLike, home: string, now: () => number, id: string, patch: MoveRowPatch): Promise<MergeRow | undefined>;
 export declare function dropRow(io: EvolutionIoLike, home: string, now: () => number, id: string): Promise<boolean>;
 export declare function rowsOf(io: EvolutionIoLike, home: string, queue?: MergeQueue): Promise<readonly MergeRow[]>;

package/lib/types/state.js

@@ -55,16 +55,23 @@ export async function mutateMergeState(io, home, now, fn) {
     void now;
     return result;
 }
-export async function upsertRow(io, home, now, row) {
-    await mutateMergeState(io, home, now, (rows) => {
+export 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 ? undefined : rows[index];
+        if (current !== undefined && expect !== 'any' && (expect === 'absent' || queueOf(current.state) !== expect)) {
+            return { rows, result: { ok: false, current } };
+        }
+        if (current === undefined && expect !== 'any' && expect !== 'absent') {
+            return { rows, result: { ok: false, current: row } };
+        }
         const normalized = { ...row, queue: queueOf(row.state) };
         const next = [...rows];
-        if (index < 0)
+        if (current === undefined)
             next.push(normalized);
         else
-            next[index] = { ...normalized, createdAt: rows[index]?.createdAt ?? normalized.createdAt };
-        return { rows: next, result: undefined };
+            next[index] = { ...normalized, createdAt: current.createdAt };
+        return { rows: next, result: { ok: true } };
     });
 }
 export async function moveRow(io, home, now, id, patch) {

package/lib/types/status.js

@@ -1,4 +1,5 @@
 import { queueOf, stageOf } from "./contracts.js";
+import { fitToolText } from "./presentation-budget.js";
 export function countRows(rows) {
     const counts = { verify: 0, pending: 0, fuse: 0, skipped: 0 };
     for (const row of rows)
@@ -17,12 +18,12 @@ export function formatStatus(rows) {
     ];
     for (const row of rows)
         lines.push('- ' + describe(row));
-    return lines.join('\n');
+    return fitToolText(lines.join('\n'));
 }
 export 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'));
 }
 //# sourceMappingURL=status.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-merge",
   "description": "Skill auto-merge domain: screening, two-round authoring, queues and commit orchestration (community build)",
-  "version": "0.30.0",
+  "version": "0.30.2",
   "publishConfig": {
     "access": "public"
   },
@@ -27,8 +27,8 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.5",
-    "@lmzhen/dsh-evolution-core": "^0.30.0",
-    "@lmzhen/dsh-evolution-merge-engine": "^0.30.0"
+    "@lmzhen/dsh-evolution-core": "^0.30.2",
+    "@lmzhen/dsh-evolution-merge-engine": "^0.30.2"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5"