merge-steward 0.30.0 → 0.30.1

package/dist/cli/commands/pr-status.d.ts

@@ -4,6 +4,19 @@ import { type ResolveCommandRunner } from "../resolve.ts";
 import { type PrGitHubOverview } from "./pr-github.ts";
 export type PrStatusKind = "merged" | "merged_outside_queue" | "queued" | "preparing_head" | "validating" | "merging" | "evicted" | "dequeued" | "closed" | "changes_requested" | "checks_failing" | "checks_pending" | "approved_clean" | "not_queued";
 export type PrStatusSource = "queue" | "github";
+/**
+ * Live position of an entry among the entries actually still in the queue,
+ * ordered the way the reconciler processes them (priority DESC, position
+ * ASC). This is what an operator means by "where am I in line" — unlike the
+ * raw `position`, which is a lifetime admission counter that only ever
+ * grows (every PR ever queued bumps it), so a value like 290 reads as "289
+ * ahead" when in reality only a couple of entries are active.
+ */
+export interface QueueActiveRank {
+    rank: number;
+    activeTotal: number;
+}
+export declare function computeActiveRank(entries: QueueEntry[], target: QueueEntry): QueueActiveRank | undefined;
 export interface PrStatusReport {
     repoId: string;
     repoFullName: string;
@@ -15,6 +28,7 @@ export interface PrStatusReport {
     reason?: string;
     queueEntry?: QueueEntry;
     queueSource?: "service" | "database";
+    queueActiveRank?: QueueActiveRank;
     queueRuntime?: QueueRuntimeStatus;
     queueLatestEvent?: QueueEventSummary;
     github?: PrGitHubOverview;
@@ -32,6 +46,7 @@ export interface BuildReportOptions {
     prNumber: number;
     queueEntry?: QueueEntry | undefined;
     queueSource?: "service" | "database" | undefined;
+    queueActiveRank?: QueueActiveRank | undefined;
     queueRuntime?: QueueRuntimeStatus | undefined;
     queueLatestEvent?: QueueEventSummary | undefined;
     github?: PrGitHubOverview | undefined;

package/dist/cli/commands/pr-status.js

@@ -5,6 +5,18 @@ import { defaultResolveRunner, resolvePrNumber, resolveRepo } from "../resolve.j
 import { parseIntegerFlag } from "../args.js";
 import { fetchPrGitHubOverview } from "./pr-github.js";
 import { formatRuntimeActivity } from "../../runtime-format.js";
+const TERMINAL_QUEUE_STATUSES = new Set(["merged", "evicted", "dequeued"]);
+export function computeActiveRank(entries, target) {
+    if (TERMINAL_QUEUE_STATUSES.has(target.status))
+        return undefined;
+    const active = entries
+        .filter((entry) => !TERMINAL_QUEUE_STATUSES.has(entry.status))
+        .sort((a, b) => (b.priority - a.priority) || (a.position - b.position));
+    const index = active.findIndex((entry) => entry.id === target.id);
+    if (index < 0)
+        return undefined;
+    return { rank: index + 1, activeTotal: active.length };
+}
 export function classifyQueueEntry(entry) {
     switch (entry.status) {
         case "merged": return "merged";
@@ -85,11 +97,13 @@ async function loadQueueEntry(config, prNumber) {
         if (!entry)
             return { kind: "not_found" };
         const latestEvent = latestEventForPr(snapshot, prNumber);
+        const activeRank = computeActiveRank(snapshot.entries, entry);
         return {
             kind: "found",
             entry,
             source: "service",
             runtime: snapshot.runtime,
+            ...(activeRank ? { activeRank } : {}),
             ...(latestEvent ? { latestEvent } : {}),
         };
     }
@@ -99,7 +113,8 @@ async function loadQueueEntry(config, prNumber) {
         }
         const store = new SqliteStore(config.database.path);
         try {
-            const entries = store.listAll(config.repoId).filter((entry) => entry.prNumber === prNumber);
+            const all = store.listAll(config.repoId);
+            const entries = all.filter((entry) => entry.prNumber === prNumber);
             if (entries.length === 0)
                 return { kind: "not_found" };
             entries.sort((left, right) => {
@@ -109,7 +124,9 @@ async function loadQueueEntry(config, prNumber) {
                     return leftTerminal - rightTerminal;
                 return right.position - left.position;
             });
-            return { kind: "found", entry: entries[0], source: "database" };
+            const entry = entries[0];
+            const activeRank = computeActiveRank(all, entry);
+            return { kind: "found", entry, source: "database", ...(activeRank ? { activeRank } : {}) };
         }
         finally {
             store.close();
@@ -138,6 +155,7 @@ export function buildPrStatusReport(options) {
             exitCode: exitCodeForKind(kind),
             queueEntry: options.queueEntry,
             ...(options.queueSource ? { queueSource: options.queueSource } : {}),
+            ...(options.queueActiveRank ? { queueActiveRank: options.queueActiveRank } : {}),
             ...(options.queueRuntime ? { queueRuntime: options.queueRuntime } : {}),
             ...(options.queueLatestEvent ? { queueLatestEvent: options.queueLatestEvent } : {}),
             checkedAt,
@@ -172,7 +190,12 @@ export function formatReportText(report) {
         lines.push(`Reason: ${report.reason}`);
     if (report.queueEntry) {
         const entry = report.queueEntry;
-        lines.push(`Queue position: ${entry.position}`);
+        // Show live rank among active entries — NOT the raw `position`, which is
+        // a lifetime admission counter and reads as a huge phantom backlog.
+        if (report.queueActiveRank) {
+            const { rank, activeTotal } = report.queueActiveRank;
+            lines.push(`Queue position: ${rank} of ${activeTotal} active`);
+        }
         lines.push(`Branch: ${entry.branch}`);
         lines.push(`Head SHA: ${entry.headSha}`);
         if (entry.waitDetail)
@@ -260,6 +283,7 @@ export async function handlePrStatus(options) {
                 prNumber: resolvedPr.prNumber,
                 queueEntry: queueResult.entry,
                 queueSource: queueResult.source,
+                ...(queueResult.activeRank ? { queueActiveRank: queueResult.activeRank } : {}),
                 ...(queueResult.runtime ? { queueRuntime: queueResult.runtime } : {}),
                 ...(queueResult.latestEvent ? { queueLatestEvent: queueResult.latestEvent } : {}),
             });

package/package.json

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