merge-steward 0.13.0 → 0.14.0

package/dist/github/actions-runner.js

@@ -34,19 +34,32 @@ export class GitHubActionsRunner {
                 return "pending";
             const requiredChecks = this.getRequiredChecks();
             const normalizedRequired = requiredChecks.map(normalizeCheckName);
-            const relevant = requiredChecks.length > 0
+            const hasRequired = requiredChecks.length > 0;
+            const relevant = hasRequired
                 ? checkRuns.filter((c) => normalizedRequired.includes(normalizeCheckName(c.name)))
                 : checkRuns;
             if (relevant.length === 0)
                 return "pending";
             if (relevant.some((c) => c.status !== "completed"))
                 return "pending";
-            // REST API returns lowercase conclusions; any non-success completed
-            // check is a failure.  "skipped" is NOT accepted — if a check is
-            // required it must actually execute.  A skipped required check means
-            // the CI workflow doesn't trigger on the spec branch, which would
-            // let untested code through (see: MAF-49 incident).
-            if (relevant.some((c) => c.conclusion !== "success" && c.conclusion !== "neutral"))
+            // REST API returns lowercase conclusions.  For required checks,
+            // "skipped" is rejected — a gate job can report success while the
+            // underlying required job was skipped by a workflow branch filter,
+            // letting untested code through.  When no required checks are
+            // configured, "skipped" is accepted as passing, matching
+            // mapRestConclusion in pr-client.ts — otherwise getMainStatus reports
+            // "fail" whenever main has conditional workflow jobs that are skipped
+            // (e.g. deploy-stage on main), even though listChecksForRef treats
+            // those same checks as success, producing a "main_broken" block with
+            // an empty failing-check list and stalling the queue.
+            const acceptSkipped = !hasRequired;
+            if (relevant.some((c) => {
+                if (c.conclusion === "success" || c.conclusion === "neutral")
+                    return false;
+                if (acceptSkipped && c.conclusion === "skipped")
+                    return false;
+                return true;
+            }))
                 return "fail";
             return "pass";
         }

package/dist/install.js

