@lmzhen/dsh-evolution-merge 0.30.27 → 0.30.28

package/lib/index.js

@@ -8217,7 +8217,7 @@ function buildValidationPlan(input) {
 	const staged = new Set(files.map((file) => file.path));
 	const manifest = new Set(manifestFiles);
 	const forwardRefs = [...refs].filter((ref) => !staged.has(ref)).sort();
-	const reverseRefs = files.map((file) => file.path).filter((path) => !refs.has(path) && manifest.has(path)).sort();
+	const reverseRefs = files.map((file) => file.path).filter((path) => path !== "SKILL.md" && !refs.has(path) && manifest.has(path)).sort();
 	const orphanFiles = [...new Set(input.existingSupport ?? [])].filter((path) => !staged.has(path)).sort();
 	const byPath = /* @__PURE__ */ new Map();
 	const supportSources = input.supportSources ?? [];
@@ -8234,12 +8234,14 @@ function buildValidationPlan(input) {
 		path,
 		sources: value.sources
 	}));
-	const sourceThreatFiles = (input.cards ?? []).flatMap((card) => (card.files ?? []).filter((file) => scanContentThreats(file.content) !== null).map((file) => card.name + "/" + file.path));
+	const participants = input.participants === void 0 ? void 0 : new Set(input.participants);
+	const participantCards = participants === void 0 ? input.cards ?? [] : (input.cards ?? []).filter((card) => participants.has(card.name));
+	const sourceThreatFiles = participantCards.flatMap((card) => (card.files ?? []).filter((file) => scanContentThreats(file.content) !== null).map((file) => card.name + "/" + file.path));
 	const threat = {
-		body: scanContentThreats(input.tree.body) !== null || (input.cards ?? []).some((card) => scanContentThreats(card.body) !== null),
+		body: scanContentThreats(input.tree.body) !== null || participantCards.some((card) => scanContentThreats(card.body) !== null),
 		files: [...files.filter((file) => scanContentThreats(file.content) !== null).map((file) => file.path), ...sourceThreatFiles]
 	};
-	const sourceRevisions = input.sourceRevisions ?? Object.fromEntries((input.cards ?? []).map((card) => [card.name, digest(card.body)]));
+	const sourceRevisions = input.sourceRevisions ?? Object.fromEntries(participantCards.map((card) => [card.name, digest(card.body)]));
 	const revision = digest(JSON.stringify({
 		target: input.target,
 		body: digest(input.tree.body),
@@ -8473,6 +8475,7 @@ async function runAuthoring(options) {
 			source: "staged"
 		})),
 		manifestFiles,
+		...options.sources === void 0 ? {} : { participants: [...options.sources, options.target] },
 		existingSupport: (options.cards.find((card) => card.name === options.target)?.files ?? []).map((file) => file.path)
 	});
 	const findings = [...validateStagedTree(tree.value, limitsSnapshot.skillLimits), ...validationPlan.findings];
@@ -8890,6 +8893,11 @@ async function runNewChildAuthoring(options, row, decision, signal) {
 				source: "staged"
 			})),
 			manifestFiles,
