Fix race condition in branch picker when creating PR (#8628)

* Initial plan

* Initial plan for fixing branch picker race condition

Agent-Logs-Url: https://github.com/microsoft/vscode-pull-request-github/sessions/f9f9a4fa-befb-4089-968f-721dfd44e120

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

* Fix race condition in branch picker when creating PR

Register onDidAccept/onDidHide handlers before async updateItems to
avoid missing early user interactions. Fall back to activeItems when
selectedItems is empty due to items being replaced during debounced
refresh.

Agent-Logs-Url: https://github.com/microsoft/vscode-pull-request-github/sessions/f9f9a4fa-befb-4089-968f-721dfd44e120

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

---------

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/@types/vscode.proposed.chatParticipantAdditions.d.ts

@@ -990,10 +990,6 @@ declare module 'vscode' {
 		readonly toolReferences?: readonly ChatLanguageModelToolReference[];
 	}
 
-	export interface ChatResultFeedback {
-		readonly unhelpfulReason?: string;
-	}
-
 	export namespace lm {
 		export function fileIsIgnored(uri: Uri, token?: CancellationToken): Thenable<boolean>;
 	}

src/@types/vscode.proposed.chatParticipantPrivate.d.ts

@@ -50,12 +50,6 @@ declare module 'vscode' {
 		constructor(cell: TextDocument);
 	}
 
-	export interface ChatRequestSessionGrouping {
-		readonly id: string;
-		readonly order: number;
-		readonly kind?: string;
-	}
-
 	export interface ChatRequest {
 		/**
 		 * The id of the chat request. Used to identity an interaction with any of the chat surfaces.
@@ -122,11 +116,6 @@ declare module 'vscode' {
 		 */
 		readonly parentRequestId?: string;
 
-		/**
-		 * Optional metadata used to group related requests together in the UI.
-		 */
-		readonly sessionGrouping?: ChatRequestSessionGrouping;
-
 		/**
 		 * The permission level for tool auto-approval in this request.
 		 * - `'autoApprove'`: Auto-approve all tool calls and retry on errors.
@@ -199,10 +188,15 @@ declare module 'vscode' {
 		 */
 		readonly modelId?: string;
 
+		/**
+		 * The mode instructions that were active for this request, if any.
+		 */
+		readonly modeInstructions2?: ChatRequestModeInstructions;
+
 		/**
 		 * @hidden
 		 */
-		constructor(prompt: string, command: string | undefined, references: ChatPromptReference[], participant: string, toolReferences: ChatLanguageModelToolReference[], editedFileEvents: ChatRequestEditedFileEvent[] | undefined, id: string | undefined, modelId: string | undefined);
+		constructor(prompt: string, command: string | undefined, references: ChatPromptReference[], participant: string, toolReferences: ChatLanguageModelToolReference[], editedFileEvents: ChatRequestEditedFileEvent[] | undefined, id: string | undefined, modelId: string | undefined, modeInstructions2: ChatRequestModeInstructions | undefined);
 	}
 
 	export class ChatResponseTurn2 {
@@ -421,4 +415,17 @@ declare module 'vscode' {
 	}
 
 	// #endregion
+
+	export interface LanguageModelToolInformation {
+		/**
+		 * The full reference name of this tool as used in agent definition files.
+		 *
+		 * For MCP tools, this is the canonical name in the format `serverShortName/toolReferenceName`
+		 * (e.g., `github/search_issues`). This can be used to map between the tool names specified
+		 * in agent `.md` files and the tool's internal {@link LanguageModelToolInformation.name id}.
+		 *
+		 * This property is only set for MCP tools. For other tool types, it is `undefined`.
+		 */
+		readonly fullReferenceName?: string;
+	}
 }

src/github/createPRViewProvider.ts

@@ -1161,19 +1161,14 @@ Don't forget to commit your template file to the repository so that it can be us
 				const activeItem = message.args.currentBranch ? quickPick.items.find(item => item.branch === message.args.currentBranch) : undefined;
 				quickPick.activeItems = activeItem ? [activeItem] : [];
 			}
-			await updateItems(githubRepository, undefined);
-		} else {
-			quickPick.items = await this.remotePicks(isBase);
 		}
-		const activeItem = message.args.currentBranch ? quickPick.items.find(item => item.branch === message.args.currentBranch) : undefined;
-		quickPick.activeItems = activeItem ? [activeItem] : [];
-		quickPick.busy = false;
+		// Register event handlers before awaiting async operations to avoid missing early user interactions
 		const remoteAndBranch: Promise<{ remote: RemoteInfo, branch: string } | undefined> = new Promise((resolve) => {
 			quickPick.onDidAccept(async () => {
-				if (quickPick.selectedItems.length === 0) {
+				const selectedPick = quickPick.selectedItems[0] ?? quickPick.activeItems[0];
+				if (!selectedPick) {
 					return;
 				}
-				const selectedPick = quickPick.selectedItems[0];
 				if (selectedPick.label === chooseDifferentRemote) {
 					quickPick.busy = true;
 					quickPick.items = await this.remotePicks(isBase);
@@ -1194,6 +1189,14 @@ Don't forget to commit your template file to the repository so that it can be us
 			});
 		});
 		const hidePromise = new Promise<void>((resolve) => quickPick.onDidHide(() => resolve()));
+		if (githubRepository) {
+			await updateItems(githubRepository, undefined);
+		} else {
+			quickPick.items = await this.remotePicks(isBase);
+		}
+		const activeItem = message.args.currentBranch ? quickPick.items.find(item => item.branch === message.args.currentBranch) : undefined;
+		quickPick.activeItems = activeItem ? [activeItem] : [];
+		quickPick.busy = false;
 		const result = await Promise.race([remoteAndBranch, hidePromise]);
 		if (!result || !githubRepository) {
 			quickPick.hide();

src/github/pullRequestOverview.ts

@@ -1136,13 +1136,14 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 			quickPick.canSelectMany = false;
 			quickPick.placeholder = vscode.l10n.t('Select a new base branch');
 			quickPick.show();
-			await updateItems(undefined);
-
-			quickPick.busy = false;
+			// Register event handlers before awaiting async operations to avoid missing early user interactions
 			const acceptPromise = asPromise<void>(quickPick.onDidAccept).then(() => {
-				return quickPick.selectedItems[0]?.branch;
+				return (quickPick.selectedItems[0] ?? quickPick.activeItems[0])?.branch;
 			});
 			const hidePromise = asPromise<void>(quickPick.onDidHide);
+			await updateItems(undefined);
+
+			quickPick.busy = false;
 			const selectedBranch = await Promise.race<string | void>([acceptPromise, hidePromise]);
 			quickPick.busy = true;
 			quickPick.enabled = false;