@@ -9,6 +9,17 @@ function renderTemplate(template, replacements) {
     const home = homedir();
     const user = basename(home);
     const layout = getMergeStewardPathLayout();
+    // When running from source (e.g. during tests or `npm run dev`) the dist/
+    // entrypoint isn't built yet.  Fall back to the PATH-resolved binary so the
+    // systemd template still renders — the ExecStart will need `merge-steward`
+    // on PATH at service start, which is true for any normal install.
+    let cliEntry;
+    try {
+        cliEntry = getBuiltCliEntryPath();
+    }
+    catch {
+        cliEntry = "/usr/bin/env merge-steward";
+    }
     let rendered = template
         .replaceAll("/home/your-user", home)
         .replaceAll("your-user", user)
@@ -19,7 +30,7 @@ function renderTemplate(template, replacements) {
         .replaceAll("/home/your-user/.config/merge-steward/repos", layout.repoConfigDir)
         .replaceAll("/home/your-user/.local/state/merge-steward", layout.stateDir)
         .replaceAll("/home/your-user/.local/share/merge-steward", layout.dataDir)
-        .replaceAll("/usr/bin/env merge-steward", `${getBuiltCliEntryPath()}`);
+        .replaceAll("/usr/bin/env merge-steward", cliEntry);
     if (replacements?.publicBaseUrl) {
         rendered = rendered.replaceAll("https://queue.example.com", replacements.publicBaseUrl);
     }

package/dist/reconciler-merge.js

@@ -47,7 +47,17 @@ export async function mergeHead(ctx, entry) {
     }
     if (ctx.ci.getMainStatus) {
         const mainStatus = await ctx.ci.getMainStatus(ctx.baseBranch);
-        if (mainStatus !== "pass") {
+        if (mainStatus === "pending") {
+            // Main is still verifying itself (typically post-merge CI from the
+            // previous entry).  The spec was built on top of main-as-it-was
+            // (isFF check above guarantees main hasn't diverged) and already
+            // passed CI, so keep the spec + CI state and retry next tick.
+            // Throwing the spec away here would force a rebuild + re-run of
+            // CI that produces the same tree — wasting the speculation.
+            emit(ctx, entry, "merge_waiting_main", { detail: "main checks still pending, holding merge" });
+            return;
+        }
+        if (mainStatus === "fail") {
             try {
                 const refresh = await ctx.policy.refreshOnIssue("main_unhealthy_at_merge");
                 if (refresh.attempted && refresh.changed) {

package/dist/service-runtime.js

@@ -101,7 +101,7 @@ export class MergeStewardRuntime {
                         || event.action === "ci_failed"
                         || event.action === "merge_rejected" || event.action === "budget_exhausted";
                     const isDebug = event.action === "ci_pending" || event.action === "retry_gated"
-                        || event.action === "fetch_started";
+                        || event.action === "fetch_started" || event.action === "merge_waiting_main";
                     const level = isWarn ? "warn" : isDebug ? "debug" : "info";
                     this.logger[level]({ ...event }, `Queue: ${event.action} PR #${event.prNumber}`);
                     if (event.action === "main_broken" && tickQueueBlockEvent === null) {

package/dist/types.d.ts

@@ -190,7 +190,7 @@ export interface QueueConfig {
     flakyRetries: number;
     pollIntervalMs: number;
 }
-export type ReconcileAction = "promoted" | "fetch_started" | "main_broken" | "branch_mismatch" | "spec_build_started" | "spec_build_succeeded" | "spec_build_conflict" | "ci_triggered" | "ci_pending" | "ci_passed" | "ci_failed" | "ci_flaky_retry" | "merge_revalidating" | "merge_succeeded" | "merge_rejected" | "merge_external" | "policy_changed" | "evicted" | "invalidated" | "retry_gated" | "budget_exhausted" | "merge_waiting_approval" | "sanitized_closed" | "sanitized_duplicate" | "post_merge_verification_started" | "post_merge_verification_completed" | "branch_unreachable";
+export type ReconcileAction = "promoted" | "fetch_started" | "main_broken" | "branch_mismatch" | "spec_build_started" | "spec_build_succeeded" | "spec_build_conflict" | "ci_triggered" | "ci_pending" | "ci_passed" | "ci_failed" | "ci_flaky_retry" | "merge_revalidating" | "merge_succeeded" | "merge_rejected" | "merge_external" | "policy_changed" | "evicted" | "invalidated" | "retry_gated" | "budget_exhausted" | "merge_waiting_approval" | "merge_waiting_main" | "sanitized_closed" | "sanitized_duplicate" | "post_merge_verification_started" | "post_merge_verification_completed" | "branch_unreachable";
 export interface ReconcileEvent {
     at: string;
     entryId: string;

package/dist/watch/ProjectDetailView.js

@@ -89,5 +89,5 @@ export function ProjectDetailView({ repo, selectedEntryId, detail, filter, }) {
                         return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: isSelected ? "cyan" : "gray", children: isSelected ? ">" : " " }), _jsx(Text, { bold: true, children: `#${entry.prNumber}` }), entry.issueKey ? _jsx(Text, { children: ` ${entry.issueKey}` }) : null, _jsx(Text, { children: `  ` }), _jsx(Text, { color: ci.color, children: ci.icon }), _jsx(Text, { color: statusColor, children: ` ${statusText}` }), compact ? null : (_jsxs(_Fragment, { children: [_jsx(Text, { dimColor: true, children: `  updated ${relativeTime(entry.updatedAt)} ago` }), isHead ? _jsx(Text, { dimColor: true, children: `  · ${humanStatus(entry.status, entry)} head` }) : null] }))] }), (isSelected || entry.status === "evicted" || (isHead && queueBlockSummary)) && (_jsx(Box, { paddingLeft: 2, children: _jsx(Text, { dimColor: true, children: truncate(describeEntry(entry, { isHead, queueBlockSummary }), compact ? width - 4 : 110) }) }))] }, entry.id));
                     }))] }), selectedEntry ? (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { bold: true, children: `Selected PR #${selectedEntry.prNumber}` }), compact ? (_jsx(Text, { dimColor: true, children: `head ${shortSha(selectedEntry.headSha)} · base ${shortSha(selectedEntry.baseSha)}` })) : (_jsxs(Text, { dimColor: true, children: [selectedEntry.branch, " \u00B7 head ", shortSha(selectedEntry.headSha), " \u00B7 base ", shortSha(selectedEntry.baseSha)] })), compact ? null : _jsx(Text, { dimColor: true, children: `Test branch: ${specChainLabel(selectedEntry, snapshot.entries)}` }), selectedEntry.status === "merged" ? (_jsx(Text, { dimColor: true, children: `Post-merge: ${postMergeStatusLine(selectedEntry)}${selectedEntry.postMergeCheckedAt ? ` · ${relativeTime(selectedEntry.postMergeCheckedAt)} ago` : ""}` })) : null, detail?.incidents.length
                         ? detail.incidents.slice(-2).map((incident) => (_jsxs(Text, { color: "red", children: [relativeTime(incident.at), " ago \u00B7 ", incident.failureClass, " \u00B7 ", incident.outcome] }, incident.id)))
