@lmzhen/dsh-evolution-merge 0.30.11 → 0.30.12

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: {
@@ -1790,16 +1797,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 && placed.current.state === "skipped") {
-				const restored = transition(placed.current, {
+			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;

package/lib/types/scan-run.js

@@ -65,15 +65,16 @@ export 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 && placed.current.state === 'skipped') {
-                const restored = transition(placed.current, { type: 'restore', at: at(options.now) });
+            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/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.12",
   "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.12",
+    "@lmzhen/dsh-evolution-merge-engine": "^0.30.12"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5"