Add stacked PR info to PR webview

.husky/pre-commit

@@ -10,7 +10,7 @@ lint_pid=''
 # Stream a NUL-delimited list directly to xargs -0 so paths with spaces/newlines
 # are handled safely (command substitution would strip NUL bytes).
 if git diff --cached --name-only --diff-filter=ACMR -- '*.ts' '*.tsx' | grep -q .; then
-	git diff --cached --name-only --diff-filter=ACMR -z -- '*.ts' '*.tsx' | xargs -0 node ./node_modules/eslint/bin/eslint.js --fix --cache &
+	git diff --cached --name-only --diff-filter=ACMR -z -- '*.ts' '*.tsx' | xargs -0 node ./node_modules/eslint/bin/eslint.js --fix --cache --no-warn-ignored &
 	lint_pid=$!
 fi
 

src/common/utils.ts

@@ -98,6 +98,10 @@ export function onceEvent<T>(event: Event<T>): Event<T> {
 	};
 }
 
+export function isObject(value: unknown): value is Record<string, unknown> {
+	return typeof value === 'object' && value !== null;
+}
+
 function isWindowsPath(path: string): boolean {
 	return /^[a-zA-Z]:\\/.test(path);
 }

src/github/activityBarViewProvider.ts

@@ -89,6 +89,8 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 				return this.createComment(message);
 			case 'pr.merge':
 				return this.mergePullRequest(message);
+			case 'pr.merge-stack':
+				return PullRequestReviewCommon.mergeStack(this.getReviewContext(), message);
 			case 'pr.open-create':
 				return this.create();
 			case 'pr.deleteBranch':
@@ -300,6 +302,9 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 				mergeMethodsAvailability,
 				defaultMergeMethod,
 				mergeQueueMethod,
+				stack: undefined,
+				stackLoaded: false,
+				stackLoadError: false,
 				repositoryDefaultBranch: defaultBranch,
 				doneCheckoutBranch,
 				isIssue: false,
@@ -318,6 +323,27 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 				command: 'pr.initialize',
 				pullrequest: context,
 			});
+			void pullRequest.getStack().then(async stack => {
+				if (!this._item.equals(pullRequest)) {
+					return;
+				}
+				const stackQueueMethod = stack ? await this._folderRepositoryManager.mergeQueueMethodForBranch(stack.base, pullRequest.remote.owner, pullRequest.remote.repositoryName) : undefined;
+				if (this._item.equals(pullRequest)) {
+					this._postMessage({
+						command: 'pr.update',
+						pullrequest: {
+							stack,
+							stackLoaded: true,
+							...(stack ? { mergeQueueMethod: stackQueueMethod } : {}),
+						} satisfies Partial<PullRequest>,
+					});
+				}
+			}).catch(error => {
+				Logger.error(`Failed to load active pull request stack: ${formatError(error)}`, PullRequestViewProvider.name);
+				if (this._item.equals(pullRequest)) {
+					this._postMessage({ command: 'pr.update', pullrequest: { stackLoadError: true } satisfies Partial<PullRequest> });
+				}
+			});
 
 		} catch (e) {
 			vscode.window.showErrorMessage(`Error updating active pull request view: ${formatError(e)}`);

src/github/githubRepository.ts

@@ -340,7 +340,7 @@ export class GitHubRepository extends Disposable {
 		}
 	}
 
-	query = async <T>(query: QueryOptions, ignoreSamlErrors: boolean = false, legacyFallback?: { query: DocumentNode, variables: OperationVariables }): Promise<ApolloQueryResult<T>> => {
+	query = async <T>(query: QueryOptions, ignoreSamlErrors: boolean = false, legacyFallback?: { query: DocumentNode, variables: OperationVariables }, allowLimitedFallback: boolean = true): Promise<ApolloQueryResult<T>> => {
 		const gql = this.authMatchesServer && this.hub && this.hub.graphql;
 		if (!gql) {
 			const logValue = (query.query.definitions[0] as { name: { value: string } | undefined }).name?.value;
@@ -367,7 +367,7 @@ export class GitHubRepository extends Disposable {
 				return this.query(query, ignoreSamlErrors);
 			}
 
-			if (gqlErrors && gqlErrors.length && (gqlErrors.some(error => error.extensions?.code === 'undefinedField')) && !this._areQueriesLimited) {
+			if (allowLimitedFallback && gqlErrors && gqlErrors.length && (gqlErrors.some(error => error.extensions?.code === 'undefinedField')) && !this._areQueriesLimited) {
 				// We're running against a GitHub server that doesn't support the query we're trying to run.
 				// Switch to the limited schema and try again.
 				this._areQueriesLimited = true;

src/github/graphql.ts

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ForkDetails } from './githubRepository';
+import { GithubItemStateEnum } from './interface';
 import { DiffSide, SubjectType, ViewedState } from '../common/comment';
 
 interface PageInfo {
@@ -815,6 +816,34 @@ export interface PullRequestResponse {
 	rateLimit: RateLimit;
 }
 
+export interface PullRequestStackResponse {
+	repository: {
+		pullRequest: {
+			stackEntry: { position: number } | null;
+			stack: {
+				size: number;
+				baseRefName: string;
+				entries: {
+					nodes: {
+						position: number;
+						pullRequest: {
+							number: number;
+							title: string;
+							url: string;
+							state: GithubItemStateEnum;
+							isDraft: boolean;
+							headRefName: string;
+							mergeable: 'MERGEABLE' | 'CONFLICTING' | 'UNKNOWN';
+							mergeStateStatus: 'BEHIND' | 'BLOCKED' | 'CLEAN' | 'DIRTY' | 'HAS_HOOKS' | 'UNKNOWN' | 'UNSTABLE';
+						};
+					}[];
+					pageInfo: { hasNextPage: boolean; endCursor: string | null };
+				};
+			} | null;
+		} | null;
+	} | null;
+}
+
 export interface IssueResponse {
 	repository: {
 		issue: PullRequest;

src/github/interface.ts

@@ -23,6 +23,22 @@ export enum GithubItemStateEnum {
 	Closed = 'CLOSED',
 }
 
+export interface PullRequestStack {
+	position: number;
+	size: number;
+	base: string;
+	pullRequests: {
+		position: number;
+		number: number;
+		title: string;
+		url: string;
+		head: string;
+		state: GithubItemStateEnum;
+		isDraft: boolean;
+		mergeable: PullRequestMergeability;
+	}[];
+}
+
 export enum PullRequestMergeability {
 	Mergeable,
 	NotMergeable,

src/github/loggingOctokit.ts

@@ -14,6 +14,7 @@ import { GitHubRef } from '../common/githubRef';
 import Logger from '../common/logger';
 import { GitHubRemote } from '../common/remote';
 import { ITelemetry } from '../common/telemetry';
+import { isObject } from '../common/utils';
 
 interface RestResponse {
 	headers: {
@@ -35,15 +36,13 @@ export enum GraphQLErrorType {
 export interface GraphQLError {
 	extensions?: {
 		code: string;
+		typeName?: string;
+		fieldName?: string;
 	};
 	type?: GraphQLErrorType;
 	message?: string;
 }
 
-function isObject(value: unknown): value is Record<string, unknown> {
-	return typeof value === 'object' && value !== null;
-}
-
 /**
  * Detects whether an error from a REST (Octokit) or GraphQL (Apollo) call
  * indicates that the GitHub authentication token is no longer valid. This