merge-steward 0.12.0 → 0.13.0

package/dist/db/schema.js

@@ -24,6 +24,10 @@ export function ensureSchema(connection) {
       spec_branch TEXT,
       spec_sha TEXT,
       spec_based_on TEXT,
+      post_merge_status TEXT,
+      post_merge_sha TEXT,
+      post_merge_summary TEXT,
+      post_merge_checked_at TEXT,
       enqueued_at TEXT NOT NULL,
       updated_at TEXT NOT NULL
     )
@@ -64,6 +68,16 @@ export function ensureSchema(connection) {
     connection.exec(`
     CREATE INDEX IF NOT EXISTS idx_queue_events_entry
       ON queue_events(entry_id, id)
+  `);
+    ensureColumn(connection, "queue_entries", "post_merge_status", "TEXT");
+    ensureColumn(connection, "queue_entries", "post_merge_sha", "TEXT");
+    ensureColumn(connection, "queue_entries", "post_merge_summary", "TEXT");
+    ensureColumn(connection, "queue_entries", "post_merge_checked_at", "TEXT");
+    connection.exec(`
+    UPDATE queue_entries
+       SET post_merge_status = 'pending'
+     WHERE status = 'merged'
+       AND post_merge_status IS NULL
   `);
     // Must match TERMINAL_STATUSES in types.ts: merged, evicted, dequeued
     connection.exec(`
@@ -72,3 +86,18 @@ export function ensureSchema(connection) {
       WHERE status NOT IN ('merged', 'evicted', 'dequeued')
   `);
 }
+function hasColumn(connection, table, column) {
+    const rows = connection.prepare(`PRAGMA table_info(${table})`).all();
+    for (const row of rows) {
+        if (String(row.name) === column) {
+            return true;
+        }
+    }
+    return false;
+}
+function ensureColumn(connection, table, column, type) {
+    if (hasColumn(connection, table, column)) {
+        return;
+    }
+    connection.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${type}`);
+}

package/dist/db/sqlite-store.d.ts

@@ -12,7 +12,7 @@ export declare class SqliteStore implements QueueStore {
     listActive(repoId: string): QueueEntry[];
     listAll(repoId: string): QueueEntry[];
     insert(entry: QueueEntry): void;
-    transition(entryId: string, to: QueueEntryStatus, patch?: Partial<Pick<QueueEntry, "headSha" | "baseSha" | "ciRunId" | "ciRetries" | "retryAttempts" | "lastFailedBaseSha" | "specBranch" | "specSha" | "specBasedOn">>, detail?: string): void;
+    transition(entryId: string, to: QueueEntryStatus, patch?: Partial<Pick<QueueEntry, "headSha" | "baseSha" | "ciRunId" | "ciRetries" | "retryAttempts" | "lastFailedBaseSha" | "specBranch" | "specSha" | "specBasedOn" | "postMergeStatus" | "postMergeSha" | "postMergeSummary" | "postMergeCheckedAt">>, detail?: string): void;
     dequeue(entryId: string): void;
     updateHead(entryId: string, newHeadSha: string): void;
     insertIncident(incident: IncidentRecord): void;

package/dist/db/sqlite-store.js

@@ -22,6 +22,12 @@ function mapEntry(row) {
         specBranch: row.spec_branch === null || row.spec_branch === undefined ? null : String(row.spec_branch),
         specSha: row.spec_sha === null || row.spec_sha === undefined ? null : String(row.spec_sha),
         specBasedOn: row.spec_based_on === null || row.spec_based_on === undefined ? null : String(row.spec_based_on),
+        postMergeStatus: row.post_merge_status === null || row.post_merge_status === undefined
+            ? null
+            : String(row.post_merge_status),
+        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),
         enqueuedAt: String(row.enqueued_at),
         updatedAt: String(row.updated_at),
     };
@@ -116,8 +122,10 @@ export class SqliteStore {
             this.conn.prepare(`INSERT INTO queue_entries
          (id, repo_id, pr_number, branch, head_sha, base_sha, status, position,
           priority, generation, ci_run_id, ci_retries, retry_attempts,
-          max_retries, last_failed_base_sha, issue_key, 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, entry.enqueuedAt, entry.updatedAt);
+          max_retries, last_failed_base_sha, issue_key,
+          post_merge_status, post_merge_sha, post_merge_summary, post_merge_checked_at,
+          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.postMergeStatus ?? null, entry.postMergeSha ?? null, entry.postMergeSummary ?? null, entry.postMergeCheckedAt ?? null, entry.enqueuedAt, entry.updatedAt);
             this.writeEvent(entry.id, null, entry.status);
         })();
     }
