Fix up

Author: alexr00

src/common/copilot.ts

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { EventType, TimelineEvent } from './timelineEvent';
+import { AccountType, IAccount } from '../github/interface';
 
 export const COPILOT_SWE_AGENT = 'copilot-swe-agent';
 export const COPILOT_CLOUD_AGENT = 'copilot-cloud-agent';
@@ -16,6 +17,15 @@ export const COPILOT_LOGINS = [
 	'Copilot'
 ];
 
+export const COPILOT_REVIEWER_ACCOUNT: IAccount = {
+	login: COPILOT_REVIEWER,
+	id: COPILOT_REVIEWER_ID,
+	url: '',
+	avatarUrl: '',
+	name: 'Copilot',
+	accountType: AccountType.Bot
+};
+
 export enum CopilotPRStatus {
 	None = 0,
 	Started = 1,

src/github/graphql.ts

@@ -130,6 +130,11 @@ export function isTeam(x: Actor | Team | Node | undefined | null): x is Team {
 	return !!asTeam && (asTeam?.slug !== undefined);
 }
 
+export function isBot(x: Actor | Team | Node | undefined | null): x is Actor {
+	const asBot = x as Partial<Actor>;
+	return !!asBot && !!asBot.id?.startsWith('BOT_');
+}
+
 export interface Team {
 	avatarUrl: string;
 	name: string;
@@ -347,6 +352,14 @@ export interface GetReviewRequestsResponse {
 	} | null;
 }
 
+export interface AddReviewRequestResponse {
+	requestReviews: {
+		pullRequest: {
+			id: string;
+		};
+	} | null;
+}
+
 export interface PullRequestState {
 	repository: {
 		pullRequest: {

src/github/pullRequestModel.ts

@@ -17,6 +17,7 @@ import { GitHubRepository, GraphQLError, GraphQLErrorType } from './githubReposi
 import {
 	AddCommentResponse,
 	AddReactionResponse,
+	AddReviewRequestResponse as AddReviewsResponse,
 	AddReviewThreadResponse,
 	DeleteReactionResponse,
 	DeleteReviewResponse,
@@ -1247,21 +1248,26 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 			input.botIds = reviewers.filter(r => r.accountType === AccountType.Bot).map(r => r.id);
 		}
 
-		const { data } = await mutate<GetReviewRequestsResponse>({
+		const { data } = await mutate<AddReviewsResponse>({
 			mutation: schema.AddReviewers,
 			variables: {
 				input
 			},
 		});
 
-		if (!data?.repository) {
+		if (!data?.requestReviews) {
 			Logger.error('Unexpected null repository while getting review requests', PullRequestModel.ID);
 			return;
 		}
 
-		const newReviewers: (IAccount | ITeam)[] = parseGraphQLReviewers(data, this.githubRepository);
-		if (this.reviewers?.length !== newReviewers.length || (this.reviewers.some(r => !newReviewers.some(rr => rr.id === r.id)))) {
-			this.reviewers = newReviewers;
+		const newReviewers: (IAccount | ITeam)[] = [...reviewers, ...teamReviewers].filter(r => !this.reviewers?.some(rr => rr.id === r.id));
+		if (this.reviewers?.length !== newReviewers.length) {
+			if (!this.reviewers) {
+				this.reviewers = newReviewers;
+			} else {
+				this.reviewers.push(...newReviewers);
+			}
+			this.reviewers = [...this.reviewers, ...newReviewers];
 			this._onDidChange.fire({ reviewers: true });
 		}
 	}

src/github/pullRequestOverview.ts

@@ -27,7 +27,7 @@ import { pickEmail, reviewersQuickPick } from './quickPicks';
 import { parseReviewers } from './utils';
 import { CancelCodingAgentReply, DeleteReviewResult, MergeArguments, MergeResult, PullRequest, ReviewType } from './views';
 import { COPILOT_ACCOUNTS, IComment } from '../common/comment';
-import { COPILOT_SWE_AGENT, copilotEventToStatus, CopilotPRStatus, mostRecentCopilotEvent } from '../common/copilot';
+import { COPILOT_REVIEWER, COPILOT_REVIEWER_ACCOUNT, COPILOT_SWE_AGENT, copilotEventToStatus, CopilotPRStatus, mostRecentCopilotEvent } from '../common/copilot';
 import { commands, contexts } from '../common/executeCommands';
 import { disposeAll } from '../common/lifecycle';
 import Logger from '../common/logger';
@@ -308,7 +308,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 			Logger.debug('pr.initialize', PullRequestOverviewPanel.ID);
 			const users = this._assignableUsers[pullRequestModel.remote.remoteName] ?? [];
 			const copilotUser = users.find(user => COPILOT_ACCOUNTS[user.login]);
-			const isCopilotAlreadyReviewer = this._existingReviewers.some(reviewer => !isITeam(reviewer.reviewer) && COPILOT_ACCOUNTS[reviewer.reviewer.login]);
+			const isCopilotAlreadyReviewer = this._existingReviewers.some(reviewer => !isITeam(reviewer.reviewer) && reviewer.reviewer.login === COPILOT_REVIEWER);
 			const baseContext = this.getInitializeContext(currentUser, pullRequest, timelineEvents, repositoryAccess, viewerCanEdit, users);
 
 			this.preLoadInfoNotRequiredForOverview(pullRequest);
@@ -757,7 +757,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 		try {
 			const copilotUser = this._assignableUsers[this._item.remote.remoteName]?.find(user => COPILOT_ACCOUNTS[user.login]);
 			if (copilotUser) {
-				await this._item.requestReview([copilotUser], []);
+				await this._item.requestReview([COPILOT_REVIEWER_ACCOUNT], []);
 				const newReviewers = await this._item.getReviewRequests();
 				this._existingReviewers = parseReviewers(newReviewers!, await this._item.getTimelineEvents(), this._item.author);
 				const reply = {

src/github/quickPicks.ts

@@ -8,11 +8,11 @@ import { Buffer } from 'buffer';
 import * as vscode from 'vscode';
 import { FolderRepositoryManager } from './folderRepositoryManager';
 import { GitHubRepository, TeamReviewerRefreshKind } from './githubRepository';
-import { AccountType, IAccount, ILabel, IMilestone, IProject, isISuggestedReviewer, isITeam, ISuggestedReviewer, ITeam, reviewerId, ReviewState } from './interface';
+import { IAccount, ILabel, IMilestone, IProject, isISuggestedReviewer, isITeam, ISuggestedReviewer, ITeam, reviewerId, ReviewState } from './interface';
 import { IssueModel } from './issueModel';
 import { DisplayLabel } from './views';
 import { COPILOT_ACCOUNTS } from '../common/comment';
-import { COPILOT_REVIEWER, COPILOT_REVIEWER_ID, COPILOT_SWE_AGENT } from '../common/copilot';
+import { COPILOT_REVIEWER, COPILOT_REVIEWER_ACCOUNT, COPILOT_SWE_AGENT } from '../common/copilot';
 import { emojify, ensureEmojis } from '../common/emoji';
 import Logger from '../common/logger';
 import { DataUri } from '../common/uri';
@@ -191,15 +191,7 @@ async function getReviewersQuickPickItems(folderRepositoryManager: FolderReposit
 
 	// If we removed the coding agent, add the Copilot reviewer instead
 	if (hasCopilotSweAgent && !existingReviewers.find(user => (user.reviewer as IAccount).login === COPILOT_REVIEWER)) {
-		const copilotReviewer: IAccount = {
-			login: COPILOT_REVIEWER,
-			id: COPILOT_REVIEWER_ID,
-			url: '',
-			avatarUrl: '',
-			name: COPILOT_ACCOUNTS[COPILOT_REVIEWER]?.name ?? 'Copilot',
-			accountType: AccountType.Bot
-		};
-		assignableUsers.push(copilotReviewer);
+		assignableUsers.push(COPILOT_REVIEWER_ACCOUNT);
 	}
 
 	// Suggested reviewers

src/github/utils.ts

@@ -695,7 +695,7 @@ export function parseGraphQLReviewers(data: GraphQL.GetReviewRequestsResponse, r
 		if (GraphQL.isTeam(reviewer.requestedReviewer)) {
 			const team: ITeam = parseTeam(reviewer.requestedReviewer, repository);
 			reviewers.push(team);
-		} else if (GraphQL.isAccount(reviewer.requestedReviewer)) {
+		} else if (GraphQL.isAccount(reviewer.requestedReviewer) || GraphQL.isBot(reviewer.requestedReviewer)) {
 			const account: IAccount = parseAccount(reviewer.requestedReviewer, repository);
 			reviewers.push(account);
 		}