merge-steward 0.10.1 → 0.10.2

package/dist/watch/dashboard-model.js

@@ -3,6 +3,39 @@ import { formatDuration, humanStatus, nextStepLabel, relativeTime, summarizeQueu
 const RECENT_EVICTION_MS = 60 * 60 * 1_000;
 const STUCK_ENTRY_MS = 25 * 60 * 1_000;
 const OFFLINE_STALE_MS = 10 * 1_000;
+function isLaterEntry(left, right) {
+    if (left.position !== right.position) {
+        return left.position > right.position;
+    }
+    return new Date(left.updatedAt).getTime() >= new Date(right.updatedAt).getTime();
+}
+function getLatestEntries(snapshot) {
+    if (!snapshot) {
+        return [];
+    }
+    const byPR = new Map();
+    for (const entry of snapshot.entries) {
+        const existing = byPR.get(entry.prNumber);
+        if (!existing || isLaterEntry(entry, existing)) {
+            byPR.set(entry.prNumber, entry);
+        }
+    }
+    return [...byPR.values()].sort((a, b) => a.position - b.position);
+}
+function getMostRecentActivityAt(snapshot) {
+    const latestEntries = getLatestEntries(snapshot);
+    if (latestEntries.length === 0) {
+        return undefined;
+    }
+    return latestEntries.reduce((latest, entry) => {
+        if (!latest) {
+            return entry.updatedAt;
+        }
+        return new Date(entry.updatedAt).getTime() > new Date(latest).getTime()
+            ? entry.updatedAt
+            : latest;
+    }, undefined);
+}
 export function matchRepoRef(repo, repoRef) {
     if (!repoRef) {
         return false;
@@ -22,10 +55,7 @@ export function getChainEntries(snapshot) {
     return buildChainEntries(snapshot.entries);
 }
 export function getActiveEntries(snapshot) {
-    if (!snapshot) {
-        return [];
-    }
-    return snapshot.entries.filter((entry) => (entry.status !== "merged" && entry.status !== "evicted" && entry.status !== "dequeued"));
+    return getLatestEntries(snapshot).filter((entry) => (entry.status !== "merged" && entry.status !== "evicted" && entry.status !== "dequeued"));
 }
 export function getDefaultEntryId(snapshot, filter, preferredPrNumber) {
     if (!snapshot) {
@@ -81,7 +111,7 @@ export function getRepoHealth(repo, now = Date.now()) {
             };
         }
     }
-    const recentEvicted = snapshot.entries.find((entry) => (entry.status === "evicted"
+    const recentEvicted = getLatestEntries(snapshot).find((entry) => (entry.status === "evicted"
         && now - new Date(entry.updatedAt).getTime() <= RECENT_EVICTION_MS));
     if (recentEvicted) {
         return {
@@ -106,7 +136,7 @@ export function getRepoHealth(repo, now = Date.now()) {
         label: "Idle",
         color: "green",
         detail: snapshot.summary.total > 0
-            ? `No active queue work right now. Last activity was ${relativeTime(snapshot.entries[0]?.updatedAt)} ago.`
+            ? `No active queue work right now. Last activity was ${relativeTime(getMostRecentActivityAt(snapshot))} ago.`
             : "No pull requests are queued right now.",
     };
 }
@@ -143,19 +173,23 @@ export function projectStatsSummary(snapshot) {
     if (!snapshot) {
         return "No queue data yet.";
     }
-    const { summary } = snapshot;
+    const latestEntries = getLatestEntries(snapshot);
     const activeEntries = getActiveEntries(snapshot);
     const avgWaitMs = activeEntries.length > 0
         ? activeEntries.reduce((sum, entry) => sum + (Date.now() - new Date(entry.enqueuedAt).getTime()), 0) / activeEntries.length
         : 0;
+    const queued = latestEntries.filter((entry) => entry.status === "queued").length;
+    const validating = latestEntries.filter((entry) => entry.status === "validating" || entry.status === "preparing_head").length;
+    const merging = latestEntries.filter((entry) => entry.status === "merging").length;
+    const evicted = latestEntries.filter((entry) => entry.status === "evicted").length;
     const parts = [
-        `${summary.active} active`,
-        `${summary.queued} waiting`,
-        `${summary.validating} testing`,
-        `${summary.merging} merging`,
+        `${activeEntries.length} active`,
+        `${queued} waiting`,
+        `${validating} testing`,
+        `${merging} merging`,
     ];
-    if (summary.evicted > 0) {
-        parts.push(`${summary.evicted} need repair`);
+    if (evicted > 0) {
+        parts.push(`${evicted} need repair`);
     }
     if (avgWaitMs > 0) {
         parts.push(`avg wait ${formatDuration(avgWaitMs)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merge-steward",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "Serial merge queue for GitHub — rebase, CI-gate, and merge PRs one at a time",
   "type": "module",
   "repository": {