@@ -165,6 +173,22 @@ export class SqliteStore {
                 sets.push("spec_based_on = ?");
                 values.push(patch.specBasedOn);
             }
+            if (patch?.postMergeStatus !== undefined) {
+                sets.push("post_merge_status = ?");
+                values.push(patch.postMergeStatus);
+            }
+            if (patch?.postMergeSha !== undefined) {
+                sets.push("post_merge_sha = ?");
+                values.push(patch.postMergeSha);
+            }
+            if (patch?.postMergeSummary !== undefined) {
+                sets.push("post_merge_summary = ?");
+                values.push(patch.postMergeSummary);
+            }
+            if (patch?.postMergeCheckedAt !== undefined) {
+                sets.push("post_merge_checked_at = ?");
+                values.push(patch.postMergeCheckedAt);
+            }
             this.conn.prepare(`UPDATE queue_entries SET ${sets.join(", ")} WHERE id = ?`).run(...values, entryId);
             this.writeEvent(entryId, from, to, detail);
         })();
@@ -186,6 +210,7 @@ export class SqliteStore {
           ci_run_id = NULL, ci_retries = 0, retry_attempts = 0,
           last_failed_base_sha = NULL,
           spec_branch = NULL, spec_sha = NULL, spec_based_on = NULL,
+          post_merge_status = NULL, post_merge_sha = NULL, post_merge_summary = NULL, post_merge_checked_at = NULL,
           updated_at = ?
          WHERE id = ?`).run(newHeadSha, newGen, isoNow(), entryId);
             this.writeEvent(entryId, from, "queued", `updateHead: generation ${newGen}`);

package/dist/reconciler-merge.js

@@ -1,5 +1,6 @@
 import { CLEAN_CI, CLEAN_SPEC, emit, isBudgetExhausted, ref } from "./reconciler-core.js";
 import { cleanupSpec, evictEntry, invalidateDownstream } from "./reconciler-evict.js";
+import { verifyPostMergeStatus } from "./reconciler-post-merge.js";
 export async function mergeHead(ctx, entry) {
     emit(ctx, entry, "merge_revalidating");
     const prStatus = await ctx.github.getStatus(entry.prNumber);
@@ -99,7 +100,17 @@ export async function mergeHead(ctx, entry) {
         return;
     }
     emit(ctx, entry, "merge_succeeded");
-    ctx.store.transition(entry.id, "merged", CLEAN_SPEC, "spec pushed to main");
+    const verificationResult = await verifyPostMergeStatus(ctx, {
+        ...entry,
+        postMergeSha: entry.specSha ?? entry.headSha,
+    });
+    ctx.store.transition(entry.id, "merged", {
+        ...CLEAN_SPEC,
+        postMergeStatus: verificationResult.postMergeStatus,
+        postMergeSha: verificationResult.postMergeSha,
+        postMergeSummary: verificationResult.postMergeSummary,
+        postMergeCheckedAt: new Date().toISOString(),
+    }, `spec pushed to main; ${verificationResult.postMergeSummary}`);
     await cleanupSpec(ctx, entry);
     try {
         await ctx.github.deleteBranch(entry.prNumber);

package/dist/reconciler-post-merge.d.ts

@@ -0,0 +1,8 @@
+import type { PostMergeStatus, QueueEntry } from "./types.ts";
+import type { ReconcileContext } from "./reconciler-core.ts";
+export interface PostMergeVerificationResult {
+    postMergeStatus: PostMergeStatus;
+    postMergeSummary: string;
+    postMergeSha: string;
+}
+export declare function verifyPostMergeStatus(ctx: ReconcileContext, entry: QueueEntry): Promise<PostMergeVerificationResult>;

package/dist/reconciler-post-merge.js

@@ -0,0 +1,85 @@
+function normalizeCheckName(name) {
+    return name.trim().toLowerCase();
+}
+function joinItems(items) {
+    if (items.length === 0) {
+        return "";
+    }
+    return items.slice(0, 5).join(", ");
+}
+function evaluateChecks(requiredChecks, checks) {
+    const isPassingConclusion = (conclusion) => conclusion === "success";
+    if (requiredChecks.length > 0) {
+        const byName = new Map(checks.map((check) => [normalizeCheckName(check.name), check]));
+        const failed = [];
+        const pending = [];
+        for (const required of requiredChecks) {
+            const check = byName.get(normalizeCheckName(required));
+            if (!check) {
+                pending.push(required);
+                continue;
+            }
+            if (check.conclusion === "pending") {
+                pending.push(check.name);
+            }
+            else if (!isPassingConclusion(check.conclusion)) {
+                failed.push(check.name);
+            }
+        }
+        if (failed.length > 0) {
+            return {
+                postMergeStatus: "fail",
+                summary: failed.length === 1 ? `check failed: ${failed[0]}` : `checks failed: ${joinItems(failed)}`,
+            };
+        }
+        if (pending.length > 0) {
+            return {
+                postMergeStatus: "pending",
+                summary: pending.length === 1 ? `check pending: ${pending[0]}` : `checks pending: ${joinItems(pending)}`,
+            };
+        }
+        return { postMergeStatus: "pass", summary: "all required checks passed" };
+    }
+    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" };
+    }
+    if (failed.length > 0) {
+        return {
+            postMergeStatus: "fail",
+            summary: failed.length === 1 ? `check failed: ${failed[0]}` : `checks failed: ${joinItems(failed)}`,
+        };
+    }
+    if (pending.length > 0) {
+        return {
+            postMergeStatus: "pending",
+            summary: pending.length === 1 ? `check pending: ${pending[0]}` : `checks pending: ${joinItems(pending)}`,
+        };
+    }
+    return { postMergeStatus: "pass", summary: "all checks passed" };
+}
+export async function verifyPostMergeStatus(ctx, entry) {
+    const postMergeSha = entry.postMergeSha ?? entry.specSha ?? entry.headSha;
+    const requiredChecks = ctx.policy.getRequiredChecks();
+    if (!postMergeSha) {
+        return {
+            postMergeStatus: "unknown",
+            postMergeSummary: "post-merge SHA is unknown",
+            postMergeSha: entry.headSha,
+        };
+    }
+    let checks;
+    try {
+        checks = await ctx.github.listChecksForRef(postMergeSha);
+    }
+    catch {
+        checks = [];
+    }
+    const evaluation = evaluateChecks(requiredChecks, checks);
+    return {
+        postMergeStatus: evaluation.postMergeStatus,
+        postMergeSummary: evaluation.summary,
+        postMergeSha,
+    };
+}

package/dist/reconciler-sanitize.js

@@ -1,5 +1,6 @@
 import { CLEAN_SPEC, emit } from "./reconciler-core.js";
 import { cleanupSpec } from "./reconciler-evict.js";
+import { verifyPostMergeStatus } from "./reconciler-post-merge.js";
 export async function sanitizeEntry(ctx, entry) {
     const canonical = ctx.store.getEntryByPR(ctx.repoId, entry.prNumber);
     if (canonical && canonical.id !== entry.id) {
@@ -13,11 +14,21 @@ export async function sanitizeEntry(ctx, entry) {
     try {
         const prStatus = await ctx.github.getStatus(entry.prNumber);
         if (prStatus.merged) {
+            const verification = await verifyPostMergeStatus(ctx, {
+                ...entry,
+                postMergeSha: entry.headSha,
+            });
             emit(ctx, entry, "merge_external", {
                 detail: `PR #${entry.prNumber} already merged on GitHub (detected in sanitize)`,
             });
             await cleanupSpec(ctx, entry);
