paperclip-github-plugin 0.5.1 → 0.5.2

package/dist/worker.js

@@ -728,6 +728,17 @@ var PENDING_STATUS_CONTEXT_STATES = /* @__PURE__ */ new Set(["EXPECTED", "PENDIN
 var GITHUB_REPOSITORY_MAINTAINER_WARMUP_CONCURRENCY = 4;
 var GITHUB_REPOSITORY_MAINTAINER_ROLE_NAMES = /* @__PURE__ */ new Set(["admin", "maintain"]);
 var GITHUB_REPOSITORY_TRUSTED_AUTHOR_ASSOCIATIONS = /* @__PURE__ */ new Set(["collaborator", "member", "owner"]);
+var ACTION_REQUIRED_GITHUB_PULL_REQUEST_MERGE_STATE_STATUSES = /* @__PURE__ */ new Set([
+  "behind",
+  "blocked",
+  "dirty",
+  "draft",
+  "unstable"
+]);
+var REVIEW_READY_GITHUB_PULL_REQUEST_MERGE_STATE_STATUSES = /* @__PURE__ */ new Set([
+  "clean",
+  "has_hooks"
+]);
 var GITHUB_ISSUE_STATUS_SNAPSHOT_QUERY = `
   query GitHubIssueStatusSnapshot($owner: String!, $repo: String!, $issueNumber: Int!, $after: String) {
     repository(owner: $owner, name: $repo) {
@@ -762,6 +773,8 @@ var GITHUB_PULL_REQUEST_CI_CONTEXTS_QUERY = `
   query GitHubPullRequestCiContexts($owner: String!, $repo: String!, $pullRequestNumber: Int!, $after: String) {
     repository(owner: $owner, name: $repo) {
       pullRequest(number: $pullRequestNumber) {
+        mergeable
+        mergeStateStatus
         statusCheckRollup {
           contexts(first: 100, after: $after) {
             pageInfo {
@@ -825,6 +838,8 @@ var GITHUB_REPOSITORY_OPEN_PULL_REQUEST_STATUSES_QUERY = `
         }
         nodes {
           number
+          mergeable
+          mergeStateStatus
           reviewThreads(first: 100) {
             pageInfo {
               hasNextPage
@@ -950,6 +965,8 @@ var GITHUB_PROJECT_PULL_REQUEST_SUMMARY_FIELDS = `${GITHUB_PROJECT_PULL_REQUEST_
 var GITHUB_PROJECT_PULL_REQUEST_METRICS_FIELDS = `
           number
           mergeable
+          mergeStateStatus
+          baseRefName
           reviews(first: 100) {
             pageInfo {
               hasNextPage
@@ -2219,6 +2236,7 @@ async function resolvePaperclipIssueGitHubLink(ctx, issueId, companyId, options
       githubIssueNumber: entityMatch.data.githubIssueNumber,
       githubIssueUrl: entityMatch.data.githubIssueUrl,
       linkedPullRequestNumbers: entityMatch.data.linkedPullRequestNumbers,
+      linkedPullRequests: entityMatch.data.linkedPullRequests,
       entityRecord: entityMatch
     };
   }
@@ -2240,7 +2258,8 @@ async function resolvePaperclipIssueGitHubLink(ctx, issueId, companyId, options
         githubIssueId: registryMatch.githubIssueId,
         githubIssueNumber: registryMatch.githubIssueNumber,
         githubIssueUrl: githubIssueUrl2,
-        linkedPullRequestNumbers: []
+        linkedPullRequestNumbers: [],
+        linkedPullRequests: []
       };
       return await hydrateRecoveredPaperclipIssueGitHubLink(ctx, issueId, fallbackLink2) ?? fallbackLink2;
     }
@@ -2258,7 +2277,8 @@ async function resolvePaperclipIssueGitHubLink(ctx, issueId, companyId, options
     repositoryUrl: githubIssueReference.repositoryUrl,
     githubIssueNumber: githubIssueReference.issueNumber,
     githubIssueUrl: githubIssueReference.issueUrl,
-    linkedPullRequestNumbers: []
+    linkedPullRequestNumbers: [],
+    linkedPullRequests: []
   };
   return await hydrateRecoveredPaperclipIssueGitHubLink(ctx, issueId, fallbackLink) ?? fallbackLink;
 }
@@ -2293,7 +2313,7 @@ async function hydrateRecoveredPaperclipIssueGitHubLink(ctx, issueId, fallbackLi
       },
       issueId,
       githubIssue,
-      linkedPullRequestNumbers
+      linkedPullRequests
     );
     await upsertGitHubIssueLinkRecord(
       ctx,
@@ -2304,7 +2324,7 @@ async function hydrateRecoveredPaperclipIssueGitHubLink(ctx, issueId, fallbackLi
       },
       issueId,
       githubIssue,
-      linkedPullRequestNumbers
+      linkedPullRequests
     );
     return {
       source: "entity",
@@ -2315,6 +2335,7 @@ async function hydrateRecoveredPaperclipIssueGitHubLink(ctx, issueId, fallbackLi
       githubIssueNumber: githubIssue.number,
       githubIssueUrl: normalizeGitHubIssueHtmlUrl(githubIssue.htmlUrl) ?? githubIssue.htmlUrl,
       linkedPullRequestNumbers,
+      linkedPullRequests: normalizeLinkedPullRequestReferences(linkedPullRequests, fallbackLink.repositoryUrl),
       entityRecord
     };
   } catch (error) {
@@ -2418,11 +2439,12 @@ function buildCommentAnnotationLinksFromStoredData(annotation) {
       href: annotation.githubIssueUrl
     }
   ];
-  for (const pullRequestNumber of annotation.linkedPullRequestNumbers) {
+  const linkedPullRequests = annotation.linkedPullRequests.length > 0 ? annotation.linkedPullRequests : normalizeLinkedPullRequestReferences(annotation.linkedPullRequestNumbers, annotation.repositoryUrl);
+  for (const pullRequest of linkedPullRequests) {
     links.push({
       type: "pull_request",
-      label: `PR #${pullRequestNumber}`,
-      href: `${annotation.repositoryUrl}/pull/${pullRequestNumber}`
+      label: formatLinkedPullRequestReferenceLabel(pullRequest, annotation.repositoryUrl),
+      href: `${pullRequest.repositoryUrl}/pull/${pullRequest.number}`
     });
   }
   return links;
@@ -2540,6 +2562,7 @@ async function buildIssueGitHubDetails(ctx, input) {
       githubIssueStateReason: entityMatch.data.githubIssueStateReason,
       commentsCount: entityMatch.data.commentsCount,
       linkedPullRequestNumbers: entityMatch.data.linkedPullRequestNumbers,
+      linkedPullRequests: entityMatch.data.linkedPullRequests,
       labels: entityMatch.data.labels,
       syncedAt: entityMatch.data.syncedAt
     };
@@ -2550,7 +2573,8 @@ async function buildIssueGitHubDetails(ctx, input) {
     githubIssueNumber: link.githubIssueNumber,
     githubIssueUrl: link.githubIssueUrl,
     repositoryUrl: link.repositoryUrl,
-    linkedPullRequestNumbers: link.linkedPullRequestNumbers
+    linkedPullRequestNumbers: link.linkedPullRequestNumbers,
+    linkedPullRequests: link.linkedPullRequests
   };
 }
 async function resolveIssueByIdentifier(ctx, input) {
@@ -4010,8 +4034,13 @@ function normalizeProjectPullRequestClosingIssues(repository, nodes) {
 function resolveProjectPullRequestReviewable(record) {
   return record.githubMergeable === true && record.checksStatus === "passed" && typeof record.copilotUnresolvedReviewThreads === "number" && record.copilotUnresolvedReviewThreads === 0;
 }
+function resolveProjectPullRequestTargetsDefaultBranch(record) {
+  const baseBranch = normalizeOptionalString2(record.baseBranch);
+  const defaultBranchName = normalizeOptionalString2(record.defaultBranchName);
+  return Boolean(baseBranch && defaultBranchName && baseBranch === defaultBranchName);
+}
 function resolveProjectPullRequestMergeable(record) {
-  return record.githubMergeable === true && record.checksStatus === "passed" && typeof record.reviewApprovals === "number" && record.reviewApprovals > 0 && typeof record.unresolvedReviewThreads === "number" && record.unresolvedReviewThreads === 0;
+  return record.githubMergeable === true && record.checksStatus === "passed" && typeof record.reviewApprovals === "number" && record.reviewApprovals > 0 && typeof record.reviewChangesRequested === "number" && record.reviewChangesRequested === 0 && typeof record.unresolvedReviewThreads === "number" && record.unresolvedReviewThreads === 0 && resolveProjectPullRequestTargetsDefaultBranch(record);
 }
 function resolveProjectPullRequestUpToDateStatus(record) {
   const mergeStateStatus = typeof record.mergeStateStatus === "string" ? record.mergeStateStatus : null;
@@ -4194,12 +4223,12 @@ function classifyGitHubPullRequestCiState(contexts) {
   return hasPendingContext ? "unfinished" : "green";
 }
 function resolvePaperclipStatusFromLinkedPullRequests(linkedPullRequests, options) {
-  if (linkedPullRequests.some((pullRequest) => pullRequest.hasUnresolvedReviewThreads || pullRequest.ciState === "red")) {
+  if (linkedPullRequests.some(
+    (pullRequest) => pullRequest.hasUnresolvedReviewThreads || pullRequest.ciState === "red" || isGitHubPullRequestActionRequiredForSync(pullRequest)
+  )) {
     return options?.preferInProgress ? "in_progress" : "todo";
   }
-  if (linkedPullRequests.length > 0 && linkedPullRequests.every(
-    (pullRequest) => pullRequest.ciState === "green" && pullRequest.hasUnresolvedReviewThreads === false
-  )) {
+  if (linkedPullRequests.length > 0 && linkedPullRequests.every((pullRequest) => isGitHubPullRequestReviewReadyForSync(pullRequest))) {
     return "in_review";
   }
   return "in_progress";
@@ -4445,15 +4474,19 @@ function resolvePaperclipIssueReviewAssignee(syncContext, advancedSettings) {
       role: nextStage.type === "approval" ? "approver" : "reviewer"
     };
   }
+  const reviewStageType = nextStage?.type ?? currentStageType;
+  if (!reviewStageType && !syncContext.executionPolicy) {
+    return null;
+  }
   const approverOverride = getConfiguredAdvancedAssigneePrincipal(advancedSettings, "approver");
-  if (nextStage?.type === "approval" && approverOverride) {
+  if (reviewStageType === "approval" && approverOverride) {
     return {
       principal: approverOverride,
       role: "approver"
     };
   }
   const reviewerOverride = getConfiguredAdvancedAssigneePrincipal(advancedSettings, "reviewer");
-  if (reviewerOverride) {
+  if (reviewStageType !== "approval" && reviewerOverride) {
     return {
       principal: reviewerOverride,
       role: "reviewer"
@@ -4541,6 +4574,9 @@ function buildSyncFallbackExecutionStatePatch(params) {
   if ((currentStatus === "done" || currentStatus === "cancelled") && nextStatus !== "done" && nextStatus !== "cancelled") {
     return previousState ? null : void 0;
   }
+  if (nextStatus === "done" || nextStatus === "cancelled") {
+    return previousState ? null : void 0;
+  }
   if (nextStatus === "in_review" && syncContext.executionPolicy) {
     const nextStageMatch = findPaperclipIssueExecutionStageMatch(syncContext.executionPolicy, previousState);
     if (!nextStageMatch) {
@@ -4599,32 +4635,33 @@ function describeGitHubStatusTransitionReason(params) {
   }
   const linkedPullRequestSubject = snapshot.linkedPullRequests.length === 1 ? "the linked pull request" : "linked pull requests";
   const linkedPullRequestVerb = snapshot.linkedPullRequests.length === 1 ? "has" : "have";
-  const hasRedCi = snapshot.linkedPullRequests.some((pullRequest) => pullRequest.ciState === "red");
-  const hasUnresolvedReviewThreads = snapshot.linkedPullRequests.some((pullRequest) => pullRequest.hasUnresolvedReviewThreads);
+  const blockingConditions = [...new Set(
+    snapshot.linkedPullRequests.flatMap((pullRequest) => listGitHubPullRequestSyncBlockingConditions(pullRequest))
+  )];
   const hasUnfinishedCi = snapshot.linkedPullRequests.some((pullRequest) => pullRequest.ciState === "unfinished");
-  if (hasRedCi && hasUnresolvedReviewThreads) {
-    return `${linkedPullRequestSubject} ${linkedPullRequestVerb} failing CI with unresolved review threads`;
-  }
-  if (hasRedCi) {
-    return `${linkedPullRequestSubject} ${linkedPullRequestVerb} failing CI`;
-  }
-  if (hasUnresolvedReviewThreads) {
-    return `${linkedPullRequestSubject} ${linkedPullRequestVerb} unresolved review threads`;
+  const hasUnknownMergeability = snapshot.linkedPullRequests.some(
+    (pullRequest) => pullRequest.mergeStateStatus === "unknown"
+  );
+  if (blockingConditions.length > 0) {
+    return `${linkedPullRequestSubject} ${linkedPullRequestVerb} ${formatPlainTextList(blockingConditions)}`;
   }
   if (hasUnfinishedCi) {
     return `${linkedPullRequestSubject} still ${linkedPullRequestVerb} unfinished CI jobs`;
   }
+  if (hasUnknownMergeability) {
+    return `${linkedPullRequestSubject} ${linkedPullRequestVerb} unknown mergeability`;
+  }
   return `${linkedPullRequestSubject} ${linkedPullRequestVerb} green CI with all review threads resolved`;
 }
 function buildStatusTransitionCommentAnnotation(params) {
   const { repository, snapshot, previousStatus, nextStatus, reason } = params;
+  const linkedPullRequests = normalizeLinkedPullRequestReferences(snapshot.linkedPullRequests);
   return {
     repositoryUrl: repository.url,
     githubIssueNumber: snapshot.issueNumber,
     githubIssueUrl: `${repository.url}/issues/${snapshot.issueNumber}`,
-    linkedPullRequestNumbers: normalizeLinkedPullRequestNumbers(
-      snapshot.linkedPullRequests.map((pullRequest) => pullRequest.number)
-    ),
+    linkedPullRequestNumbers: normalizeLinkedPullRequestNumbers(linkedPullRequests.map((pullRequest) => pullRequest.number)),
+    linkedPullRequests,
     previousStatus,
     nextStatus,
     reason,
@@ -4695,7 +4732,7 @@ function resolvePaperclipIssueStatus(params) {
 }
 async function listLinkedPullRequestsForIssue(octokit, repository, issueNumber) {
   const linkedPullRequests = [];
-  const seenPullRequestNumbers = /* @__PURE__ */ new Set();
+  const seenPullRequestKeys = /* @__PURE__ */ new Set();
   let after;
   do {
     const response = await octokit.graphql(GITHUB_ISSUE_STATUS_SNAPSHOT_QUERY, {
@@ -4707,31 +4744,37 @@ async function listLinkedPullRequestsForIssue(octokit, repository, issueNumber)
     const nextLinkedPullRequests = collectGitHubLinkedPullRequests(
       response.repository?.issue?.closedByPullRequestsReferences?.nodes ?? [],
       repository,
-      seenPullRequestNumbers
+      seenPullRequestKeys
     );
     linkedPullRequests.push(...nextLinkedPullRequests);
     after = getPageCursor(response.repository?.issue?.closedByPullRequestsReferences?.pageInfo);
   } while (after);
   return linkedPullRequests;
 }
-function collectGitHubLinkedPullRequests(nodes, repository, seenPullRequestNumbers = /* @__PURE__ */ new Set()) {
+function collectGitHubLinkedPullRequests(nodes, repository, seenPullRequestKeys = /* @__PURE__ */ new Set()) {
   const linkedPullRequests = [];
   for (const node of nodes) {
-    if (!node || typeof node.number !== "number" || !node.state || seenPullRequestNumbers.has(node.number)) {
+    if (!node || typeof node.number !== "number" || !node.state) {
       continue;
     }
     const pullRequestOwner = node.repository?.owner?.login?.trim();
     const pullRequestRepo = node.repository?.name?.trim();
-    if (pullRequestOwner && pullRequestRepo && !areRepositoriesEqual(repository, {
-      owner: pullRequestOwner,
-      repo: pullRequestRepo
-    })) {
+    const pullRequestRepository = pullRequestOwner && pullRequestRepo ? parseRepositoryReference(`${pullRequestOwner}/${pullRequestRepo}`) : repository;
+    if (!pullRequestRepository) {
+      continue;
+    }
+    const pullRequestKey = buildGitHubPullRequestReferenceKey({
+      number: node.number,
+      repositoryUrl: pullRequestRepository.url
+    });
+    if (seenPullRequestKeys.has(pullRequestKey)) {
       continue;
     }
-    seenPullRequestNumbers.add(node.number);
+    seenPullRequestKeys.add(pullRequestKey);
     linkedPullRequests.push({
       number: node.number,
-      state: node.state
+      state: node.state,
+      repositoryUrl: pullRequestRepository.url
     });
   }
   return linkedPullRequests;
@@ -4789,7 +4832,75 @@ function extractGitHubCiContextRecords(nodes) {
   }
   return contexts;
 }
-function tryBuildGitHubPullRequestStatusSnapshotFromBatchNode(node) {
+function normalizeGitHubPullRequestMergeability(value) {
+  if (value === "MERGEABLE") {
+    return "mergeable";
+  }
+  if (value === "CONFLICTING") {
+    return "conflicting";
+  }
+  return "unknown";
+}
+function normalizeGitHubPullRequestMergeStateStatus(value) {
+  switch (typeof value === "string" ? value.trim().toLowerCase() : "") {
+    case "behind":
+      return "behind";
+    case "blocked":
+      return "blocked";
+    case "clean":
+      return "clean";
+    case "dirty":
+      return "dirty";
+    case "draft":
+      return "draft";
+    case "has_hooks":
+      return "has_hooks";
+    case "unstable":
+      return "unstable";
+    default:
+      return "unknown";
+  }
+}
+function isGitHubPullRequestActionRequiredForSync(pullRequest) {
+  return pullRequest.mergeability === "conflicting" || ACTION_REQUIRED_GITHUB_PULL_REQUEST_MERGE_STATE_STATUSES.has(pullRequest.mergeStateStatus);
+}
+function isGitHubPullRequestReviewReadyForSync(pullRequest) {
+  if (pullRequest.ciState !== "green" || pullRequest.hasUnresolvedReviewThreads) {
+    return false;
+  }
+  return REVIEW_READY_GITHUB_PULL_REQUEST_MERGE_STATE_STATUSES.has(pullRequest.mergeStateStatus);
+}
+function listGitHubPullRequestSyncBlockingConditions(pullRequest) {
+  const conditions = [];
+  if (pullRequest.ciState === "red") {
+    conditions.push("failing CI");
+  }
+  if (pullRequest.mergeability === "conflicting" || pullRequest.mergeStateStatus === "dirty") {
+    conditions.push("merge conflicts");
+  } else {
+    switch (pullRequest.mergeStateStatus) {
+      case "behind":
+        conditions.push("out-of-date branch state");
+        break;
+      case "blocked":
+        conditions.push("blocked merge requirements");
+        break;
+      case "draft":
+        conditions.push("draft status");
+        break;
+      case "unstable":
+        conditions.push("unstable merge requirements");
+        break;
+      default:
+        break;
+    }
+  }
+  if (pullRequest.hasUnresolvedReviewThreads) {
+    conditions.push("unresolved review threads");
+  }
+  return conditions;
+}
+function tryBuildGitHubPullRequestStatusSnapshotFromBatchNode(node, repository) {
   if (typeof node.number !== "number") {
     return null;
   }
@@ -4800,8 +4911,11 @@ function tryBuildGitHubPullRequestStatusSnapshotFromBatchNode(node) {
   }
   return {
     number: node.number,
+    repositoryUrl: repository.url,
     hasUnresolvedReviewThreads: reviewThreadSummary.unresolvedReviewThreads > 0,
-    ciState
+    ciState,
+    mergeability: normalizeGitHubPullRequestMergeability(node.mergeable),
+    mergeStateStatus: normalizeGitHubPullRequestMergeStateStatus(node.mergeStateStatus)
   };
 }
 function tryBuildGitHubPullRequestCiStateFromBatchNode(node) {
@@ -4816,7 +4930,9 @@ async function warmGitHubPullRequestStatusCache(octokit, repository, targetPullR
     return;
   }
   const remainingNumbers = new Set(
-    [...targetPullRequestNumbers].filter((pullRequestNumber) => !pullRequestStatusCache.has(pullRequestNumber))
+    [...targetPullRequestNumbers].filter(
+      (pullRequestNumber) => !getCachedGitHubPullRequestStatusSnapshot(pullRequestStatusCache, repository, pullRequestNumber)
+    )
   );
   if (remainingNumbers.size === 0) {
     return;
@@ -4837,9 +4953,9 @@ async function warmGitHubPullRequestStatusCache(octokit, repository, targetPullR
         continue;
       }
       remainingNumbers.delete(node.number);
-      const snapshot = tryBuildGitHubPullRequestStatusSnapshotFromBatchNode(node);
+      const snapshot = tryBuildGitHubPullRequestStatusSnapshotFromBatchNode(node, repository);
       if (snapshot) {
-        pullRequestStatusCache.set(node.number, snapshot);
+        setCachedGitHubPullRequestStatusSnapshot(pullRequestStatusCache, snapshot);
         cacheGitHubPullRequestStatusSnapshot(repository, snapshot);
       }
     }
@@ -4850,7 +4966,12 @@ async function warmGitHubPullRequestStatusCache(octokit, repository, targetPullR
   } while (after);
 }
 async function getGitHubPullRequestCiState(octokit, repository, pullRequestNumber) {
+  return (await getGitHubPullRequestCiSnapshot(octokit, repository, pullRequestNumber)).ciState;
+}
+async function getGitHubPullRequestCiSnapshot(octokit, repository, pullRequestNumber) {
   const contexts = [];
+  let mergeability = "unknown";
+  let mergeStateStatus = "unknown";
   let after;
   do {
     const response = await octokit.graphql(GITHUB_PULL_REQUEST_CI_CONTEXTS_QUERY, {
@@ -4859,6 +4980,8 @@ async function getGitHubPullRequestCiState(octokit, repository, pullRequestNumbe
       pullRequestNumber,
       after
     });
+    mergeability = normalizeGitHubPullRequestMergeability(response.repository?.pullRequest?.mergeable);
+    mergeStateStatus = normalizeGitHubPullRequestMergeStateStatus(response.repository?.pullRequest?.mergeStateStatus);
     const connection = response.repository?.pullRequest?.statusCheckRollup?.contexts;
     const nodes = connection?.nodes ?? [];
     for (const node of nodes) {
@@ -4882,49 +5005,63 @@ async function getGitHubPullRequestCiState(octokit, repository, pullRequestNumbe
     }
     after = getPageCursor(connection?.pageInfo);
   } while (after);
-  return classifyGitHubPullRequestCiState(contexts);
+  return {
+    ciState: classifyGitHubPullRequestCiState(contexts),
+    mergeability,
+    mergeStateStatus
+  };
 }
 async function getGitHubPullRequestStatusSnapshot(octokit, repository, pullRequestNumber, pullRequestStatusCache, options) {
-  const cached = pullRequestStatusCache.get(pullRequestNumber);
+  const cached = getCachedGitHubPullRequestStatusSnapshot(pullRequestStatusCache, repository, pullRequestNumber);
   if (cached) {
     return cached;
   }
   const cacheKey = buildRepositoryPullRequestRecordCacheKey(repository, pullRequestNumber, "status");
   const cachedSnapshot = getFreshCacheValue(activeGitHubPullRequestStatusSnapshotCache, cacheKey);
   if (cachedSnapshot) {
-    pullRequestStatusCache.set(pullRequestNumber, cachedSnapshot);
+    setCachedGitHubPullRequestStatusSnapshot(pullRequestStatusCache, cachedSnapshot);
     return cachedSnapshot;
   }
-  if (options?.reviewThreadSummary && options.ciState) {
+  if (options?.reviewThreadSummary && options.ciState && options.mergeability !== void 0 && options.mergeStateStatus !== void 0) {
     const snapshot = cacheGitHubPullRequestStatusSnapshot(repository, {
       number: pullRequestNumber,
+      repositoryUrl: repository.url,
       hasUnresolvedReviewThreads: options.reviewThreadSummary.unresolvedReviewThreads > 0,
-      ciState: options.ciState
+      ciState: options.ciState,
+      mergeability: options.mergeability,
+      mergeStateStatus: options.mergeStateStatus
     });
-    pullRequestStatusCache.set(pullRequestNumber, snapshot);
+    setCachedGitHubPullRequestStatusSnapshot(pullRequestStatusCache, snapshot);
     return snapshot;
   }
   const inFlightSnapshot = activeGitHubPullRequestStatusSnapshotPromiseCache.get(cacheKey);
   if (inFlightSnapshot) {
     const snapshot = await inFlightSnapshot;
-    pullRequestStatusCache.set(pullRequestNumber, snapshot);
+    setCachedGitHubPullRequestStatusSnapshot(pullRequestStatusCache, snapshot);
     return snapshot;
   }
   const loadSnapshotPromise = (async () => {
-    const [reviewThreadSummary, ciState] = await Promise.all([
+    const [reviewThreadSummary, ciSnapshot] = await Promise.all([
       options?.reviewThreadSummary ?? getOrLoadCachedGitHubPullRequestReviewThreadSummary(octokit, repository, pullRequestNumber),
-      options?.ciState ?? getGitHubPullRequestCiState(octokit, repository, pullRequestNumber)
+      options?.ciState && options.mergeability !== void 0 && options.mergeStateStatus !== void 0 ? {
+        ciState: options.ciState,
+        mergeability: options.mergeability,
+        mergeStateStatus: options.mergeStateStatus
+      } : getGitHubPullRequestCiSnapshot(octokit, repository, pullRequestNumber)
     ]);
     return cacheGitHubPullRequestStatusSnapshot(repository, {
       number: pullRequestNumber,
+      repositoryUrl: repository.url,
       hasUnresolvedReviewThreads: reviewThreadSummary.unresolvedReviewThreads > 0,
-      ciState
+      ciState: ciSnapshot.ciState,
+      mergeability: ciSnapshot.mergeability,
+      mergeStateStatus: ciSnapshot.mergeStateStatus
     });
   })();
   activeGitHubPullRequestStatusSnapshotPromiseCache.set(cacheKey, loadSnapshotPromise);
   try {
     const snapshot = await loadSnapshotPromise;
-    pullRequestStatusCache.set(pullRequestNumber, snapshot);
+    setCachedGitHubPullRequestStatusSnapshot(pullRequestStatusCache, snapshot);
     return snapshot;
   } finally {
     if (activeGitHubPullRequestStatusSnapshotPromiseCache.get(cacheKey) === loadSnapshotPromise) {
@@ -4957,8 +5094,14 @@ async function getGitHubIssueStatusSnapshot(octokit, repository, issueNumber, gi
     if (pullRequest.state !== "OPEN") {
       continue;
     }
+    const linkedPullRequestRepository = requireRepositoryReference(pullRequest.repositoryUrl);
     linkedPullRequestSnapshots.push(
-      await getGitHubPullRequestStatusSnapshot(octokit, repository, pullRequest.number, pullRequestStatusCache)
+      await getGitHubPullRequestStatusSnapshot(
+        octokit,
+        linkedPullRequestRepository,
+        pullRequest.number,
+        pullRequestStatusCache
+      )
     );
   }
   const snapshot = {
@@ -5212,11 +5355,86 @@ function getHiddenGitHubImportMarkerPattern() {
     "i"
   );
 }
+function formatPlainTextList(items) {
+  if (items.length === 0) {
+    return "";
+  }
+  if (items.length === 1) {
+    return items[0];
+  }
+  if (items.length === 2) {
+    return `${items[0]} and ${items[1]}`;
+  }
+  return `${items.slice(0, -1).join(", ")}, and ${items.at(-1)}`;
+}
 function normalizeLinkedPullRequestNumbers(values) {
   return [...new Set(
     values.filter((pullRequestNumber) => Number.isInteger(pullRequestNumber) && pullRequestNumber > 0)
   )].sort((left, right) => left - right);
 }
+function buildGitHubPullRequestReferenceKey(pullRequest) {
+  return `${getNormalizedMappingRepositoryUrl({ repositoryUrl: pullRequest.repositoryUrl }).toLowerCase()}#${Math.max(1, Math.floor(pullRequest.number))}`;
+}
+function normalizeLinkedPullRequestReferences(values, fallbackRepositoryUrl) {
+  const references = [];
+  const seenKeys = /* @__PURE__ */ new Set();
+  const normalizedFallbackRepositoryUrl = typeof fallbackRepositoryUrl === "string" && fallbackRepositoryUrl.trim() ? getNormalizedMappingRepositoryUrl({
+    repositoryUrl: fallbackRepositoryUrl
+  }) : void 0;
+  for (const value of values) {
+    const number = typeof value === "number" ? Math.floor(value) : value && typeof value === "object" && typeof value.number === "number" ? Math.floor(value.number) : void 0;
+    const repositoryUrl = value && typeof value === "object" && typeof value.repositoryUrl === "string" && value.repositoryUrl.trim() ? getNormalizedMappingRepositoryUrl({
+      repositoryUrl: value.repositoryUrl
+    }) : normalizedFallbackRepositoryUrl;
+    if (!number || number < 1 || !repositoryUrl) {
+      continue;
+    }
+    const referenceKey = buildGitHubPullRequestReferenceKey({
+      number,
+      repositoryUrl
+    });
+    if (seenKeys.has(referenceKey)) {
+      continue;
+    }
+    seenKeys.add(referenceKey);
+    references.push({
+      number,
+      repositoryUrl
+    });
+  }
+  references.sort((left, right) => {
+    const repositoryUrlComparison = left.repositoryUrl.toLowerCase().localeCompare(right.repositoryUrl.toLowerCase());
+    if (repositoryUrlComparison !== 0) {
+      return repositoryUrlComparison;
+    }
+    return left.number - right.number;
+  });
+  return references;
+}
+function formatLinkedPullRequestReferenceLabel(pullRequest, issueRepositoryUrl) {
+  const pullRequestRepository = parseRepositoryReference(pullRequest.repositoryUrl);
+  if (!pullRequestRepository) {
+    return `PR #${pullRequest.number}`;
+  }
+  if (issueRepositoryUrl) {
+    const issueRepository = parseRepositoryReference(issueRepositoryUrl);
+    if (issueRepository && areRepositoriesEqual(issueRepository, pullRequestRepository)) {
+      return `PR #${pullRequest.number}`;
+    }
+  }
+  return `${formatRepositoryLabel(pullRequestRepository)}#${pullRequest.number}`;
+}
+function getCachedGitHubPullRequestStatusSnapshot(pullRequestStatusCache, repository, pullRequestNumber) {
+  return pullRequestStatusCache.get(
+    buildGitHubPullRequestReferenceKey({
+      number: pullRequestNumber,
+      repositoryUrl: repository.url
+    })
+  );
+}
+function setCachedGitHubPullRequestStatusSnapshot(pullRequestStatusCache, snapshot) {
+  pullRequestStatusCache.set(buildGitHubPullRequestReferenceKey(snapshot), snapshot);
+}
 function extractImportedGitHubIssueUrlFromDescription(description) {
   if (typeof description !== "string") {
     return void 0;
@@ -5442,6 +5660,14 @@ function normalizeGitHubIssueLinkEntityData(value) {
   if (!repositoryUrl || githubIssueId === void 0 || githubIssueNumber === void 0 || !githubIssueUrl || !githubIssueState || !syncedAt) {
     return null;
   }
+  const linkedPullRequestNumbers = normalizeLinkedPullRequestNumbers(
+    Array.isArray(record.linkedPullRequestNumbers) ? record.linkedPullRequestNumbers.filter((entry) => typeof entry === "number") : []
+  );
+  const rawLinkedPullRequests = Array.isArray(record.linkedPullRequests) ? record.linkedPullRequests : [];
+  const linkedPullRequests = normalizeLinkedPullRequestReferences(
+    rawLinkedPullRequests.length > 0 ? rawLinkedPullRequests : linkedPullRequestNumbers,
+    repositoryUrl
+  );
   return {
     ...typeof record.companyId === "string" && record.companyId.trim() ? { companyId: record.companyId.trim() } : {},
     ...typeof record.paperclipProjectId === "string" && record.paperclipProjectId.trim() ? { paperclipProjectId: record.paperclipProjectId.trim() } : {},
@@ -5455,9 +5681,8 @@ function normalizeGitHubIssueLinkEntityData(value) {
     githubIssueState,
     ...githubIssueStateReason ? { githubIssueStateReason } : {},
     commentsCount,
-    linkedPullRequestNumbers: normalizeLinkedPullRequestNumbers(
-      Array.isArray(record.linkedPullRequestNumbers) ? record.linkedPullRequestNumbers.filter((entry) => typeof entry === "number") : []
-    ),
+    linkedPullRequestNumbers,
+    linkedPullRequests,
     labels: normalizeStoredGitHubIssueLabels(record.labels),
     syncedAt
   };
@@ -5507,15 +5732,22 @@ function normalizeStoredStatusTransitionCommentAnnotation(value) {
   if (!repositoryUrl || githubIssueNumber === void 0 || !githubIssueUrl || !previousStatus || !nextStatus || !reason || !createdAt || !paperclipIssueId) {
     return null;
   }
+  const linkedPullRequestNumbers = normalizeLinkedPullRequestNumbers(
+    Array.isArray(record.linkedPullRequestNumbers) ? record.linkedPullRequestNumbers.filter((entry) => typeof entry === "number") : []
+  );
+  const rawLinkedPullRequests = Array.isArray(record.linkedPullRequests) ? record.linkedPullRequests : [];
+  const linkedPullRequests = normalizeLinkedPullRequestReferences(
+    rawLinkedPullRequests.length > 0 ? rawLinkedPullRequests : linkedPullRequestNumbers,
+    repositoryUrl
+  );
   return {
     ...typeof record.companyId === "string" && record.companyId.trim() ? { companyId: record.companyId.trim() } : {},
     paperclipIssueId,
     repositoryUrl,
     githubIssueNumber,
     githubIssueUrl,
-    linkedPullRequestNumbers: normalizeLinkedPullRequestNumbers(
-      Array.isArray(record.linkedPullRequestNumbers) ? record.linkedPullRequestNumbers.filter((entry) => typeof entry === "number") : []
-    ),
+    linkedPullRequestNumbers,
+    linkedPullRequests,
     previousStatus,
     nextStatus,
     reason,
@@ -5642,9 +5874,10 @@ async function findStoredStatusTransitionCommentAnnotation(ctx, params) {
   }
   return null;
 }
-function buildGitHubIssueLinkRecord(target, issueId, githubIssue, linkedPullRequestNumbers) {
+function buildGitHubIssueLinkRecord(target, issueId, githubIssue, linkedPullRequests) {
   const githubIssueUrl = normalizeGitHubIssueHtmlUrl(githubIssue.htmlUrl) ?? githubIssue.htmlUrl;
   const repositoryUrl = parseRepositoryReference(target.repositoryUrl)?.url ?? target.repositoryUrl.trim();
+  const normalizedLinkedPullRequests = normalizeLinkedPullRequestReferences(linkedPullRequests, repositoryUrl);
   return {
     paperclipIssueId: issueId,
     title: `GitHub issue #${githubIssue.number}`,
@@ -5662,14 +5895,17 @@ function buildGitHubIssueLinkRecord(target, issueId, githubIssue, linkedPullRequ
       githubIssueState: githubIssue.state,
       ...githubIssue.stateReason ? { githubIssueStateReason: githubIssue.stateReason } : {},
       commentsCount: githubIssue.commentsCount,
-      linkedPullRequestNumbers: normalizeLinkedPullRequestNumbers(linkedPullRequestNumbers),
+      linkedPullRequestNumbers: normalizeLinkedPullRequestNumbers(
+        normalizedLinkedPullRequests.map((pullRequest) => pullRequest.number)
+      ),
+      linkedPullRequests: normalizedLinkedPullRequests,
       labels: githubIssue.labels,
       syncedAt: (/* @__PURE__ */ new Date()).toISOString()
     }
   };
 }
-async function upsertGitHubIssueLinkRecord(ctx, target, issueId, githubIssue, linkedPullRequestNumbers) {
-  const record = buildGitHubIssueLinkRecord(target, issueId, githubIssue, linkedPullRequestNumbers);
+async function upsertGitHubIssueLinkRecord(ctx, target, issueId, githubIssue, linkedPullRequests) {
+  const record = buildGitHubIssueLinkRecord(target, issueId, githubIssue, linkedPullRequests);
   await ctx.entities.upsert({
     entityType: ISSUE_LINK_ENTITY_TYPE,
     scopeKind: "issue",
@@ -6580,14 +6816,22 @@ async function updatePaperclipIssueState(ctx, params) {
     syncContext,
     nextStatus,
     nextAssignee,
+    clearAssignee,
     transitionComment,
     transitionCommentAnnotation,
     paperclipApiBaseUrl
   } = params;
   const trimmedTransitionComment = transitionComment.trim();
   let issueUpdated = false;
+  const syncExecutionStatePatch = buildSyncFallbackExecutionStatePatch({
+    currentStatus,
+    nextStatus,
+    syncContext,
+    nextAssignee
+  });
   const issuePatch = {
-    status: nextStatus
+    status: nextStatus,
+    ...syncExecutionStatePatch === null ? { executionState: null } : {}
   };
   if (nextAssignee) {
     if (nextAssignee.kind === "agent") {
@@ -6597,6 +6841,9 @@ async function updatePaperclipIssueState(ctx, params) {
       issuePatch.assigneeAgentId = null;
       issuePatch.assigneeUserId = nextAssignee.id;
     }
+  } else if (clearAssignee) {
+    issuePatch.assigneeAgentId = null;
+    issuePatch.assigneeUserId = null;
   }
   if (paperclipApiBaseUrl) {
     try {
@@ -6642,16 +6889,10 @@ async function updatePaperclipIssueState(ctx, params) {
     }
   }
   if (!issueUpdated) {
-    const fallbackExecutionStatePatch = buildSyncFallbackExecutionStatePatch({
-      currentStatus,
-      nextStatus,
-      syncContext,
-      nextAssignee
-    });
     const preserveExistingUserAssigneeWithoutLocalApi = nextAssignee?.kind === "user" && !paperclipApiBaseUrl;
     const sdkIssuePatch = {
       ...issuePatch,
-      ...fallbackExecutionStatePatch !== void 0 ? { executionState: fallbackExecutionStatePatch } : {}
+      ...syncExecutionStatePatch !== void 0 ? { executionState: syncExecutionStatePatch } : {}
     };
     if (preserveExistingUserAssigneeWithoutLocalApi) {
       delete sdkIssuePatch.assigneeAgentId;
@@ -7034,7 +7275,7 @@ async function synchronizePaperclipIssueStatuses(ctx, octokit, repository, mappi
           stateReason: snapshot.stateReason,
           commentsCount: snapshot.commentCount
         },
-        snapshotLinkedPullRequestNumbers
+        snapshot.linkedPullRequests
       );
       const previousCommentCount = importedIssue.lastSeenCommentCount;
       const hasNewComments = snapshot.commentCount > (previousCommentCount ?? snapshot.commentCount);
@@ -7073,12 +7314,30 @@ async function synchronizePaperclipIssueStatuses(ctx, octokit, repository, mappi
         syncContext: paperclipIssueSyncContext,
         advancedSettings
       });
+      const shouldClearTransitionAssignee = nextStatus === "in_review" && nextTransitionAssignee === null && paperclipIssueSyncContext.assignee !== null;
       const nextAssigneeChanged = nextTransitionAssignee ? !doesPaperclipIssueAssigneeMatch(paperclipIssueSyncContext.assignee, nextTransitionAssignee.principal) : false;
       const shouldWakeImportedAssignee = wasImportedThisRun && paperclipIssue.status === nextStatus && nextStatus === "todo" && paperclipIssueSyncContext.assignee?.kind === "agent";
       const shouldWakeTransitionAssignee = paperclipIssue.status !== nextStatus && nextTransitionAssignee?.principal.kind === "agent" && isActionablePaperclipIssueStatus(nextStatus) && (nextAssigneeChanged || paperclipIssue.status !== nextStatus);
       importedIssue.githubIssueNumber = githubIssue.number;
       importedIssue.lastSeenCommentCount = snapshot.commentCount;
       if (paperclipIssue.status === nextStatus) {
+        if (shouldClearTransitionAssignee) {
+          updateSyncFailureContext(syncFailureContext, {
+            phase: "updating_paperclip_status",
+            repositoryUrl: repository.url,
+            githubIssueNumber: githubIssue.number
+          });
+          await updatePaperclipIssueState(ctx, {
+            companyId: mapping.companyId,
+            issueId: importedIssue.paperclipIssueId,
+            currentStatus: paperclipIssue.status,
+            syncContext: paperclipIssueSyncContext,
+            nextStatus,
+            clearAssignee: true,
+            transitionComment: "",
+            paperclipApiBaseUrl
+          });
+        }
         if (shouldWakeImportedAssignee) {
           queuedIssueWakeups.push({
             assigneeAgentId: paperclipIssueSyncContext.assignee?.kind === "agent" ? paperclipIssueSyncContext.assignee.id : null,
@@ -7110,6 +7369,7 @@ async function synchronizePaperclipIssueStatuses(ctx, octokit, repository, mappi
         syncContext: paperclipIssueSyncContext,
         nextStatus,
         ...nextTransitionAssignee ? { nextAssignee: nextTransitionAssignee.principal } : {},
+        ...shouldClearTransitionAssignee ? { clearAssignee: true } : {},
         transitionComment: transitionComment.body,
         transitionCommentAnnotation: transitionComment.annotation,
         paperclipApiBaseUrl
@@ -7672,23 +7932,73 @@ async function resolveGitHubPullRequestToolTarget(ctx, runCtx, input) {
     if (!link) {
       throw new Error("This Paperclip issue is not linked to GitHub yet.");
     }
-    const repository2 = assertExplicitRepositoryMatchesLinkedRepository(
-      input.repository,
-      link.repositoryUrl,
-      "repository must match the GitHub repository linked to the provided Paperclip issue."
-    );
     const explicitPullRequestNumber = normalizeToolPositiveInteger(input.pullRequestNumber);
+    const linkedPullRequests = link.linkedPullRequests.length > 0 ? link.linkedPullRequests : normalizeLinkedPullRequestReferences(link.linkedPullRequestNumbers, link.repositoryUrl);
     if (explicitPullRequestNumber !== void 0) {
+      const explicitRepository = normalizeOptionalToolString(input.repository);
+      const matchingLinkedPullRequests = linkedPullRequests.filter(
+        (pullRequest) => pullRequest.number === explicitPullRequestNumber
+      );
+      if (explicitRepository) {
+        const requestedRepository = requireRepositoryReference(explicitRepository);
+        if (matchingLinkedPullRequests.length > 0) {
+          const matchingLinkedPullRequest = matchingLinkedPullRequests.find(
+            (pullRequest) => areRepositoriesEqual(requestedRepository, requireRepositoryReference(pullRequest.repositoryUrl))
+          );
+          if (!matchingLinkedPullRequest) {
+            const linkedIssueRepository = requireRepositoryReference(link.repositoryUrl);
+            const allMatchingPullRequestsUseIssueRepository = matchingLinkedPullRequests.every(
+              (pullRequest) => areRepositoriesEqual(linkedIssueRepository, requireRepositoryReference(pullRequest.repositoryUrl))
+            );
+            throw new Error(
+              allMatchingPullRequestsUseIssueRepository ? "repository must match the GitHub repository linked to the provided Paperclip issue." : "repository must match the GitHub repository for the selected linked pull request."
+            );
+          }
+          return {
+            repository: requestedRepository,
+            pullRequestNumber: explicitPullRequestNumber,
+            paperclipIssueId
+          };
+        }
+        const repository2 = assertExplicitRepositoryMatchesLinkedRepository(
+          input.repository,
+          link.repositoryUrl,
+          "repository must match the GitHub repository linked to the provided Paperclip issue."
+        );
+        return {
+          repository: repository2,
+          pullRequestNumber: explicitPullRequestNumber,
+          paperclipIssueId
+        };
+      }
+      if (matchingLinkedPullRequests.length === 1) {
+        return {
+          repository: requireRepositoryReference(matchingLinkedPullRequests[0].repositoryUrl),
+          pullRequestNumber: explicitPullRequestNumber,
+          paperclipIssueId
+        };
+      }
+      if (matchingLinkedPullRequests.length > 1) {
+        throw new Error("repository is required because the linked Paperclip issue has matching pull request numbers in multiple repositories.");
+      }
       return {
-        repository: repository2,
+        repository: requireRepositoryReference(link.repositoryUrl),
         pullRequestNumber: explicitPullRequestNumber,
         paperclipIssueId
       };
     }
-    if (link.linkedPullRequestNumbers.length === 1) {
+    if (linkedPullRequests.length === 1) {
+      const inferredPullRequest = linkedPullRequests[0];
+      const explicitRepository = normalizeOptionalToolString(input.repository);
+      if (explicitRepository) {
+        const requestedRepository = requireRepositoryReference(explicitRepository);
+        if (!areRepositoriesEqual(requestedRepository, requireRepositoryReference(inferredPullRequest.repositoryUrl))) {
+          throw new Error("repository must match the GitHub repository for the selected linked pull request.");
+        }
+      }
       return {
-        repository: repository2,
-        pullRequestNumber: link.linkedPullRequestNumbers[0],
+        repository: requireRepositoryReference(inferredPullRequest.repositoryUrl),
+        pullRequestNumber: inferredPullRequest.number,
         paperclipIssueId
       };
     }
@@ -8437,7 +8747,7 @@ function getProjectPullRequestStatus(state) {
       return "open";
   }
 }
-async function buildProjectPullRequestSummaryRecord(octokit, repository, node, issueLookup, pullRequestStatusCache) {
+async function buildProjectPullRequestSummaryRecord(octokit, repository, node, issueLookup, pullRequestStatusCache, defaultBranchName) {
   if (!node || typeof node.number !== "number" || !node.url || !node.title?.trim()) {
     return null;
   }
@@ -8446,6 +8756,8 @@ async function buildProjectPullRequestSummaryRecord(octokit, repository, node, i
   const inlineCiState = tryBuildGitHubPullRequestCiStateFromBatchNode({
     statusCheckRollup: node.statusCheckRollup
   });
+  const inlineMergeability = normalizeGitHubPullRequestMergeability(node.mergeable);
+  const inlineMergeStateStatus = normalizeGitHubPullRequestMergeStateStatus(node.mergeStateStatus);
   const [reviewThreadSummary, reviewSummary, statusSnapshot, behindBy] = await Promise.all([
     getOrLoadCachedGitHubPullRequestReviewThreadSummary(
       octokit,
@@ -8461,7 +8773,9 @@ async function buildProjectPullRequestSummaryRecord(octokit, repository, node, i
     ),
     getGitHubPullRequestStatusSnapshot(octokit, repository, node.number, pullRequestStatusCache, {
       reviewThreadSummary: inlineReviewThreadSummary,
-      ciState: inlineCiState
+      ciState: inlineCiState,
+      mergeability: inlineMergeability,
+      mergeStateStatus: inlineMergeStateStatus
     }),
     getGitHubPullRequestBehindCount(octokit, repository, {
       baseBranch: node.baseRefName,
@@ -8486,8 +8800,11 @@ async function buildProjectPullRequestSummaryRecord(octokit, repository, node, i
   const mergeable = resolveProjectPullRequestMergeable({
     checksStatus,
     reviewApprovals: reviewSummary.approvals,
+    reviewChangesRequested: reviewSummary.changesRequested,
     unresolvedReviewThreads: reviewThreadSummary.unresolvedReviewThreads,
-    githubMergeable
+    githubMergeable,
+    baseBranch: node.baseRefName,
+    defaultBranchName
   });
   const upToDateStatus = resolveProjectPullRequestUpToDateStatus({
     mergeStateStatus: node.mergeStateStatus,
@@ -8562,7 +8879,8 @@ async function listProjectPullRequestSummaryRecords(ctx, octokit, scope, options
         scope.repository,
         node,
         issueLookup,
-        pullRequestStatusCache
+        pullRequestStatusCache,
+        defaultBranchName
       )
     );
     pullRequests.push(...pageRecords.filter((record) => Boolean(record)));
@@ -8581,7 +8899,7 @@ async function listProjectPullRequestSummaryRecords(ctx, octokit, scope, options
     ...nextCursor ? { nextCursor } : {}
   };
 }
-async function buildProjectPullRequestMetricCounts(octokit, repository, node, pullRequestStatusCache) {
+async function buildProjectPullRequestMetricCounts(octokit, repository, node, pullRequestStatusCache, defaultBranchName) {
   if (!node || typeof node.number !== "number") {
     return {
       pullRequestNumber: null,
@@ -8595,6 +8913,8 @@ async function buildProjectPullRequestMetricCounts(octokit, repository, node, pu
   const inlineCiState = tryBuildGitHubPullRequestCiStateFromBatchNode({
     statusCheckRollup: node.statusCheckRollup
   });
+  const inlineMergeability = normalizeGitHubPullRequestMergeability(node.mergeable);
+  const inlineMergeStateStatus = normalizeGitHubPullRequestMergeStateStatus(node.mergeStateStatus);
   const [reviewThreadSummary, reviewSummary, statusSnapshot] = await Promise.all([
     getOrLoadCachedGitHubPullRequestReviewThreadSummary(
       octokit,
@@ -8610,7 +8930,9 @@ async function buildProjectPullRequestMetricCounts(octokit, repository, node, pu
     ),
     getGitHubPullRequestStatusSnapshot(octokit, repository, node.number, pullRequestStatusCache, {
       reviewThreadSummary: inlineReviewThreadSummary,
-      ciState: inlineCiState
+      ciState: inlineCiState,
+      mergeability: inlineMergeability,
+      mergeStateStatus: inlineMergeStateStatus
     })
   ]);
   const checksStatus = statusSnapshot.ciState === "green" ? "passed" : statusSnapshot.ciState === "red" ? "failed" : "pending";
@@ -8623,8 +8945,11 @@ async function buildProjectPullRequestMetricCounts(octokit, repository, node, pu
   const mergeable = resolveProjectPullRequestMergeable({
     checksStatus,
     reviewApprovals: reviewSummary.approvals,
+    reviewChangesRequested: reviewSummary.changesRequested,
     unresolvedReviewThreads: reviewThreadSummary.unresolvedReviewThreads,
-    githubMergeable
+    githubMergeable,
+    baseBranch: node.baseRefName,
+    defaultBranchName
   });
   return {
     pullRequestNumber: Math.floor(node.number),
@@ -8674,7 +8999,13 @@ async function listProjectPullRequestMetrics(octokit, scope) {
     const pageMetrics = await mapWithConcurrency(
       pageNodes,
       PROJECT_PULL_REQUEST_SUMMARY_CONCURRENCY,
-      async (node) => buildProjectPullRequestMetricCounts(octokit, scope.repository, node, pullRequestStatusCache)
+      async (node) => buildProjectPullRequestMetricCounts(
+        octokit,
+        scope.repository,
+        node,
+        pullRequestStatusCache,
+        defaultBranchName
+      )
     );
     for (const pageMetric of pageMetrics) {
       mergeablePullRequests += pageMetric.mergeablePullRequests;
@@ -9410,6 +9741,20 @@ function getPullRequestApiState(value) {
   }
   return value.state === "closed" ? "closed" : "open";
 }
+async function getGitHubRepositoryDefaultBranchName(octokit, repository) {
+  try {
+    const response = await octokit.rest.repos.get({
+      owner: repository.owner,
+      repo: repository.repo,
+      headers: {
+        "X-GitHub-Api-Version": GITHUB_API_VERSION
+      }
+    });
+    return normalizeOptionalString2(response.data.default_branch);
+  } catch {
+    return void 0;
+  }
+}
 async function buildProjectPullRequestDetailData(ctx, input) {
   const pullRequestNumber = normalizeToolPositiveInteger(input.pullRequestNumber);
   if (!pullRequestNumber) {
@@ -9425,6 +9770,15 @@ async function buildProjectPullRequestDetailData(ctx, input) {
     activeProjectPullRequestSummaryRecordCache,
     buildProjectPullRequestSummaryRecordCacheKey(scope, pullRequestNumber)
   );
+  const cachedSummary = getFreshCacheValue(
+    activeProjectPullRequestSummaryCache,
+    buildProjectPullRequestSummaryCacheKey(scope)
+  );
+  const cachedMetrics = getFreshCacheValue(
+    activeProjectPullRequestMetricsCache,
+    buildProjectPullRequestMetricsCacheKey(scope)
+  );
+  const cachedDefaultBranchName = normalizeOptionalString2(cachedSummary?.defaultBranchName) ?? normalizeOptionalString2(cachedMetrics?.defaultBranchName);
   const cachedLinkedIssue = cachedSummaryRecord ? getLinkedPaperclipIssueFromProjectPullRequestRecord(cachedSummaryRecord) : void 0;
   const octokit = await createGitHubToolOctokit(ctx, scope.companyId);
   const response = await octokit.rest.pulls.get({
@@ -9443,7 +9797,8 @@ async function buildProjectPullRequestDetailData(ctx, input) {
       reviewThreadSummary: reviewThreadSummary2
     })
   );
-  const [reviewSummary, reviewThreadSummary, comments, linkedIssue, statusSnapshot] = await Promise.all([
+  const defaultBranchNamePromise = cachedDefaultBranchName ? Promise.resolve(cachedDefaultBranchName) : getGitHubRepositoryDefaultBranchName(octokit, scope.repository);
+  const [reviewSummary, reviewThreadSummary, comments, linkedIssue, statusSnapshot, defaultBranchName] = await Promise.all([
     reviewSummaryPromise,
     reviewThreadSummaryPromise,
     listAllGitHubIssueComments(octokit, scope.repository, pullRequestNumber),
@@ -9455,7 +9810,8 @@ async function buildProjectPullRequestDetailData(ctx, input) {
         issueLookup
       );
     })(),
-    statusSnapshotPromise
+    statusSnapshotPromise,
+    defaultBranchNamePromise
   ]);
   const author = buildProjectPullRequestPerson({
     login: pullRequest.user?.login,
@@ -9499,8 +9855,11 @@ async function buildProjectPullRequestDetailData(ctx, input) {
   const mergeable = resolveProjectPullRequestMergeable({
     checksStatus,
     reviewApprovals: reviewSummary.approvals,
+    reviewChangesRequested: reviewSummary.changesRequested,
     unresolvedReviewThreads: reviewThreadSummary.unresolvedReviewThreads,
-    githubMergeable
+    githubMergeable,
+    baseBranch: pullRequest.base.ref,
+    defaultBranchName
   });
   return setCacheValue(
     activeProjectPullRequestDetailCache,
@@ -9695,6 +10054,49 @@ async function mergeProjectPullRequest(ctx, input) {
   }
   const scope = await requireProjectPullRequestScope(ctx, input);
   const octokit = await createGitHubToolOctokit(ctx, scope.companyId);
+  const pullRequestResponse = await octokit.rest.pulls.get({
+    owner: scope.repository.owner,
+    repo: scope.repository.repo,
+    pull_number: pullRequestNumber,
+    headers: {
+      "X-GitHub-Api-Version": GITHUB_API_VERSION
+    }
+  });
+  const pullRequest = pullRequestResponse.data;
+  const reviewSummaryPromise = getOrLoadCachedGitHubPullRequestReviewSummary(octokit, scope.repository, pullRequestNumber);
+  const reviewThreadSummaryPromise = getOrLoadCachedGitHubPullRequestReviewThreadSummary(octokit, scope.repository, pullRequestNumber);
+  const statusSnapshotPromise = reviewThreadSummaryPromise.then(
+    (reviewThreadSummary2) => getGitHubPullRequestStatusSnapshot(octokit, scope.repository, pullRequestNumber, /* @__PURE__ */ new Map(), {
+      reviewThreadSummary: reviewThreadSummary2
+    })
+  );
+  const defaultBranchNamePromise = getGitHubRepositoryDefaultBranchName(octokit, scope.repository);
+  const [reviewSummary, reviewThreadSummary, statusSnapshot, defaultBranchName] = await Promise.all([
+    reviewSummaryPromise,
+    reviewThreadSummaryPromise,
+    statusSnapshotPromise,
+    defaultBranchNamePromise
+  ]);
+  if (!defaultBranchName) {
+    throw new Error(
+      "Could not determine the repository default branch before merging this pull request. Retry the merge, and if it keeps failing check GitHub token permissions and connectivity."
+    );
+  }
+  const checksStatus = statusSnapshot.ciState === "green" ? "passed" : statusSnapshot.ciState === "red" ? "failed" : "pending";
+  const mergeable = resolveProjectPullRequestMergeable({
+    checksStatus,
+    reviewApprovals: reviewSummary.approvals,
+    reviewChangesRequested: reviewSummary.changesRequested,
+    unresolvedReviewThreads: reviewThreadSummary.unresolvedReviewThreads,
+    githubMergeable: pullRequest.mergeable === true,
+    baseBranch: pullRequest.base.ref,
+    defaultBranchName
+  });
+  if (!mergeable) {
+    throw new Error(
+      "This pull request is not mergeable yet. It must target the current default branch, have passing checks, at least one approval, no outstanding changes requests, and no unresolved review threads."
+    );
+  }
   const response = await octokit.rest.pulls.merge({
     owner: scope.repository.owner,
     repo: scope.repository.repo,
@@ -10472,20 +10874,28 @@ async function performSync(ctx, trigger, options = {}) {
           for (const [issueNumber, linkedPullRequests] of warmedLinkedPullRequests.entries()) {
             linkedPullRequestsByIssueNumber.set(issueNumber, linkedPullRequests);
           }
-          const openLinkedPullRequestNumbers = /* @__PURE__ */ new Set();
+          const openLinkedPullRequestNumbersByRepository = /* @__PURE__ */ new Map();
           for (const linkedPullRequests of warmedLinkedPullRequests.values()) {
             for (const pullRequest of linkedPullRequests) {
               if (pullRequest.state === "OPEN") {
-                openLinkedPullRequestNumbers.add(pullRequest.number);
+                const pullRequestRepository = requireRepositoryReference(pullRequest.repositoryUrl);
+                const entry = openLinkedPullRequestNumbersByRepository.get(pullRequestRepository.url) ?? {
+                  repository: pullRequestRepository,
+                  numbers: /* @__PURE__ */ new Set()
+                };
+                entry.numbers.add(pullRequest.number);
+                openLinkedPullRequestNumbersByRepository.set(pullRequestRepository.url, entry);
               }
             }
           }
-          await warmGitHubPullRequestStatusCache(
-            octokit,
-            repository,
-            openLinkedPullRequestNumbers,
-            pullRequestStatusCache
-          );
+          for (const entry of openLinkedPullRequestNumbersByRepository.values()) {
+            await warmGitHubPullRequestStatusCache(
+              octokit,
+              entry.repository,
+              entry.numbers,
+              pullRequestStatusCache
+            );
+          }
           await throwIfSyncCancelled();
         } catch (error) {
           if (error instanceof SyncCancellationError || isGitHubRateLimitError(error)) {
@@ -11274,6 +11684,7 @@ function registerGitHubAgentTools(ctx) {
       ].filter((warning) => warning !== null);
       const snapshot = snapshotResult.status === "fulfilled" ? snapshotResult.value : {
         number: target.pullRequestNumber,
+        repositoryUrl: target.repository.url,
         hasUnresolvedReviewThreads: false,
         ciState: "unfinished"
       };