merge-steward 0.17.0 → 0.18.0

package/dist/db/schema.js

@@ -75,6 +75,7 @@ export function ensureSchema(connection) {
     ensureColumn(connection, "queue_entries", "post_merge_summary", "TEXT");
     ensureColumn(connection, "queue_entries", "post_merge_checked_at", "TEXT");
     ensureColumn(connection, "queue_entries", "wait_detail", "TEXT");
+    ensureColumn(connection, "queue_entries", "pr_title", "TEXT");
     connection.exec(`
     UPDATE queue_entries
        SET post_merge_status = 'pending'

package/dist/db/sqlite-store.js

@@ -29,6 +29,7 @@ function mapEntry(row) {
         postMergeSha: row.post_merge_sha === null || row.post_merge_sha === undefined ? null : String(row.post_merge_sha),
         postMergeSummary: row.post_merge_summary === null || row.post_merge_summary === undefined ? null : String(row.post_merge_summary),
         postMergeCheckedAt: row.post_merge_checked_at === null || row.post_merge_checked_at === undefined ? null : String(row.post_merge_checked_at),
+        prTitle: row.pr_title === null || row.pr_title === undefined ? null : String(row.pr_title),
         enqueuedAt: String(row.enqueued_at),
         updatedAt: String(row.updated_at),
     };
@@ -125,8 +126,9 @@ 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,
           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.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.enqueuedAt, entry.updatedAt);
             this.writeEvent(entry.id, null, entry.status);
         })();
     }

package/dist/github/actions-runner.js

@@ -55,7 +55,14 @@ 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 && !requireAllChecks;
+            // Accept "skipped" whenever there are no named required checks,
+            // including strict-protection-with-empty-contexts mode. A skipped
+            // job is an `if:` or `on:` gate by the workflow author declaring
+            // the job does not apply here; it is not a failure. The bypass
+            // concern (a gate job reporting success while a required job was
+            // skipped) only matters when we have a named required-check set
+            // to gate against, i.e. `hasRequired === true`.
+            const acceptSkipped = !hasRequired;
             if (relevant.some((c) => {
                 if (c.conclusion === "success" || c.conclusion === "neutral")
                     return false;

package/dist/github/pr-client.js

@@ -24,13 +24,14 @@ export class GitHubPRClient {
         const result = await exec("gh", [
             "pr", "view", String(prNumber),
             "--repo", this.repoFullName,
-            "--json", "number,headRefName,headRefOid,reviewDecision,state,mergeStateStatus",
+            "--json", "number,title,headRefName,headRefOid,reviewDecision,state,mergeStateStatus",
         ], { githubRepoFullName: this.repoFullName });
         const data = JSON.parse(result.stdout);
         return {
             number: data.number,
             branch: data.headRefName,
             headSha: data.headRefOid,
+            ...(data.title ? { title: data.title } : {}),
             mergeable: data.state === "OPEN",
             mergeStateStatus: data.mergeStateStatus,
             reviewDecision: data.reviewDecision,

package/dist/service-queue.d.ts

@@ -18,6 +18,7 @@ export declare class MergeStewardQueueCommands {
         headSha: string;
         issueKey?: string;
         priority?: number;
+        prTitle?: string;
     }): QueueEntry | undefined;
     scanStartupAdmissions(): Promise<void>;
     scanEligibleOpenPrs(): Promise<{

package/dist/service-queue.js

@@ -63,6 +63,7 @@ export class MergeStewardQueueCommands {
             postMergeSha: null,
             postMergeSummary: null,
             postMergeCheckedAt: null,
+            prTitle: params.prTitle ?? null,
             enqueuedAt: new Date().toISOString(),
             updatedAt: new Date().toISOString(),
         };
@@ -161,7 +162,7 @@ export class MergeStewardQueueCommands {
                     return false;
                 }
             }
-            this.enqueue({ prNumber, branch, headSha });
+            this.enqueue({ prNumber, branch, headSha, ...(status.title ? { prTitle: status.title } : {}) });
             return true;
         }
         catch (error) {

package/dist/types.d.ts

@@ -42,6 +42,8 @@ export interface QueueEntry {
     waitDetail?: string | null;
     /** Post-merge verification status for the landed commit on main. */
     postMergeStatus: PostMergeStatus | null;
+    /** PR title captured at admission. Falls back to branch name in the UI. */
+    prTitle?: string | null;
     /** Commit SHA used when checking post-merge status. */
     postMergeSha: string | null;
     /** Optional one-line summary of post-merge checks. */
@@ -180,6 +182,7 @@ export interface PRStatus {
     number: number;
     branch: string;
     headSha: string;
+    title?: string | undefined;
     mergeable: boolean;
     mergeStateStatus?: string | undefined;
     reviewDecision?: string | undefined;

package/dist/watch/ProjectDetailView.js

@@ -3,13 +3,26 @@ import { Box, Text, useStdout } from "ink";
 import { RepoRow } from "./OverviewView.js";
 import { clipSummary } from "./dashboard-model.js";
 const PR_ID_WIDTH = 7;
+const PR_PHRASE_WIDTH = 20;
 const SUMMARY_INDENT = 9;
 function PrEntryRow({ entry, width, includeSummary, }) {
     const idText = `#${entry.prNumber}`.padEnd(PR_ID_WIDTH, " ");
+    const paddedPhrase = entry.phrase.padEnd(PR_PHRASE_WIDTH, " ");
     const summaryText = includeSummary
         ? clipSummary(entry.summary, { maxLines: 3, width: Math.max(20, width - SUMMARY_INDENT) })
         : "";
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: entry.color, children: idText }), _jsx(Text, { color: entry.color, children: entry.glyph }), _jsx(Text, { children: `  ${entry.phrase}` })] }), summaryText ? (_jsxs(Box, { children: [_jsx(Text, { children: " ".repeat(SUMMARY_INDENT) }), _jsx(Text, { dimColor: true, children: summaryText })] })) : null] }));
+    const titleSpace = Math.max(0, width - (PR_ID_WIDTH + 3 + PR_PHRASE_WIDTH + 1));
+    const title = entry.title && entry.title !== entry.phrase && titleSpace >= 8
+        ? truncate(entry.title, titleSpace)
+        : "";
+    return (_jsxs(Box, { flexDirection: "column", children: [_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] }), summaryText ? (_jsxs(Box, { children: [_jsx(Text, { children: " ".repeat(SUMMARY_INDENT) }), _jsx(Text, { dimColor: true, children: summaryText })] })) : null] }));
+}
+function truncate(value, maxWidth) {
+    if (value.length <= maxWidth)
+        return value;
+    if (maxWidth <= 1)
+        return value.slice(0, maxWidth);
+    return `${value.slice(0, Math.max(0, maxWidth - 1))}\u2026`;
 }
 export function ProjectDetailView({ model, selectedRepoId }) {
     const { stdout } = useStdout();

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

@@ -23,6 +23,7 @@ export interface DashboardToken {
 export interface DashboardPrEntry extends DashboardToken {
     phrase: string;
     summary?: string;
+    title?: string;
     eventAt: number;
 }
 export interface DashboardRepo {

package/dist/watch/dashboard-model.js

@@ -151,6 +151,9 @@ function repoEntriesFromSnapshot(snapshot, cutoff) {
         const summary = entrySummary(entry);
         if (summary)
             item.summary = summary;
+        const title = entry.prTitle?.trim() || entry.branch;
+        if (title)
+            item.title = title;
         byPr.set(entry.prNumber, item);
     }
     return [...byPr.values()].sort((left, right) => {

package/package.json

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