-            ctx.store.transition(entry.id, "merged", CLEAN_SPEC, "merged externally (sanitize)");
+            ctx.store.transition(entry.id, "merged", {
+                ...CLEAN_SPEC,
+                postMergeStatus: verification.postMergeStatus,
+                postMergeSha: verification.postMergeSha,
+                postMergeSummary: verification.postMergeSummary,
+                postMergeCheckedAt: new Date().toISOString(),
+            }, "merged externally (sanitize)");
             return true;
         }
         if (!prStatus.mergeable && !prStatus.merged) {

package/dist/reconciler.js

@@ -6,6 +6,7 @@ import { checkValidation } from "./reconciler-validate.js";
 import { mergeHead } from "./reconciler-merge.js";
 import { cleanupSpec } from "./reconciler-evict.js";
 import { INVALIDATION_PATCH } from "./invalidation.js";
+import { verifyPostMergeStatus } from "./reconciler-post-merge.js";
 // ─── Main reconcile loop ────────────────────────────────────────
 export async function reconcile(ctx) {
     const allActive = ctx.store.listActive(ctx.repoId);
@@ -74,5 +75,42 @@ export async function reconcile(ctx) {
             throw wrapped;
         }
     }
+    await verifyMergedEntriesPostPush(ctx);
+}
+async function verifyMergedEntriesPostPush(ctx) {
+    const mergedEntries = ctx.store.listAll(ctx.repoId).filter((entry) => entry.status === "merged");
+    for (const entry of mergedEntries) {
+        if (entry.postMergeStatus === "pass" || entry.postMergeStatus === "fail")
+            continue;
+        const postMergeSha = entry.postMergeSha ?? entry.specSha ?? entry.headSha;
+        if (!postMergeSha) {
+            continue;
+        }
+        emit(ctx, entry, "post_merge_verification_started", {
+            detail: `post-merge check on ${postMergeSha.slice(0, 8)}`,
+        });
+        const verification = await verifyPostMergeStatus(ctx, entry);
+        emit(ctx, entry, "post_merge_verification_completed", {
+            detail: `post-merge checks ${verification.postMergeStatus}: ${verification.postMergeSummary}`,
+        });
+        const now = new Date().toISOString();
+        const previousStatus = entry.postMergeStatus ?? "pending";
+        if (previousStatus !== verification.postMergeStatus
+            || entry.postMergeSummary !== verification.postMergeSummary
+            || entry.postMergeCheckedAt === null
+            || entry.postMergeCheckedAt === undefined) {
+            ctx.store.transition(entry.id, "merged", {
+                postMergeStatus: verification.postMergeStatus,
+                postMergeSha: verification.postMergeSha,
+                postMergeSummary: verification.postMergeSummary,
+                postMergeCheckedAt: now,
+            }, `post-merge verification: ${verification.postMergeStatus}`);
+        }
+        else {
+            ctx.store.transition(entry.id, "merged", {
+                postMergeCheckedAt: now,
+            }, "post-merge verification");
+        }
+    }
 }
 // phase implementations live in dedicated modules now

