Refreshing PR does not refresh rerun status checks

Fixes #8449

Author: alexr00

src/github/githubRepository.ts

@@ -49,6 +49,7 @@ import {
 	MergeMethod,
 	PullRequest,
 	PullRequestChecks,
+	PullRequestCheckStatus,
 	PullRequestReviewRequirement,
 	RepoAccessAndMergeMethods,
 	User,
@@ -1688,51 +1689,56 @@ export class GitHubRepository extends Disposable {
 		// We always fetch the status checks for only the last commit, so there should only be one node present
 		const statusCheckRollup = result.data.repository.pullRequest.commits.nodes[0].commit.statusCheckRollup;
 
-		const checks: PullRequestChecks = !statusCheckRollup
-			? {
+		let checks: PullRequestChecks;
+		if (!statusCheckRollup) {
+			checks = {
 				state: CheckState.Success,
 				statuses: []
-			}
-			: {
-				state: this.mapStateAsCheckState(statusCheckRollup.state),
-				statuses: statusCheckRollup.contexts.nodes.map(context => {
-					if (isCheckRun(context)) {
-						return {
-							id: context.id,
-							url: context.checkSuite?.app?.url,
-							avatarUrl:
-								context.checkSuite?.app?.logoUrl &&
-								getAvatarWithEnterpriseFallback(
-									context.checkSuite.app.logoUrl,
-									undefined,
-									this.remote.isEnterprise,
-								),
-							state: this.mapStateAsCheckState(context.conclusion),
-							description: context.title,
-							context: context.name,
-							workflowName: context.checkSuite?.workflowRun?.workflow.name,
-							event: context.checkSuite?.workflowRun?.event,
-							targetUrl: context.detailsUrl,
-							isRequired: context.isRequired,
-						};
-					} else {
-						return {
-							id: context.id,
-							url: context.targetUrl ?? undefined,
-							avatarUrl: context.avatarUrl
-								? getAvatarWithEnterpriseFallback(context.avatarUrl, undefined, this.remote.isEnterprise)
-								: undefined,
-							state: this.mapStateAsCheckState(context.state),
-							description: context.description,
-							context: context.context,
-							workflowName: undefined,
-							event: undefined,
-							targetUrl: context.targetUrl,
-							isRequired: context.isRequired,
-						};
-					}
-				}),
 			};
+		} else {
+			const dedupedStatuses = this.deduplicateStatusChecks(statusCheckRollup.contexts.nodes.map(context => {
+				if (isCheckRun(context)) {
+					return {
+						id: context.id,
+						url: context.checkSuite?.app?.url,
+						avatarUrl:
+							context.checkSuite?.app?.logoUrl &&
+							getAvatarWithEnterpriseFallback(
+								context.checkSuite.app.logoUrl,
+								undefined,
+								this.remote.isEnterprise,
+							),
+						state: this.mapStateAsCheckState(context.conclusion),
+						description: context.title,
+						context: context.name,
+						workflowName: context.checkSuite?.workflowRun?.workflow.name,
+						event: context.checkSuite?.workflowRun?.event,
+						targetUrl: context.detailsUrl,
+						isRequired: context.isRequired,
+					};
+				} else {
+					return {
+						id: context.id,
+						url: context.targetUrl ?? undefined,
+						avatarUrl: context.avatarUrl
+							? getAvatarWithEnterpriseFallback(context.avatarUrl, undefined, this.remote.isEnterprise)
+							: undefined,
+						state: this.mapStateAsCheckState(context.state),
+						description: context.description,
+						context: context.context,
+						workflowName: undefined,
+						event: undefined,
+						targetUrl: context.targetUrl,
+						isRequired: context.isRequired,
+					};
+				}
+			}));
+
+			checks = {
+				state: this.computeOverallCheckState(dedupedStatuses),
+				statuses: dedupedStatuses
+			};
+		}
 
 		let reviewRequirement: PullRequestReviewRequirement | null = null;
 		const rule = result.data.repository.pullRequest.baseRef?.refUpdateRule;
@@ -1807,4 +1813,74 @@ export class GitHubRepository extends Disposable {
 
 		return CheckState.Unknown;
 	}
+
+	/**
+	 * Deduplicate status checks by context (check name).
+	 * When a check is re-run on the same commit (e.g., when a PR is closed and reopened),
+	 * GitHub's API returns all check run instances. This method keeps only one entry per
+	 * check context, preferring pending/running checks over completed ones, and the most
+	 * recent completed check when all are completed.
+	 */
+	private deduplicateStatusChecks(statuses: PullRequestCheckStatus[]): PullRequestCheckStatus[] {
+		const statusByContext = new Map<string, PullRequestCheckStatus>();
+
+		for (const status of statuses) {
+			const existing = statusByContext.get(status.context);
+			if (!existing) {
+				statusByContext.set(status.context, status);
+				continue;
+			}
+
+			// Prefer pending/unknown checks over completed ones (they represent the latest run)
+			const existingIsPending = existing.state === CheckState.Pending || existing.state === CheckState.Unknown;
+			const currentIsPending = status.state === CheckState.Pending || status.state === CheckState.Unknown;
+
+			if (currentIsPending && !existingIsPending) {
+				// Current is pending, existing is completed - prefer current
+				statusByContext.set(status.context, status);
+			} else if (!currentIsPending && existingIsPending) {
+				// Current is completed, existing is pending - keep existing
+				continue;
+			} else {
+				// Both are same type (both pending or both completed)
+				// Prefer the one with a higher ID (more recent), as GitHub IDs are monotonically increasing
+				if (status.id > existing.id) {
+					statusByContext.set(status.context, status);
+				}
+			}
+		}
+
+		return Array.from(statusByContext.values());
+	}
+
+	/**
+	 * Compute the overall check state from individual status checks.
+	 * - If any check has failed, the overall state is failure
+	 * - If any check is pending/unknown (and none have failed), the overall state is pending
+	 * - If all checks are successful or neutral/skipped, the overall state is success
+	 */
+	private computeOverallCheckState(statuses: PullRequestCheckStatus[]): CheckState {
+		if (statuses.length === 0) {
+			return CheckState.Success;
+		}
+
+		let hasFailure = false;
+		let hasPending = false;
+
+		for (const status of statuses) {
+			if (status.state === CheckState.Failure) {
+				hasFailure = true;
+			} else if (status.state === CheckState.Pending || status.state === CheckState.Unknown) {
+				hasPending = true;
+			}
+		}
+
+		if (hasFailure) {
+			return CheckState.Failure;
+		}
+		if (hasPending) {
+			return CheckState.Pending;
+		}
+		return CheckState.Success;
+	}
 }

webviews/components/merge.tsx

@@ -66,7 +66,7 @@ const StatusChecks = ({ pr }: { pr: PullRequest }) => {
 				toggleDetails();
 			}
 		}
-	}, status?.statuses);
+	}, [status?.statuses]);
 
 	return state === GithubItemStateEnum.Open && status?.statuses.length ? (
 		<>
@@ -589,7 +589,8 @@ const CHECK_STATE_ORDER: Record<CheckState, number> = {
 
 const StatusCheckDetails = ({ statuses }: { statuses: PullRequestCheckStatus[] }) => {
 	// Sort statuses to group by state: failure first, then pending, neutral, and success
-	const sortedStatuses = statuses.sort((a, b) => {
+	// Use slice() to avoid mutating the original array
+	const sortedStatuses = statuses.slice().sort((a, b) => {
 		return CHECK_STATE_ORDER[a.state] - CHECK_STATE_ORDER[b.state];
 	});