merge-steward 0.16.2 → 0.17.0

package/dist/cli/commands/queue.js

@@ -37,6 +37,7 @@ async function readQueueSnapshot(config, eventLimit) {
                     baseBranch: config.baseBranch,
                     githubPolicy: {
                         requiredChecks: [],
+                        requireAllChecksOnEmptyRequiredSet: false,
                         fetchedAt: null,
                         lastRefreshReason: null,
                         lastRefreshChanged: null,

package/dist/github/actions-runner.d.ts

@@ -9,7 +9,8 @@ import type { CIStatus } from "../types.ts";
 export declare class GitHubActionsRunner implements CIRunner {
     private readonly repoFullName;
     private readonly getRequiredChecks;
-    constructor(repoFullName: string, getRequiredChecks?: () => string[]);
+    private readonly shouldRequireAllChecksOnEmptyRequiredSet;
+    constructor(repoFullName: string, getRequiredChecks?: () => string[], shouldRequireAllChecksOnEmptyRequiredSet?: () => boolean);
     triggerRun(_branch: string, sha: string): Promise<string>;
     getStatus(runId: string): Promise<CIStatus>;
     cancelRun(_runId: string): Promise<void>;

package/dist/github/actions-runner.js

@@ -11,9 +11,11 @@ function normalizeCheckName(name) {
 export class GitHubActionsRunner {
     repoFullName;
     getRequiredChecks;
-    constructor(repoFullName, getRequiredChecks = () => []) {
+    shouldRequireAllChecksOnEmptyRequiredSet;
+    constructor(repoFullName, getRequiredChecks = () => [], shouldRequireAllChecksOnEmptyRequiredSet = () => false) {
         this.repoFullName = repoFullName;
         this.getRequiredChecks = getRequiredChecks;
+        this.shouldRequireAllChecksOnEmptyRequiredSet = shouldRequireAllChecksOnEmptyRequiredSet;
     }
     async triggerRun(_branch, sha) {
         // CI is triggered by the push. Return the SHA as the poll key.
@@ -35,6 +37,7 @@ export class GitHubActionsRunner {
             const requiredChecks = this.getRequiredChecks();
             const normalizedRequired = requiredChecks.map(normalizeCheckName);
             const hasRequired = requiredChecks.length > 0;
+            const requireAllChecks = !hasRequired && this.shouldRequireAllChecksOnEmptyRequiredSet();
             const relevant = hasRequired
                 ? checkRuns.filter((c) => normalizedRequired.includes(normalizeCheckName(c.name)))
                 : checkRuns;
@@ -52,7 +55,7 @@ export class GitHubActionsRunner {
             // (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;
+            const acceptSkipped = !hasRequired && !requireAllChecks;
             if (relevant.some((c) => {
                 if (c.conclusion === "success" || c.conclusion === "neutral")
                     return false;

package/dist/github-policy.d.ts

@@ -2,6 +2,7 @@ import type { Logger } from "pino";
 import type { DiscoveredRepoSettings } from "./github-repo-discovery.ts";
 export interface GitHubPolicySnapshot {
     requiredChecks: string[];
+    requireAllChecksOnEmptyRequiredSet: boolean;
     fetchedAt: string | null;
     lastRefreshReason: string | null;
     lastRefreshChanged: boolean | null;
@@ -11,12 +12,14 @@ export interface GitHubPolicyRefreshResult {
     changed: boolean;
     previousRequiredChecks: string[];
     requiredChecks: string[];
+    requireAllChecksOnEmptyRequiredSet: boolean;
     fetchedAt: string | null;
     skippedReason?: string | undefined;
 }
 interface GitHubPolicyCacheOptions {
     repoFullName: string;
     initialRequiredChecks: string[];
+    initialRequireAllChecksOnEmptyRequiredSet?: boolean;
     logger: Logger;
     refreshPolicy(): Promise<DiscoveredRepoSettings>;
     issueRefreshCooldownMs?: number;
@@ -24,6 +27,7 @@ interface GitHubPolicyCacheOptions {
 export declare class GitHubPolicyCache {
     private readonly options;
     private requiredChecks;
+    private requireAllChecksOnEmptyRequiredSet;
     private fetchedAt;
     private lastIssueRefreshAt;
     private readonly issueRefreshCooldownMs;
@@ -32,6 +36,7 @@ export declare class GitHubPolicyCache {
     constructor(options: GitHubPolicyCacheOptions);
     getSnapshot(): GitHubPolicySnapshot;
     getRequiredChecks(): string[];
+    shouldRequireAllChecksOnEmptyRequiredSet(): boolean;
     refreshFromWebhook(reason: string): Promise<GitHubPolicyRefreshResult>;
     refreshOnIssue(reason: string): Promise<GitHubPolicyRefreshResult>;
     private refresh;

package/dist/github-policy.js

@@ -11,6 +11,7 @@ function equalChecks(left, right) {
 export class GitHubPolicyCache {
     options;
     requiredChecks;
+    requireAllChecksOnEmptyRequiredSet;
     fetchedAt;
     lastIssueRefreshAt = 0;
     issueRefreshCooldownMs;
@@ -19,12 +20,14 @@ export class GitHubPolicyCache {
     constructor(options) {
         this.options = options;
         this.requiredChecks = normalizeChecks(options.initialRequiredChecks);
+        this.requireAllChecksOnEmptyRequiredSet = options.initialRequireAllChecksOnEmptyRequiredSet ?? false;
         this.fetchedAt = new Date().toISOString();
         this.issueRefreshCooldownMs = options.issueRefreshCooldownMs ?? 5 * 60_000;
     }
     getSnapshot() {
         return {
             requiredChecks: [...this.requiredChecks],
+            requireAllChecksOnEmptyRequiredSet: this.requireAllChecksOnEmptyRequiredSet,
             fetchedAt: this.fetchedAt,
             lastRefreshReason: this.lastRefreshReason,
             lastRefreshChanged: this.lastRefreshChanged,
@@ -33,6 +36,9 @@ export class GitHubPolicyCache {
     getRequiredChecks() {
         return [...this.requiredChecks];
     }
+    shouldRequireAllChecksOnEmptyRequiredSet() {
+        return this.requireAllChecksOnEmptyRequiredSet;
+    }
     async refreshFromWebhook(reason) {
         return await this.refresh(reason, { force: true, issueTriggered: false });
     }
@@ -44,6 +50,7 @@ export class GitHubPolicyCache {
                 changed: false,
                 previousRequiredChecks: [...this.requiredChecks],
                 requiredChecks: [...this.requiredChecks],
+                requireAllChecksOnEmptyRequiredSet: this.requireAllChecksOnEmptyRequiredSet,
                 fetchedAt: this.fetchedAt,
                 skippedReason: "cooldown",
             };
@@ -53,10 +60,13 @@ export class GitHubPolicyCache {
     }
     async refresh(reason, options) {
         const previousRequiredChecks = [...this.requiredChecks];
+        const previousRequireAllChecksOnEmptyRequiredSet = this.requireAllChecksOnEmptyRequiredSet;
         const discovered = await this.options.refreshPolicy();
         const nextRequiredChecks = normalizeChecks(discovered.requiredChecks);
-        const changed = !equalChecks(previousRequiredChecks, nextRequiredChecks);
+        const changed = !equalChecks(previousRequiredChecks, nextRequiredChecks)
+            || previousRequireAllChecksOnEmptyRequiredSet !== discovered.requireAllChecksOnEmptyRequiredSet;
         this.requiredChecks = nextRequiredChecks;
+        this.requireAllChecksOnEmptyRequiredSet = discovered.requireAllChecksOnEmptyRequiredSet;
         this.fetchedAt = new Date().toISOString();
         this.lastRefreshReason = reason;
         this.lastRefreshChanged = changed;
@@ -65,6 +75,7 @@ export class GitHubPolicyCache {
             reason,
             changed,
             requiredChecks: this.requiredChecks,
+            requireAllChecksOnEmptyRequiredSet: this.requireAllChecksOnEmptyRequiredSet,
             policyRefreshSource: options.issueTriggered ? "issue" : (options.force ? "webhook" : "manual"),
         }, "Refreshed GitHub protection policy");
         return {
@@ -72,6 +83,7 @@ export class GitHubPolicyCache {
             changed,
             previousRequiredChecks,
             requiredChecks: [...this.requiredChecks],
+            requireAllChecksOnEmptyRequiredSet: this.requireAllChecksOnEmptyRequiredSet,
             fetchedAt: this.fetchedAt,
         };
     }

package/dist/github-repo-discovery.d.ts

@@ -3,6 +3,7 @@ export interface DiscoveredRepoSettings {
     defaultBranch: string;
     branch: string;
     requiredChecks: string[];
+    requireAllChecksOnEmptyRequiredSet: boolean;
     warnings: string[];
 }
 export declare function discoverRepoSettings(credentials: GitHubAppCredentials, repoFullName: string, options?: {

package/dist/github-repo-discovery.js

@@ -94,14 +94,20 @@ export async function discoverRepoSettings(credentials, repoFullName, options) {
     const { requiredChecks: ruleChecks, warnings } = normalizeRequiredChecks(parseRulesResponse(rulesResponse));
     const protection = await fetchGitHubJsonOptional(`https://api.github.com/repos/${encodedRepo}/branches/${encodeURIComponent(branch)}/protection`, token);
     const protectionChecks = extractProtectionChecks(protection);
+    const requireAllChecksOnEmptyRequiredSet = (ruleChecks.length === 0
+        && protectionChecks.length === 0
+        && Boolean(protection?.required_status_checks));
     const requiredChecks = [...new Set([...ruleChecks, ...protectionChecks])].sort((left, right) => left.localeCompare(right));
     if (requiredChecks.length === 0) {
-        warnings.push(`No required status checks discovered for ${branch}; Steward will treat any green check as sufficient until GitHub branch protection declares explicit required checks.`);
+        warnings.push(requireAllChecksOnEmptyRequiredSet
+            ? `GitHub requires status checks on ${branch} but does not expose explicit contexts; Steward will require all observed checks on the ref to pass until branch protection declares named required checks.`
+            : `No required status checks discovered for ${branch}; Steward will treat any green check as sufficient until GitHub branch protection declares explicit required checks.`);
     }
     return {
         defaultBranch,
         branch,
         requiredChecks,
+        requireAllChecksOnEmptyRequiredSet,
         warnings,
     };
 }

package/dist/reconciler-post-merge.js

@@ -7,7 +7,7 @@ function joinItems(items) {
     }
     return items.slice(0, 5).join(", ");
 }
-function evaluateChecks(requiredChecks, checks) {
+function evaluateChecks(requiredChecks, requireAllChecksOnEmptyRequiredSet, checks) {
     const isPassingConclusion = (conclusion) => conclusion === "success";
     if (requiredChecks.length > 0) {
         const byName = new Map(checks.map((check) => [normalizeCheckName(check.name), check]));
@@ -43,7 +43,10 @@ function evaluateChecks(requiredChecks, checks) {
     const pending = checks.filter((check) => check.conclusion === "pending").map((check) => check.name);
     const failed = checks.filter((check) => !isPassingConclusion(check.conclusion)).map((check) => check.name);
     if (checks.length === 0) {
-        return { postMergeStatus: "unknown", summary: "no checks found yet" };
+        return {
+            postMergeStatus: requireAllChecksOnEmptyRequiredSet ? "pending" : "unknown",
+            summary: requireAllChecksOnEmptyRequiredSet ? "checks required but none found yet" : "no checks found yet",
+        };
     }
     if (failed.length > 0) {
         return {
@@ -57,11 +60,15 @@ function evaluateChecks(requiredChecks, checks) {
             summary: pending.length === 1 ? `check pending: ${pending[0]}` : `checks pending: ${joinItems(pending)}`,
         };
     }
-    return { postMergeStatus: "pass", summary: "all checks passed" };
+    return {
+        postMergeStatus: "pass",
+        summary: requireAllChecksOnEmptyRequiredSet ? "all observed checks passed" : "all checks passed",
+    };
 }
 export async function verifyPostMergeStatus(ctx, entry) {
     const postMergeSha = entry.postMergeSha ?? entry.specSha ?? entry.headSha;
     const requiredChecks = ctx.policy.getRequiredChecks();
+    const requireAllChecksOnEmptyRequiredSet = ctx.policy.shouldRequireAllChecksOnEmptyRequiredSet();
     if (!postMergeSha) {
         return {
             postMergeStatus: "unknown",
@@ -76,7 +83,7 @@ export async function verifyPostMergeStatus(ctx, entry) {
     catch {
         checks = [];
     }
-    const evaluation = evaluateChecks(requiredChecks, checks);
+    const evaluation = evaluateChecks(requiredChecks, requireAllChecksOnEmptyRequiredSet, checks);
     return {
         postMergeStatus: evaluation.postMergeStatus,
         postMergeSummary: evaluation.summary,

package/dist/server.js

@@ -27,7 +27,7 @@ async function createRepoInstance(config, policy, logger, botIdentity) {
         git.setBotIdentity(botIdentity);
     if (config.autoResolvePatterns.length > 0)
         git.setAutoResolvePatterns(config.autoResolvePatterns);
-    const ci = new GitHubActionsRunner(config.repoFullName, () => policy.getRequiredChecks());
+    const ci = new GitHubActionsRunner(config.repoFullName, () => policy.getRequiredChecks(), () => policy.shouldRequireAllChecksOnEmptyRequiredSet());
     const github = new GitHubPRClient(config.repoFullName);
     const eviction = new GitHubCheckRunReporter(config.repoFullName, config.server.bind, config.server.port, config.server.publicBaseUrl, config.admissionLabel, config.mergeQueueCheckName);
     const service = new MergeStewardService(config, policy, store, git, ci, github, eviction, git, logger);
@@ -220,10 +220,11 @@ export async function startMultiServer() {
         try {
             const discovery = githubAuth.mode === "app"
                 ? await discoverRepoSettings(githubAuth.credentials, config.repoFullName, { baseBranch: config.baseBranch })
-                : { defaultBranch: config.baseBranch, branch: config.baseBranch, requiredChecks: [], warnings: [] };
+                : { defaultBranch: config.baseBranch, branch: config.baseBranch, requiredChecks: [], requireAllChecksOnEmptyRequiredSet: false, warnings: [] };
             const policy = new GitHubPolicyCache({
                 repoFullName: config.repoFullName,
                 initialRequiredChecks: discovery.requiredChecks,
+                initialRequireAllChecksOnEmptyRequiredSet: discovery.requireAllChecksOnEmptyRequiredSet,
                 logger: logger.child({ repoId: config.repoId, component: "github-policy" }),
                 refreshPolicy: async () => {
                     if (githubAuth.mode !== "app") {
@@ -231,6 +232,7 @@ export async function startMultiServer() {
                             defaultBranch: config.baseBranch,
                             branch: config.baseBranch,
                             requiredChecks: [],
+                            requireAllChecksOnEmptyRequiredSet: false,
                             warnings: [],
                         };
                     }
@@ -243,6 +245,7 @@ export async function startMultiServer() {
                 repoId: config.repoId,
                 repoFullName: config.repoFullName,
                 githubRequiredChecks: policy.getRequiredChecks(),
+                requireAllChecksOnEmptyRequiredSet: policy.shouldRequireAllChecksOnEmptyRequiredSet(),
             }, "Resolved GitHub protection requirements");
             const instance = await createRepoInstance(config, policy, logger.child({ repoId: config.repoId }), botIdentity);
             if (shuttingDown) {

package/dist/service-queue.js

@@ -138,6 +138,21 @@ export class MergeStewardQueueCommands {
                     return false;
                 }
             }
+            else if (this.policy.shouldRequireAllChecksOnEmptyRequiredSet()) {
+                if (checks.length === 0) {
+                    this.logger.debug({ prNumber }, "GitHub requires checks but none are visible yet, skipping admission");
+                    return false;
+                }
+                const hasPending = checks.some((check) => check.conclusion === "pending");
+                const hasFailures = checks.some((check) => check.conclusion === "failure");
+                if (hasPending || hasFailures) {
+                    this.logger.debug({
+                        prNumber,
+                        checkNames: checks.map((check) => `${check.name}:${check.conclusion}`),
+                    }, "GitHub requires all observed checks to pass before admission");
+                    return false;
+                }
+            }
             else {
                 const nonSteward = checks.filter((c) => !c.name.startsWith("merge-steward"));
                 const hasGreen = nonSteward.some((c) => c.conclusion === "success");

package/dist/types.d.ts

@@ -144,6 +144,7 @@ export interface QueueBlockState {
 }
 export interface GitHubPolicyState {
     requiredChecks: string[];
+    requireAllChecksOnEmptyRequiredSet: boolean;
     fetchedAt: string | null;
     lastRefreshReason: string | null;
     lastRefreshChanged: boolean | null;

package/dist/watch/OverviewView.d.ts

@@ -10,5 +10,9 @@ export declare function RepoRow({ repo, selected, showCursor, width, }: {
     showCursor: boolean;
     width: number;
 }): React.JSX.Element;
+export declare function pickVisibleWindow(total: number, selectedIndex: number, availableRows: number): {
+    start: number;
+    end: number;
+};
 export declare function OverviewView({ model, selectedRepoId, showCursor }: ListViewProps): React.JSX.Element;
 export {};

package/dist/watch/OverviewView.js

@@ -24,25 +24,42 @@ export function RepoRow({ repo, selected, showCursor, width, }) {
         : repo.repoFullName.padEnd(repoLabelWidth, " ");
     return (_jsxs(Box, { children: [_jsx(Text, { color: selected ? "cyan" : "gray", children: cursorChar }), _jsx(Text, { bold: selected, children: ` ${repoLabel}  ` }), repo.offlineMessage ? (_jsx(Text, { color: "red", children: repo.offlineMessage })) : (_jsx(RepoTokens, { tokens: repo.tokens, width: tokenWidth }))] }));
 }
+export function pickVisibleWindow(total, selectedIndex, availableRows) {
+    if (total === 0)
+        return { start: 0, end: 0 };
+    if (total <= availableRows)
+        return { start: 0, end: total };
+    const clamped = Math.max(0, Math.min(selectedIndex, total - 1));
+    let start = clamped;
+    let end = clamped + 1;
+    while (end - start < availableRows) {
+        if (start > 0 && (end === total || clamped - start <= end - 1 - clamped)) {
+            start -= 1;
+        }
+        else if (end < total) {
+            end += 1;
+        }
+        else {
+            break;
+        }
+    }
+    return { start, end };
+}
 export function OverviewView({ model, selectedRepoId, showCursor }) {
     const { stdout } = useStdout();
     const rows = Math.max(3, stdout?.rows ?? 24);
     const width = Math.max(40, stdout?.columns ?? 80);
     const availableRows = Math.max(1, rows - 3);
-    const selectedIndex = model.repos.findIndex((repo) => repo.repoId === selectedRepoId);
-    const selected = selectedIndex >= 0 ? model.repos[selectedIndex] : model.repos[0];
-    const others = model.repos.filter((repo) => repo !== selected);
-    const ordered = [];
-    if (selected)
-        ordered.push(selected);
-    ordered.push(...others);
-    const quietLine = model.quietCount > 0 ? 1 : 0;
-    const maxRepoLines = Math.max(1, availableRows - quietLine);
-    const visible = ordered.slice(0, maxRepoLines);
-    const hiddenActive = ordered.length - visible.length;
-    const quietFooter = model.quietCount + hiddenActive;
+    const selectedIndex = Math.max(0, model.repos.findIndex((repo) => repo.repoId === selectedRepoId));
+    const quietReserve = model.repos.length > availableRows && model.quietCount > 0 ? 1 : 0;
+    const windowRows = Math.max(1, availableRows - quietReserve);
+    const { start, end } = pickVisibleWindow(model.repos.length, selectedIndex, windowRows);
+    const visible = model.repos.slice(start, end);
+    const hiddenQuiet = model.repos
+        .filter((repo, index) => !repo.hasActivity && repo.offlineMessage === null && (index < start || index >= end))
+        .length;
     if (visible.length === 0) {
         return _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: " " }) });
     }
-    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [visible.map((repo) => (_jsx(RepoRow, { repo: repo, selected: repo === selected, showCursor: showCursor, width: width - 2 }, repo.repoId))), quietFooter > 0 ? (_jsx(Box, { paddingLeft: 2, children: _jsx(Text, { dimColor: true, children: `+${quietFooter} quiet` }) })) : null] }));
+    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [visible.map((repo) => (_jsx(RepoRow, { repo: repo, selected: repo.repoId === selectedRepoId, showCursor: showCursor, width: width - 2 }, repo.repoId))), hiddenQuiet > 0 ? (_jsx(Box, { paddingLeft: 2, children: _jsx(Text, { dimColor: true, children: `+${hiddenQuiet} quiet` }) })) : null] }));
 }

package/dist/watch/dashboard-model.js

@@ -197,22 +197,25 @@ export function buildDashboard(repos, opts = {}) {
             offlineMessage: null,
         };
     });
-    const active = mapped.filter((repo) => repo.hasActivity || repo.offlineMessage);
-    active.sort((left, right) => {
+    mapped.sort((left, right) => {
         if (left.offlineMessage !== null && right.offlineMessage === null)
             return 1;
         if (right.offlineMessage !== null && left.offlineMessage === null)
             return -1;
-        const leftHasActive = left.entries.some((entry) => entry.kind === "running" || entry.kind === "queued");
-        const rightHasActive = right.entries.some((entry) => entry.kind === "running" || entry.kind === "queued");
-        if (leftHasActive !== rightHasActive)
-            return leftHasActive ? -1 : 1;
+        const leftVisible = left.hasActivity || left.offlineMessage !== null;
+        const rightVisible = right.hasActivity || right.offlineMessage !== null;
+        if (leftVisible !== rightVisible)
+            return leftVisible ? -1 : 1;
+        const leftActive = left.entries.some((entry) => entry.kind === "running" || entry.kind === "queued");
+        const rightActive = right.entries.some((entry) => entry.kind === "running" || entry.kind === "queued");
+        if (leftActive !== rightActive)
+            return leftActive ? -1 : 1;
         if (left.latestActivityAt !== right.latestActivityAt)
             return right.latestActivityAt - left.latestActivityAt;
         return left.repoFullName.localeCompare(right.repoFullName);
     });
-    const quietCount = mapped.length - active.length;
-    return { repos: active, quietCount };
+    const quietCount = mapped.filter((repo) => !repo.hasActivity && repo.offlineMessage === null).length;
+    return { repos: mapped, quietCount };
 }
 export function clipSummary(summary, opts = {}) {
     if (!summary)

package/package.json

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