@lmzhen/dsh-evolution-merge 0.30.14 → 0.30.16

package/lib/index.js

@@ -246,6 +246,14 @@ function parseLedger(raw) {
 		};
 	}
 	const body = parsed;
+	if (typeof body.schemaVersion === "number" && body.schemaVersion > 2) return {
+		ok: false,
+		ledger: {
+			schemaVersion: 2,
+			rows: []
+		},
+		note: "merge-state-forward-only"
+	};
 	if (!Array.isArray(body.rows)) return {
 		ok: false,
 		ledger: {
@@ -300,7 +308,8 @@ function parseState(raw) {
 	const parsed = parseLedger(raw);
 	if (!parsed.ok) return {
 		ok: false,
-		rows: []
+		rows: [],
+		...parsed.note === void 0 ? {} : { note: parsed.note }
 	};
 	return {
 		ok: true,
@@ -1551,8 +1560,13 @@ function mergeUsage() {
 //#region lib/types/read-commands.js
 async function handleReadOnlyMergeCommand(command, io, home, cards) {
 	const withNote = (text, note) => note === void 0 ? text : "note: " + note + "\n" + text;
+	const load = async () => {
+		const result = await loadMergeState(io, home);
+		if (result.note === "merge-state-forward-only") throw new Error("merge-state-forward-only");
+		return result;
+	};
 	if (command.verb === "status") {
-		const loaded = await loadMergeState(io, home);
+		const loaded = await load();
 		if (command.id !== void 0) {
 			const row = loaded.state.rows.find((item) => item.id === command.id);
 			return withNote(row === void 0 ? "merge row not found: " + command.id : formatStatus([row]), loaded.note);
@@ -1560,17 +1574,17 @@ async function handleReadOnlyMergeCommand(command, io, home, cards) {
 		return withNote(formatStatus(loaded.state.rows), loaded.note);
 	}
 	if (command.verb === "pending") {
-		const loaded = await loadMergeState(io, home);
+		const loaded = await load();
 		const rows = command.expired === true ? loaded.state.rows.filter((row) => row.expired !== void 0) : loaded.state.rows;
 		const live = cards === void 0 ? rows : rows.filter((row) => cards.some((card) => card.name === row.a) && cards.some((card) => card.name === row.b));
 		return withNote(command.expired === true ? formatStatus(live) : formatQueue(live, "pending"), loaded.note);
 	}
 	if (command.verb === "candidates") {
-		const loaded = await loadMergeState(io, home);
+		const loaded = await load();
 		return withNote(formatQueue(command.retry === true ? loaded.state.rows.filter((row) => row.state === "approved") : loaded.state.rows, command.retry === true ? "fuse" : "verify"), loaded.note);
 	}
 	if (command.verb === "skipped") {
-		const loaded = await loadMergeState(io, home);
+		const loaded = await load();
 		return withNote(formatQueue(loaded.state.rows, "skipped"), loaded.note);
 	}
 	return null;
@@ -2498,13 +2512,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 +4090,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/domain/ledger.js

@@ -17,6 +17,9 @@ export function parseLedger(raw) {
         return { ok: false, ledger: { schemaVersion: 2, rows: [] }, note: 'invalid json' };
     }
     const body = parsed;
+    if (typeof body.schemaVersion === 'number' && body.schemaVersion > 2) {
+        return { ok: false, ledger: { schemaVersion: 2, rows: [] }, note: 'merge-state-forward-only' };
+    }
     if (!Array.isArray(body.rows))
         return { ok: false, ledger: { schemaVersion: 2, rows: [] }, note: 'rows missing' };
     const rows = [];

package/lib/types/read-commands.js

@@ -3,8 +3,14 @@ import { formatQueue, formatStatus } from "./status.js";
 import { mergeUsage } from "./commands.js";
 export async function handleReadOnlyMergeCommand(command, io, home, cards) {
     const withNote = (text, note) => note === undefined ? text : 'note: ' + note + '\n' + text;
+    const load = async () => {
+        const result = await loadMergeState(io, home);
+        if (result.note === 'merge-state-forward-only')
+            throw new Error('merge-state-forward-only');
+        return result;
+    };
     if (command.verb === 'status') {
-        const loaded = await loadMergeState(io, home);
+        const loaded = await load();
         if (command.id !== undefined) {
             const row = loaded.state.rows.find(item => item.id === command.id);
             return withNote(row === undefined ? 'merge row not found: ' + command.id : formatStatus([row]), loaded.note);
@@ -12,18 +18,18 @@ export async function handleReadOnlyMergeCommand(command, io, home, cards) {
         return withNote(formatStatus(loaded.state.rows), loaded.note);
     }
     if (command.verb === 'pending') {
-        const loaded = await loadMergeState(io, home);
+        const loaded = await load();
         const rows = command.expired === true ? loaded.state.rows.filter(row => row.expired !== undefined) : loaded.state.rows;
         const live = cards === undefined ? rows : rows.filter(row => cards.some(card => card.name === row.a) && cards.some(card => card.name === row.b));
         return withNote(command.expired === true ? formatStatus(live) : formatQueue(live, 'pending'), loaded.note);
     }
     if (command.verb === 'candidates') {
-        const loaded = await loadMergeState(io, home);
+        const loaded = await load();
         const rows = command.retry === true ? loaded.state.rows.filter(row => row.state === 'approved') : loaded.state.rows;
         return withNote(formatQueue(rows, command.retry === true ? 'fuse' : 'verify'), loaded.note);
     }
     if (command.verb === 'skipped') {
-        const loaded = await loadMergeState(io, home);
+        const loaded = await load();
         return withNote(formatQueue(loaded.state.rows, 'skipped'), loaded.note);
     }
     return null;

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/lib/types/state.js

@@ -16,7 +16,7 @@ export function mergeStatePath(home) {
 function parseState(raw) {
     const parsed = parseLedger(raw);
     if (!parsed.ok)
-        return { ok: false, rows: [] };
+        return { ok: false, rows: [], ...(parsed.note === undefined ? {} : { note: parsed.note }) };
     return {
         ok: true,
         rows: parsed.ledger.rows,

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