@lmzhen/dsh-evolution-merge 0.30.4 → 0.30.5

package/lib/index.js

@@ -1284,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) {
@@ -1517,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=\"\""
 		};
 	}
 }
@@ -3286,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
@@ -3354,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) {
@@ -3653,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);
@@ -3660,6 +3676,10 @@ 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
@@ -3726,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));
@@ -4012,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",

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/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,12 +47,18 @@ 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') {
@@ -95,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));
@@ -273,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.4",
+  "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.4",
-    "@lmzhen/dsh-evolution-merge-engine": "^0.30.4"
+    "@lmzhen/dsh-evolution-core": "^0.30.5",
+    "@lmzhen/dsh-evolution-merge-engine": "^0.30.5"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5"