-                        : null] })) : null, _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { bold: true, children: detail ? "Selected PR Activity" : "Recent Project Activity" }), visibleEvents.length === 0 ? (_jsx(Text, { dimColor: true, children: "No queue events yet." })) : (visibleEvents.map((event) => (_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: relativeTime(event.at).padStart(4, " ") }), _jsx(Text, { children: truncate(formatEventNarrative(event), compact ? Math.max(12, width - 8) : 106) })] }, "id" in event && event.id ? String(event.id) : `${event.entryId}-${event.at}`))))] })] }));
+                        : null] })) : null, _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { bold: true, children: detail ? "Selected PR Activity" : "Recent Project Activity" }), visibleEvents.length === 0 ? (_jsx(Text, { dimColor: true, children: "No queue events yet." })) : (visibleEvents.map((event) => (_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: relativeTime(event.at).padStart(4, " ") }), _jsx(Text, { children: truncate(formatEventNarrative(event, selectedEntry ? { prNumber: selectedEntry.prNumber } : {}), compact ? Math.max(12, width - 8) : 106) })] }, "id" in event && event.id ? String(event.id) : `${event.entryId}-${event.at}`))))] })] }));
 }

package/dist/watch/display-filter.js

@@ -1,9 +1,22 @@
 import { TERMINAL_STATUSES } from "../types.js";
 const RECENTLY_COMPLETED_MS = 60_000;
+function isPostMergeUnresolved(entry) {
+    if (entry.status !== "merged")
+        return false;
+    return entry.postMergeStatus === null
+        || entry.postMergeStatus === "pending"
+        || entry.postMergeStatus === "unknown";
+}
 function isActiveFilterVisible(entry, cutoff) {
     if (!TERMINAL_STATUSES.includes(entry.status)) {
         return true;
     }
+    // Keep a merged entry visible until main's own post-merge CI resolves so
+    // the operator can watch the verification land.  Once it's pass/fail we
+    // fall back to the recently-completed window.
+    if (isPostMergeUnresolved(entry)) {
+        return true;
+    }
     return new Date(entry.updatedAt).getTime() > cutoff;
 }
 function isLaterEntry(left, right) {
@@ -50,7 +63,7 @@ export function buildChainEntries(entries) {
         .filter((entry) => {
         const isActive = !TERMINAL_STATUSES.includes(entry.status);
         const isRecent = !isActive && new Date(entry.updatedAt).getTime() > cutoff;
-        return isActive || isRecent;
+        return isActive || isRecent || isPostMergeUnresolved(entry);
     })
         .sort((a, b) => a.position - b.position);
 }

package/dist/watch/format.d.ts

@@ -28,7 +28,9 @@ export declare function specChainLabel(entry: {
 export declare function runtimeLabel(runtime: QueueRuntimeStatus): string;
 export declare function formatEventSummary(event: QueueEventSummary): string;
 export declare function formatEntryEvent(event: QueueEventRecord): string;
-export declare function formatEventNarrative(event: QueueEventRecord | QueueEventSummary): string;
+export declare function formatEventNarrative(event: QueueEventRecord | QueueEventSummary, options?: {
+    prNumber?: number;
+}): string;
 export declare function formatDuration(ms: number): string;
 export declare function progressBar(current: number, total: number, width: number): string;
 export declare function truncate(value: string, width: number): string;

package/dist/watch/format.js

@@ -165,8 +165,10 @@ function withDetail(text, detail) {
     }
     return `${text} ${shortenHashes(detail)}`;
 }
-export function formatEventNarrative(event) {
-    const prPrefix = "prNumber" in event ? `PR #${event.prNumber} ` : "This PR ";
+export function formatEventNarrative(event, options = {}) {
+    const eventPrNumber = "prNumber" in event ? event.prNumber : undefined;
+    const resolvedPr = options.prNumber ?? eventPrNumber;
+    const prPrefix = resolvedPr !== undefined ? `PR #${resolvedPr} ` : "This PR ";
     if (!event.fromStatus && event.toStatus === "queued") {
         return withDetail(`${prPrefix}entered the merge queue.`, event.detail);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merge-steward",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "Serial merge queue for GitHub — rebase, CI-gate, and merge PRs one at a time",
   "type": "module",
   "repository": {
@@ -40,9 +40,9 @@
     "build": "rm -rf dist && tsc -p tsconfig.json && chmod +x dist/index.js",
     "start": "node dist/index.js serve",
     "typecheck": "tsc -p tsconfig.json --noEmit",
-    "test": "node --experimental-transform-types --test test/**/*.test.ts",
-    "test:scenarios": "node --experimental-transform-types --test test/scenarios/*.test.ts",
-    "test:property": "node --experimental-transform-types --test test/property/*.test.ts"
+    "test": "node --experimental-transform-types --test 'test/**/*.test.ts'",
+    "test:scenarios": "node --experimental-transform-types --test 'test/scenarios/*.test.ts'",
+    "test:property": "node --experimental-transform-types --test 'test/property/*.test.ts'"
   },
   "dependencies": {
     "fastify": "^5.8.2",