@lmzhen/dsh-evolution-merge 0.30.1 → 0.30.3

package/lib/types/state.js

@@ -55,16 +55,23 @@ export async function mutateMergeState(io, home, now, fn) {
     void now;
     return result;
 }
-export async function upsertRow(io, home, now, row) {
-    await mutateMergeState(io, home, now, (rows) => {
+export async function upsertRow(io, home, now, row, expect = 'any') {
+    return await mutateMergeState(io, home, now, (rows) => {
         const index = rows.findIndex(item => item.pairKey === row.pairKey);
+        const current = index < 0 ? undefined : rows[index];
+        if (current !== undefined && expect !== 'any' && (expect === 'absent' || queueOf(current.state) !== expect)) {
+            return { rows, result: { ok: false, current } };
+        }
+        if (current === undefined && expect !== 'any' && expect !== 'absent' && expect !== 'verify') {
+            return { rows, result: { ok: false, current: row } };
+        }
         const normalized = { ...row, queue: queueOf(row.state) };
         const next = [...rows];
-        if (index < 0)
+        if (current === undefined)
             next.push(normalized);
         else
-            next[index] = { ...normalized, createdAt: rows[index]?.createdAt ?? normalized.createdAt };
-        return { rows: next, result: undefined };
+            next[index] = { ...normalized, createdAt: current.createdAt };
+        return { rows: next, result: { ok: true } };
     });
 }
 export async function moveRow(io, home, now, id, patch) {

package/lib/types/status.js

@@ -1,4 +1,5 @@
 import { queueOf, stageOf } from "./contracts.js";
+import { fitToolText } from "./presentation-budget.js";
 export function countRows(rows) {
     const counts = { verify: 0, pending: 0, fuse: 0, skipped: 0 };
     for (const row of rows)
@@ -17,12 +18,12 @@ export function formatStatus(rows) {
     ];
     for (const row of rows)
         lines.push('- ' + describe(row));
-    return lines.join('\n');
+    return fitToolText(lines.join('\n'));
 }
 export function formatQueue(rows, queue) {
     const selected = rows.filter(row => queueOf(row.state) === queue);
     if (selected.length === 0)
         return 'merge ' + queue + ': empty';
-    return ['merge ' + queue + ': ' + String(selected.length)].concat(selected.map(row => '- ' + describe(row))).join('\n');
+    return fitToolText(['merge ' + queue + ': ' + String(selected.length)].concat(selected.map(row => '- ' + describe(row))).join('\n'));
 }
 //# sourceMappingURL=status.js.map

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