package/dist/service-queue.js

@@ -48,6 +48,10 @@ export class MergeStewardQueueCommands {
             specBranch: null,
             specSha: null,
             specBasedOn: null,
+            postMergeStatus: null,
+            postMergeSha: null,
+            postMergeSummary: null,
+            postMergeCheckedAt: null,
             enqueuedAt: new Date().toISOString(),
             updatedAt: new Date().toISOString(),
         };
@@ -156,7 +160,12 @@ export class MergeStewardQueueCommands {
     acknowledgeExternalMerge(prNumber) {
         const entry = this.store.getEntryByPR(this.config.repoId, prNumber);
         if (entry) {
-            this.store.transition(entry.id, "merged");
+            this.store.transition(entry.id, "merged", {
+                postMergeStatus: "pending",
+                postMergeSha: entry.headSha,
+                postMergeSummary: "external merge detected, verification pending",
+                postMergeCheckedAt: new Date().toISOString(),
+            });
             this.invalidateDownstreamOf(entry);
             this.logger.info({ prNumber, entryId: entry.id }, "External merge acknowledged");
         }

package/dist/store.d.ts

@@ -11,7 +11,7 @@ export interface QueueStore {
     listActive(repoId: string): QueueEntry[];
     listAll(repoId: string): QueueEntry[];
     insert(entry: QueueEntry): void;
-    transition(entryId: string, to: QueueEntryStatus, patch?: Partial<Pick<QueueEntry, "headSha" | "baseSha" | "ciRunId" | "ciRetries" | "retryAttempts" | "lastFailedBaseSha" | "specBranch" | "specSha" | "specBasedOn">>, detail?: string): void;
+    transition(entryId: string, to: QueueEntryStatus, patch?: Partial<Pick<QueueEntry, "headSha" | "baseSha" | "ciRunId" | "ciRetries" | "retryAttempts" | "lastFailedBaseSha" | "specBranch" | "specSha" | "specBasedOn" | "postMergeStatus" | "postMergeSha" | "postMergeSummary" | "postMergeCheckedAt">>, detail?: string): void;
     dequeue(entryId: string): void;
     updateHead(entryId: string, newHeadSha: string): void;
     insertIncident(incident: IncidentRecord): void;

package/dist/types.d.ts

@@ -13,6 +13,7 @@
  */
 export type QueueEntryStatus = "queued" | "preparing_head" | "validating" | "merging" | "evicted" | "merged" | "dequeued";
 export declare const TERMINAL_STATUSES: QueueEntryStatus[];
+export type PostMergeStatus = "pending" | "pass" | "fail" | "unknown";
 export interface QueueEntry {
     id: string;
     repoId: string;
@@ -37,6 +38,14 @@ export interface QueueEntry {
     specSha: string | null;
     /** Entry ID of the previous entry this spec branch is based on. Null if based on main. */
     specBasedOn: string | null;
+    /** Post-merge verification status for the landed commit on main. */
+    postMergeStatus: PostMergeStatus | null;
+    /** Commit SHA used when checking post-merge status. */
+    postMergeSha: string | null;
+    /** Optional one-line summary of post-merge checks. */
+    postMergeSummary: string | null;
+    /** Timestamp of the most recent post-merge verification attempt. */
+    postMergeCheckedAt: string | null;
     enqueuedAt: string;
     updatedAt: string;
 }
@@ -181,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" | "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" | "sanitized_closed" | "sanitized_duplicate" | "post_merge_verification_started" | "post_merge_verification_completed" | "branch_unreachable";
 export interface ReconcileEvent {
     at: string;
     entryId: string;

package/dist/watch/OverviewView.js

@@ -39,6 +39,6 @@ export function OverviewView({ repos, selectedRepoId, gatewayError }) {
                             }).join(" ")
                             : compact ? "empty" : "queue is empty"
                         : "queue data unavailable";
-                    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: repo.repoId === selectedRepoId ? "cyan" : "gray", children: repo.repoId === selectedRepoId ? "\u25b8" : " " }), _jsx(Text, { bold: true, children: truncate(repo.repoId, idWidth) }), compact ? null : _jsx(Text, { dimColor: true, children: `  ${truncate(repo.repoFullName, 28)}` }), _jsx(Text, { children: `  ` }), _jsx(Text, { color: health.color, children: compact ? health.label.slice(0, 5) : health.label }), _jsx(Text, { dimColor: true, children: `  ${projectStatsSummary(repo.snapshot, compact)}` })] }), _jsx(Box, { paddingLeft: 2, children: _jsx(Text, { dimColor: true, children: `Queue: ${truncate(chainText, chainWidth)}` }) }), compact ? null : (_jsx(Box, { paddingLeft: 2, children: _jsx(Text, { color: health.color, children: truncate(queueBlockSummary ?? health.detail, 110) }) }))] }, repo.repoId));
+                    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: repo.repoId === selectedRepoId ? "cyan" : "gray", children: repo.repoId === selectedRepoId ? ">" : " " }), _jsx(Text, { bold: true, children: truncate(repo.repoId, idWidth) }), compact ? null : _jsx(Text, { dimColor: true, children: `  ${truncate(repo.repoFullName, 28)}` }), _jsx(Text, { children: `  ` }), _jsx(Text, { color: health.color, children: compact ? health.label.slice(0, 5) : health.label }), _jsx(Text, { dimColor: true, children: `  ${projectStatsSummary(repo.snapshot, compact)}` })] }), _jsx(Box, { paddingLeft: 2, children: _jsx(Text, { dimColor: true, children: `Queue: ${truncate(chainText, chainWidth)}` }) }), compact ? null : (_jsx(Box, { paddingLeft: 2, children: _jsx(Text, { color: health.color, children: truncate(queueBlockSummary ?? health.detail, 110) }) }))] }, repo.repoId));
                 }) }))] }));
 }

