Merge branch 'pawang/improveGitBranchNaming' of github.com:microsoft/vscode-pull-request-github into pawang/improveGitBranchNaming

Author: pwang347

CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 0.120.0
+
+### Changes
+
+- The `#openPullRequest` tool recognizes open PR diffs and PR files as being the "open pull request".
+- All Copilot PR notifications can be marked as ready using the right-click context menu on the Copilot section header in the Pull Requests view.
+- The setting `githubIssues.issueAvatarDisplay` can be used to control whether the first assignee's avatar or the author's avatar is shown in the Issues view.
+- Instead of always running the pull request queries that back the Pull Requests view when refreshing, we now check to see if there are new PRs in the repo before running the queries. This should reduce API usage when there are no new PRs.
+- The "Copy link" action is back near the PR title in the pull request description webview.
+- You can configure that the default branch is pulled when you're "done" with a PR using `"githubPullRequests.postDone": "checkoutDefaultBranchAndPull"`.
+
+### Fixes
+
+- Unable to get list of users to assign them to a pull request. https://github.com/microsoft/vscode-pull-request-github/issues/7908
+- Error notifications when using GitHub Enterprise Server. https://github.com/microsoft/vscode-pull-request-github/issues/7901
+- Ignore worktrees that aren't in one of the workspace folders. https://github.com/microsoft/vscode-pull-request-github/issues/7896
+- Typing "#" and then Enter or Tab opens the GitHub issue queries settings. https://github.com/microsoft/vscode-pull-request-github/issues/7838
+- Unexpected branch switching when githubIssues.useBranchForIssues = off. https://github.com/microsoft/vscode-pull-request-github/issues/7827
+- Extension enters rapid refresh loop, causing high API usage and rate limiting. https://github.com/microsoft/vscode-pull-request-github/issues/7816
+- GitHub PR view highlights all repos with Copilot notification. https://github.com/microsoft/vscode-pull-request-github/issues/7852
+- Wrong commit is checked out when local branch exists with the same name. https://github.com/microsoft/vscode-pull-request-github/issues/7702
+- Visual Label not provided for "Title" and "Description" field. https://github.com/microsoft/vscode-pull-request-github/issues/7595
+- VSCode unresponsive during GitHub Pull Requests PR checkout (large number of files changed). https://github.com/microsoft/vscode-pull-request-github/issues/6952
+- extension explodes and kicks back out to GITHUB: LOGIN when non github repos are in working directory (specifically codeberg). https://github.com/microsoft/vscode-pull-request-github/issues/6945
+
 ## 0.118.2
 
 ### Fixes

package.json

@@ -3681,7 +3681,7 @@
 				"displayName": "%languageModelTools.github-pull-request_issue_fetch.displayName%",
 				"modelDescription": "Get a GitHub issue/PR's details as a JSON object.",
 				"icon": "$(info)",
