pr-shepherd 0.51.1 → 0.52.1

package/bin/config.json

@@ -1,4 +1,5 @@
 {
+  "cliCommand": ["pr-shepherd"],
   "botUsernames": [
     "chatgpt-connector",
     "openai-codex",

package/bin/exit-codes.d.mts

@@ -25,6 +25,8 @@ export declare const EXIT: Readonly<{
     readonly CLOSED: 14;
     /** Agent should run the emitted merge or queue command. */
     readonly MERGE: 15;
+    /** Aggregate stack has PRs to shepherd through one-PR sessions. */
+    readonly SHEPHERD: 16;
     /** Bad/unknown flag, unknown subcommand, missing required arg, invalid duration. */
     readonly USAGE: 64;
     /** Malformed caller data: bad `--require-sha`, `PRRC_*` IDs, bad repo string. */

package/bin/exit-codes.mjs

@@ -24,6 +24,8 @@ export const EXIT = Object.freeze({
     CLOSED: 14,
     /** Agent should run the emitted merge or queue command. */
     MERGE: 15,
+    /** Aggregate stack has PRs to shepherd through one-PR sessions. */
+    SHEPHERD: 16,
     /** Bad/unknown flag, unknown subcommand, missing required arg, invalid duration. */
     USAGE: 64,
     /** Malformed caller data: bad `--require-sha`, `PRRC_*` IDs, bad repo string. */

package/bin/github/batch-parsers.mjs

@@ -125,6 +125,7 @@ export function parseRawPr(raw, rawThreadPages, rawCommentNodes, rawReviewNodes,
                 null,
         },
         baseRefName: raw.baseRefName,
+        ...(raw.baseRefOid && { baseRefOid: raw.baseRefOid }),
         reviewRequests,
         latestReviews,
         reviewThreads,

package/bin/github/batch-raw-types.d.mts

@@ -30,6 +30,8 @@ export interface RawPr extends RawPrMergeFields {
         viewerPermission: string | null;
     } | null;
     baseRefName: string;
+    /** `PullRequest.baseRefOid`: the base commit GitHub recorded for this PR, not the branch's live tip. */
+    baseRefOid?: string;
     baseRef: import("./batch-raw-rules.mts").RawBaseRef | null;
     reviewRequests: {
         nodes: Array<{

package/bin/github/errors.d.mts

@@ -10,6 +10,11 @@ export interface GitHubGraphQlError {
 }
 /** GitHub GraphQL engine crash: HTTP 200, `data: null`, INTERNAL type/code or message. */
 export declare function isRetryableGraphQlInternal(graphqlErrors?: GitHubGraphQlError[]): boolean;
+/** HTTP 200 GraphQL response whose `repository` field resolved to null. */
+export declare function missingRepositoryError(repo: {
+    owner: string;
+    name: string;
+}): GitHubRequestError;
 export declare class GitHubRequestError extends ShepherdError {
     readonly status: number;
     readonly rateLimit?: RateLimitInfo;

package/bin/github/errors.mjs

@@ -47,6 +47,10 @@ function classifyStatus(status, rateLimit, retryAfterSeconds, graphqlErrors) {
         return EXIT.NOPERM;
     return EXIT.UNAVAILABLE;
 }
+/** HTTP 200 GraphQL response whose `repository` field resolved to null. */
+export function missingRepositoryError(repo) {
+    return new GitHubRequestError(`GitHub GraphQL response did not include repository ${repo.owner}/${repo.name} (not found or access denied)`, { status: 200 });
+}
 export class GitHubRequestError extends ShepherdError {
     status;
     rateLimit;

package/bin/github/gql/batch-pr.gql

@@ -35,6 +35,7 @@ query BatchPr($owner: String!, $repo: String!, $pr: Int!) {
         viewerPermission
       }
       baseRefName
+      baseRefOid
       isInMergeQueue
       ...PrMergePolicy
       autoMergeRequest {

package/bin/github/gql/poll-stack-summary.gql

@@ -1,4 +1,10 @@
-query PollStackSummary($owner: String!, $repo: String!, $anchor: Int!, $after: String) {
+query PollStackSummary(
+  $owner: String!
+  $repo: String!
+  $anchor: Int!
+  $first: Int!
+  $after: String
+) {
   _shepherdRateLimit: rateLimit {
     cost
     limit
@@ -15,7 +21,7 @@ query PollStackSummary($owner: String!, $repo: String!, $anchor: Int!, $after: S
         number
         size
         baseRefName
-        entries(first: 50, after: $after) {
+        entries(first: $first, after: $after) {
           pageInfo {
             hasNextPage
             endCursor

package/bin/github/gql/poll-stack-topology.gql

@@ -0,0 +1,38 @@
+query PollStackTopology($owner: String!, $repo: String!, $anchor: Int!, $after: String) {
+  _shepherdRateLimit: rateLimit {
+    cost
+    limit
+    nodeCount
+    remaining
+    resetAt
+    used
+  }
+  repository(owner: $owner, name: $repo) {
+    viewerCanAdminister
+    pullRequest(number: $anchor) {
+      stack {
+        id
+        number
+        size
+        baseRefName
+        entries(first: 50, after: $after) {
+          pageInfo {
+            hasNextPage
+            endCursor
+          }
+          nodes {
+            position
+            pullRequest {
+              number
+              state
+              headRefName
+              headRefOid
+              baseRefName
+              baseRefOid
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/bin/github/gql/poll-summary-check-contexts.gql

@@ -0,0 +1,34 @@
+fragment PollSummaryCheckContexts on StatusCheckRollupContextConnection {
+  totalCount
+  pageInfo {
+    hasPreviousPage
+    startCursor
+  }
+  nodes {
+    __typename
+    ... on CheckRun {
+      id
+      name
+      status
+      conclusion
+      detailsUrl
+      annotations(first: 1) {
+        totalCount
+      }
+      checkSuite {
+        workflowRun {
+          databaseId
+          event
+          workflow {
+            databaseId
+            name
+          }
+        }
+      }
+    }
+    ... on StatusContext {
+      context
+      state
+    }
+  }
+}

package/bin/github/gql/poll-summary-check-page.gql

@@ -0,0 +1,23 @@
+query PollSummaryCheckPage($owner: String!, $repo: String!, $oid: GitObjectID!, $before: String!) {
+  _shepherdRateLimit: rateLimit {
+    cost
+    limit
+    nodeCount
+    remaining
+    resetAt
+    used
+  }
+  repository(owner: $owner, name: $repo) {
+    object(oid: $oid) {
+      __typename
+      ... on Commit {
+        oid
+        statusCheckRollup {
+          contexts(last: 100, before: $before) {
+            ...PollSummaryCheckContexts
+          }
+        }
+      }
+    }
+  }
+}

package/bin/github/gql/poll-summary-fragment.gql

@@ -3,6 +3,7 @@ fragment PollSummaryPr on PullRequest {
   title
   url
   state
+  updatedAt
   isDraft
   viewerCanUpdate
   headRefName
@@ -11,6 +12,26 @@ fragment PollSummaryPr on PullRequest {
   baseRefOid
   mergeable
   mergeStateStatus
+  lifecycleEvents: timelineItems(
+    last: 1
+    itemTypes: [CLOSED_EVENT, REOPENED_EVENT, CONVERT_TO_DRAFT_EVENT, READY_FOR_REVIEW_EVENT]
+  ) {
+    nodes {
+      __typename
+      ... on ClosedEvent {
+        createdAt
+      }
+      ... on ReopenedEvent {
+        createdAt
+      }
+      ... on ConvertToDraftEvent {
+        createdAt
+      }
+      ... on ReadyForReviewEvent {
+        createdAt
+      }
+    }
+  }
   reviewDecision
   reviewRequests(last: 50) {
     nodes {
@@ -38,38 +59,39 @@ fragment PollSummaryPr on PullRequest {
     }
   }
   isInMergeQueue
+  mergeQueueAdditions: timelineItems(last: 1, itemTypes: [ADDED_TO_MERGE_QUEUE_EVENT]) {
+    nodes {
+      ... on AddedToMergeQueueEvent {
+        createdAt
+      }
+    }
+  }
+  mergeQueueRemovals: timelineItems(last: 1, itemTypes: [REMOVED_FROM_MERGE_QUEUE_EVENT]) {
+    nodes {
+      ... on RemovedFromMergeQueueEvent {
+        id
+        reason
+        createdAt
+        actor {
+          login
+        }
+        beforeCommit {
+          oid
+          parents(first: 100) {
+            nodes {
+              oid
+            }
+          }
+        }
+      }
+    }
+  }
   mergeQueueEntry {
     headCommit {
+      oid
       statusCheckRollup {
         contexts(last: 100) {
-          totalCount
-          pageInfo {
-            hasPreviousPage
-          }
-          nodes {
-            __typename
-            ... on CheckRun {
-              id
-              name
-              status
-              conclusion
-              detailsUrl
-              checkSuite {
-                workflowRun {
-                  databaseId
-                  event
-                  workflow {
-                    databaseId
-                    name
-                  }
-                }
-              }
-            }
-            ... on StatusContext {
-              context
-              state
-            }
-          }
+          ...PollSummaryCheckContexts
         }
       }
     }
@@ -161,36 +183,11 @@ fragment PollSummaryPr on PullRequest {
   commits(last: 1) {
     nodes {
       commit {
+        oid
+        committedDate
         statusCheckRollup {
           contexts(last: 100) {
-            totalCount
-            pageInfo {
-              hasPreviousPage
-            }
-            nodes {
-              __typename
-              ... on CheckRun {
-                id
-                name
-                status
-                conclusion
-                detailsUrl
-                checkSuite {
-                  workflowRun {
-                    databaseId
-                    event
-                    workflow {
-                      databaseId
-                      name
-                    }
-                  }
-                }
-              }
-              ... on StatusContext {
-                context
-                state
-              }
-            }
+            ...PollSummaryCheckContexts
           }
         }
       }

package/bin/github/merge-queue-checks.mjs

@@ -1,4 +1,6 @@
+import { parseCreatedAt } from "./batch-parser-helpers.mjs";
 import { graphql } from "./client.mjs";
+import { queueRemovalAppliesToHead } from "./queue-removal-freshness.mjs";
 import { requireContextNodes } from "./batch-response.mjs";
 import { COMMIT_CHECK_CONTEXTS_QUERY } from "./queries.mjs";
 function omittedCursorError(oid) {
@@ -60,8 +62,15 @@ function currentRemovalCommit(raw) {
     if (addition && Date.parse(removal.createdAt) < Date.parse(addition.createdAt))
         return undefined;
     const parentOids = removal.beforeCommit.parents?.nodes.map((node) => node.oid);
-    if (!parentOids?.includes(raw.headRefOid))
+    const headCommittedAt = raw.commits?.nodes[0]?.commit.committedDate;
+    if (!queueRemovalAppliesToHead({
+        parentOids,
+        headOid: raw.headRefOid,
+        ...(headCommittedAt && { headCommittedAtUnix: parseCreatedAt(headCommittedAt) }),
+        removedAtUnix: Math.floor(Date.parse(removal.createdAt) / 1000),
+    })) {
         return undefined;
+    }
     return removal.beforeCommit;
 }
 /** Hydrate all status contexts for the active or most recently removed queue commit. */

package/bin/github/poll-summary-check-hydration.d.mts

@@ -0,0 +1,12 @@
+import { type RepoInfo } from "./client.mts";
+import type { RawSummaryPr } from "./poll-summary-raw.mts";
+/**
+ * Complete the compact summary's `last: 100` status-context windows in place.
+ *
+ * Without this, a PR with more than 100 contexts always reports incomplete
+ * checks, so it can never earn or match a READY receipt. Every summary fetch
+ * path runs this before anything fingerprints `commits`, so one-PR receipts and
+ * aggregate stack reads hash the same evidence. A window that cannot be
+ * completed stays incomplete, which already fails readiness closed.
+ */
+export declare function hydratePollSummaryChecks(raw: RawSummaryPr, repo: RepoInfo): Promise<void>;

package/bin/github/poll-summary-check-hydration.mjs

@@ -0,0 +1,55 @@
+import { graphqlWithRateLimit } from "./client.mjs";
+import { POLL_SUMMARY_CHECK_PAGE_QUERY } from "./queries.mjs";
+/**
+ * Complete the compact summary's `last: 100` status-context windows in place.
+ *
+ * Without this, a PR with more than 100 contexts always reports incomplete
+ * checks, so it can never earn or match a READY receipt. Every summary fetch
+ * path runs this before anything fingerprints `commits`, so one-PR receipts and
+ * aggregate stack reads hash the same evidence. A window that cannot be
+ * completed stays incomplete, which already fails readiness closed.
+ */
+export async function hydratePollSummaryChecks(raw, repo) {
+    const headCommit = raw.commits.nodes[0]?.commit;
+    if (headCommit)
+        await hydrateCommitContexts(headCommit, repo);
+    const queueCommit = raw.mergeQueueEntry?.headCommit;
+    if (queueCommit)
+        await hydrateCommitContexts(queueCommit, repo);
+}
+async function hydrateCommitContexts(commit, repo) {
+    const contexts = commit.statusCheckRollup?.contexts;
+    if (!contexts)
+        return;
+    const nodes = [...contexts.nodes];
+    let pageInfo = contexts.pageInfo;
+    while (pageInfo.hasPreviousPage && pageInfo.startCursor) {
+        const older = await fetchOlderContexts(commit.oid, pageInfo.startCursor, repo);
+        if (!older)
+            break;
+        nodes.unshift(...older.nodes);
+        pageInfo = older.pageInfo;
+    }
+    // A window that shifted between pages can repeat or skip contexts; the
+    // first page's total is the snapshot the hydrated list must account for.
+    const complete = !pageInfo.hasPreviousPage && nodes.length === contexts.totalCount;
+    commit.statusCheckRollup = {
+        contexts: {
+            totalCount: contexts.totalCount,
+            pageInfo: { hasPreviousPage: !complete },
+            nodes,
+        },
+    };
+}
+async function fetchOlderContexts(oid, before, repo) {
+    const { data } = await graphqlWithRateLimit(POLL_SUMMARY_CHECK_PAGE_QUERY, {
+        owner: repo.owner,
+        repo: repo.name,
+        oid,
+        before,
+    });
+    const object = data.repository?.object;
+    if (object?.__typename !== "Commit" || object.oid !== oid)
+        return null;
+    return object.statusCheckRollup?.contexts ?? null;
+}

package/bin/github/poll-summary-fingerprint.d.mts

@@ -0,0 +1,8 @@
+import type { RawSummaryPr } from "./poll-summary-raw.mts";
+/**
+ * Bind receipts to the review and head-commit CI evidence shared by one-PR
+ * completion and stack reconciliation. Queue entry, queue checks, and GitHub's
+ * computed merge state are checked separately: including them here would
+ * invalidate a READY receipt merely because a ready PR entered the queue.
+ */
+export declare function fingerprintRawSummaryPr(raw: RawSummaryPr): string | null;

package/bin/github/poll-summary-fingerprint.mjs

@@ -0,0 +1,48 @@
+import { createHash } from "node:crypto";
+/**
+ * Bind receipts to the review and head-commit CI evidence shared by one-PR
+ * completion and stack reconciliation. Queue entry, queue checks, and GitHub's
+ * computed merge state are checked separately: including them here would
+ * invalidate a READY receipt merely because a ready PR entered the queue.
+ */
+export function fingerprintRawSummaryPr(raw) {
+    if (!raw.updatedAt || !raw.headRefOid || !raw.baseRefOid)
+        return null;
+    const evidence = {
+        number: raw.number,
+        state: raw.state,
+        lifecycleEvents: raw.lifecycleEvents,
+        isDraft: raw.isDraft,
+        headRefOid: raw.headRefOid,
+        baseRefOid: raw.baseRefOid,
+        baseRefName: raw.baseRefName,
+        reviewDecision: raw.reviewDecision,
+        reviewRequests: raw.reviewRequests,
+        latestReviews: raw.latestReviews,
+        comments: hideBodies(raw.comments),
+        reviews: hideBodies(raw.reviews),
+        reviewThreads: {
+            ...raw.reviewThreads,
+            nodes: raw.reviewThreads.nodes.map((thread) => ({
+                ...thread,
+                rootComments: thread.rootComments && hideBodies(thread.rootComments),
+                comments: hideBodies(thread.comments),
+            })),
+        },
+        commits: {
+            ...raw.commits,
+            nodes: raw.commits.nodes.map((node) => ({
+                ...node,
+                commit: { ...node.commit, committedDate: undefined },
+            })),
+        },
+    };
+    return createHash("sha256").update(JSON.stringify(evidence)).digest("hex");
+}
+/** Hidden bodies are not readiness evidence: bots keep editing hidden notices after a PR settles. */
+function hideBodies(connection) {
+    return {
+        ...connection,
+        nodes: connection.nodes.map((node) => (node.isMinimized ? { ...node, body: undefined } : node)),
+    };
+}

package/bin/github/poll-summary-projector.mjs

@@ -3,8 +3,12 @@ import { updateReadyDelay } from "../commands/ready-delay.mjs";
 import { formatPrUrl } from "../pr-reference.mjs";
 import { buildPrShepherdCommand } from "../cli/runner.mjs";
 import { loadSeenMap } from "../state/seen-comments.mjs";
+import { isReadyReceiptCurrent, readReadyReceipt } from "../state/ready-receipts.mjs";
 import { summarizePollSummaryChecks } from "./poll-summary-checks.mjs";
 import { summarizePollSummaryReview } from "./poll-summary-review.mjs";
+import { fingerprintRawSummaryPr } from "./poll-summary-fingerprint.mjs";
+import { currentQueueRemovalEvent } from "./poll-summary-queue-removal.mjs";
+import { isCurrentSummaryReady } from "./poll-summary-readiness.mjs";
 import { normalizePollSummaryState, routePollSummary } from "./poll-summary-route.mjs";
 export async function summarizePollSummaryPr(raw, repo, opts, viewerCanAdminister = false) {
     const repoName = `${repo.owner}/${repo.name}`;
@@ -12,19 +16,24 @@ export async function summarizePollSummaryPr(raw, repo, opts, viewerCanAdministe
     const checks = summarizePollSummaryChecks(raw);
     const review = await summarizePollSummaryReview(raw, seen, viewerCanAdminister);
     const blockingReviewerInProgress = detectBlockingReviewer(raw);
+    const removalEvent = currentQueueRemovalEvent(raw);
     let { action, reasons } = routePollSummary(raw, checks, review, opts);
     let remainingSeconds;
-    if (raw.isDraft && blockingReviewerInProgress && action === "mark_ready") {
+    if (raw.isDraft &&
+        blockingReviewerInProgress &&
+        (action === "mark_ready" || reasons.includes("draft-auto-mark-ready-disabled"))) {
         action = "wait";
         reasons = ["blocking-reviewer-in-progress"];
     }
     const appearsReady = reasons.includes("appears-ready");
-    const readyDelaySeconds = opts.readyDelaySeconds ?? (loadConfig().watch?.readyDelayMinutes ?? 10) * 60;
-    const readyState = await updateReadyDelay(raw.number, appearsReady, readyDelaySeconds, repo.owner, repo.name, { retainElapsed: true });
-    if (appearsReady && !readyState.shouldCancel) {
-        action = "wait";
-        reasons = ["ready-delay"];
-        remainingSeconds = readyState.remainingSeconds;
+    if (opts.stackPrNumber === undefined) {
+        const readyDelaySeconds = opts.readyDelaySeconds ?? (loadConfig().watch?.readyDelayMinutes ?? 10) * 60;
+        const readyState = await updateReadyDelay(raw.number, appearsReady, readyDelaySeconds, repo.owner, repo.name, { headSha: raw.headRefOid });
+        if (appearsReady && !readyState.shouldCancel) {
+            action = "wait";
+            reasons = ["ready-delay"];
+            remainingSeconds = readyState.remainingSeconds;
+        }
     }
     const stack = raw.stack
         ? {
@@ -34,6 +43,32 @@ export async function summarizePollSummaryPr(raw, repo, opts, viewerCanAdministe
             baseRefName: raw.stack.baseRefName,
         }
         : undefined;
+    const fingerprint = opts.stackPrNumber !== undefined ? fingerprintRawSummaryPr(raw) : null;
+    const receipt = fingerprint
+        ? await readReadyReceipt({ owner: repo.owner, repo: repo.name, pr: raw.number })
+        : null;
+    // A queued PR's target branch can advance as earlier queue entries merge.
+    // Keep the pre-enqueue base binding for the receipt comparison while the
+    // merge group itself supplies the current mergeability evidence.
+    const receiptFingerprint = raw.isInMergeQueue && receipt
+        ? fingerprintRawSummaryPr({ ...raw, baseRefOid: receipt.baseRefOid })
+        : fingerprint;
+    const currentReady = isCurrentSummaryReady(raw, checks, review, {
+        allowQueuedProgress: opts.stackPrNumber !== undefined && raw.isInMergeQueue,
+    });
+    const readyReceipt = receiptFingerprint !== null &&
+        isReadyReceiptCurrent(receipt, {
+            headRefOid: raw.headRefOid,
+            baseRefOid: raw.isInMergeQueue && receipt ? receipt.baseRefOid : raw.baseRefOid,
+            readinessFingerprint: receiptFingerprint,
+            status: currentReady ? "READY" : "PENDING",
+            isDraft: raw.isDraft,
+        });
+    const queueRemoval = removalEvent?.id && readyReceipt && receipt?.acknowledgedQueueRemovalId === removalEvent.id
+        ? undefined
+        : removalEvent
+            ? projectQueueRemoval(removalEvent)
+            : undefined;
     return {
         pr: raw.number,
         repo: repoName,
@@ -50,15 +85,29 @@ export async function summarizePollSummaryPr(raw, repo, opts, viewerCanAdministe
         baseRefName: raw.baseRefName,
         ...(raw.isDraft && { isDraft: true }),
         ...(raw.isInMergeQueue && { isInMergeQueue: true }),
+        ...(queueRemoval && { queueRemoval }),
         ...(blockingReviewerInProgress && { blockingReviewerInProgress: true }),
         ...(remainingSeconds !== undefined && { remainingSeconds }),
         ...(Object.keys(checks).length > 0 && { checks }),
         ...(Object.keys(review).length > 0 && { review }),
         ...(stack && { stack }),
-        ...(!["wait", "cancel"].includes(action) &&
-            !(opts.stackPrNumber !== undefined && raw.stack && action === "merge") && {
-            pollCommand: buildPollCommand(repoName, raw.number, opts),
-        }),
+        ...(readyReceipt && { readyReceipt: true }),
+        ...((opts.stackPrNumber !== undefined && raw.state === "OPEN") ||
+            (!["wait", "cancel"].includes(action) &&
+                !(opts.stackPrNumber !== undefined && raw.stack && action === "merge"))
+            ? pollCommandFields(repoName, raw.number, raw.isDraft, opts)
+            : {}),
+    };
+}
+function projectQueueRemoval(removal) {
+    const removalTime = Date.parse(removal.createdAt);
+    const parents = removal.beforeCommit?.parents?.nodes.map((parent) => parent.oid) ?? [];
+    return {
+        reason: removal.reason,
+        createdAtUnix: Math.floor(removalTime / 1000),
+        ...(removal.actor?.login && { actor: removal.actor.login }),
+        ...(removal.beforeCommit?.oid && { beforeCommitOid: removal.beforeCommit.oid }),
+        beforeCommitParentOids: parents,
     };
 }
 function detectBlockingReviewer(raw) {
@@ -67,16 +116,21 @@ function detectBlockingReviewer(raw) {
     return ((raw.reviewRequests?.nodes ?? []).some((request) => matches(request.requestedReviewer)) ||
         (raw.latestReviews?.nodes ?? []).some((review) => review.state === "PENDING" && matches(review.author)));
 }
-function buildPollCommand(repo, pr, opts) {
-    const args = [formatPrUrl(repo, pr), "--until-terminal"];
-    if (opts.merge)
+function pollCommandFields(repo, pr, isDraft, opts) {
+    const autoMarkReadyDisabled = opts.noAutoMarkReady || loadConfig().actions.autoMarkReady === false;
+    const boundedDraft = isDraft && autoMarkReadyDisabled;
+    const args = boundedDraft
+        ? [formatPrUrl(repo, pr), "--timeout", "1s", "--debounce", "0s", "--no-auto-mark-ready"]
+        : [formatPrUrl(repo, pr), "--until-terminal"];
+    if (opts.merge && opts.stackPrNumber === undefined)
         args.push("--merge");
     if (opts.readyDelaySeconds !== undefined)
         args.push("--ready-delay", `${opts.readyDelaySeconds}s`);
     if (opts.stallTimeoutSeconds !== undefined) {
         args.push("--stall-timeout", `${opts.stallTimeoutSeconds}s`);
     }
-    if (opts.noAutoMarkReady)
+    if (opts.noAutoMarkReady && !boundedDraft)
         args.push("--no-auto-mark-ready");
-    return buildPrShepherdCommand(args).text;
+    const pollCommand = buildPrShepherdCommand(args).text;
+    return boundedDraft ? { pollCommand, pollProbe: true } : { pollCommand };
 }

package/bin/github/poll-summary-queue-removal.d.mts

@@ -0,0 +1,5 @@
+import type { RawSummaryPr } from "./poll-summary-raw.mts";
+type QueueRemovalEvent = NonNullable<RawSummaryPr["mergeQueueRemovals"]>["nodes"][number];
+/** Latest queue removal that still applies to this PR head, not an older attempt. */
+export declare function currentQueueRemovalEvent(raw: RawSummaryPr): QueueRemovalEvent | null;
+export {};

package/bin/github/poll-summary-queue-removal.mjs

@@ -0,0 +1,25 @@
+import { queueRemovalAppliesToHead } from "./queue-removal-freshness.mjs";
+import { parseCreatedAt } from "./batch-parser-helpers.mjs";
+/** Latest queue removal that still applies to this PR head, not an older attempt. */
+export function currentQueueRemovalEvent(raw) {
+    const removal = raw.mergeQueueRemovals?.nodes[0];
+    if (!removal || raw.isInMergeQueue)
+        return null;
+    const removalTime = Date.parse(removal.createdAt);
+    if (!Number.isFinite(removalTime))
+        return null;
+    const addition = raw.mergeQueueAdditions?.nodes[0];
+    if (addition && Date.parse(addition.createdAt) > removalTime)
+        return null;
+    const parents = removal.beforeCommit?.parents?.nodes.map((parent) => parent.oid);
+    const headCommittedAt = raw.commits?.nodes[0]?.commit.committedDate;
+    if (!queueRemovalAppliesToHead({
+        parentOids: parents,
+        headOid: raw.headRefOid,
+        ...(headCommittedAt && { headCommittedAtUnix: parseCreatedAt(headCommittedAt) }),
+        removedAtUnix: Math.floor(removalTime / 1000),
+    })) {
+        return null;
+    }
+    return removal;
+}