pr-shepherd 0.35.0 → 0.36.0

package/bin/github/batch-parsers.mjs

@@ -1,6 +1,7 @@
 import { mapAuthorType, parseCreatedAt, mapStatusContextState, latestApprovedLogins, isReviewStale, mapCheckRunNode, } from "./batch-parser-helpers.mjs";
 import { buildPrActivitySummary } from "./activity.mjs";
 import { parseBranchProtection } from "./branch-protection.mjs";
+import { parseBranchRules, parseMergeQueueEntry, parseStack } from "./batch-parsers-rules.mjs";
 function parseReviewNode(r) {
     const base = {
         id: r.id,
@@ -130,6 +131,11 @@ export function parseRawPr(raw, rawThreadPages, rawCommentNodes, rawReviewNodes,
         approvedReviews,
         checks,
         branchProtection: parseBranchProtection(raw),
+        branchRules: parseBranchRules(raw.baseRef),
+        isInMergeQueue: raw.isInMergeQueue ?? false,
+        isMergeQueueEnabled: raw.isMergeQueueEnabled ?? false,
+        mergeQueueEntry: parseMergeQueueEntry(raw.mergeQueueEntry),
+        stack: parseStack(raw),
         activity: buildPrActivitySummary(raw, comments, reviewThreads, reviewSummaries, allChangesRequestedReviews, approvedReviews),
     };
 }

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

@@ -0,0 +1,59 @@
+export interface RawBranchProtectionRule {
+    requiresApprovingReviews: boolean;
+    requiredApprovingReviewCount: number;
+    requiresConversationResolution: boolean;
+    requiresStatusChecks: boolean;
+    requiredStatusCheckContexts: string[] | null;
+    requiresCodeOwnerReviews?: boolean;
+    requireLastPushApproval?: boolean;
+    requiresCommitSignatures?: boolean;
+    requiresLinearHistory?: boolean;
+    requiresStrictStatusChecks?: boolean;
+    requiresDeployments?: boolean;
+    requiredDeploymentEnvironments?: string[] | null;
+}
+interface RawMergeQueueEntry {
+    position: number;
+    state: string;
+    estimatedTimeToMerge: number | null;
+}
+interface RawStack {
+    number: number;
+    size: number;
+    baseRefName: string;
+}
+export interface RawRepositoryRule {
+    type: string;
+    parameters: RawRuleParameters | null;
+}
+interface RawRuleParameters {
+    requiredApprovingReviewCount?: number;
+    requiredReviewThreadResolution?: boolean;
+    requireCodeOwnerReview?: boolean;
+    requireLastPushApproval?: boolean;
+    strictRequiredStatusChecksPolicy?: boolean;
+    requiredStatusChecks?: Array<{
+        context: string;
+    }>;
+    requiredDeploymentEnvironments?: string[];
+    codeScanningTools?: Array<{
+        tool: string;
+    }>;
+}
+export interface RawBaseRef {
+    branchProtectionRule: RawBranchProtectionRule | null;
+    rules: {
+        nodes: RawRepositoryRule[];
+    } | null;
+}
+export interface RawPrMergeFields {
+    isInMergeQueue?: boolean;
+    isMergeQueueEnabled?: boolean;
+    mergeQueueEntry?: RawMergeQueueEntry | null;
+    stack?: RawStack | null;
+    stackEntry?: {
+        position: number;
+    } | null;
+    baseRef?: RawBaseRef | null;
+}
+export {};

package/bin/github/batch-raw-rules.mjs

@@ -0,0 +1 @@
+export {};

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

@@ -1,10 +1,11 @@
 import type { CommentAuthorAssociation } from "../types/github.mts";
+import type { RawPrMergeFields } from "./batch-raw-rules.mts";
 export interface RawBatchResponse {
     repository: {
         pullRequest: RawPr | null;
     } | null;
 }
-export interface RawPr {
+export interface RawPr extends RawPrMergeFields {
     id: string;
     number: number;
     state: string;
@@ -18,9 +19,7 @@ export interface RawPr {
         nameWithOwner: string;
     } | null;
     baseRefName: string;
-    baseRef: {
-        branchProtectionRule: RawBranchProtectionRule | null;
-    } | null;
+    baseRef: import("./batch-raw-rules.mts").RawBaseRef | null;
     reviewRequests: {
         nodes: Array<{
             requestedReviewer: {
@@ -79,6 +78,7 @@ export interface RawPr {
             commit: {
                 oid: string;
                 committedDate?: string;
+                checkSuites?: RawCheckSuites;
                 statusCheckRollup: {
                     contexts: {
                         pageInfo: {
@@ -92,6 +92,22 @@ export interface RawPr {
         }>;
     };
 }
+interface RawCheckSuites {
+    pageInfo: {
+        hasNextPage: boolean;
+    };
+    nodes: Array<{
+        conclusion: string | null;
+        workflowRun: {
+            databaseId: number | null;
+            event: string | null;
+            url: string | null;
+            workflow: {
+                name: string | null;
+            } | null;
+        } | null;
+    }>;
+}
 interface RawAuthor {
     __typename?: string;
     login: string;
@@ -165,13 +181,6 @@ export interface RawReviewSummary {
     body: string;
     createdAt?: string;
 }
-interface RawBranchProtectionRule {
-    requiresApprovingReviews: boolean;
-    requiredApprovingReviewCount: number;
-    requiresConversationResolution: boolean;
-    requiresStatusChecks: boolean;
-    requiredStatusCheckContexts: string[] | null;
-}
 export type RawContextNode = {
     __typename: "CheckRun";
     id: string;

package/bin/github/batch.d.mts

@@ -3,6 +3,8 @@ import type { BatchPrData } from "../types.mts";
 interface BatchResult {
     data: BatchPrData;
     rateLimit?: RateLimitInfo;
+    /** True when GraphQL returned a complete CheckSuite page; skip REST startup-failure fetch. */
+    checkSuitesComplete?: boolean;
 }
 interface FetchPrBatchOptions {
     /**

package/bin/github/batch.mjs

@@ -1,134 +1,28 @@
-import { graphql, graphqlWithRateLimit } from "./client.mjs";
-import { paginateForward, paginateBackward } from "./pagination.mjs";
+import { graphqlWithRateLimit } from "./client.mjs";
 import { hydrateThreadCommentPages } from "./thread-comments.mjs";
 import { BATCH_PR_QUERY } from "./queries.mjs";
 import { parseRawPr } from "./batch-parsers.mjs";
-import { requireContextNodes, requireRawPr } from "./batch-response.mjs";
+import { parseCheckSuitesComplete, parseSuiteStartupFailures } from "./batch-parse-suites.mjs";
+import { mergeStartupFailureChecks } from "../checks/startup-failures.mjs";
+import { paginateBatchConnections } from "./batch-page.mjs";
+import { requireRawPr } from "./batch-response.mjs";
 /**
  * Fetch all PR data needed for a `shepherd check` in one (or a few, if paginating) GraphQL requests.
  */
 export async function fetchPrBatch(pr, repo, opts = {}) {
-    // First page: no cursor variables.
     const result = await graphqlWithRateLimit(BATCH_PR_QUERY, {
         owner: repo.owner,
         repo: repo.name,
         pr,
     });
     const raw = requireRawPr(result.data, pr, repo);
-    // Paginate reviewThreads backward if the first page is incomplete.
-    let rawThreadPages = raw.reviewThreads.nodes;
-    if (raw.reviewThreads.pageInfo.hasPreviousPage && raw.reviewThreads.pageInfo.startCursor) {
-        // Pass startCursor so paginateBackward fetches pages *before* the already-
-        // fetched first page instead of re-fetching it from the start.
-        const extra = await paginateBackward(async (cursor) => {
-            const res = await graphql(BATCH_PR_QUERY, {
-                owner: repo.owner,
-                repo: repo.name,
-                pr,
-                ...(cursor ? { threadsCursor: cursor } : {}),
-            });
-            const pr2 = requireRawPr(res.data, pr, repo);
-            return pr2.reviewThreads;
-        }, raw.reviewThreads.pageInfo.startCursor);
-        // extra contains pages before the first page.
-        rawThreadPages = [...extra, ...rawThreadPages];
-    }
-    rawThreadPages = await hydrateThreadCommentPages(rawThreadPages);
-    // Paginate comments backward if the first page is incomplete.
-    let rawCommentNodes = raw.comments.nodes;
-    if (raw.comments.pageInfo.hasPreviousPage && raw.comments.pageInfo.startCursor) {
-        const extra = await paginateBackward(async (cursor) => {
-            const res = await graphql(BATCH_PR_QUERY, {
-                owner: repo.owner,
-                repo: repo.name,
-                pr,
-                ...(cursor ? { commentsCursor: cursor } : {}),
-            });
-            const pr2 = requireRawPr(res.data, pr, repo);
-            return pr2.comments;
-        }, raw.comments.pageInfo.startCursor);
-        rawCommentNodes = [...extra, ...rawCommentNodes];
-    }
-    // Paginate CHANGES_REQUESTED reviews backward if the first page is incomplete.
-    let rawReviewNodes = raw.changesRequestedReviews.nodes;
-    if (raw.changesRequestedReviews.pageInfo.hasPreviousPage &&
-        raw.changesRequestedReviews.pageInfo.startCursor) {
-        const extra = await paginateBackward(async (cursor) => {
-            const res = await graphql(BATCH_PR_QUERY, {
-                owner: repo.owner,
-                repo: repo.name,
-                pr,
-                ...(cursor ? { changesRequestedCursor: cursor } : {}),
-            });
-            const pr2 = requireRawPr(res.data, pr, repo);
-            return pr2.changesRequestedReviews;
-        }, raw.changesRequestedReviews.pageInfo.startCursor);
-        rawReviewNodes = [...extra, ...rawReviewNodes];
-    }
-    // Paginate COMMENTED review summaries backward if the first page is incomplete.
-    let rawReviewSummaryNodes = raw.reviewSummaries.nodes;
-    if (raw.reviewSummaries.pageInfo.hasPreviousPage && raw.reviewSummaries.pageInfo.startCursor) {
-        const extra = await paginateBackward(async (cursor) => {
-            const res = await graphql(BATCH_PR_QUERY, {
-                owner: repo.owner,
-                repo: repo.name,
-                pr,
-                ...(cursor ? { reviewSummariesCursor: cursor } : {}),
-            });
-            const pr2 = requireRawPr(res.data, pr, repo);
-            return pr2.reviewSummaries;
-        }, raw.reviewSummaries.pageInfo.startCursor);
-        rawReviewSummaryNodes = [...extra, ...rawReviewSummaryNodes];
-    }
-    // Paginate APPROVED reviews backward if the first page is incomplete — gated behind
-    // `paginateApprovedReviews` because approvals minimization is opt-in. See FetchPrBatchOptions.
-    let rawApprovedReviewNodes = raw.approvedReviews.nodes;
-    if (opts.paginateApprovedReviews &&
-        raw.approvedReviews.pageInfo.hasPreviousPage &&
-        raw.approvedReviews.pageInfo.startCursor) {
-        const extra = await paginateBackward(async (cursor) => {
-            const res = await graphql(BATCH_PR_QUERY, {
-                owner: repo.owner,
-                repo: repo.name,
-                pr,
-                ...(cursor ? { approvedReviewsCursor: cursor } : {}),
-            });
-            const pr2 = requireRawPr(res.data, pr, repo);
-            return pr2.approvedReviews;
-        }, raw.approvedReviews.pageInfo.startCursor);
-        rawApprovedReviewNodes = [...extra, ...rawApprovedReviewNodes];
-    }
-    // Paginate check contexts forward if the first page is incomplete.
-    let rawCheckNodes = requireContextNodes(raw.commits.nodes[0]?.commit.statusCheckRollup?.contexts.nodes ?? []);
-    const checksPageInfo = raw.commits.nodes[0]?.commit.statusCheckRollup?.contexts.pageInfo;
-    const firstOid = raw.commits.nodes[0]?.commit.oid;
-    if (checksPageInfo?.hasNextPage && checksPageInfo.endCursor) {
-        // Pass endCursor so paginateForward fetches pages *after* the already-
-        // fetched first page instead of re-fetching it from the start.
-        let pageCount = 0;
-        const extra = await paginateForward(async (cursor) => {
-            const res = await graphql(BATCH_PR_QUERY, {
-                owner: repo.owner,
-                repo: repo.name,
-                pr,
-                ...(cursor ? { checksCursor: cursor } : {}),
-            });
-            const pr2 = requireRawPr(res.data, pr, repo);
-            if (!pr2?.commits.nodes[0]?.commit.statusCheckRollup) {
-                throw new Error(`Check-context pagination interrupted: statusCheckRollup disappeared on page ${pageCount + 2} (possible force-push race). Retry after the push stabilizes.`);
-            }
-            const currentOid = pr2.commits.nodes[0]?.commit.oid;
-            if (firstOid !== undefined && currentOid !== undefined && currentOid !== firstOid) {
-                throw new Error(`Check-context pagination interrupted: head commit changed from ${firstOid} to ${currentOid} between pages (force-push race). Retry.`);
-            }
-            pageCount++;
-            const ctxs = pr2.commits.nodes[0]?.commit.statusCheckRollup?.contexts;
-            if (!ctxs)
-                return { pageInfo: { hasNextPage: false, endCursor: null }, nodes: [] };
-            return { ...ctxs, nodes: requireContextNodes(ctxs.nodes) };
-        }, checksPageInfo.endCursor);
-        rawCheckNodes = [...rawCheckNodes, ...extra];
-    }
-    const data = parseRawPr(raw, rawThreadPages, rawCommentNodes, rawReviewNodes, rawReviewSummaryNodes, rawApprovedReviewNodes, rawCheckNodes);
-    return { data, rateLimit: result.rateLimit };
+    const paged = await paginateBatchConnections(pr, repo, raw, opts, result.rateLimit);
+    const rawThreadPages = await hydrateThreadCommentPages(paged.threads);
+    const data = parseRawPr(raw, rawThreadPages, paged.comments, paged.changesRequested, paged.reviewSummaries, paged.approvedReviews, paged.checks);
+    data.checks = mergeStartupFailureChecks(data.checks, parseSuiteStartupFailures(raw));
+    return {
+        data,
+        rateLimit: paged.rateLimit ?? result.rateLimit,
+        ...(parseCheckSuitesComplete(raw) && { checkSuitesComplete: true }),
+    };
 }

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

@@ -0,0 +1,189 @@
+# Follow-up pages only — skipped connections are omitted via @include so extra
+# pages do not re-pay the full batch-pr.gql node cost. Outstanding cursors are
+# sent together in one request.
+query BatchPrPage(
+  $owner: String!
+  $repo: String!
+  $pr: Int!
+  $includeThreads: Boolean!
+  $threadsCursor: String
+  $includeComments: Boolean!
+  $commentsCursor: String
+  $includeChangesRequested: Boolean!
+  $changesRequestedCursor: String
+  $includeReviewSummaries: Boolean!
+  $reviewSummariesCursor: String
+  $includeApprovedReviews: Boolean!
+  $approvedReviewsCursor: String
+  $includeChecks: Boolean!
+  $checksCursor: String
+) {
+  repository(owner: $owner, name: $repo) {
+    pullRequest(number: $pr) {
+      reviewThreads(last: 100, before: $threadsCursor) @include(if: $includeThreads) {
+        pageInfo {
+          hasPreviousPage
+          startCursor
+        }
+        nodes {
+          id
+          isResolved
+          isOutdated
+          path
+          line
+          startLine
+          comments(first: 100) {
+            pageInfo {
+              hasNextPage
+              endCursor
+            }
+            nodes {
+              id
+              isMinimized
+              url
+              authorAssociation
+              author {
+                __typename
+                login
+              }
+              pullRequestReview {
+                id
+              }
+              body
+              path
+              line
+              startLine
+              createdAt
+            }
+          }
+        }
+      }
+      comments(last: 100, before: $commentsCursor) @include(if: $includeComments) {
+        pageInfo {
+          hasPreviousPage
+          startCursor
+        }
+        nodes {
+          id
+          isMinimized
+          url
+          authorAssociation
+          author {
+            __typename
+            login
+          }
+          body
+          createdAt
+        }
+      }
+      changesRequestedReviews: reviews(
+        states: CHANGES_REQUESTED
+        last: 50
+        before: $changesRequestedCursor
+      ) @include(if: $includeChangesRequested) {
+        pageInfo {
+          hasPreviousPage
+          startCursor
+        }
+        nodes {
+          id
+          authorAssociation
+          author {
+            __typename
+            login
+          }
+          body
+          createdAt
+          commit {
+            oid
+          }
+        }
+      }
+      reviewSummaries: reviews(states: COMMENTED, last: 50, before: $reviewSummariesCursor)
+        @include(if: $includeReviewSummaries) {
+        pageInfo {
+          hasPreviousPage
+          startCursor
+        }
+        nodes {
+          id
+          isMinimized
+          authorAssociation
+          author {
+            __typename
+            login
+          }
+          body
+          createdAt
+        }
+      }
+      approvedReviews: reviews(states: APPROVED, last: 50, before: $approvedReviewsCursor)
+        @include(if: $includeApprovedReviews) {
+        pageInfo {
+          hasPreviousPage
+          startCursor
+        }
+        nodes {
+          id
+          isMinimized
+          authorAssociation
+          author {
+            __typename
+            login
+          }
+          body
+          createdAt
+        }
+      }
+      commits(last: 1) @include(if: $includeChecks) {
+        nodes {
+          commit {
+            oid
+            statusCheckRollup {
+              contexts(first: 100, after: $checksCursor) {
+                pageInfo {
+                  hasNextPage
+                  endCursor
+                }
+                nodes {
+                  __typename
+                  ... on CheckRun {
+                    id
+                    name
+                    status
+                    conclusion
+                    detailsUrl
+                    completedAt
+                    startedAt
+                    title
+                    summary
+                    checkSuite {
+                      createdAt
+                      updatedAt
+                      workflowRun {
+                        event
+                        createdAt
+                        updatedAt
+                        workflow {
+                          name
+                          databaseId
+                        }
+                      }
+                    }
+                  }
+                  ... on StatusContext {
+                    context
+                    state
+                    createdAt
+                    targetUrl
+                    description
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -1,14 +1,6 @@
-query BatchPr(
-  $owner: String!
-  $repo: String!
-  $pr: Int!
-  $threadsCursor: String
-  $checksCursor: String
-  $commentsCursor: String
-  $changesRequestedCursor: String
-  $reviewSummariesCursor: String
-  $approvedReviewsCursor: String
-) {
+# First page only. Extra pages use batch-pr-page.gql so follow-ups do not
+# re-select every connection (GraphQL points scale with possible nodes).
+query BatchPr($owner: String!, $repo: String!, $pr: Int!) {
   repository(owner: $owner, name: $repo) {
     pullRequest(number: $pr) {
       id
@@ -24,13 +16,62 @@ query BatchPr(
         nameWithOwner
       }
       baseRefName
+      isInMergeQueue
+      isMergeQueueEnabled
+      mergeQueueEntry {
+        position
+        state
+        estimatedTimeToMerge
+      }
+      stack {
+        number
+        size
+        baseRefName
+      }
+      stackEntry {
+        position
+      }
       baseRef {
         branchProtectionRule {
           requiresApprovingReviews
           requiredApprovingReviewCount
           requiresConversationResolution
+          requiresCodeOwnerReviews
+          requireLastPushApproval
+          requiresCommitSignatures
+          requiresLinearHistory
           requiresStatusChecks
           requiredStatusCheckContexts
+          requiresStrictStatusChecks
+          requiresDeployments
+          requiredDeploymentEnvironments
+        }
+        rules(first: 100) {
+          nodes {
+            type
+            parameters {
+              ... on PullRequestParameters {
+                requiredApprovingReviewCount
+                requiredReviewThreadResolution
+                requireCodeOwnerReview
+                requireLastPushApproval
+              }
+              ... on RequiredStatusChecksParameters {
+                strictRequiredStatusChecksPolicy
+                requiredStatusChecks {
+                  context
+                }
+              }
+              ... on RequiredDeploymentsParameters {
+                requiredDeploymentEnvironments
+              }
+              ... on CodeScanningParameters {
+                codeScanningTools {
+                  tool
+                }
+              }
+            }
+          }
         }
       }
       # Not paginated — capped at 50; PRs with more pending reviewers truncate silently.
@@ -61,7 +102,7 @@ query BatchPr(
           state
         }
       }
-      reviewThreads(last: 100, before: $threadsCursor) {
+      reviewThreads(last: 100) {
         pageInfo {
           hasPreviousPage
           startCursor
@@ -99,7 +140,7 @@ query BatchPr(
           }
         }
       }
-      comments(last: 100, before: $commentsCursor) {
+      comments(last: 100) {
         pageInfo {
           hasPreviousPage
           startCursor
@@ -117,11 +158,7 @@ query BatchPr(
           createdAt
         }
       }
-      changesRequestedReviews: reviews(
-        states: CHANGES_REQUESTED
-        last: 50
-        before: $changesRequestedCursor
-      ) {
+      changesRequestedReviews: reviews(states: CHANGES_REQUESTED, last: 50) {
         pageInfo {
           hasPreviousPage
           startCursor
@@ -140,7 +177,7 @@ query BatchPr(
           }
         }
       }
-      reviewSummaries: reviews(states: COMMENTED, last: 50, before: $reviewSummariesCursor) {
+      reviewSummaries: reviews(states: COMMENTED, last: 50) {
         pageInfo {
           hasPreviousPage
           startCursor
@@ -160,7 +197,7 @@ query BatchPr(
       allReviews: reviews(last: 1) {
         totalCount
       }
-      approvedReviews: reviews(states: APPROVED, last: 50, before: $approvedReviewsCursor) {
+      approvedReviews: reviews(states: APPROVED, last: 50) {
         pageInfo {
           hasPreviousPage
           startCursor
@@ -183,8 +220,24 @@ query BatchPr(
           commit {
             oid
             committedDate
+            checkSuites(first: 50) {
+              pageInfo {
+                hasNextPage
+              }
+              nodes {
+                conclusion
+                workflowRun {
+                  databaseId
+                  event
+                  url
+                  workflow {
+                    name
+                  }
+                }
+              }
+            }
             statusCheckRollup {
-              contexts(first: 100, after: $checksCursor) {
+              contexts(first: 100) {
                 pageInfo {
                   hasNextPage
                   endCursor

package/bin/github/gql/commit-suggestion-thread.gql

@@ -0,0 +1,40 @@
+query CommitSuggestionThread($owner: String!, $repo: String!, $pr: Int!, $threadId: ID!) {
+  repository(owner: $owner, name: $repo) {
+    pullRequest(number: $pr) {
+      headRefOid
+      headRefName
+      headRepository {
+        nameWithOwner
+      }
+    }
+  }
+  node(id: $threadId) {
+    ... on PullRequestReviewThread {
+      id
+      isResolved
+      isOutdated
+      path
+      line
+      startLine
+      pullRequest {
+        number
+      }
+      comments(first: 1) {
+        nodes {
+          isMinimized
+          url
+          authorAssociation
+          author {
+            __typename
+            login
+          }
+          body
+          path
+          line
+          startLine
+          createdAt
+        }
+      }
+    }
+  }
+}