+			participants: [
+				row.a,
+				row.b,
+				decision.target
+			],
 			existingSupport: (options.cards.find((card) => card.name === decision.target)?.files ?? []).map((file) => file.path),
 			supportSources: options.cards.filter((card) => card.name === row.a || card.name === row.b).flatMap((card) => (card.files ?? []).map((file) => ({
 				path: file.path,

package/lib/types/authoring-flow.js

@@ -65,7 +65,7 @@ export async function runAuthoring(options) {
     const limitsSnapshot = limitsSnapshotOf(options.limits ?? DEFAULT_SKILL_LIMITS);
     const participants = new Set(options.sources ?? []);
     const supportSources = options.cards.filter(card => participants.has(card.name)).flatMap(card => (card.files ?? []).map(file => ({ path: file.path, content: file.content, source: card.name })));
-    const validationPlan = buildValidationPlan({ tree: tree.value, target: options.target, limits: limitsSnapshot, cards: options.cards, supportSources, ...(options.promptVersion === undefined ? {} : { promptVersion: options.promptVersion }), ...(options.promptHash === undefined ? {} : { promptHash: options.promptHash }), supportFiles: tree.value.files.map(file => ({ path: file.path, content: file.content, source: 'staged' })), manifestFiles, existingSupport: (options.cards.find(card => card.name === options.target)?.files ?? []).map(file => file.path) });
+    const validationPlan = buildValidationPlan({ tree: tree.value, target: options.target, limits: limitsSnapshot, cards: options.cards, supportSources, ...(options.promptVersion === undefined ? {} : { promptVersion: options.promptVersion }), ...(options.promptHash === undefined ? {} : { promptHash: options.promptHash }), supportFiles: tree.value.files.map(file => ({ path: file.path, content: file.content, source: 'staged' })), manifestFiles, ...(options.sources === undefined ? {} : { participants: [...options.sources, options.target] }), existingSupport: (options.cards.find(card => card.name === options.target)?.files ?? []).map(file => file.path) });
     const findings = [...validateStagedTree(tree.value, limitsSnapshot.skillLimits), ...validationPlan.findings];
     const lengths = { bodyBytes: Buffer.byteLength(tree.value.body, 'utf8'), fileBytes: tree.value.files.reduce((sum, file) => sum + Buffer.byteLength(file.content, 'utf8'), 0), totalBytes: Buffer.byteLength(tree.value.body, 'utf8') + tree.value.files.reduce((sum, file) => sum + Buffer.byteLength(file.content, 'utf8'), 0) };
     if (hasBlockingFinding(findings))

package/lib/types/domain/validation-plan.d.ts

@@ -61,5 +61,7 @@ export declare function buildValidationPlan(input: {
     }[];
     readonly promptVersion?: string;
     readonly promptHash?: string;
+    /** Skills that participate in this merge (pair sources and target); omit for legacy all-card behavior. */
+    readonly participants?: readonly string[];
 }): ValidationPlan;
 //# sourceMappingURL=validation-plan.d.ts.map

package/lib/types/domain/validation-plan.js

@@ -10,7 +10,9 @@ export function buildValidationPlan(input) {
     const staged = new Set(files.map(file => file.path));
     const manifest = new Set(manifestFiles);
     const forwardRefs = [...refs].filter(ref => !staged.has(ref)).sort();
-    const reverseRefs = files.map(file => file.path).filter(path => !refs.has(path) && manifest.has(path)).sort();
+    // SKILL.md is the body itself, never a support reference; a child may list it in the
+    // authoring manifest, but it must not require the body to reference itself.
+    const reverseRefs = files.map(file => file.path).filter(path => path !== 'SKILL.md' && !refs.has(path) && manifest.has(path)).sort();
     const existing = new Set(input.existingSupport ?? []);
     const orphanFiles = [...existing].filter(path => !staged.has(path)).sort();
     const byPath = new Map();
@@ -25,9 +27,11 @@ export function buildValidationPlan(input) {
         byPath.set(file.path, entry);
     }
     const supportConflicts = [...byPath.entries()].filter(([, value]) => value.contents.size > 1).map(([path, value]) => ({ path, sources: value.sources }));
-    const sourceThreatFiles = (input.cards ?? []).flatMap(card => (card.files ?? []).filter(file => scanContentThreats(file.content) !== null).map(file => card.name + '/' + file.path));
-    const threat = { body: scanContentThreats(input.tree.body) !== null || (input.cards ?? []).some(card => scanContentThreats(card.body) !== null), files: [...files.filter(file => scanContentThreats(file.content) !== null).map(file => file.path), ...sourceThreatFiles] };
-    const sourceRevisions = input.sourceRevisions ?? Object.fromEntries((input.cards ?? []).map(card => [card.name, digest(card.body)]));
+    const participants = input.participants === undefined ? undefined : new Set(input.participants);
+    const participantCards = participants === undefined ? (input.cards ?? []) : (input.cards ?? []).filter(card => participants.has(card.name));
+    const sourceThreatFiles = participantCards.flatMap(card => (card.files ?? []).filter(file => scanContentThreats(file.content) !== null).map(file => card.name + '/' + file.path));
+    const threat = { body: scanContentThreats(input.tree.body) !== null || participantCards.some(card => scanContentThreats(card.body) !== null), files: [...files.filter(file => scanContentThreats(file.content) !== null).map(file => file.path), ...sourceThreatFiles] };
+    const sourceRevisions = input.sourceRevisions ?? Object.fromEntries(participantCards.map(card => [card.name, digest(card.body)]));
     const revision = digest(JSON.stringify({ target: input.target, body: digest(input.tree.body), files: files.map(file => [file.path, file.digest]), q09: { forwardRefs, reverseRefs, orphanFiles }, supportConflicts, threat, sourceRevisions, targetRevision: input.targetRevision ?? null }));
     const findings = [];
     const stageDigest = digest(JSON.stringify(files.map(file => [file.path, file.digest])));

package/lib/types/new-child-authoring.js

@@ -90,7 +90,7 @@ export async function runNewChildAuthoring(options, row, decision, signal) {
         if (missing !== null)
             return { kind: 'failed', failure: { stage: 'author', code: 'merge-manifest-missing', message: 'manifest file missing from staged tree: ' + missing, retryable: true, retryFrom: 'agent2' } };
         const limitsSnapshot = limitsSnapshotOf(options.limits ?? DEFAULT_SKILL_LIMITS);
-        const validationPlan = buildValidationPlan({ tree: tree.value, target: decision.target, limits: limitsSnapshot, cards: options.cards, promptVersion: MERGE_PROMPT_VERSION, promptHash: promptHashOf(buildRound2Prompt(row, decision)), supportFiles: tree.value.files.map(file => ({ path: file.path, content: file.content, source: 'staged' })), manifestFiles, existingSupport: (options.cards.find(card => card.name === decision.target)?.files ?? []).map(file => file.path), supportSources: options.cards.filter(card => card.name === row.a || card.name === row.b).flatMap(card => (card.files ?? []).map(file => ({ path: file.path, content: file.content, source: card.name }))) });
+        const validationPlan = buildValidationPlan({ tree: tree.value, target: decision.target, limits: limitsSnapshot, cards: options.cards, promptVersion: MERGE_PROMPT_VERSION, promptHash: promptHashOf(buildRound2Prompt(row, decision)), supportFiles: tree.value.files.map(file => ({ path: file.path, content: file.content, source: 'staged' })), manifestFiles, participants: [row.a, row.b, decision.target], existingSupport: (options.cards.find(card => card.name === decision.target)?.files ?? []).map(file => file.path), supportSources: options.cards.filter(card => card.name === row.a || card.name === row.b).flatMap(card => (card.files ?? []).map(file => ({ path: file.path, content: file.content, source: card.name }))) });
         const findings = [...validateStagedTree(tree.value, limitsSnapshot.skillLimits), ...validationPlan.findings];
         if (hasBlockingFinding(findings)) {
             const lengths = { bodyBytes: Buffer.byteLength(tree.value.body, 'utf8'), fileBytes: tree.value.files.reduce((sum, file) => sum + Buffer.byteLength(file.content, 'utf8'), 0), totalBytes: Buffer.byteLength(tree.value.body, 'utf8') + tree.value.files.reduce((sum, file) => sum + Buffer.byteLength(file.content, 'utf8'), 0) };

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.27",
+  "version": "0.30.28",
   "publishConfig": {
     "access": "public"
   },
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.5",
-    "@lmzhen/dsh-evolution-core": "^0.30.27",
-    "@lmzhen/dsh-evolution-commands": "^0.30.27",
-    "@lmzhen/dsh-evolution-merge-engine": "0.30.27"
+    "@lmzhen/dsh-evolution-core": "^0.30.28",
+    "@lmzhen/dsh-evolution-commands": "^0.30.28",
+    "@lmzhen/dsh-evolution-merge-engine": "0.30.28"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5"