package/dist/watch/ProjectDetailView.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { Box, Text, useStdout } from "ink";
 import { buildDisplayEntries } from "./display-filter.js";
 import { describeEntry, getChainEntries, getRepoHealth, projectStatsSummary, runtimeSummary } from "./dashboard-model.js";
-import { ciStatusIcon, formatEventNarrative, humanStatus, relativeTime, shortSha, specChainLabel, summarizeQueueBlock, truncate } from "./format.js";
+import { ciStatusIcon, formatEventNarrative, humanStatus, postMergeStatusLine, relativeTime, shortSha, specChainLabel, summarizeQueueBlock, truncate } from "./format.js";
 function clampWindowStart(selectedIndex, itemCount, maxItems) {
     if (itemCount <= maxItems) {
         return 0;
@@ -84,9 +84,10 @@ export function ProjectDetailView({ repo, selectedEntryId, detail, filter, }) {
                         const isHead = snapshot.summary.headEntryId === entry.id;
                         const isSelected = entry.id === selectedEntryId;
                         const statusColor = entry.status === "evicted" ? "red" : ci.color;
-                        const statusText = compact ? compactEntryStatus(entry.status) : humanStatus(entry.status, entry);
-                        return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: isSelected ? "cyan" : "gray", children: isSelected ? "\u25b8" : " " }), _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)}` }), detail?.incidents.length
+                        const baseStatusText = compact ? compactEntryStatus(entry.status) : humanStatus(entry.status, entry);
+                        const statusText = entry.status === "merged" ? `${baseStatusText}: ${postMergeStatusLine(entry)}` : baseStatusText;
+                        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}`))))] })] }));
 }

