@lmzhen/dsh-evolution-merge 0.30.3 → 0.30.5

package/lib/index.js

@@ -588,6 +588,7 @@ function recoveryFor(journal) {
 		case "committed":
 		case "rolled-back":
 		case "failed": return "none";
+		default: return "refuse";
 	}
 }
 //#endregion
@@ -648,7 +649,7 @@ 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);
+	if (!isSafeSkillName(name) || path.startsWith("/") || path.split("/").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);
@@ -662,68 +663,6 @@ function skillBodyPath(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.
@@ -799,6 +738,113 @@ async function readCommitReceipt(io, home, runId, target) {
 	return null;
 }
 //#endregion
+//#region lib/types/commit-recovery.js
+/** Startup replay for non-terminal commit journals. */
+async function recoverCommitJournals(io, home, now, skillRoot, restoreSource, isActive) {
+	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;
+		}
+		if (isActive?.(journal.runId) === true) {
+			reports.push({
+				runId: journal.runId,
+				phase: journal.phase,
+				action: "skipped-active-run",
+				ok: true
+			});
+			continue;
+		}
+		const recovery = recoveryFor(journal);
+		if (recovery === "none") continue;
+		if (recovery === "refuse") {
+			reports.push({
+				runId: journal.runId,
+				phase: journal.phase,
+				action: "unknown-phase-refused",
+				ok: false
+			});
+			continue;
+		}
+		let receipt = null;
+		try {
+			receipt = await readCommitReceipt(io, home, journal.runId, journal.target);
+		} catch {
+			reports.push({
+				runId: journal.runId,
+				phase: journal.phase,
+				action: "receipt-read-failed",
+				ok: false
+			});
+			continue;
+		}
+		if (receipt !== null) {
+			await writeJournal(io, home, {
+				...journal,
+				phase: "committed",
+				unitId: receipt.unitId,
+				updatedAt: new Date(now).toISOString()
+			});
+			reports.push({
+				runId: journal.runId,
+				phase: journal.phase,
+				action: "receipt-committed",
+				ok: true
+			});
+			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;
+		}
+		if (ok) await writeJournal(io, home, {
+			...journal,
+			phase: "rolled-back",
+			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/coordinator.js
 /**
 * Pure merge transition table. No io, no run shell, no subagents.
@@ -1238,7 +1284,7 @@ function makeMergeRoutes(deps, _audit) {
 }
 //#endregion
 //#region lib/types/commands.js
-const USAGE = "usage: /evolution merge scan | pair [--force] <a> <b> | status [id] | report [id] | cancel [id] | runs | doctor | pending [--expired] | candidates [--retry] | approve <id> | reject <id> | resume [id] [--retry] [--clear <id>] | skipped [--restore <id>] | discard <id> | undo <target> --run <id>";
+const USAGE = "usage: /evolution merge scan | pair [--force] <a> <b> | status [id] | report [id] | cancel [id] | runs | doctor | pending [--expired] | candidates [--retry] | approve <id> | reject <id> | resume [id] [--retry] [--clear <id>] | skipped [--restore <id>] | discard <id> | undo <target> --run <id>\ndefaults: mergeApproval=false, mergeSkippedTtlDays=0, mergeRunTimeoutMinutes=0, mergePairTimeoutMinutes=15, mergeModelsRoot=\"\"";
 function flags(args, allowed) {
 	const values = /* @__PURE__ */ new Map();
 	for (let index = 0; index < args.length; index += 1) {
@@ -1471,7 +1517,7 @@ function parseMergeCommand(argv) {
 		default: return {
 			ok: false,
 			code: "usage",
-			message: "unknown merge command: " + verb + "\nusage: /evolution merge scan | pair [--force] <a> <b> | status [id] | report [id] | cancel [id] | runs | doctor | pending [--expired] | candidates [--retry] | approve <id> | reject <id> | resume [id] [--retry] [--clear <id>] | skipped [--restore <id>] | discard <id> | undo <target> --run <id>"
+			message: "unknown merge command: " + verb + "\nusage: /evolution merge scan | pair [--force] <a> <b> | status [id] | report [id] | cancel [id] | runs | doctor | pending [--expired] | candidates [--retry] | approve <id> | reject <id> | resume [id] [--retry] [--clear <id>] | skipped [--restore <id>] | discard <id> | undo <target> --run <id>\ndefaults: mergeApproval=false, mergeSkippedTtlDays=0, mergeRunTimeoutMinutes=0, mergePairTimeoutMinutes=15, mergeModelsRoot=\"\""
 		};
 	}
 }
@@ -3240,14 +3286,23 @@ async function runAuthoring(options) {
 }
 //#endregion
 //#region lib/types/revision.js
-/** Stable source revision for a pair: names sorted, body hashed in that order. */
+function fingerprint(card) {
+	const files = [...card.files ?? []].sort((left, right) => left.path.localeCompare(right.path));
+	return card.name + "\0" + card.body + "\0" + files.map((file) => file.path + "\0" + file.content).join("\0");
+}
+/** Stable source revision for a pair: names sorted, body+support 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);
+	return contentHash(fingerprint(first) + "\0" + fingerprint(second));
+}
+/** Revision of the merge target; undefined when the target is not a live card. */
+function targetRevisionOf(cards, target) {
+	const card = cards.find((item) => item.name === target);
+	return card === void 0 ? void 0 : contentHash(fingerprint(card));
 }
 //#endregion
 //#region lib/types/scan-ports.js
@@ -3308,11 +3363,14 @@ function createChannelScanPorts(options) {
 				});
 			}
 			const sourceRevision = result.outcome.kind === "merge" ? sourceRevisionOf(options.cards, candidate.a, candidate.b) : void 0;
+			const target = result.outcome.kind === "merge" ? result.outcome.decision?.target : void 0;
+			const targetRevision = target === void 0 ? void 0 : targetRevisionOf(options.cards, target);
 			return result.outcome.kind === "merge" ? {
 				...result.outcome,
 				stagingRef: stageKey,
 				stagingExpiresAt: options.now() + 7 * 864e5,
-				...sourceRevision === void 0 ? {} : { sourceRevision }
+				...sourceRevision === void 0 ? {} : { sourceRevision },
+				...targetRevision === void 0 ? {} : { targetRevision }
 			} : result.outcome;
 		},
 		async round2(row, decision, signal) {
@@ -3552,11 +3610,16 @@ function skillLibraryPort(skills) {
 		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) ?? ""
-			})));
+			if (probe.kind === "unknown") throw new Error("support file list unknown: " + name);
+			if (probe.kind === "absent") return [];
+			return await Promise.all(probe.value.map(async (path) => {
+				const content = await skills.readSupportFile(name, path);
+				if (content === null) throw new Error("support file disappeared: " + name + "/" + path);
+				return {
+					path,
+					content
+				};
+			}));
 		}
 	};
 }
