merge-steward 0.19.2 → 0.21.0

package/dist/config.d.ts

@@ -28,6 +28,7 @@ export declare const stewardConfigSchema: z.ZodObject<{
         }>>;
     }, z.core.$strip>>;
     admissionLabel: z.ZodDefault<z.ZodString>;
+    priorityQueueLabel: z.ZodDefault<z.ZodString>;
     mergeQueueCheckName: z.ZodDefault<z.ZodString>;
     excludeBranches: z.ZodDefault<z.ZodArray<z.ZodString>>;
     autoResolvePatterns: z.ZodDefault<z.ZodArray<z.ZodObject<{

package/dist/config.js

@@ -29,6 +29,7 @@ export const stewardConfigSchema = z.object({
         level: z.enum(["debug", "info", "warn", "error"]).default("info"),
     }).default({ level: "info" }),
     admissionLabel: z.string().default("queue"),
+    priorityQueueLabel: z.string().default("queue:priority"),
     mergeQueueCheckName: z.string().default(DEFAULT_MERGE_QUEUE_CHECK_NAME),
     /** Branch name patterns to exclude from admission (glob-style). */
     excludeBranches: z.array(z.string()).default([]),

package/dist/db/sqlite-store.js

@@ -95,7 +95,7 @@ export class SqliteStore {
     getHead(repoId) {
         const row = this.conn.prepare(`SELECT * FROM queue_entries
        WHERE repo_id = ? AND status NOT IN (${NOT_TERMINAL_SQL})
-       ORDER BY position ASC LIMIT 1`).get(repoId, ...TERMINAL_STATUSES);
+       ORDER BY priority DESC, position ASC LIMIT 1`).get(repoId, ...TERMINAL_STATUSES);
         return row ? mapEntry(row) : undefined;
     }
     getEntry(entryId) {
@@ -105,18 +105,18 @@ export class SqliteStore {
     getEntryByPR(repoId, prNumber) {
         const row = this.conn.prepare(`SELECT * FROM queue_entries
        WHERE repo_id = ? AND pr_number = ? AND status NOT IN (${NOT_TERMINAL_SQL})
-       ORDER BY position ASC
+       ORDER BY priority DESC, position ASC
        LIMIT 1`).get(repoId, prNumber, ...TERMINAL_STATUSES);
         return row ? mapEntry(row) : undefined;
     }
     listActive(repoId) {
         const rows = this.conn.prepare(`SELECT * FROM queue_entries
        WHERE repo_id = ? AND status NOT IN (${NOT_TERMINAL_SQL})
-       ORDER BY position ASC`).all(repoId, ...TERMINAL_STATUSES);
+       ORDER BY priority DESC, position ASC`).all(repoId, ...TERMINAL_STATUSES);
         return rows.map(mapEntry);
     }
     listAll(repoId) {
-        const rows = this.conn.prepare("SELECT * FROM queue_entries WHERE repo_id = ? ORDER BY position ASC").all(repoId);
+        const rows = this.conn.prepare("SELECT * FROM queue_entries WHERE repo_id = ? ORDER BY priority DESC, position ASC").all(repoId);
         return rows.map(mapEntry);
     }
     insert(entry) {

package/dist/http-multi.js

@@ -116,6 +116,7 @@ export async function buildMultiRepoHttpServer(options) {
         }
         await processWebhookEvent(event, record.instance.service, {
             admissionLabel: record.config.admissionLabel,
+            priorityQueueLabel: record.config.priorityQueueLabel,
             baseBranch: record.config.baseBranch,
             repoFullName: record.config.repoFullName,
             github: record.instance.service.githubApi,

package/dist/invalidation.d.ts

@@ -9,5 +9,5 @@ export declare const INVALIDATION_PATCH: {
     readonly retryAttempts: 0;
     readonly lastFailedBaseSha: null;
 };
-/** Select non-terminal entries after `afterPosition` from a position-sorted list. */
-export declare function selectDownstream(allActive: QueueEntry[], afterPosition: number): QueueEntry[];
+/** Select non-terminal entries after `entryId` from an already ordered active queue list. */
+export declare function selectDownstream(allActive: QueueEntry[], entryId: string): QueueEntry[];

package/dist/invalidation.js

@@ -9,7 +9,10 @@ export const INVALIDATION_PATCH = {
     retryAttempts: 0,
     lastFailedBaseSha: null,
 };
-/** Select non-terminal entries after `afterPosition` from a position-sorted list. */
-export function selectDownstream(allActive, afterPosition) {
-    return allActive.filter((e) => e.position > afterPosition && !TERMINAL_STATUSES.includes(e.status));
+/** Select non-terminal entries after `entryId` from an already ordered active queue list. */
+export function selectDownstream(allActive, entryId) {
+    const index = allActive.findIndex((entry) => entry.id === entryId);
+    if (index < 0)
+        return [];
+    return allActive.slice(index + 1).filter((entry) => !TERMINAL_STATUSES.includes(entry.status));
 }

package/dist/reconciler-evict.js

@@ -10,7 +10,7 @@ export async function cleanupSpec(ctx, entry) {
     }
 }
 export async function invalidateDownstream(ctx, allActive, afterIndex) {
-    const targets = selectDownstream(allActive, allActive[afterIndex].position);
+    const targets = selectDownstream(allActive, allActive[afterIndex].id);
     for (const downstream of targets) {
         emit(ctx, downstream, "invalidated", { detail: `base changed after position ${afterIndex}` });
         await cleanupSpec(ctx, downstream);

package/dist/reconciler-merge.js

@@ -46,7 +46,7 @@ export async function mergeHead(ctx, entry) {
     catch {
         // Can't verify — proceed and let push fail if needed.
     }
-    if (ctx.ci.getMainStatus) {
+    if (ctx.ci.getMainStatus && entry.priority <= 0) {
         const mainStatus = await ctx.ci.getMainStatus(ctx.baseBranch);
         if (mainStatus === "pending") {
             // Main is still verifying itself (typically post-merge CI from the

package/dist/reconciler-prepare.js

@@ -44,7 +44,8 @@ export async function prepareEntry(ctx, entry, isHead, prevEntry) {
         return;
     }
     if (isHead) {
-        if (ctx.ci.getMainStatus) {
+        const bypassMainBlock = entry.priority > 0;
+        if (ctx.ci.getMainStatus && !bypassMainBlock) {
             const mainStatus = await ctx.ci.getMainStatus(ctx.baseBranch);
             if (mainStatus !== "pass") {
                 let mainChecks = [];

package/dist/service-queue.js

@@ -79,6 +79,9 @@ export class MergeStewardQueueCommands {
             throw error;
         }
         this.logger.info({ prNumber: params.prNumber, entryId: entry.id }, "PR enqueued");
+        if (entry.priority > 0) {
+            this.invalidateDownstreamOf(entry);
+        }
         return entry;
     }
     async scanStartupAdmissions() {
@@ -123,6 +126,8 @@ 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);
+            const priority = labels.includes(this.config.priorityQueueLabel) ? 1 : 0;
             const checks = await this.github.listChecks(prNumber);
             const requiredChecks = this.policy.getRequiredChecks();
             if (requiredChecks.length > 0) {
@@ -162,7 +167,13 @@ export class MergeStewardQueueCommands {
                     return false;
                 }
             }
-            this.enqueue({ prNumber, branch, headSha, ...(status.title ? { prTitle: status.title } : {}) });
+            this.enqueue({
+                prNumber,
+                branch,
+                headSha,
+                priority,
+                ...(status.title ? { prTitle: status.title } : {}),
+            });
             return true;
         }
         catch (error) {
@@ -204,7 +215,7 @@ export class MergeStewardQueueCommands {
     }
     invalidateDownstreamOf(removedEntry) {
         const allActive = this.store.listActive(this.config.repoId);
-        const targets = selectDownstream(allActive, removedEntry.position);
+        const targets = selectDownstream(allActive, removedEntry.id);
         for (const downstream of targets) {
             if (downstream.specBranch) {
                 this.specBuilder.deleteSpeculative(downstream.specBranch).catch(() => { });

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/dist/webhook-handler.d.ts

@@ -60,6 +60,7 @@ export declare function normalizeWebhook(eventType: string, payload: Record<stri
  */
 export declare function processWebhookEvent(event: StewardWebhookEvent, service: MergeStewardService, config: {
     admissionLabel: string;
+    priorityQueueLabel: string;
     baseBranch: string;
     repoFullName: string;
     github?: GitHubPRApi;

package/dist/webhook-handler.js

@@ -107,9 +107,9 @@ export function normalizeWebhook(eventType, payload) {
 export async function processWebhookEvent(event, service, config, logger) {
     switch (event.type) {
         case "pr_labeled": {
-            if (event.label !== config.admissionLabel)
+            if (event.label !== config.admissionLabel && event.label !== config.priorityQueueLabel)
                 return;
-            logger.info({ prNumber: event.prNumber }, "Admission label added, checking eligibility");
+            logger.info({ prNumber: event.prNumber, label: event.label }, "Queue label added, checking eligibility");
             await service.tryAdmit(event.prNumber, event.branch, event.headSha);
             break;
         }

package/package.json

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