Fix: Enable adding Copilot as a reviewer in VS Code (#7807)

* Initial plan

* Fix Copilot reviewer selection in VS Code

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

* Show Copilot reviewer, but still can't manage copilot reviewer

* Allow bot reviewers

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

src/common/copilot.ts

@@ -6,9 +6,11 @@
 import { EventType, TimelineEvent } from './timelineEvent';
 
 export const COPILOT_SWE_AGENT = 'copilot-swe-agent';
+export const COPILOT_REVIEWER = 'copilot-pull-request-reviewer';
+export const COPILOT_REVIEWER_ID = 'BOT_kgDOCnlnWA';
 
 export const COPILOT_LOGINS = [
-	'copilot-pull-request-reviewer',
+	COPILOT_REVIEWER,
 	COPILOT_SWE_AGENT,
 	'Copilot'
 ];

src/github/pullRequestModel.ts

@@ -1134,8 +1134,8 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 			owner: remote.owner,
 			repo: remote.repositoryName,
 			pull_number: this.number,
-			reviewers: reviewers.filter(r => r.accountType !== AccountType.Bot).map(r => r.id),
-			team_reviewers: teamReviewers.map(t => t.id)
+			reviewers: reviewers.map(r => r.id),
+			team_reviewers: teamReviewers.map(t => t.id),
 		});
 
 		this.reviewers = this.reviewers?.filter(r => !reviewers.some(rr => rr.id === r.id) && !teamReviewers.some(t => t.id === r.id)) || [];

src/github/pullRequestOverview.ts

@@ -424,8 +424,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 			quickPick.busy = false;
 			const acceptPromise: Promise<(IAccount | ITeam)[]> = asPromise<void>(quickPick.onDidAccept).then(() => {
 				const pickedReviewers: (IAccount | ITeam)[] | undefined = quickPick?.selectedItems.filter(item => item.user).map(item => item.user) as (IAccount | ITeam)[];
-				const botReviewers = this._existingReviewers.filter(reviewer => !isITeam(reviewer.reviewer) && reviewer.reviewer.accountType === 'Bot').map(reviewer => reviewer.reviewer);
-				return pickedReviewers.concat(botReviewers);
+				return pickedReviewers;
 			});
 			const hidePromise = asPromise<void>(quickPick.onDidHide);
 			const allReviewers = await Promise.race<(IAccount | ITeam)[] | void>([acceptPromise, hidePromise]);

src/github/quickPicks.ts

@@ -7,7 +7,7 @@
 import { Buffer } from 'buffer';
 import * as vscode from 'vscode';
 import { COPILOT_ACCOUNTS } from '../common/comment';
-import { COPILOT_SWE_AGENT } from '../common/copilot';
+import { COPILOT_REVIEWER, COPILOT_REVIEWER_ID, COPILOT_SWE_AGENT } from '../common/copilot';
 import { emojify, ensureEmojis } from '../common/emoji';
 import Logger from '../common/logger';
 import { DataUri } from '../common/uri';
@@ -152,7 +152,6 @@ function userThemeIcon(user: IAccount | ITeam) {
 async function getReviewersQuickPickItems(folderRepositoryManager: FolderRepositoryManager, remoteName: string, isInOrganization: boolean, author: IAccount, existingReviewers: ReviewState[],
 	suggestedReviewers: ISuggestedReviewer[] | undefined, refreshKind: TeamReviewerRefreshKind,
 ): Promise<(vscode.QuickPickItem & { user?: IAccount | ITeam })[]> {
-	existingReviewers = existingReviewers.filter(reviewer => isITeam(reviewer.reviewer) || (reviewer.reviewer.accountType !== AccountType.Bot));
 	if (!suggestedReviewers) {
 		return [];
 	}
@@ -162,8 +161,17 @@ async function getReviewersQuickPickItems(folderRepositoryManager: FolderReposit
 	const teamReviewers: ITeam[] = allTeamReviewers[remoteName] ?? [];
 	const assignableUsers: (IAccount | ITeam)[] = [...teamReviewers];
 
-	// Remove the swe agent as it can't do reviews
-	const assignableUsersForRemote = allAssignableUsers[remoteName].filter(user => user.login !== COPILOT_SWE_AGENT);
+	// Remove the swe agent as it can't do reviews, but add the reviewer instead
+	const originalAssignableUsers = allAssignableUsers[remoteName] ?? [];
+	let hasCopilotSweAgent: boolean = false;
+	const assignableUsersForRemote = originalAssignableUsers.filter(user => {
+		if (user.login === COPILOT_SWE_AGENT) {
+			hasCopilotSweAgent = true;
+			return false;
+		}
+		return true;
+	});
+
 	if (assignableUsersForRemote) {
 		assignableUsers.push(...assignableUsersForRemote);
 	}
@@ -181,6 +189,19 @@ async function getReviewersQuickPickItems(folderRepositoryManager: FolderReposit
 		reviewersPromises.push(getItems<IAccount | ITeam>(folderRepositoryManager.context, skipList, existingReviewers.map(reviewer => reviewer.reviewer), true));
 	}
 
+	// 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);
+	}
+
 	// Suggested reviewers
 	reviewersPromises.push(getItems<ISuggestedReviewer>(folderRepositoryManager.context, skipList, suggestedReviewers, false));