@@ -3602,6 +3665,10 @@ function createMergeRuntime(deps) {
 		const detached = deps.detached !== false;
 		if (command.verb === "pair") {
 			const signal = new AbortController().signal;
+			if (command.a === command.b) return {
+				ok: false,
+				text: "merge pair 需要两个不同技能源: " + command.a
+			};
 			const cards = await deps.cards(signal);
 			const cardA = cards.find((card) => card.name === command.a);
 			const cardB = cards.find((card) => card.name === command.b);
@@ -3609,11 +3676,16 @@ function createMergeRuntime(deps) {
 				ok: false,
 				text: "merge pair 仅支持 family-managed 技能: " + command.a + " / " + command.b
 			};
+			if (cardA.protectedBy != null || cardB.protectedBy != null || cardA.protectionUnknown === true || cardB.protectionUnknown === true) return {
+				ok: false,
+				text: "merge pair 不接受受保护/保护状态未知技能: " + command.a + " / " + command.b
+			};
 			const pair = [{
 				a: command.a,
 				b: command.b
 			}];
 			const existing = (await loadMergeState(deps.io, deps.home)).state.rows.find((row) => row.pairKey === pairKey(command.a, command.b));
+			if (existing?.state === "skipped") await dropRow(deps.io, deps.home, deps.now, existing.id);
 			if (existing?.state === "pending") return {
 				ok: false,
 				text: "该 pair 已在待批准队列，先 approve/reject/discard: " + existing.id
@@ -3674,7 +3746,7 @@ 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 managed = new Set(cards.filter((card) => card.managed === true && card.protectedBy == null).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" || row.queue === "fuse" || !canRetry(row)).map((row) => row.pairKey));
@@ -3960,6 +4032,18 @@ function createMergeRuntime(deps) {
 						text: "source-changed：源技能内容在决策后变化，拒绝照跑；出口：重新 merge pair，或 merge skipped --discard"
 					};
 				}
+				const currentTargetRevision = targetRevisionOf(cards, candidate.decision.target);
+				if (candidate.targetRevision !== void 0 && currentTargetRevision !== void 0 && currentTargetRevision !== candidate.targetRevision) {
+					const taken = transition(candidate, {
+						type: "target-taken",
+						at: (/* @__PURE__ */ new Date()).toISOString()
+					});
+					if (taken.ok && taken.row !== null) await upsertRow(deps.io, deps.home, deps.now, taken.row);
+					return {
+						ok: false,
+						text: "target-taken：目标 " + candidate.decision.target + " 在决策后变化，拒绝照跑；可重新 merge pair 或 discard"
+					};
+				}
 				if (candidate.decision.mode === "merge-into-existing" && !cards.some((card) => card.name === candidate.decision?.target)) {
 					const expired = transition(candidate, {
 						type: "target-taken",
@@ -4482,8 +4566,12 @@ function apply(ctx, rawConfig = {}) {
 				...policyStageLimits(policySnapshot?.get?.())
 			}
 		});
-		recoverCommitJournals(io, home, Date.now(), skillsRoot(), async (name) => {
+		const mergeSkillsRoot = skills.root ?? skillsRoot();
+		recoverCommitJournals(io, home, Date.now(), mergeSkillsRoot, async (name) => {
 			return (await skills.restoreFromArchive(name)).ok;
+		}, (runId) => {
+			const run = runs.find(runId);
+			return run !== void 0 && run.state === "running";
 		}).then((reports) => {
 			if (reports.length > 0) ctx.logger.info("merge commit recovery: " + reports.map((report) => report.runId + "=" + report.action).join(", "));
 		}).catch((error) => {

package/lib/types/adapters/library.js

@@ -13,9 +13,16 @@ export function skillLibraryPort(skills) {
             if (typeof skills.listSupportFiles !== 'function')
                 return [];
             const probe = await skills.listSupportFiles(name);
-            if (probe.kind !== 'present')
+            if (probe.kind === 'unknown')
+                throw new Error('support file list unknown: ' + name);
+            if (probe.kind === 'absent')
                 return [];
-            return await Promise.all(probe.value.map(async (path) => ({ path, content: await skills.readSupportFile(name, path) ?? '' })));
+            return await Promise.all(probe.value.map(async (path) => {
+                const content = await skills.readSupportFile(name, path);
+                if (content === null)
+                    throw new Error('support file disappeared: ' + name + '/' + path);
+                return { path, content };
+            }));
         },
     };
 }

package/lib/types/commands.js

@@ -1,4 +1,4 @@
-const USAGE = 'usage: /evolution merge scan | pair [--force] <a> <b> | status [id] | report [id] | cancel [id] | runs | doctor | pending [--expired] | candidates [--retry] | approve <id> | reject <id> | resume [id] [--retry] [--clear <id>] | skipped [--restore <id>] | discard <id> | undo <target> --run <id>';
+const USAGE = 'usage: /evolution merge scan | pair [--force] <a> <b> | status [id] | report [id] | cancel [id] | runs | doctor | pending [--expired] | candidates [--retry] | approve <id> | reject <id> | resume [id] [--retry] [--clear <id>] | skipped [--restore <id>] | discard <id> | undo <target> --run <id>\ndefaults: mergeApproval=false, mergeSkippedTtlDays=0, mergeRunTimeoutMinutes=0, mergePairTimeoutMinutes=15, mergeModelsRoot=""';
 function flags(args, allowed) {
     const values = new Map();
     for (let index = 0; index < args.length; index += 1) {

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

@@ -6,5 +6,5 @@ export interface CommitRecoveryReport {
     readonly action: string;
     readonly ok: boolean;
 }
-export declare function recoverCommitJournals(io: EvolutionIoLike, home: string, now: number, skillRoot: string, restoreSource?: (name: string) => Promise<boolean>): Promise<readonly CommitRecoveryReport[]>;
+export declare function recoverCommitJournals(io: EvolutionIoLike, home: string, now: number, skillRoot: string, restoreSource?: (name: string) => Promise<boolean>, isActive?: (runId: string) => boolean): Promise<readonly CommitRecoveryReport[]>;
 //# sourceMappingURL=commit-recovery.d.ts.map

package/lib/types/commit-recovery.js

@@ -3,7 +3,8 @@ import { join } from 'node:path';
 import { recoveryFor } from "./domain/commit-journal.js";
 import { writeJournal } from "./domain/commit-journal-store.js";
 import { readCommitSnapshot, skillBodyPath, skillFilePath } from "./commit-snapshot.js";
-export async function recoverCommitJournals(io, home, now, skillRoot, restoreSource) {
+import { readCommitReceipt } from "./commit-receipt.js";
+export async function recoverCommitJournals(io, home, now, skillRoot, restoreSource, isActive) {
     const dir = join(home, 'merge', 'journals');
     if (!(await io.exists(dir)))
         return [];
@@ -17,9 +18,30 @@ export async function recoverCommitJournals(io, home, now, skillRoot, restoreSou
         catch {
             continue;
         }
+        if (isActive?.(journal.runId) === true) {
+            reports.push({ runId: journal.runId, phase: journal.phase, action: 'skipped-active-run', ok: true });
+            continue;
+        }
         const recovery = recoveryFor(journal);
         if (recovery === 'none')
             continue;
+        if (recovery === 'refuse') {
+            reports.push({ runId: journal.runId, phase: journal.phase, action: 'unknown-phase-refused', ok: false });
+            continue;
+        }
+        let receipt = null;
+        try {
+            receipt = await readCommitReceipt(io, home, journal.runId, journal.target);
+        }
+        catch {
+            reports.push({ runId: journal.runId, phase: journal.phase, action: 'receipt-read-failed', ok: false });
+            continue;
+        }
+        if (receipt !== null) {
+            await writeJournal(io, home, { ...journal, phase: 'committed', unitId: receipt.unitId, updatedAt: new Date(now).toISOString() });
+            reports.push({ runId: journal.runId, phase: journal.phase, action: 'receipt-committed', ok: true });
+            continue;
+        }
         const snapshot = await readCommitSnapshot(io, home, journal.runId);
         let action = 'report-only';
         let ok = true;
@@ -75,7 +97,8 @@ export async function recoverCommitJournals(io, home, now, skillRoot, restoreSou
                 ok = false;
             }
         }
-        await writeJournal(io, home, { ...journal, phase: ok ? 'rolled-back' : 'failed', updatedAt: new Date(now).toISOString() });
+        if (ok)
+            await writeJournal(io, home, { ...journal, phase: 'rolled-back', 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));

package/lib/types/commit-snapshot.js

@@ -45,7 +45,7 @@ export function isSafeSkillName(name) {
     return /^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(name) && name !== '.' && name !== '..';
 }
 export function skillFilePath(root, name, path) {
-    if (!isSafeSkillName(name) || path.startsWith('/') || path.includes('..'))
+    if (!isSafeSkillName(name) || path.startsWith('/') || path.split('/').includes('..'))
         throw new Error('unsafe skill file: ' + name + '/' + path);
     const base = resolve(root, name);
     const file = resolve(base, path);

package/lib/types/domain/commit-journal.d.ts

@@ -10,7 +10,7 @@ export interface CommitJournal {
     readonly updatedAt: string;
 }
 export declare function advanceJournal(journal: CommitJournal, phase: JournalPhase, at: string): CommitJournal;
-export type JournalRecovery = 'none' | 'retry-commit' | 'rollback-target' | 'rollback-sources';
+export type JournalRecovery = 'none' | 'retry-commit' | 'rollback-target' | 'rollback-sources' | 'refuse';
 /** What a restart may do with the last durable phase. */
 export declare function recoveryFor(journal: CommitJournal): JournalRecovery;
 //# sourceMappingURL=commit-journal.d.ts.map

package/lib/types/domain/commit-journal.js

@@ -20,6 +20,7 @@ export function recoveryFor(journal) {
         case 'committed':
         case 'rolled-back':
         case 'failed': return 'none';
+        default: return 'refuse';
     }
 }
 //# sourceMappingURL=commit-journal.js.map

package/lib/types/index.js

@@ -138,9 +138,13 @@ export function apply(ctx, rawConfig = {}) {
             io, ctx, authority: authorityFrom({ origin: 'subagent' }),
             limits: { ...DEFAULT_SKILL_LIMITS, ...policyStageLimits(policySnapshot?.get?.()) },
         });
-        void recoverCommitJournals(io, home, Date.now(), skillsRoot(), async (name) => {
+        const mergeSkillsRoot = skills.root ?? skillsRoot();
+        void recoverCommitJournals(io, home, Date.now(), mergeSkillsRoot, async (name) => {
             const result = await skills.restoreFromArchive(name);
             return result.ok;
+        }, (runId) => {
+            const run = runs.find(runId);
+            return run !== undefined && run.state === 'running';
         }).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));

package/lib/types/revision.d.ts

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

package/lib/types/revision.js

@@ -1,5 +1,9 @@
 import { contentHash } from '@lmzhen/dsh-evolution-core';
-/** Stable source revision for a pair: names sorted, body hashed in that order. */
+function fingerprint(card) {
+    const files = [...(card.files ?? [])].sort((left, right) => left.path.localeCompare(right.path));
+    return card.name + '\u0000' + card.body + '\u0000' + files.map(file => file.path + '\u0000' + file.content).join('\u0000');
+}
+/** Stable source revision for a pair: names sorted, body+support 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();
@@ -7,6 +11,11 @@ export function sourceRevisionOf(cards, a, b) {
     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);
+    return contentHash(fingerprint(first) + '\u0000' + fingerprint(second));
+}
+/** Revision of the merge target; undefined when the target is not a live card. */
+export function targetRevisionOf(cards, target) {
+    const card = cards.find(item => item.name === target);
+    return card === undefined ? undefined : contentHash(fingerprint(card));
 }
 //# sourceMappingURL=revision.js.map

package/lib/types/runtime.js

@@ -22,7 +22,7 @@ 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";
+import { sourceRevisionOf, targetRevisionOf } 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);
@@ -47,14 +47,23 @@ export function createMergeRuntime(deps) {
             const detached = deps.detached !== false;
             if (command.verb === 'pair') {
                 const signal = new AbortController().signal;
+                if (command.a === command.b)
+                    return { ok: false, text: 'merge pair 需要两个不同技能源: ' + command.a };
                 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 };
                 }
+                if (cardA.protectedBy != null || cardB.protectedBy != null
+                    || cardA.protectionUnknown === true || cardB.protectionUnknown === true) {
+                    return { ok: false, text: 'merge pair 不接受受保护/保护状态未知技能: ' + command.a + ' / ' + command.b };
+                }
                 const pair = [{ a: command.a, b: command.b }];
                 const existing = (await loadMergeState(deps.io, deps.home)).state.rows.find(row => row.pairKey === pairKey(command.a, command.b));
+                if (existing?.state === 'skipped') {
+                    await dropRow(deps.io, deps.home, deps.now, existing.id);
+                }
                 if (existing?.state === 'pending') {
                     return { ok: false, text: '该 pair 已在待批准队列，先 approve/reject/discard: ' + existing.id };
                 }
@@ -92,7 +101,7 @@ 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 managed = new Set(cards.filter(card => card.managed === true && card.protectedBy == null).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' || row.queue === 'fuse' || !canRetry(row)).map(row => row.pairKey));
@@ -270,6 +279,14 @@ export function createMergeRuntime(deps) {
                             await upsertRow(deps.io, deps.home, deps.now, changed.row);
                         return { ok: false, text: 'source-changed：源技能内容在决策后变化，拒绝照跑；出口：重新 merge pair，或 merge skipped --discard' };
                     }
+                    const currentTargetRevision = targetRevisionOf(cards, candidate.decision.target);
+                    if (candidate.targetRevision !== undefined && currentTargetRevision !== undefined
+                        && currentTargetRevision !== candidate.targetRevision) {
+                        const taken = transition(candidate, { type: 'target-taken', at: new Date().toISOString() });
+                        if (taken.ok && taken.row !== null)
+                            await upsertRow(deps.io, deps.home, deps.now, taken.row);
+                        return { ok: false, text: 'target-taken：目标 ' + candidate.decision.target + ' 在决策后变化，拒绝照跑；可重新 merge pair 或 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)

package/lib/types/scan-ports.js

@@ -2,7 +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";
+import { sourceRevisionOf, targetRevisionOf } from "./revision.js";
 export function createChannelScanPorts(options) {
     const sessions = new Map();
     return {
@@ -44,10 +44,13 @@ export function createChannelScanPorts(options) {
                 }
             }
             const sourceRevision = result.outcome.kind === 'merge' ? sourceRevisionOf(options.cards, candidate.a, candidate.b) : undefined;
+            const target = result.outcome.kind === 'merge' ? result.outcome.decision?.target : undefined;
+            const targetRevision = target === undefined ? undefined : targetRevisionOf(options.cards, target);
             return result.outcome.kind === 'merge'
                 ? {
                     ...result.outcome, stagingRef: stageKey, stagingExpiresAt: options.now() + 7 * 86_400_000,
                     ...(sourceRevision === undefined ? {} : { sourceRevision }),
+                    ...(targetRevision === undefined ? {} : { targetRevision }),
                 }
                 : result.outcome;
         },

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.3",
+  "version": "0.30.5",
   "publishConfig": {
     "access": "public"
   },
@@ -27,8 +27,8 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.5",
-    "@lmzhen/dsh-evolution-core": "^0.30.3",
-    "@lmzhen/dsh-evolution-merge-engine": "^0.30.3"
+    "@lmzhen/dsh-evolution-core": "^0.30.5",
+    "@lmzhen/dsh-evolution-merge-engine": "^0.30.5"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5"