merge-steward 0.31.0 → 0.32.1

package/dist/db/schema.js

@@ -29,6 +29,7 @@ export function ensureSchema(connection) {
       post_merge_sha TEXT,
       post_merge_summary TEXT,
       post_merge_checked_at TEXT,
+      decided_at TEXT,
       enqueued_at TEXT NOT NULL,
       updated_at TEXT NOT NULL
     )
@@ -81,11 +82,20 @@ export function ensureSchema(connection) {
     // Plan §5.3: cached identity for patch-id-aware updateHead.
     ensureColumn(connection, "queue_entries", "head_patch_id", "TEXT");
     ensureColumn(connection, "queue_entries", "spec_tree_id", "TEXT");
+    ensureColumn(connection, "queue_entries", "decided_at", "TEXT");
     connection.exec(`
     UPDATE queue_entries
        SET post_merge_status = 'pending'
      WHERE status = 'merged'
        AND post_merge_status IS NULL
+  `);
+    // Backfill decided_at for already-terminal rows so historic entries show a
+    // sensible duration/age; updated_at is the best estimate we have for them.
+    connection.exec(`
+    UPDATE queue_entries
+       SET decided_at = updated_at
+     WHERE decided_at IS NULL
+       AND status IN ('merged', 'evicted', 'dequeued')
   `);
     // Must match TERMINAL_STATUSES in types.ts: merged, evicted, dequeued
     connection.exec(`

package/dist/db/sqlite-store.js

@@ -33,6 +33,7 @@ function mapEntry(row) {
         baseRefName: row.base_ref_name === null || row.base_ref_name === undefined ? null : String(row.base_ref_name),
         headPatchId: row.head_patch_id === null || row.head_patch_id === undefined ? null : String(row.head_patch_id),
         specTreeId: row.spec_tree_id === null || row.spec_tree_id === undefined ? null : String(row.spec_tree_id),
+        decidedAt: row.decided_at === null || row.decided_at === undefined ? null : String(row.decided_at),
         enqueuedAt: String(row.enqueued_at),
         updatedAt: String(row.updated_at),
     };
@@ -136,20 +137,27 @@ export class SqliteStore {
           priority, generation, ci_run_id, ci_retries, retry_attempts,
           max_retries, last_failed_base_sha, issue_key, wait_detail,
           post_merge_status, post_merge_sha, post_merge_summary, post_merge_checked_at,
-          pr_title, base_ref_name,
+          pr_title, base_ref_name, decided_at,
           enqueued_at, updated_at)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(entry.id, entry.repoId, entry.prNumber, entry.branch, entry.headSha, entry.baseSha, entry.status, entry.position, entry.priority, entry.generation, entry.ciRunId, entry.ciRetries, entry.retryAttempts, entry.maxRetries, entry.lastFailedBaseSha, entry.issueKey ?? null, entry.waitDetail ?? null, entry.postMergeStatus ?? null, entry.postMergeSha ?? null, entry.postMergeSummary ?? null, entry.postMergeCheckedAt ?? null, entry.prTitle ?? null, entry.baseRefName ?? null, entry.enqueuedAt, entry.updatedAt);
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(entry.id, entry.repoId, entry.prNumber, entry.branch, entry.headSha, entry.baseSha, entry.status, entry.position, entry.priority, entry.generation, entry.ciRunId, entry.ciRetries, entry.retryAttempts, entry.maxRetries, entry.lastFailedBaseSha, entry.issueKey ?? null, entry.waitDetail ?? null, entry.postMergeStatus ?? null, entry.postMergeSha ?? null, entry.postMergeSummary ?? null, entry.postMergeCheckedAt ?? null, entry.prTitle ?? null, entry.baseRefName ?? null, entry.decidedAt ?? null, entry.enqueuedAt, entry.updatedAt);
             this.writeEvent(entry.id, null, entry.status);
         })();
     }
     transition(entryId, to, patch, detail) {
         this.conn.transaction(() => {
-            const current = this.conn.prepare("SELECT status FROM queue_entries WHERE id = ?").get(entryId);
+            const current = this.conn.prepare("SELECT status, decided_at FROM queue_entries WHERE id = ?").get(entryId);
             if (!current)
                 return;
             const from = String(current.status);
+            const now = isoNow();
             const sets = ["status = ?", "updated_at = ?"];
-            const values = [to, isoNow()];
+            const values = [to, now];
+            // Stamp decidedAt the first time the entry becomes terminal; never move it
+            // afterward (post-merge re-verification keeps transitioning to 'merged').
+            if (TERMINAL_STATUSES.includes(to) && (current.decided_at === null || current.decided_at === undefined)) {
+                sets.push("decided_at = ?");
+                values.push(now);
+            }
             if (patch?.headSha !== undefined) {
                 sets.push("head_sha = ?");
                 values.push(patch.headSha);

package/dist/github/pr-client.js

@@ -132,19 +132,15 @@ export class GitHubPRClient {
     }
     async listLabels(prNumber) {
         const result = await exec("gh", [
-            "pr", "view", String(prNumber),
-            "--repo", this.repoFullName,
-            "--json", "labels",
+            "api",
+            `repos/${this.repoFullName}/issues/${prNumber}/labels`,
+            "--paginate",
+            "--jq", ".[].name",
         ], { allowNonZero: true, githubRepoFullName: this.repoFullName });
-        if (result.exitCode !== 0)
-            return [];
-        try {
-            const data = JSON.parse(result.stdout);
-            return data.labels.map((l) => l.name);
-        }
-        catch {
-            return [];
+        if (result.exitCode !== 0) {
+            throw new Error(`Failed to list labels for PR #${prNumber}: ${result.stderr.trim() || `exit ${result.exitCode}`}`);
         }
+        return result.stdout.split(/\r?\n/).map((label) => label.trim()).filter(Boolean);
     }
     async setLabels(prNumber, opts) {
         const args = ["pr", "edit", String(prNumber), "--repo", this.repoFullName];
@@ -155,7 +151,10 @@ export class GitHubPRClient {
         // Nothing to change beyond the base args — skip the call.
         if (args.length === 5)
             return;
-        await exec("gh", args, { allowNonZero: true, githubRepoFullName: this.repoFullName });
+        const result = await exec("gh", args, { allowNonZero: true, githubRepoFullName: this.repoFullName });
+        if (result.exitCode !== 0) {
+            throw new Error(`Failed to edit labels for PR #${prNumber}: ${result.stderr.trim() || `exit ${result.exitCode}`}`);
+        }
     }
 }
 /** Map GitHub REST API check-run status/conclusion to our union. */