package/dist/watch/QueueListView.js

@@ -3,14 +3,17 @@ import { useMemo } from "react";
 import { Box, Text, useStdout } from "ink";
 import { TERMINAL_STATUSES } from "../types.js";
 import { buildChainEntries } from "./display-filter.js";
-import { ciStatusIcon, formatEventSummary, humanStatus, isPendingMainVerification, nextStepLabel, relativeTime, statusColor, summarizeQueueBlock, truncate } from "./format.js";
+import { ciStatusIcon, formatEventSummary, humanStatus, isPendingMainVerification, nextStepLabel, postMergeStatusLine, relativeTime, statusColor, summarizeQueueBlock, truncate } from "./format.js";
 const CHROME_ROWS = 13;
 function QueueRow({ entry, selected, isHead, queueBlock, }) {
     const isTerminal = TERMINAL_STATUSES.includes(entry.status);
     if (isTerminal) {
         const icon = entry.status === "merged" ? "\u2713" : "\u2717";
         const iconColor = entry.status === "merged" ? "green" : "red";
-        return (_jsxs(Box, { children: [_jsx(Text, { dimColor: true, children: " " }), _jsx(Text, { dimColor: true, children: ` #${entry.prNumber}` }), entry.issueKey ? _jsx(Text, { dimColor: true, children: ` ${entry.issueKey}` }) : null, _jsx(Text, { dimColor: true, children: `  ${relativeTime(entry.updatedAt).padStart(4)}` }), _jsx(Text, { children: `  ` }), _jsx(Text, { color: iconColor, children: `${icon} ${humanStatus(entry.status)}` })] }));
+        const statusSuffix = entry.status === "merged"
+            ? ` \u00b7 ${postMergeStatusLine(entry)}`
+            : "";
+        return (_jsxs(Box, { children: [_jsx(Text, { dimColor: true, children: " " }), _jsx(Text, { dimColor: true, children: ` #${entry.prNumber}` }), entry.issueKey ? _jsx(Text, { dimColor: true, children: ` ${entry.issueKey}` }) : null, _jsx(Text, { dimColor: true, children: `  ${relativeTime(entry.updatedAt).padStart(4)}` }), _jsx(Text, { children: `  ` }), _jsx(Text, { color: iconColor, children: `${icon} ${humanStatus(entry.status)}${statusSuffix}` })] }));
     }
     const blockedOnMain = isHead && queueBlock?.reason === "main_broken" && queueBlock.headPrNumber === entry.prNumber;
     const pendingMainVerification = blockedOnMain && isPendingMainVerification(queueBlock);
@@ -25,7 +28,7 @@ function QueueRow({ entry, selected, isHead, queueBlock, }) {
         : nextStepLabel(entry.status, entry);
     // Only show retry counter when retries have actually happened.
     const retryNote = entry.retryAttempts > 0 ? ` \u00b7 retry ${entry.retryAttempts}/${entry.maxRetries}` : "";
-    return (_jsxs(Box, { children: [_jsx(Text, { color: selected ? "cyan" : "gray", children: selected ? "\u25b8" : " " }), _jsx(Text, { ...(isHead ? { color: "green" } : {}), bold: true, children: ` #${entry.prNumber}` }), entry.issueKey ? _jsx(Text, { children: ` ${entry.issueKey}` }) : null, _jsx(Text, { dimColor: true, children: `  ${relativeTime(entry.updatedAt).padStart(4)}` }), _jsx(Text, { children: `  ` }), _jsx(Text, { color: color, children: status }), _jsx(Text, { dimColor: true, children: ` \u00b7 ${nextStep}${retryNote}` })] }));
+    return (_jsxs(Box, { children: [_jsx(Text, { color: selected ? "cyan" : "gray", children: selected ? ">" : " " }), _jsx(Text, { ...(isHead ? { color: "green" } : {}), bold: true, children: ` #${entry.prNumber}` }), entry.issueKey ? _jsx(Text, { children: ` ${entry.issueKey}` }) : null, _jsx(Text, { dimColor: true, children: `  ${relativeTime(entry.updatedAt).padStart(4)}` }), _jsx(Text, { children: `  ` }), _jsx(Text, { color: color, children: status }), _jsx(Text, { dimColor: true, children: ` \u00b7 ${nextStep}${retryNote}` })] }));
 }
 export function QueueListView({ entries, allEntries, selectedEntryId, recentEvents, headEntryId, queueBlock, }) {
     const { stdout } = useStdout();
@@ -38,7 +41,7 @@ export function QueueListView({ entries, allEntries, selectedEntryId, recentEven
     const chainEntries = useMemo(() => buildChainEntries(allEntries), [allEntries]);
     return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [chainEntries.length > 0 && (_jsxs(Box, { marginBottom: 1, gap: 0, children: [_jsx(Text, { dimColor: true, children: "main" }), chainEntries.map((entry) => {
                         const ci = ciStatusIcon(entry);
-                        return (_jsxs(Box, { gap: 0, children: [_jsx(Text, { dimColor: true, children: " \u2500 " }), _jsxs(Text, { bold: true, children: ["#", entry.prNumber] }), _jsx(Text, { color: ci.color, children: ` ${ci.icon}` })] }, entry.id));
+                        return (_jsxs(Box, { gap: 0, children: [_jsx(Text, { dimColor: true, children: " \u2500 " }), _jsxs(Text, { bold: true, children: ["#", entry.prNumber] }), _jsx(Text, { color: ci.color, children: ci.icon })] }, entry.id));
                     })] })), queueBlock && (_jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsxs(Text, { color: "yellow", children: ["Queue paused: ", queueBlockLabel ?? "waiting for main checks", queueBlock.baseSha ? ` at ${truncate(queueBlock.baseSha, 10)}` : "", "."] }), _jsx(Text, { dimColor: true, children: queueBlock.missingRequiredChecks.length > 0
                             ? `Head PR #${queueBlock.headPrNumber ?? "?"} is waiting for an operator fix on ${queueBlock.baseBranch}.`
                             : `Head PR #${queueBlock.headPrNumber ?? "?"} will resume automatically once main is healthy.` })] })), entries.length === 0 ? (_jsx(Text, { dimColor: true, children: "No queue entries in this filter." })) : (entries.map((entry) => (_jsx(QueueRow, { entry: entry, selected: entry.id === selectedEntryId, isHead: entry.id === headEntryId, queueBlock: queueBlock }, entry.id)))), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { bold: true, children: "Recent Events" }), displayedEvents.length === 0 ? (_jsx(Text, { dimColor: true, children: "No queue events yet." })) : (displayedEvents.map((event) => (_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: relativeTime(event.at).padStart(4, " ") }), _jsx(Text, { children: formatEventSummary(event) })] }, event.id ?? `${event.entryId}-${event.at}`))))] })] }));

