@lmzhen/dsh-evolution-merge 0.30.11 → 0.30.13

package/lib/index.js

@@ -345,10 +345,17 @@ async function mutateMergeState(io, home, now, fn) {
 	});
 	return result;
 }
-async function upsertRow(io, home, now, row, expect = "any") {
+async function upsertRow(io, home, now, row, expect = "any", cas) {
 	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 (cas !== void 0 && (cas === null && current !== void 0 || cas !== null && current?.updatedAt !== cas)) return {
+			rows,
+			result: {
+				ok: false,
+				current: current ?? row
+			}
+		};
 		if (current !== void 0 && expect !== "any" && (expect === "absent" || queueOf(current.state) !== expect)) return {
 			rows,
 			result: {
@@ -1789,17 +1796,20 @@ async function runScan(options) {
 				at: at(options.now)
 			});
 			if (!created.ok || created.row === null) throw new Error(created.ok ? "candidate row missing" : created.message);
-			row = created.row;
-			const placed = await upsertRow(options.io, options.home, options.now, row, "verify");
-			if (!placed.ok && placed.current.state === "skipped") {
-				const restored = transition(placed.current, {
+			row = options.runId === void 0 ? created.row : {
+				...created.row,
+				runId: options.runId
+			};
+			const before = (await loadMergeState(options.io, options.home)).state.rows.find((item) => item.pairKey === row.pairKey);
+			const placed = await upsertRow(options.io, options.home, options.now, row, "verify", before?.updatedAt ?? null);
+			if (!placed.ok && before?.state === "skipped") {
+				const restored = transition(before, {
 					type: "restore",
 					at: at(options.now)
 				});
 				if (!restored.ok || restored.row === null) throw new Error("cannot restore skipped pair");
+				if (!(await upsertRow(options.io, options.home, options.now, restored.row, "any", before.updatedAt)).ok) throw new Error("pair changed while restoring skipped row");
 				row = restored.row;
-				const retried = await upsertRow(options.io, options.home, options.now, row, "verify");
-				if (!retried.ok) throw new Error("pair already in " + retried.current.state);
 			} else if (!placed.ok) throw new Error("pair already in " + placed.current.state);
 		} catch (error) {
 			totals.failed += 1;
@@ -2166,6 +2176,7 @@ async function runScanCommand(options) {
 				ports,
 				stage: ctx.stage,
 				startedAt: ctx.startedAt,
+				runId: ctx.runId,
 				...options.timeoutMinutes === void 0 ? {} : { timeoutMinutes: options.timeoutMinutes },
 				...options.notes === void 0 ? {} : { notes: options.notes }
 			});
@@ -2242,37 +2253,51 @@ function releaseClaim(current, token) {
 //#endregion
 //#region lib/types/target-claim.js
 /** Durable target claim: one approve writer per merge target at a time. */
-const LEASE_MS = 5 * 6e4;
+const LEASE_MS = 30 * 6e4;
 function claimPath(home, target) {
 	return join(home, "merge", "claims", contentHash(target) + ".json");
 }
-async function readClaim(io, home, target) {
-	const path = claimPath(home, target);
-	if (!await io.exists(path)) return void 0;
-	const raw = await io.readText(path);
+function parseClaim(raw) {
 	if (raw === null) return void 0;
 	const parsed = JSON.parse(raw);
-	if (typeof parsed.token !== "string" || typeof parsed.expiresAt !== "number") throw new Error("corrupt target claim: " + target);
+	if (typeof parsed.token !== "string" || typeof parsed.expiresAt !== "number") throw new Error("corrupt target claim");
 	return {
 		id: "claim",
 		token: parsed.token,
 		expiresAt: parsed.expiresAt
 	};
 }
+async function compareAndSwap(io, path, task) {
+	if (io.transact !== void 0) {
+		await io.transact(path, (current) => task(current));
+		return;
+	}
+	const current = await io.exists(path) ? await io.readText(path) : null;
+	const next = task(current);
+	if (next === null) {
+		if (current !== null) try {
+			await io.remove(path);
+		} catch {}
+	} else if (next !== current) await io.writeText(path, next);
+}
 async function acquireTargetClaim(io, home, target, now) {
-	const current = await readClaim(io, home, target);
+	const path = claimPath(home, target);
 	const token = randomUUID();
-	const claim = acquireClaim(current, now, LEASE_MS, token);
-	if (claim === void 0) return null;
-	await io.writeText(claimPath(home, target), JSON.stringify(claim) + "\n");
+	let granted;
+	await compareAndSwap(io, path, (raw) => {
+		const claim = acquireClaim(parseClaim(raw), now, LEASE_MS, token);
+		if (claim === void 0) return raw;
+		granted = claim;
+		return JSON.stringify(claim) + "\n";
+	});
+	if (granted === void 0) return null;
 	return {
 		token,
 		async release() {
-			const next = releaseClaim(await readClaim(io, home, target), token);
-			if (next === void 0) try {
-				await io.remove(claimPath(home, target));
-			} catch {}
-			else await io.writeText(claimPath(home, target), JSON.stringify(next) + "\n");
+			await compareAndSwap(io, path, (raw) => {
+				const next = releaseClaim(parseClaim(raw), token);
+				return next === void 0 ? null : JSON.stringify(next) + "\n";
+			});
 		}
 	};
 }
@@ -3780,7 +3805,7 @@ function createMergeRuntime(deps) {
 				ok: false,
 				text: "merge pair 不接受受保护/保护状态未知技能: " + command.a + " / " + command.b
 			};
-			if (deps.isBlocked?.(command.a) === true || deps.isBlocked?.(command.b) === true) return {
+			if (await deps.isBlocked?.(command.a) === true || await deps.isBlocked?.(command.b) === true) return {
 				ok: false,
 				text: "merge pair 不接受被范围门拦下的技能: " + command.a + " / " + command.b
 			};
@@ -3850,10 +3875,12 @@ 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 && card.protectedBy == null && deps.isBlocked?.(card.name) !== true).map((card) => card.name));
+			const blocked = /* @__PURE__ */ new Set();
+			for (const card of cards) if (await deps.isBlocked?.(card.name) === true) blocked.add(card.name);
+			const managed = new Set(cards.filter((card) => card.managed === true && card.protectedBy == null && !blocked.has(card.name)).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" || row.queue === "verify" && !canRetry(row)).map((row) => row.pairKey));
+			const held = new Set(loadedState.state.rows.filter((row) => row.queue === "pending" || row.queue === "fuse" || row.queue === "verify" && (row.runId !== void 0 && deps.now() - Date.parse(row.updatedAt) < 10 * 6e4 || !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,
@@ -4788,8 +4815,8 @@ function apply(ctx, rawConfig = {}) {
 			parent: void 0,
 			allow: ["merge_stage"],
 			timeoutMinutes: params.mergeRunTimeoutMinutes,
-			isBlocked: (name) => {
-				return ctx.get("evolutionCurator")?.gates?.isBlocked?.(name) === true;
+			isBlocked: async (name) => {
+				return await ctx.get("evolutionCurator")?.isBlocked?.(name) === true;
 			},
 			async cards(signal) {
 				const listed = await skills.list({ withContent: true });

package/lib/types/index.js

@@ -218,9 +218,9 @@ export function apply(ctx, rawConfig = {}) {
         const runtime = createMergeRuntime({
             io, home, registry: runs, skills, now: () => Date.now(), params, platformWrite: true,
             channel, parent: undefined, allow: ['merge_stage'], timeoutMinutes: params.mergeRunTimeoutMinutes,
-            isBlocked: (name) => {
+            isBlocked: async (name) => {
                 const curator = ctx.get('evolutionCurator');
-                return curator?.gates?.isBlocked?.(name) === true;
+                return (await curator?.isBlocked?.(name)) === true;
             },
             async cards(signal) {
                 const listed = await skills.list({ withContent: true });

package/lib/types/runtime.d.ts

@@ -32,7 +32,7 @@ export interface MergeRuntimeDeps {
     readonly detached?: boolean;
     readonly cards: (signal: AbortSignal) => Promise<readonly SkillCard[]>;
     /** Curator gate set: excluded/referenced/suppressed/protected builtins. */
-    readonly isBlocked?: (name: string) => boolean;
+    readonly isBlocked?: (name: string) => boolean | Promise<boolean>;
     /** Run-scoped engine screening. */
     readonly screeningForRun: (cards: readonly SkillCard[], runId: string, signal: AbortSignal) => Promise<readonly MergeCandidate[]>;
     readonly stage?: MergeStageBindingPort;

package/lib/types/runtime.js

@@ -59,7 +59,7 @@ export function createMergeRuntime(deps) {
                     || cardA.protectionUnknown === true || cardB.protectionUnknown === true) {
                     return { ok: false, text: 'merge pair 不接受受保护/保护状态未知技能: ' + command.a + ' / ' + command.b };
                 }
-                if (deps.isBlocked?.(command.a) === true || deps.isBlocked?.(command.b) === true) {
+                if ((await deps.isBlocked?.(command.a)) === true || (await deps.isBlocked?.(command.b)) === true) {
                     return { ok: false, text: 'merge pair 不接受被范围门拦下的技能: ' + command.a + ' / ' + command.b };
                 }
                 const pair = [{ a: command.a, b: command.b }];
@@ -104,12 +104,18 @@ export function createMergeRuntime(deps) {
             if (command.verb === 'scan') {
                 const signal = new AbortController().signal;
                 const cards = await deps.cards(signal);
+                const blocked = new Set();
+                for (const card of cards)
+                    if ((await deps.isBlocked?.(card.name)) === true)
+                        blocked.add(card.name);
                 const managed = new Set(cards
-                    .filter(card => card.managed === true && card.protectedBy == null && deps.isBlocked?.(card.name) !== true)
+                    .filter(card => card.managed === true && card.protectedBy == null && !blocked.has(card.name))
                     .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' || (row.queue === 'verify' && !canRetry(row))).map(row => row.pairKey));
+                const held = new Set(loadedState.state.rows.filter(row => row.queue === 'pending' || row.queue === 'fuse'
+                    || (row.queue === 'verify' && (row.runId !== undefined && deps.now() - Date.parse(row.updatedAt) < 10 * 60_000 || !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);

package/lib/types/scan-command.js

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

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

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

package/lib/types/scan-run.js

@@ -64,16 +64,17 @@ export async function runScan(options) {
             const created = transition(undefined, { type: 'candidate', a: candidate.a, b: candidate.b, at: at(options.now) });
             if (!created.ok || created.row === null)
                 throw new Error(created.ok ? 'candidate row missing' : created.message);
-            row = created.row;
-            const placed = await upsertRow(options.io, options.home, options.now, row, 'verify');
-            if (!placed.ok && placed.current.state === 'skipped') {
-                const restored = transition(placed.current, { type: 'restore', at: at(options.now) });
+            row = options.runId === undefined ? created.row : { ...created.row, runId: options.runId };
+            const before = (await loadMergeState(options.io, options.home)).state.rows.find(item => item.pairKey === row.pairKey);
+            const placed = await upsertRow(options.io, options.home, options.now, row, 'verify', before?.updatedAt ?? null);
+            if (!placed.ok && before?.state === 'skipped') {
+                const restored = transition(before, { type: 'restore', at: at(options.now) });
                 if (!restored.ok || restored.row === null)
                     throw new Error('cannot restore skipped pair');
+                const persisted = await upsertRow(options.io, options.home, options.now, restored.row, 'any', before.updatedAt);
+                if (!persisted.ok)
+                    throw new Error('pair changed while restoring skipped row');
                 row = restored.row;
-                const retried = await upsertRow(options.io, options.home, options.now, row, 'verify');
-                if (!retried.ok)
-                    throw new Error('pair already in ' + retried.current.state);
             }
             else if (!placed.ok) {
                 throw new Error('pair already in ' + placed.current.state);

package/lib/types/state.d.ts

@@ -29,7 +29,7 @@ export type UpsertResult = {
     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 upsertRow(io: EvolutionIoLike, home: string, now: () => number, row: MergeRow, expect?: UpsertExpect, cas?: string | null): 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,10 +55,13 @@ export async function mutateMergeState(io, home, now, fn) {
     void now;
     return result;
 }
-export async function upsertRow(io, home, now, row, expect = 'any') {
+export async function upsertRow(io, home, now, row, expect = 'any', cas) {
     return await mutateMergeState(io, home, now, (rows) => {
         const index = rows.findIndex(item => item.pairKey === row.pairKey);
         const current = index < 0 ? undefined : rows[index];
+        if (cas !== undefined && ((cas === null && current !== undefined) || (cas !== null && current?.updatedAt !== cas))) {
+            return { rows, result: { ok: false, current: current ?? row } };
+        }
         if (current !== undefined && expect !== 'any' && (expect === 'absent' || queueOf(current.state) !== expect)) {
             return { rows, result: { ok: false, current } };
         }

package/lib/types/target-claim.js

@@ -3,43 +3,56 @@ import { randomUUID } from 'node:crypto';
 import { join } from 'node:path';
 import { contentHash } from '@lmzhen/dsh-evolution-core';
 import { acquireClaim, releaseClaim } from "./domain/claim.js";
-const LEASE_MS = 5 * 60_000;
+const LEASE_MS = 30 * 60_000;
 function claimPath(home, target) {
     return join(home, 'merge', 'claims', contentHash(target) + '.json');
 }
-async function readClaim(io, home, target) {
-    const path = claimPath(home, target);
-    if (!(await io.exists(path)))
-        return undefined;
-    const raw = await io.readText(path);
+function parseClaim(raw) {
     if (raw === null)
         return undefined;
     const parsed = JSON.parse(raw);
     if (typeof parsed.token !== 'string' || typeof parsed.expiresAt !== 'number')
-        throw new Error('corrupt target claim: ' + target);
+        throw new Error('corrupt target claim');
     return { id: 'claim', token: parsed.token, expiresAt: parsed.expiresAt };
 }
+async function compareAndSwap(io, path, task) {
+    if (io.transact !== undefined) {
+        await io.transact(path, current => task(current));
+        return;
+    }
+    const current = (await io.exists(path)) ? await io.readText(path) : null;
+    const next = task(current);
+    if (next === null) {
+        if (current !== null)
+            try {
+                await io.remove(path);
+            }
+            catch { /* already gone */ }
+    }
+    else if (next !== current) {
+        await io.writeText(path, next);
+    }
+}
 export async function acquireTargetClaim(io, home, target, now) {
-    const current = await readClaim(io, home, target);
+    const path = claimPath(home, target);
     const token = randomUUID();
-    const claim = acquireClaim(current, now, LEASE_MS, token);
-    if (claim === undefined)
+    let granted;
+    await compareAndSwap(io, path, (raw) => {
+        const claim = acquireClaim(parseClaim(raw), now, LEASE_MS, token);
+        if (claim === undefined)
+            return raw;
+        granted = claim;
+        return JSON.stringify(claim) + '\n';
+    });
+    if (granted === undefined)
         return null;
-    await io.writeText(claimPath(home, target), JSON.stringify(claim) + '\n');
     return {
         token,
         async release() {
-            const latest = await readClaim(io, home, target);
-            const next = releaseClaim(latest, token);
-            if (next === undefined) {
-                try {
-                    await io.remove(claimPath(home, target));
-                }
-                catch { /* already gone */ }
-            }
-            else {
-                await io.writeText(claimPath(home, target), JSON.stringify(next) + '\n');
-            }
+            await compareAndSwap(io, path, (raw) => {
+                const next = releaseClaim(parseClaim(raw), token);
+                return next === undefined ? null : JSON.stringify(next) + '\n';
+            });
         },
     };
 }

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