Merge pull request #13292 from gitbutlerapp/warn-if-checks-blocked

Show "Blocked" when PR has missing required checks

Author: mtsgrd

apps/desktop/src/components/branch/BranchCard.svelte

@@ -270,6 +270,7 @@
 										{projectId}
 										branchName={pr.sourceBranch}
 										prUpdatedAt={pr.updatedAt}
+										mergeableState={pr.mergeableState}
 										isFork={pr.fork}
 										isMerged={pr.merged}
 									/>

apps/desktop/src/components/forge/CIChecksBadge.svelte

@@ -11,6 +11,7 @@
 		projectId: string;
 		branchName: string;
 		prUpdatedAt?: string;
+		mergeableState?: string;
 		hasChecks?: boolean;
 		isFork?: boolean;
 		isMerged?: boolean;
@@ -29,6 +30,7 @@
 		projectId,
 		branchName,
 		prUpdatedAt,
+		mergeableState,
 		isFork,
 		isMerged,
 		hasChecks = $bindable(),
@@ -83,6 +85,21 @@
 		}
 
 		if (checks) {
+			// GitHub only returns check runs that have actually been created.
+			// When required checks haven't reported yet, the API may return
+			// all existing checks as passed while the PR is still unmergeable.
+			if (checks.completed && checks.success) {
+				if (mergeableState === "blocked") {
+					return {
+						style: "warning",
+						icon: "warning",
+						text: "Blocked",
+						reducedText: "Blocked",
+						tooltip: "Some required checks have not reported yet.",
+					};
+				}
+			}
+
 			const style = checks.completed ? (checks.success ? "safe" : "danger") : "warning";
 			// Keep the terminal icon stable during background re-fetches
 			const icon = checks.completed ? (checks.success ? "tick" : "danger") : "spinner";
@@ -158,7 +175,13 @@
 			prUpdatedAtChangedTime !== undefined &&
 			Date.now() - prUpdatedAtChangedTime < STALE_GRACE_PERIOD_MS;
 		const checksCompleted = checksQuery?.response?.completed || checksQuery?.response === null;
-		shouldStop = !withinGracePeriod && checksCompleted;
+		// Don't stop polling if checks appear passed but the PR is blocked
+		// (some required checks may not have been created yet).
+		const blocked =
+			checksQuery?.response?.completed &&
+			checksQuery?.response?.success &&
+			mergeableState === "blocked";
+		shouldStop = !withinGracePeriod && checksCompleted && !blocked;
 
 		if (!isDone && loadedOnce && !loading && shouldStop) {
 			projectState.branchesToPoll.remove(branchName);