package/dist/watch/dashboard-model.js

@@ -1,5 +1,5 @@
 import { buildChainEntries, buildDisplayEntries } from "./display-filter.js";
-import { formatDuration, humanStatus, nextStepLabel, relativeTime, summarizeQueueBlock } from "./format.js";
+import { formatDuration, humanStatus, nextStepLabel, postMergeStatusLine, relativeTime, summarizeQueueBlock } from "./format.js";
 const RECENT_EVICTION_MS = 60 * 60 * 1_000;
 const STUCK_ENTRY_MS = 25 * 60 * 1_000;
 const OFFLINE_STALE_MS = 10 * 1_000;
@@ -285,6 +285,10 @@ export function describeEntry(entry, options) {
     if (options.isHead && options.queueBlockSummary) {
         return options.queueBlockSummary;
     }
+    if (entry.status === "merged") {
+        return `Landed on main. ${postMergeStatusLine(entry)}`
+            + (entry.postMergeCheckedAt ? ` (${relativeTime(entry.postMergeCheckedAt)} ago).` : ".");
+    }
     if (entry.status === "queued") {
         if (entry.position > 1) {
             return `Waiting behind ${entry.position - 1} earlier PRs.`;

package/dist/watch/format.d.ts

@@ -1,4 +1,4 @@
-import type { CheckResult, QueueBlockState, QueueEntryStatus, QueueEventRecord, QueueEventSummary, QueueRuntimeStatus } from "../types.ts";
+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;
@@ -32,11 +32,17 @@ export declare function formatEventNarrative(event: QueueEventRecord | QueueEven
 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;
+export declare function postMergeLabel(status: PostMergeStatus | null | undefined): string;
+export declare function postMergeStatusLine(entry: {
+    postMergeStatus?: PostMergeStatus | null;
+    postMergeSummary?: string | null;
+}): string;
 export declare function summarizeCheckNames(checks: CheckResult[], limit?: number): string;
 /** CI status icon for the spec chain summary line. */
 export declare function ciStatusIcon(entry: {
     status: QueueEntryStatus;
     ciRunId: string | null;
+    postMergeStatus?: PostMergeStatus | null;
 }): {
     icon: string;
     color: string;

package/dist/watch/format.js

@@ -1,3 +1,10 @@
+const QUEUE_SYMBOLS = {
+    inProgress: "\u25cf",
+    checkPassed: "\u2713",
+    checkFailed: "\u2717",
+    checkPending: "\u25cf",
+    checkUnknown: "\u25cb",
+};
 export function isPendingMainVerification(block) {
     return Boolean(block
         && block.failingChecks.length === 0
@@ -211,6 +218,40 @@ export function truncate(value, width) {
         return value.slice(0, width);
     return `${value.slice(0, width - 1)}…`;
 }
+function postMergeSymbol(status) {
+    if (status === "pass")
+        return QUEUE_SYMBOLS.checkPassed;
+    if (status === "fail")
+        return QUEUE_SYMBOLS.checkFailed;
+    if (status === "pending")
+        return QUEUE_SYMBOLS.checkPending;
+    return QUEUE_SYMBOLS.checkUnknown;
+}
+function postMergeColor(status) {
+    if (status === "pass")
+        return "green";
+    if (status === "fail")
+        return "red";
+    if (status === "pending")
+        return "yellow";
+    return "gray";
+}
+export function postMergeLabel(status) {
+    if (status === "pass")
+        return "checks passed";
+    if (status === "fail")
+        return "checks failed";
+    if (status === "pending")
+        return "checks running";
+    return "checks unknown";
+}
+export function postMergeStatusLine(entry) {
+    const status = postMergeLabel(entry.postMergeStatus);
+    if (!entry.postMergeSummary) {
+        return status;
+    }
+    return `${status}: ${entry.postMergeSummary}`;
+}
 export function summarizeCheckNames(checks, limit = 3) {
     const names = [...new Set(checks.map((check) => check.name))];
     if (names.length === 0)
@@ -222,17 +263,21 @@ export function summarizeCheckNames(checks, limit = 3) {
 /** CI status icon for the spec chain summary line. */
 export function ciStatusIcon(entry) {
     switch (entry.status) {
-        case "merged": return { icon: "\u2713", color: "green" }; // ✓
+        case "merged":
+            return {
+                icon: postMergeSymbol(entry.postMergeStatus),
+                color: postMergeColor(entry.postMergeStatus),
+            };
         case "merging": return { icon: "\u2713", color: "cyan" }; // ✓
         case "evicted": return { icon: "\u2717", color: "red" }; // ✗
         case "dequeued": return { icon: "\u2012", color: "gray" }; // ‒
         case "validating":
-            return entry.ciRunId ? { icon: "\u25cf", color: "cyan" } : { icon: "\u25cb", color: "gray" }; // ● or ○
+            return entry.ciRunId ? { icon: QUEUE_SYMBOLS.inProgress, color: "cyan" } : { icon: QUEUE_SYMBOLS.checkUnknown, color: "gray" };
         case "preparing_head":
-            return { icon: "\u25cb", color: "yellow" }; // ○
+            return { icon: QUEUE_SYMBOLS.checkUnknown, color: "yellow" };
         case "queued":
         default:
-            return { icon: "\u25cb", color: "gray" }; // ○
+            return { icon: QUEUE_SYMBOLS.checkUnknown, color: "gray" };
     }
 }
 export function summarizeQueueBlock(block) {

package/package.json

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