@lmzhen/dsh-evolution-merge 0.30.14 → 0.30.15

package/lib/index.js

@@ -2498,13 +2498,18 @@ async function runResumeCommand(options) {
 					}])
 				};
 			} },
-			...options.timeoutMinutes === void 0 ? {} : { timeoutMinutes: options.timeoutMinutes }
+			...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,
@@ -4071,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)")

package/lib/types/resume-command.js

@@ -25,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.js

@@ -232,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;

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.14",
+  "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.14",
-    "@lmzhen/dsh-evolution-merge-engine": "^0.30.14"
+    "@lmzhen/dsh-evolution-core": "^0.30.15",
+    "@lmzhen/dsh-evolution-merge-engine": "^0.30.15"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5"