@lmzhen/dsh-evolution-merge 0.30.13 → 0.30.15

package/lib/index.js

@@ -1801,6 +1801,7 @@ async function runScan(options) {
 				runId: options.runId
 			};
 			const before = (await loadMergeState(options.io, options.home)).state.rows.find((item) => item.pairKey === row.pairKey);
+			if (before?.state === "verify" && before.runId !== void 0 && before.runId !== options.runId && await options.isOwnerActive?.(before.runId) === true) continue;
 			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, {
@@ -2178,7 +2179,8 @@ async function runScanCommand(options) {
 				startedAt: ctx.startedAt,
 				runId: ctx.runId,
 				...options.timeoutMinutes === void 0 ? {} : { timeoutMinutes: options.timeoutMinutes },
-				...options.notes === void 0 ? {} : { notes: options.notes }
+				...options.notes === void 0 ? {} : { notes: options.notes },
+				...options.isOwnerActive === void 0 ? {} : { isOwnerActive: options.isOwnerActive }
 			});
 		}
 	});
@@ -2467,36 +2469,47 @@ async function runResumeCommand(options) {
 		ok: false,
 		message: "merge row not found: " + options.rowId
 	};
-	if (row.state === "verify") return await runScanCommand({
-		io: options.io,
-		home: options.home,
-		registry: options.registry,
-		approval: true,
-		platformWrite: options.platformWrite,
-		now: options.now,
-		...options.makePorts === void 0 ? { ports: {
-			...options.ports,
-			screening: () => Promise.resolve([{
-				a: row.a,
-				b: row.b
-			}])
-		} } : { makePorts: (runId) => {
-			const makePorts = options.makePorts;
-			if (makePorts === void 0) throw new Error("resume makePorts disappeared");
-			return {
-				...makePorts(runId),
+	if (row.state === "verify") {
+		if (row.runId !== void 0 && await options.isOwnerActive?.(row.runId) === true) return {
+			ok: false,
+			message: "merge run still owns this verify row: " + row.runId
+		};
+		return await runScanCommand({
+			io: options.io,
+			home: options.home,
+			registry: options.registry,
+			approval: true,
+			platformWrite: options.platformWrite,
+			now: options.now,
+			...options.makePorts === void 0 ? { ports: {
+				...options.ports,
 				screening: () => Promise.resolve([{
 					a: row.a,
 					b: row.b
 				}])
-			};
-		} },
-		...options.timeoutMinutes === void 0 ? {} : { timeoutMinutes: options.timeoutMinutes }
-	});
+			} } : { makePorts: (runId) => {
+				const makePorts = options.makePorts;
+				if (makePorts === void 0) throw new Error("resume makePorts disappeared");
+				return {
+					...makePorts(runId),
+					screening: () => Promise.resolve([{
+						a: row.a,
+						b: row.b
+					}])
+				};
+			} },
+			...options.timeoutMinutes === void 0 ? {} : { timeoutMinutes: options.timeoutMinutes },
+			...options.isOwnerActive === void 0 ? {} : { isOwnerActive: options.isOwnerActive }
+		});
+	}
 	if (row.state !== "fuse" && row.state !== "approved") return {
 		ok: false,
 		message: "row is not resumable from state " + row.state
 	};
+	if (row.runId !== void 0 && await options.isOwnerActive?.(row.runId) === true) return {
+		ok: false,
+		message: "merge run still owns this fuse row: " + row.runId
+	};
 	const decision = row.decision;
 	if (decision === void 0) return {
 		ok: false,
@@ -3774,6 +3787,7 @@ function createMergeRuntime(deps) {
 		registry: deps.registry,
 		platformWrite: deps.platformWrite,
 		now: deps.now,
+		...deps.isOwnerActive === void 0 ? {} : { isOwnerActive: deps.isOwnerActive },
 		...timeout === void 0 ? {} : { timeoutMinutes: timeout }
 	};
 	const stage = deps.stage;
@@ -4062,7 +4076,13 @@ function createMergeRuntime(deps) {
 				};
 			}
 			const loaded = await loadMergeState(deps.io, deps.home);
