@lmzhen/dsh-evolution-merge 0.32.6 → 0.33.0

package/lib/index.js

@@ -3700,6 +3700,10 @@ function runView(run, readAt, includeResultRef = false) {
 	const record = run.record;
 	const state = run.meta?.phase === "undone" ? "undone" : run.meta?.stopReason === "interrupted" ? "interrupted" : run.meta?.approval === "pending" ? "awaiting-approval" : record.state;
 	const stopReason = run.meta?.stopReason ?? (record.state === "cancelled" ? "cancelled" : record.state === "failed" ? "failed" : record.state === "succeeded" ? "completed" : void 0);
+	const progress = record.progress === void 0 ? null : {
+		done: state === "succeeded" || state === "undone" ? Math.max(record.progress.done, run.pairs.length) : record.progress.done,
+		total: record.progress.total
+	};
 	return {
 		wireVersion: 1,
 		readAt,
@@ -3707,10 +3711,7 @@ function runView(run, readAt, includeResultRef = false) {
 		state,
 		command: record.command ?? "scan",
 		...record.stage === void 0 ? {} : { stage: record.stage },
-		progress: record.progress === void 0 ? null : {
-			done: record.progress.done,
-			total: record.progress.total
-		},
+		progress,
 		startedAt: record.startedAt,
 		...record.endedAt === void 0 ? {} : { endedAt: record.endedAt },
 		...stopReason === void 0 ? {} : { stopReason },

package/lib/types/surface/merge-view.js

@@ -86,7 +86,13 @@ function runView(run, readAt, includeResultRef = false) {
             : run.meta?.approval === 'pending' ? 'awaiting-approval'
                 : record.state;
     const stopReason = run.meta?.stopReason ?? (record.state === 'cancelled' ? 'cancelled' : record.state === 'failed' ? 'failed' : record.state === 'succeeded' ? 'completed' : undefined);
-    return { wireVersion: 1, readAt, id: record.id, state, command: record.command ?? 'scan', ...(record.stage === undefined ? {} : { stage: record.stage }), progress: record.progress === undefined ? null : { done: record.progress.done, total: record.progress.total }, startedAt: record.startedAt, ...(record.endedAt === undefined ? {} : { endedAt: record.endedAt }), ...(stopReason === undefined ? {} : { stopReason }), ...(record.failure === undefined ? {} : { failure: { stage: 'settle', code: 'run-failed', retryable: false, retryFrom: 'none', detail: record.failure } }), ...(record.parentRunId === undefined ? {} : { parentRunId: record.parentRunId }), ...(run.pairs[0]?.pairKey === undefined ? {} : { currentPairKey: run.pairs[0].pairKey }), ...(record.resultRef === undefined ? {} : { resultRef: record.resultRef }), actions: [{ id: 'status', command: base + 'status ' + record.id, confirm: false, enabled: true }, { id: 'report', command: base + 'report ' + record.id, confirm: false, enabled: record.resultRef !== undefined }, { id: 'cancel', command: base + 'cancel ' + record.id, confirm: false, enabled: record.state === 'running' }] };
+    // The maker records progress while running; a terminal run that actually produced pairs
+    // must not keep the last in-flight 0/N. The UI shows what happened, not the last tick.
+    const progress = record.progress === undefined ? null : {
+        done: state === 'succeeded' || state === 'undone' ? Math.max(record.progress.done, run.pairs.length) : record.progress.done,
+        total: record.progress.total,
+    };
+    return { wireVersion: 1, readAt, id: record.id, state, command: record.command ?? 'scan', ...(record.stage === undefined ? {} : { stage: record.stage }), progress, startedAt: record.startedAt, ...(record.endedAt === undefined ? {} : { endedAt: record.endedAt }), ...(stopReason === undefined ? {} : { stopReason }), ...(record.failure === undefined ? {} : { failure: { stage: 'settle', code: 'run-failed', retryable: false, retryFrom: 'none', detail: record.failure } }), ...(record.parentRunId === undefined ? {} : { parentRunId: record.parentRunId }), ...(run.pairs[0]?.pairKey === undefined ? {} : { currentPairKey: run.pairs[0].pairKey }), ...(record.resultRef === undefined ? {} : { resultRef: record.resultRef }), actions: [{ id: 'status', command: base + 'status ' + record.id, confirm: false, enabled: true }, { id: 'report', command: base + 'report ' + record.id, confirm: false, enabled: record.resultRef !== undefined }, { id: 'cancel', command: base + 'cancel ' + record.id, confirm: false, enabled: record.state === 'running' }] };
 }
 export function buildFacts(snapshot) {
     const ordered = [...snapshot.runs].sort((a, b) => b.record.startedAt - a.record.startedAt);

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.32.6",
+  "version": "0.33.0",
   "publishConfig": {
     "access": "public"
   },
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.5",
-    "@lmzhen/dsh-evolution-core": "^0.32.6",
-    "@lmzhen/dsh-evolution-commands": "^0.32.6",
-    "@lmzhen/dsh-evolution-merge-engine": "0.32.6"
+    "@lmzhen/dsh-evolution-core": "^0.33.0",
+    "@lmzhen/dsh-evolution-commands": "^0.33.0",
+    "@lmzhen/dsh-evolution-merge-engine": "0.33.0"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5"