merge-steward 0.19.2 → 0.20.0

package/dist/watch/OverviewView.js

@@ -1,12 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text, useStdout } from "ink";
+import { formatRepoTokenText } from "./format.js";
 function RepoTokens({ tokens, width }) {
     if (tokens.length === 0 || width < 6)
         return null;
     const parts = [];
     let used = 0;
     for (const token of tokens) {
-        const text = `#${token.prNumber} ${token.glyph}`;
+        const text = formatRepoTokenText(token);
         const separatorWidth = parts.length === 0 ? 0 : 2;
         if (used + separatorWidth + text.length > width)
             break;

package/dist/watch/ProjectDetailView.js

@@ -2,9 +2,11 @@ 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";
 const PR_ID_WIDTH = 7;
 const PR_PHRASE_WIDTH = 20;
 const SUMMARY_INDENT = 9;
+const AGE_WIDTH = 4;
 function truncate(value, maxWidth) {
     if (value.length <= maxWidth)
         return value;
@@ -33,11 +35,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 titleSpace = Math.max(0, width - (PR_ID_WIDTH + 3 + PR_PHRASE_WIDTH + 1));
+    const age = formatTokenAge(entry.eventAt);
+    const titleSpace = Math.max(0, width - (PR_ID_WIDTH + 3 + PR_PHRASE_WIDTH + 3 + AGE_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}` }), 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: `  ${age}` }), title ? _jsx(Text, { dimColor: true, children: `  ${title}` }) : null] }));
 }
 function renderLine(line, key, width) {
     if (line.kind === "blank")

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

@@ -19,6 +19,7 @@ export interface DashboardToken {
     glyph: string;
     color: DashboardTokenColor;
     kind: DashboardTokenKind;
+    eventAt: number;
 }
 export interface DashboardPrEntry extends DashboardToken {
     phrase: string;

package/dist/watch/dashboard-model.js

@@ -193,7 +193,7 @@ export function buildDashboard(repos, opts = {}) {
         return {
             repoId: repo.repoId,
             repoFullName: repo.repoFullName,
-            tokens: entries.map(({ prNumber, glyph, color, kind }) => ({ prNumber, glyph, color, kind })),
+            tokens: entries.map(({ prNumber, glyph, color, kind, eventAt }) => ({ prNumber, glyph, color, kind, eventAt })),
             entries,
             latestActivityAt,
             hasActivity: entries.length > 0,

package/dist/watch/format.d.ts

@@ -1,7 +1,13 @@
 import type { CheckResult, PostMergeStatus, QueueBlockState, QueueEntryStatus, QueueEventRecord, QueueEventSummary, QueueRuntimeStatus } from "../types.ts";
 export declare function isPendingMainVerification(block: QueueBlockState | null | undefined): boolean;
 export declare function shortSha(value: string | null | undefined): string;
-export declare function relativeTime(iso: string | null | undefined): string;
+export declare function relativeTime(iso: string | number | null | undefined): string;
+export declare function formatTokenAge(eventAt: number): string;
+export declare function formatRepoTokenText(token: {
+    prNumber: number;
+    glyph: string;
+    eventAt: number;
+}): string;
 export declare function mergeWaitState(entry: {
     status: QueueEntryStatus;
     waitDetail?: string | null | undefined;

package/dist/watch/format.js

@@ -21,7 +21,8 @@ export function relativeTime(iso) {
     if (!iso) {
         return "-";
     }
-    const seconds = Math.max(0, Math.floor((Date.now() - new Date(iso).getTime()) / 1000));
+    const timestamp = typeof iso === "number" ? iso : new Date(iso).getTime();
+    const seconds = Math.max(0, Math.floor((Date.now() - timestamp) / 1000));
     if (seconds < 5)
         return "now";
     if (seconds < 60)
@@ -35,6 +36,12 @@ export function relativeTime(iso) {
     const days = Math.floor(hours / 24);
     return `${days}d`;
 }
+export function formatTokenAge(eventAt) {
+    return relativeTime(eventAt).padStart(4, " ");
+}
+export function formatRepoTokenText(token) {
+    return `#${token.prNumber} ${token.glyph} ${relativeTime(token.eventAt)}`;
+}
 export function mergeWaitState(entry) {
     if (!entry || entry.status !== "merging" || !entry.waitDetail) {
         return null;

package/package.json

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