-				"canBeReferencedInPrompt": false,
+				"canBeReferencedInPrompt": true,
 				"inputSchema": {
 					"type": "object",
 					"properties": {
@@ -3937,7 +3937,7 @@
 				"displayName": "%languageModelTools.github-pull-request_suggest-fix.displayName%",
 				"modelDescription": "Summarize and suggest a fix for a GitHub issue.",
 				"icon": "$(info)",
-				"canBeReferencedInPrompt": false,
+				"canBeReferencedInPrompt": true,
 				"inputSchema": {
 					"type": "object",
 					"properties": {
@@ -3984,7 +3984,7 @@
 				"displayName": "%languageModelTools.github-pull-request_formSearchQuery.displayName%",
 				"modelDescription": "Converts natural language to a GitHub search query. Should ALWAYS be called before doing a search.",
 				"icon": "$(search)",
-				"canBeReferencedInPrompt": false,
+				"canBeReferencedInPrompt": true,
 				"inputSchema": {
 					"type": "object",
 					"properties": {
@@ -4028,7 +4028,7 @@
 				"displayName": "%languageModelTools.github-pull-request_doSearch.displayName%",
 				"modelDescription": "Execute a GitHub search given a well formed GitHub search query. Call github-pull-request_formSearchQuery first to get good search syntax and pass the exact result in as the 'query'.",
 				"icon": "$(search)",
-				"canBeReferencedInPrompt": false,
+				"canBeReferencedInPrompt": true,
 				"inputSchema": {
 					"type": "object",
 					"properties": {
@@ -4074,7 +4074,7 @@
 				"displayName": "%languageModelTools.github-pull-request_renderIssues.displayName%",
 				"modelDescription": "Render issue items from an issue search in a markdown table. The markdown table will be displayed directly to the user by the tool. No further display should be done after this!",
 				"icon": "$(paintcan)",
-				"canBeReferencedInPrompt": false,
+				"canBeReferencedInPrompt": true,
 				"inputSchema": {
 					"type": "object",
 					"properties": {

src/common/uri.ts

@@ -205,7 +205,17 @@ export namespace DataUri {
 	const iconsFolder = 'userIcons';
 
 	function iconFilename(user: IAccount | ITeam): string {
-		return `${reviewerId(user)}.jpg`;
+		// Include avatarUrl hash to invalidate cache when URL changes
+		const baseId = reviewerId(user);
+		if (user.avatarUrl) {
+			// Create a simple hash of the URL to detect changes
+			const urlHash = user.avatarUrl.split('').reduce((a, b) => {
+				a = ((a << 5) - a) + b.charCodeAt(0);
+				return a & a;
+			}, 0);
+			return `${baseId}_${Math.abs(urlHash)}.jpg`;
+		}
+		return `${baseId}.jpg`;
 	}
 
 	function cacheLocation(context: vscode.ExtensionContext): vscode.Uri {
@@ -291,7 +301,6 @@ export namespace DataUri {
 		const startingCacheSize = cacheLogOrder.length;
 
 		const results = await Promise.all(users.map(async (user) => {
-
 			const imageSourceUrl = user.avatarUrl;
 			if (imageSourceUrl === undefined) {
 				return undefined;
@@ -311,6 +320,9 @@ export namespace DataUri {
 				cacheMiss = true;
 				const doFetch = async () => {
 					const response = await fetch(imageSourceUrl.toString());
+					if (!response.ok) {
+						throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+					}
 					const buffer = await response.arrayBuffer();
 					await writeAvatarToCache(context, user, new Uint8Array(buffer));
 					innerImageContents = Buffer.from(buffer);

src/github/copilotRemoteAgent.ts

@@ -42,6 +42,7 @@ const CONTINUE_WITHOUT_PUSHING = vscode.l10n.t('Ignore changes');
 const CONTINUE_AND_DO_NOT_ASK_AGAIN = vscode.l10n.t('Continue and don\'t ask again');
 
 const CONTINUE_TRUNCATION = vscode.l10n.t('Continue with truncation');
+const DELEGATE_MODAL_DETAILS = vscode.l10n.t('The agent will work asynchronously to create a pull request with your requested changes.');
 
 const COPILOT = '@copilot';
 
@@ -72,23 +73,25 @@ export namespace SessionIdForPr {
 
 export class CopilotRemoteAgentManager extends Disposable {
 	async chatParticipantImpl(request: vscode.ChatRequest, context: vscode.ChatContext, stream: vscode.ChatResponseStream, token: vscode.CancellationToken) {
-		const startSession = async (prompt: string, history: ReadonlyArray<vscode.ChatRequestTurn | vscode.ChatResponseTurn>, source: string, chatSummary?: { prompt?: string; history?: string }) => {
+		const startSession = async (source: string) => {
 			/* __GDPR__
 				"copilot.remoteagent.editor.invoke" : {
 					"promptLength" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 					"historyLength" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					"hasPromptSummary" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					"hasHistorySummary" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"promptSummaryLength" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"historySummaryLength" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 					"source" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 				}
 			*/
-			const promptSummary = chatSummary?.prompt;
-			const historySummary = chatSummary?.history;
+			const prompt = request.prompt;
+			const history = context.history;
+			const promptSummary = context.chatSummary?.prompt;
+			const historySummary = context.chatSummary?.history;
 			this.telemetry.sendTelemetryEvent('copilot.remoteagent.editor.invoke', {
 				promptLength: prompt.length.toString(),
 				historyLength: history?.length.toString(),
-				hasPromptSummary: String(!!promptSummary),
-				hasHistorySummary: String(!!historySummary),
+				promptSummaryLength: promptSummary?.length.toString() || '0',
+				historySummaryLength: historySummary?.length.toString() || '0',
 				source,
 			});
 			stream.progress(vscode.l10n.t('Delegating to coding agent'));
@@ -109,9 +112,48 @@ export class CopilotRemoteAgentManager extends Disposable {
 			return result.number;
 		};
 
+		const handleConfirmationData = async () => {
+			const results: Array<{ step: string; accepted: boolean }> = [];
+			results.push(...(request.acceptedConfirmationData?.map(data => ({ step: data.step, accepted: true })) ?? []));
+			results.push(...((request.rejectedConfirmationData ?? []).filter(data => !results.some(r => r.step === data.step)).map(data => ({ step: data.step, accepted: false }))));
+			for (const data of results) {
+				switch (data.step) {
+					case 'create':
+						if (!data.accepted) {
+							stream.markdown(vscode.l10n.t('Coding agent request cancelled.'));
+							return {};
+						}
+						const number = await startSession('chat');
+						if (!number) {
+							return {};
+						}
+						const pullRequest = await this.findPullRequestById(number, true);
+						if (!pullRequest) {
+							stream.warning(vscode.l10n.t('Could not find the associated pull request {0} for this chat session.', number));
+							return {};
+						}
+						const uri = await toOpenPullRequestWebviewUri({ owner: pullRequest.remote.owner, repo: pullRequest.remote.repositoryName, pullRequestNumber: pullRequest.number });
+						const plaintextBody = marked.parse(pullRequest.body, { renderer: new PlainTextRenderer(true), smartypants: true }).trim();
+						const card = new vscode.ChatResponsePullRequestPart(uri, pullRequest.title, plaintextBody, pullRequest.author.specialDisplayName ?? pullRequest.author.login, `#${pullRequest.number}`);
+						stream.push(card);
+						stream.markdown(vscode.l10n.t('GitHub Copilot coding agent has begun working on your request. Follow its progress in the associated chat and pull request.'));
+						vscode.window.showChatSession(COPILOT_SWE_AGENT, String(number), { viewColumn: vscode.ViewColumn.Active });
+						break;
+					default:
+						stream.warning(`Unknown confirmation step: ${data.step}\n\n`);
+						break;
+				}
+			}
+			return {};
+		};
+
+		if (request.acceptedConfirmationData || request.rejectedConfirmationData) {
+			return await handleConfirmationData();
+		}
+
 		if (context.chatSessionContext?.isUntitled) {
 			/* Generate new coding agent session from an 'untitled' session */
-			const number = await startSession(request.prompt, context.history, 'untitledChatSession');
+			const number = await startSession('untitledChatSession');
 			if (!number) {
 				return {};
 			}
@@ -175,25 +217,13 @@ export class CopilotRemoteAgentManager extends Disposable {
 		} else {
 			/* @copilot invoked from a 'normal' chat */
 
-			// TODO(jospicer): Use confirmations to guide users
-
-			const number = await startSession(request.prompt, context.history, 'chat', context.chatSummary); // TODO(jospicer): 'All of the chat messages so far in the current chat session. Currently, only chat messages for the current participant are included'
-			if (!number) {
-				return {};
-			}
-			const pullRequest = await this.findPullRequestById(number, true);
-			if (!pullRequest) {
-				stream.warning(vscode.l10n.t('Could not find the associated pull request {0} for this chat session.', number));
-				return {};
-			}
-
-			const uri = await toOpenPullRequestWebviewUri({ owner: pullRequest.remote.owner, repo: pullRequest.remote.repositoryName, pullRequestNumber: pullRequest.number });
-			const plaintextBody = marked.parse(pullRequest.body, { renderer: new PlainTextRenderer(true), smartypants: true }).trim();
+			stream.confirmation(
+				vscode.l10n.t('Delegate to coding agent'),
+				DELEGATE_MODAL_DETAILS,
+				{ step: 'create' },
+				['Delegate', 'Cancel']
+			);
 
-			const card = new vscode.ChatResponsePullRequestPart(uri, pullRequest.title, plaintextBody, pullRequest.author.specialDisplayName ?? pullRequest.author.login, `#${pullRequest.number}`);
-			stream.push(card);
-			stream.markdown(vscode.l10n.t('GitHub Copilot coding agent has begun working on your request. Follow its progress in the associated chat and pull request.'));
-			vscode.window.showChatSession(COPILOT_SWE_AGENT, String(number), { viewColumn: vscode.ViewColumn.Active });
 		}
 	}
 
@@ -549,7 +579,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 
 		let autoPushAndCommit = false;
 		const message = vscode.l10n.t('Copilot coding agent will continue your work in \'{0}\'.', repoName);
-		const detail = vscode.l10n.t('Your chat context will be used to continue work in a new pull request.');
+		const detail = DELEGATE_MODAL_DETAILS;
 		if (source !== 'prompt' && hasChanges && CopilotRemoteAgentConfig.getAutoCommitAndPushEnabled()) {
 			// Pending changes modal
 			const modalResult = await vscode.window.showInformationMessage(

src/github/folderRepositoryManager.ts

@@ -1303,13 +1303,13 @@ export class FolderRepositoryManager extends Disposable {
 	 * Pull request defaults in the query, like owner and repository variables, will be resolved.
 	 */
 	async getIssues(
-		query?: string,
+		query?: string, options: IPullRequestsPagingOptions = { fetchNextPage: false, fetchOnePagePerRepo: false }
 	): Promise<ItemsResponseResult<IssueModel> | undefined> {
 		if (this.gitHubRepositories.length === 0) {
 			return undefined;
 		}
 		try {
-			const data = await this.fetchPagedData<Issue>({ fetchNextPage: false, fetchOnePagePerRepo: false }, `issuesKey${query}`, PagedDataType.IssueSearch, PRType.All, query);
+			const data = await this.fetchPagedData<Issue>(options, `issuesKey${query}`, PagedDataType.IssueSearch, PRType.All, query);
 			const mappedData: ItemsResponseResult<IssueModel> = {
 				items: [],
 				hasMorePages: data.hasMorePages,

src/github/githubRepository.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as buffer from 'buffer';
-import { ApolloQueryResult, DocumentNode, FetchResult, MutationOptions, NetworkStatus, QueryOptions } from 'apollo-boost';
+import { ApolloQueryResult, DocumentNode, FetchResult, MutationOptions, NetworkStatus, OperationVariables, QueryOptions } from 'apollo-boost';
 import LRUCache from 'lru-cache';
 import * as vscode from 'vscode';
 import { AuthenticationError, AuthProvider, GitHubServerType, isSamlError } from '../common/authentication';
@@ -172,6 +172,7 @@ export class GitHubRepository extends Disposable {
 	// eslint-disable-next-line rulesdir/no-any-except-union-method-signature
 	private _queriesSchema: any;
 	private _areQueriesLimited: boolean = false;
+	get areQueriesLimited(): boolean { return this._areQueriesLimited; }
 
 	private _onDidAddPullRequest: vscode.EventEmitter<PullRequestModel> = this._register(new vscode.EventEmitter());
 	public readonly onDidAddPullRequest: vscode.Event<PullRequestModel> = this._onDidAddPullRequest.event;
@@ -277,7 +278,7 @@ export class GitHubRepository extends Disposable {
 		}
 	}
 
-	query = async <T>(query: QueryOptions, ignoreSamlErrors: boolean = false, legacyFallback?: { query: DocumentNode }): Promise<ApolloQueryResult<T>> => {
+	query = async <T>(query: QueryOptions, ignoreSamlErrors: boolean = false, legacyFallback?: { query: DocumentNode, variables?: OperationVariables }): 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;
@@ -299,6 +300,7 @@ export class GitHubRepository extends Disposable {
 			Logger.error(`Error querying GraphQL API (${logInfo}): ${e.message}${gqlErrors ? `. ${gqlErrors.map(error => error.extensions?.code).join(',')}` : ''}`, this.id);
 			if (legacyFallback) {
 				query.query = legacyFallback.query;
+				query.variables = legacyFallback.variables;
 				return this.query(query, ignoreSamlErrors);
 			}
 
@@ -426,7 +428,7 @@ export class GitHubRepository extends Disposable {
 		}
 
 		if (oldHub !== this._hub) {
-			if (this._areQueriesLimited || this._credentialStore.areScopesOld(this.remote.authProviderId)) {
+			if (this._areQueriesLimited || this._credentialStore.areScopesOld(this.remote.authProviderId) || (this.remote.authProviderId === AuthProvider.githubEnterprise)) {
 				this._areQueriesLimited = true;
 				this._queriesSchema = mergeQuerySchemaWithShared(sharedSchema.default as any, limitedSchema.default as any);
 			} else {
@@ -1330,6 +1332,14 @@ export class GitHubRepository extends Disposable {
 							first: 100,
 							after: after,
 						},
+					}, false, {
+						query: schema.GetAssignableUsers,
+						variables: {
+							owner: remote.owner,
+							name: remote.repositoryName,
+							first: 100,
+							after: after,
+						}
 					});
 
 				} else {

src/github/pullRequestModel.ts

@@ -1099,16 +1099,20 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 	 */
 	async requestReview(reviewers: IAccount[], teamReviewers: ITeam[], union: boolean = false): Promise<void> {
 		const { mutate, schema } = await this.githubRepository.ensure();
+		const input: { pullRequestId: string, teamIds: string[], userIds: string[], botIds?: string[], union: boolean } = {
+			pullRequestId: this.graphNodeId,
+			teamIds: teamReviewers.map(t => t.id),
+			userIds: reviewers.filter(r => r.accountType !== AccountType.Bot).map(r => r.id),
+			union
+		};
+		if (!this.githubRepository.areQueriesLimited) {
+			input.botIds = reviewers.filter(r => r.accountType === AccountType.Bot).map(r => r.id);
+		}
+
 		const { data } = await mutate<GetReviewRequestsResponse>({
 			mutation: schema.AddReviewers,
 			variables: {
-				input: {
-					pullRequestId: this.graphNodeId,
-					teamIds: teamReviewers.map(t => t.id),
-					userIds: reviewers.filter(r => r.accountType !== AccountType.Bot).map(r => r.id),
-					botIds: reviewers.filter(r => r.accountType === AccountType.Bot).map(r => r.id),
-					union
-				},
+				input
 			},
 		});