@lmzhen/dsh-evolution-merge 0.30.5 → 0.30.6

package/lib/index.js

@@ -1527,24 +1527,28 @@ function mergeUsage() {
 //#endregion
 //#region lib/types/read-commands.js
 async function handleReadOnlyMergeCommand(command, io, home) {
+	const withNote = (text, note) => note === void 0 ? text : "note: " + note + "\n" + text;
 	if (command.verb === "status") {
 		const loaded = await loadMergeState(io, home);
 		if (command.id !== void 0) {
 			const row = loaded.state.rows.find((item) => item.id === command.id);
-			return row === void 0 ? "merge row not found: " + command.id : formatStatus([row]);
+			return withNote(row === void 0 ? "merge row not found: " + command.id : formatStatus([row]), loaded.note);
 		}
-		return formatStatus(loaded.state.rows);
+		return withNote(formatStatus(loaded.state.rows), loaded.note);
 	}
 	if (command.verb === "pending") {
 		const loaded = await loadMergeState(io, home);
 		const rows = command.expired === true ? loaded.state.rows.filter((row) => row.expired !== void 0) : loaded.state.rows;
-		return command.expired === true ? formatStatus(rows) : formatQueue(rows, "pending");
+		return withNote(command.expired === true ? formatStatus(rows) : formatQueue(rows, "pending"), loaded.note);
 	}
 	if (command.verb === "candidates") {
 		const loaded = await loadMergeState(io, home);
-		return formatQueue(command.retry === true ? loaded.state.rows.filter((row) => row.state === "approved") : loaded.state.rows, command.retry === true ? "fuse" : "verify");
+		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);
+		return withNote(formatQueue(loaded.state.rows, "skipped"), loaded.note);
 	}
-	if (command.verb === "skipped") return formatQueue((await loadMergeState(io, home)).state.rows, "skipped");
 	return null;
 }
 function mergeCommandHelp() {
@@ -1554,8 +1558,8 @@ function mergeCommandHelp() {
 //#region lib/types/domain/errors.js
 function formatMergeError(error) {
 	if (error.kind === "parameter") return "merge: " + error.message + " (" + error.code + ")";
-	const detail = "\n" + (error.detail ?? "no additional detail");
-	return "merge failed: " + error.message + " (" + error.code + ")" + detail + "\nnext: fix the target or rerun after the cause is gone";
+	const where = error.stage === void 0 && error.runId === void 0 ? error.detail ?? "no additional detail" : [error.stage === void 0 ? void 0 : "stage=" + error.stage, error.runId === void 0 ? void 0 : "run=" + error.runId].filter(Boolean).join(" ");
+	return "merge failed: " + error.message + " (" + error.code + ")\n" + where + "\nnext: fix the target or rerun after the cause is gone";
 }
 //#endregion
 //#region lib/types/merge-command.js
@@ -1767,7 +1771,16 @@ async function runScan(options) {
 			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) throw new Error("pair already in " + placed.current.state);
+			if (!placed.ok && placed.current.state === "skipped") {
+				const restored = transition(placed.current, {
+					type: "restore",
+					at: at(options.now)
+				});
+				if (!restored.ok || restored.row === null) throw new Error("cannot restore skipped pair");
+				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;
 			pairs.push({
@@ -3749,7 +3762,7 @@ function createMergeRuntime(deps) {
 			const managed = new Set(cards.filter((card) => card.managed === true && card.protectedBy == null).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" || !canRetry(row)).map((row) => row.pairKey));
+			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 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,

package/lib/types/domain/errors.d.ts

@@ -5,6 +5,8 @@ export interface MergeError {
     readonly code: string;
     readonly message: string;
     readonly detail?: string;
+    readonly stage?: string;
+    readonly runId?: string;
 }
 export declare function formatMergeError(error: MergeError): string;
 //# sourceMappingURL=errors.d.ts.map

package/lib/types/domain/errors.js

@@ -1,7 +1,9 @@
 export function formatMergeError(error) {
     if (error.kind === 'parameter')
         return 'merge: ' + error.message + ' (' + error.code + ')';
-    const detail = '\n' + (error.detail ?? 'no additional detail');
-    return 'merge failed: ' + error.message + ' (' + error.code + ')' + detail + '\nnext: fix the target or rerun after the cause is gone';
+    const where = error.stage === undefined && error.runId === undefined
+        ? (error.detail ?? 'no additional detail')
+        : [error.stage === undefined ? undefined : 'stage=' + error.stage, error.runId === undefined ? undefined : 'run=' + error.runId].filter(Boolean).join(' ');
+    return 'merge failed: ' + error.message + ' (' + error.code + ')\n' + where + '\nnext: fix the target or rerun after the cause is gone';
 }
 //# sourceMappingURL=errors.js.map

package/lib/types/read-commands.js

@@ -2,27 +2,28 @@ import { loadMergeState } from "./state.js";
 import { formatQueue, formatStatus } from "./status.js";
 import { mergeUsage } from "./commands.js";
 export async function handleReadOnlyMergeCommand(command, io, home) {
+    const withNote = (text, note) => note === undefined ? text : 'note: ' + note + '\n' + text;
     if (command.verb === 'status') {
         const loaded = await loadMergeState(io, home);
         if (command.id !== undefined) {
             const row = loaded.state.rows.find(item => item.id === command.id);
-            return row === undefined ? 'merge row not found: ' + command.id : formatStatus([row]);
+            return withNote(row === undefined ? 'merge row not found: ' + command.id : formatStatus([row]), loaded.note);
         }
-        return formatStatus(loaded.state.rows);
+        return withNote(formatStatus(loaded.state.rows), loaded.note);
     }
     if (command.verb === 'pending') {
         const loaded = await loadMergeState(io, home);
         const rows = command.expired === true ? loaded.state.rows.filter(row => row.expired !== undefined) : loaded.state.rows;
-        return command.expired === true ? formatStatus(rows) : formatQueue(rows, 'pending');
+        return withNote(command.expired === true ? formatStatus(rows) : formatQueue(rows, 'pending'), loaded.note);
     }
     if (command.verb === 'candidates') {
         const loaded = await loadMergeState(io, home);
         const rows = command.retry === true ? loaded.state.rows.filter(row => row.state === 'approved') : loaded.state.rows;
-        return formatQueue(rows, command.retry === true ? 'fuse' : 'verify');
+        return withNote(formatQueue(rows, command.retry === true ? 'fuse' : 'verify'), loaded.note);
     }
     if (command.verb === 'skipped') {
         const loaded = await loadMergeState(io, home);
-        return formatQueue(loaded.state.rows, 'skipped');
+        return withNote(formatQueue(loaded.state.rows, 'skipped'), loaded.note);
     }
     return null;
 }

package/lib/types/runtime.js

@@ -104,7 +104,7 @@ export function createMergeRuntime(deps) {
                 const managed = new Set(cards.filter(card => card.managed === true && card.protectedBy == null).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' || !canRetry(row)).map(row => row.pairKey));
+                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 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-run.js

@@ -66,8 +66,18 @@ export async function runScan(options) {
                 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)
+            if (!placed.ok && placed.current.state === 'skipped') {
+                const restored = transition(placed.current, { type: 'restore', at: at(options.now) });
+                if (!restored.ok || restored.row === null)
+                    throw new Error('cannot restore skipped pair');
+                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;

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