-			const row = command.id === void 0 ? loaded.state.rows.find((item) => item.state === "fuse" || item.state === "verify" || command.retry === true && item.state === "approved") : loaded.state.rows.find((item) => item.id === command.id);
+			let row = command.id === void 0 ? void 0 : loaded.state.rows.find((item) => item.id === command.id);
+			if (command.id === void 0) for (const item of loaded.state.rows) {
+				if (item.state !== "fuse" && item.state !== "verify" && !(command.retry === true && item.state === "approved")) continue;
+				if (item.runId !== void 0 && await deps.isOwnerActive?.(item.runId) === true) continue;
+				row = item;
+				break;
+			}
 			if (row === void 0) return {
 				ok: false,
 				text: "merge row not found: " + (command.id ?? "(auto)")
@@ -4092,6 +4112,7 @@ function createMergeRuntime(deps) {
 				...common,
 				rowId: row.id,
 				ports: basePorts,
+				...deps.isOwnerActive === void 0 ? {} : { isOwnerActive: deps.isOwnerActive },
 				makePorts: (runId) => createChannelScanPorts({
 					io: deps.io,
 					home: deps.home,
@@ -4818,6 +4839,10 @@ function apply(ctx, rawConfig = {}) {
 			isBlocked: async (name) => {
 				return await ctx.get("evolutionCurator")?.isBlocked?.(name) === true;
 			},
+			isOwnerActive: (runId) => {
+				const run = runs.find(runId);
+				return run !== void 0 && run.state === "running";
+			},
 			async cards(signal) {
 				const listed = await skills.list({ withContent: true });
 				if (signal.aborted) return [];

package/lib/types/index.js

@@ -222,6 +222,10 @@ export function apply(ctx, rawConfig = {}) {
                 const curator = ctx.get('evolutionCurator');
                 return (await curator?.isBlocked?.(name)) === true;
             },
+            isOwnerActive: (runId) => {
+                const run = runs.find(runId);
+                return run !== undefined && run.state === 'running';
+            },
             async cards(signal) {
                 const listed = await skills.list({ withContent: true });
                 if (signal.aborted)

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

@@ -19,6 +19,7 @@ export interface RunResumeCommandOptions {
     readonly platformWrite: boolean;
     readonly timeoutMinutes?: number;
     readonly now: () => number;
+    readonly isOwnerActive?: (runId: string) => boolean | Promise<boolean>;
 }
 export declare function runResumeCommand(options: RunResumeCommandOptions): Promise<WithMergeRunResult>;
 //# sourceMappingURL=resume-command.d.ts.map

package/lib/types/resume-command.js

@@ -8,6 +8,9 @@ export async function runResumeCommand(options) {
     if (row === undefined)
         return { ok: false, message: 'merge row not found: ' + options.rowId };
     if (row.state === 'verify') {
+        if (row.runId !== undefined && (await options.isOwnerActive?.(row.runId)) === true) {
+            return { ok: false, message: 'merge run still owns this verify row: ' + row.runId };
+        }
         return await runScanCommand({
             io: options.io, home: options.home, registry: options.registry,
             approval: true, platformWrite: options.platformWrite, now: options.now,
@@ -22,10 +25,14 @@ export async function runResumeCommand(options) {
                     },
                 }),
             ...(options.timeoutMinutes === undefined ? {} : { timeoutMinutes: options.timeoutMinutes }),
+            ...(options.isOwnerActive === undefined ? {} : { isOwnerActive: options.isOwnerActive }),
         });
     }
     if (row.state !== 'fuse' && row.state !== 'approved')
         return { ok: false, message: 'row is not resumable from state ' + row.state };
+    if (row.runId !== undefined && (await options.isOwnerActive?.(row.runId)) === true) {
+        return { ok: false, message: 'merge run still owns this fuse row: ' + row.runId };
+    }
     const decision = row.decision;
     if (decision === undefined)
         return { ok: false, message: 'fuse row has no decision' };

package/lib/types/runtime.d.ts

@@ -33,6 +33,7 @@ export interface MergeRuntimeDeps {
     readonly cards: (signal: AbortSignal) => Promise<readonly SkillCard[]>;
     /** Curator gate set: excluded/referenced/suppressed/protected builtins. */
     readonly isBlocked?: (name: string) => boolean | Promise<boolean>;
+    readonly isOwnerActive?: (runId: 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

@@ -34,6 +34,7 @@ export function createMergeRuntime(deps) {
     const common = {
         io: deps.io, home: deps.home, registry: deps.registry,
         platformWrite: deps.platformWrite, now: deps.now,
+        ...(deps.isOwnerActive === undefined ? {} : { isOwnerActive: deps.isOwnerActive }),
         ...(timeout === undefined ? {} : { timeoutMinutes: timeout }),
     };
     const stage = deps.stage;
@@ -231,9 +232,17 @@ export function createMergeRuntime(deps) {
                     return { ok: true, text: '已清除合并行：' + cleared.id };
                 }
                 const loaded = await loadMergeState(deps.io, deps.home);
-                const row = command.id === undefined
-                    ? loaded.state.rows.find(item => item.state === 'fuse' || item.state === 'verify' || (command.retry === true && item.state === 'approved'))
-                    : loaded.state.rows.find(item => item.id === command.id);
+                let row = command.id === undefined ? undefined : loaded.state.rows.find(item => item.id === command.id);
+                if (command.id === undefined) {
+                    for (const item of loaded.state.rows) {
+                        if (item.state !== 'fuse' && item.state !== 'verify' && !(command.retry === true && item.state === 'approved'))
+                            continue;
+                        if (item.runId !== undefined && (await deps.isOwnerActive?.(item.runId)) === true)
+                            continue;
+                        row = item;
+                        break;
+                    }
+                }
                 if (row === undefined)
                     return { ok: false, text: 'merge row not found: ' + (command.id ?? '(auto)') };
                 const signal = new AbortController().signal;
@@ -250,6 +259,7 @@ export function createMergeRuntime(deps) {
                 };
                 const result = await runResumeCommand({
                     ...common, rowId: row.id, ports: basePorts,
+                    ...(deps.isOwnerActive === undefined ? {} : { isOwnerActive: deps.isOwnerActive }),
                     makePorts: runId => createChannelScanPorts({
                         io: deps.io, home: deps.home, runId, cards, screening: pair,
                         channel: deps.channel, parent, allow: deps.allow,

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

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

package/lib/types/scan-command.js

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

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

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

package/lib/types/scan-run.js

@@ -66,6 +66,10 @@ export async function runScan(options) {
                 throw new Error(created.ok ? 'candidate row missing' : created.message);
             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);
+            if (before?.state === 'verify' && before.runId !== undefined && before.runId !== options.runId
+                && (await options.isOwnerActive?.(before.runId)) === true) {
+                continue;
+            }
             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) });

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