package/dist/service-queue.js

@@ -67,6 +67,7 @@ export class MergeStewardQueueCommands {
             specTreeId: null,
             prTitle: params.prTitle ?? null,
             baseRefName: params.baseRefName ?? null,
+            decidedAt: null,
             enqueuedAt: new Date().toISOString(),
             updatedAt: new Date().toISOString(),
         };
@@ -145,7 +146,13 @@ export class MergeStewardQueueCommands {
                 this.logger.debug({ prNumber, reviewDecision: status.reviewDecision }, "PR review gate is not satisfied, skipping admission");
                 return false;
             }
-            const labels = await this.github.listLabels(prNumber);
+            let labels = [];
+            try {
+                labels = await this.github.listLabels(prNumber);
+            }
+            catch (error) {
+                this.logger.debug({ prNumber, err: error }, "Could not read labels for priority detection; continuing without priority label");
+            }
             const priority = labels.includes(this.config.priorityQueueLabel) ? 1 : 0;
             const checks = await this.github.listChecks(prNumber);
             const requiredChecks = this.policy.getRequiredChecks();

package/dist/types.d.ts

@@ -74,6 +74,14 @@ export interface QueueEntry {
     specTreeId: string | null;
     enqueuedAt: string;
     updatedAt: string;
+    /**
+     * Set once, when the entry first reaches a terminal status
+     * (merged/evicted/dequeued), and never bumped afterward — unlike
+     * updatedAt, which post-merge re-verification keeps moving. Lets the
+     * dashboard report an accurate "how long it took" (decidedAt - enqueuedAt)
+     * and "how long ago" (now - decidedAt). Null while still in flight.
+     */
+    decidedAt: string | null;
 }
 export type FailureClass = "main_broken" | "branch_local" | "integration_conflict" | "policy_blocked";
 export type CheckConclusion = "success" | "failure" | "pending";

package/dist/watch/ProjectDetailView.js

@@ -2,11 +2,17 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text, useStdout } from "ink";
 import { RepoRow } from "./OverviewView.js";
 import { clipSummary } from "./dashboard-model.js";
-import { formatTokenAge } from "./format.js";
+import { relativeTime } from "./format.js";
+import { formatDurationMs } from "../runtime-format.js";
 const PR_ID_WIDTH = 7;
 const PR_PHRASE_WIDTH = 20;
 const SUMMARY_INDENT = 9;
-const AGE_WIDTH = 4;
+const TIMING_WIDTH = 22;
+// "took 7m · 3m ago" for a finished entry; "running 12m" while in flight.
+function timingLabel(entry) {
+    const duration = formatDurationMs(entry.durationMs);
+    return entry.recencyAt != null ? `took ${duration} · ${relativeTime(entry.recencyAt)} ago` : `running ${duration}`;
+}
 function truncate(value, maxWidth) {
     if (value.length <= maxWidth)
         return value;
@@ -38,12 +44,12 @@ export function buildContentLines(repo, width) {
 function EntryHeaderRow({ entry, width }) {
     const idText = `#${entry.prNumber}`.padEnd(PR_ID_WIDTH, " ");
     const paddedPhrase = entry.phrase.padEnd(PR_PHRASE_WIDTH, " ");
-    const age = formatTokenAge(entry.eventAt);
-    const titleSpace = Math.max(0, width - (PR_ID_WIDTH + 3 + PR_PHRASE_WIDTH + 3 + AGE_WIDTH));
+    const timing = timingLabel(entry).padEnd(TIMING_WIDTH, " ");
+    const titleSpace = Math.max(0, width - (PR_ID_WIDTH + 3 + PR_PHRASE_WIDTH + 3 + TIMING_WIDTH));
     const title = entry.title && entry.title !== entry.phrase && titleSpace >= 8
         ? truncate(entry.title, titleSpace)
         : "";
-    return (_jsxs(Box, { children: [_jsx(Text, { color: entry.color, children: idText }), _jsx(Text, { color: entry.color, children: entry.glyph }), _jsx(Text, { children: `  ${paddedPhrase}` }), _jsx(Text, { dimColor: true, children: `  ${age}` }), title ? _jsx(Text, { dimColor: true, children: `  ${title}` }) : null] }));
+    return (_jsxs(Box, { children: [_jsx(Text, { color: entry.color, children: idText }), _jsx(Text, { color: entry.color, children: entry.glyph }), _jsx(Text, { children: `  ${paddedPhrase}` }), _jsx(Text, { dimColor: true, children: `  ${timing}` }), title ? _jsx(Text, { dimColor: true, children: `  ${title}` }) : null] }));
 }
 function renderLine(line, key, width) {
     if (line.kind === "blank")

package/dist/watch/dashboard-model.d.ts

@@ -26,6 +26,10 @@ export interface DashboardToken {
     active: boolean;
     /** PR number this entry's speculative spec is stacked on, when that parent is still active. */
     stackedOnPr: number | null;
+    /** How long the queue processing took: enqueue -> decided (terminal) or enqueue -> now (active). */
+    durationMs: number;
+    /** Completion instant (decidedAt) the views age against; null while in flight. */
+    recencyAt: number | null;
 }
 export interface DashboardPrEntry extends DashboardToken {
     phrase: string;

package/dist/watch/dashboard-model.js

@@ -121,7 +121,7 @@ function overrideKind(kind, override) {
         return "error";
     return kind;
 }
-function repoEntriesFromSnapshot(snapshot, cutoff) {
+function repoEntriesFromSnapshot(snapshot, cutoff, now) {
     const latest = pickLatestPerPR(snapshot.entries);
     const head = latest
         .filter((entry) => isActive(entry.status))
@@ -149,16 +149,24 @@ function repoEntriesFromSnapshot(snapshot, cutoff) {
         const phrase = entryPhrase(entry, { isHead, queueBlocked });
         const parent = entry.specBasedOn ? idToEntry.get(entry.specBasedOn) ?? null : null;
         const stackedOnPr = parent && isActive(parent.status) ? parent.prNumber : null;
+        // decidedAt is the terminal-transition time (never bumped by post-merge
+        // re-checks). Duration = enqueue -> decided (or -> now while in flight);
+        // recencyAt = the completion instant the views age against.
+        const enqueuedAt = timestamp(entry.enqueuedAt);
+        const decidedAt = active ? null : timestamp(entry.decidedAt) || timestamp(entry.updatedAt);
+        const durationMs = Math.max(0, (decidedAt ?? now) - enqueuedAt);
         const item = {
             prNumber: entry.prNumber,
             glyph,
             color,
             kind,
             phrase,
-            eventAt: timestamp(entry.updatedAt),
+            eventAt: decidedAt ?? timestamp(entry.updatedAt),
             position: entry.position,
             active,
             stackedOnPr,
+            durationMs,
+            recencyAt: decidedAt,
         };
         const summary = entrySummary(entry);
         if (summary)
@@ -209,12 +217,12 @@ export function buildDashboard(repos, opts = {}) {
                 offlineMessage: message,
             };
         }
-        const entries = repoEntriesFromSnapshot(snapshot, cutoff);
+        const entries = repoEntriesFromSnapshot(snapshot, cutoff, now);
         const latestActivityAt = entries.reduce((max, entry) => Math.max(max, entry.eventAt), 0);
         return {
             repoId: repo.repoId,
             repoFullName: repo.repoFullName,
-            tokens: entries.map(({ prNumber, glyph, color, kind, eventAt, position, active, stackedOnPr }) => ({ prNumber, glyph, color, kind, eventAt, position, active, stackedOnPr })),
+            tokens: entries.map(({ prNumber, glyph, color, kind, eventAt, position, active, stackedOnPr, durationMs, recencyAt }) => ({ prNumber, glyph, color, kind, eventAt, position, active, stackedOnPr, durationMs, recencyAt })),
             entries,
             latestActivityAt,
             hasActivity: entries.length > 0,

package/dist/watch/format.d.ts

@@ -12,6 +12,8 @@ export declare function formatRepoTokenText(token: {
     glyph: string;
     eventAt: number;
     stackedOnPr?: number | null;
+    durationMs?: number | null;
+    recencyAt?: number | null;
 }): string;
 export declare function mergeWaitState(entry: {
     status: QueueEntryStatus;

package/dist/watch/format.js

@@ -1,3 +1,4 @@
+import { formatDurationMs } from "../runtime-format.js";
 const QUEUE_SYMBOLS = {
     inProgress: "\u25cf",
     checkPassed: "\u2713",
@@ -52,7 +53,12 @@ export function formatRepoTokenText(token) {
     // A leading connector marks an entry whose spec is speculatively stacked on
     // the PR shown just before it, so the queue order reads as a stack.
     const stackMark = token.stackedOnPr != null ? "↳" : "";
-    return `${stackMark}#${token.prNumber} ${token.glyph} ${relativeTime(token.eventAt)}`;
+    // Two times: how long it took (duration) and, for finished entries, how long
+    // ago it finished (recency), joined as "took·ago" e.g. "7m·3m". In-flight
+    // entries show only the running duration.
+    const duration = token.durationMs != null ? formatDurationMs(token.durationMs) : relativeTime(token.eventAt);
+    const timing = token.recencyAt != null ? `${duration}·${relativeTime(token.recencyAt)}` : duration;
+    return `${stackMark}#${token.prNumber} ${token.glyph} ${timing}`;
 }
 export function mergeWaitState(entry) {
     if (!entry || entry.status !== "merging" || !entry.waitDetail) {

package/package.json

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