Merge branch 'main' into alexr00/deep-cuckoo

Author: alexr00

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 0.134.0
+
+### Changes
+
+- Branch names in the create PR view are now cached for faster target branch loading.
+- GitHub permalink links in PR and issue overview webviews now open the corresponding local file when the file exists in the workspace.
+
+### Fixes
+
+- Selecting a target branch when creating a PR is sometimes broken. https://github.com/microsoft/vscode-pull-request-github/issues/8627
+- "Apply suggestion using AI" for code comment reviews results in a redundant disclaimer suffix. https://github.com/microsoft/vscode-pull-request-github/issues/8605
+
+**_Thank You_**
+
+* [@Daniel-Aaron-Bloom](https://github.com/Daniel-Aaron-Bloom): Link to local file for permalinks in webview [PR #8583](https://github.com/microsoft/vscode-pull-request-github/pull/8583)
+
 ## 0.132.2
 
 ### Fixes

package-lock.json

@@ -44,7 +44,7 @@
 		"treeItemMarkdownLabel",
 		"treeViewMarkdownMessage"
 	],
-	"version": "0.132.2",
+	"version": "0.134.0",
 	"publisher": "GitHub",
 	"engines": {
 		"vscode": "^1.110.0"
@@ -4103,6 +4103,33 @@
 					]
 				},
 				"when": "config.githubPullRequests.experimental.chat"
+			},
+			{
+				"name": "github-pull-request_resolveReviewThread",
+				"tags": [
+					"github",
+					"pull request",
+					"review"
+				],
+				"toolReferenceName": "resolveReviewThread",
+				"displayName": "%languageModelTools.github-pull-request_resolveReviewThread.displayName%",
+				"modelDescription": "Resolve a review thread on the active GitHub pull request. Use the threadId from the reviewThreads array returned by the activePullRequest tool. Only resolves threads where canResolve is true and isResolved is false.",
+				"icon": "$(pass)",
+				"canBeReferencedInPrompt": true,
+				"userDescription": "%languageModelTools.github-pull-request_resolveReviewThread.description%",
+				"when": "config.githubPullRequests.experimental.chat",
+				"inputSchema": {
+					"type": "object",
+					"properties": {
+						"threadId": {
+							"type": "string",
+							"description": "The GraphQL node ID of the review thread to resolve. Obtain this from the id field in the reviewThreads array of the activePullRequest tool output."
+						}
+					},
+					"required": [
+						"threadId"
+					]
+				}
 			}
 		]
 	},
@@ -4240,7 +4267,7 @@
 	"overrides": {
 		"mocha": {
 			"diff": "7.0.0",
-			"serialize-javascript": "6.0.1"
+			"serialize-javascript": "7.0.5"
 		},
 		"elliptic": "6.6.1"
 	},

package.json

@@ -446,6 +446,8 @@
 	"languageModelTools.github-pull-request_pullRequestStatusChecks.description": "Get the status checks and CI results for a GitHub pull request.",
 	"languageModelTools.github-pull-request_openPullRequest.displayName": "Open Pull Request",
 	"languageModelTools.github-pull-request_openPullRequest.description": "Get information about the open GitHub pull request. This information includes: comments, files changed, pull request title + description, and pull request state.",
+	"languageModelTools.github-pull-request_resolveReviewThread.displayName": "Resolve Review Thread",
+	"languageModelTools.github-pull-request_resolveReviewThread.description": "Resolve a review thread on the active GitHub pull request.",
 	"languageModelTools.github-pull-request_create_pull_request.displayName": "Create a GitHub pull request",
 	"languageModelTools.github-pull-request_create_pull_request.description": "Create a new GitHub pull request with a title, head branch, and optional body, base branch, and draft flag."
 }

package.nls.json

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

@@ -100,14 +100,36 @@ declare module 'vscode' {
 			readonly command?: string;
 		};
 
+		/**
+		 * @deprecated Use `inputState` instead
+		 */
 		readonly sessionOptions: ReadonlyArray<{ optionId: string; value: string | ChatSessionProviderOptionItem }>;
+
+		readonly inputState: ChatSessionInputState;
 	}
 
 	/**
 	 * Extension callback invoked when a new chat session is started.
 	 */
 	export type ChatSessionItemControllerNewItemHandler = (context: ChatSessionItemControllerNewItemHandlerContext, token: CancellationToken) => Thenable<ChatSessionItem>;
 
+	/**
+	 * Extension callback invoked to get the input state for a chat session.
+	 *
+	 * @param sessionResource The resource of the chat session to get the input state for. `undefined` indicates this is
+	 * for a blank chat editor that is not yet associated with a session.
+	 * @param context Additional context
+	 * @param token Cancellation token.
+	 *
+	 * @return A new chat session input state. This should be created using {@link ChatSessionItemController.createChatSessionInputState}.
+	 */
+	export type ChatSessionControllerGetInputState = (sessionResource: Uri | undefined, context: {
+		/**
+		 * The previous input state for the session.
+		 */
+		readonly previousInputState: ChatSessionInputState | undefined;
+	}, token: CancellationToken) => Thenable<ChatSessionInputState> | ChatSessionInputState;
+
 	/**
 	 * Extension callback invoked to fork an existing chat session item managed by a {@linkcode ChatSessionItemController}.
 	 *
@@ -150,6 +172,11 @@ declare module 'vscode' {
 		 */
 		readonly refreshHandler: ChatSessionItemControllerRefreshHandler;
 
+		/**
+		 * Fired when an item's archived state changes.
+		 */
+		readonly onDidChangeChatSessionItemState: Event<ChatSessionItem>;
+
 		/**
 		 * Invoked when a new chat session is started.
 		 *
@@ -168,9 +195,14 @@ declare module 'vscode' {
 		forkHandler?: ChatSessionItemControllerForkHandler;
 
 		/**
-		 * Fired when an item's archived state changes.
+		 * Gets the input state for a chat session.
 		 */
-		readonly onDidChangeChatSessionItemState: Event<ChatSessionItem>;
+		getChatSessionInputState?: ChatSessionControllerGetInputState;
+
+		/**
+		 * Create a new managed ChatSessionInputState object.
+		 */
+		createChatSessionInputState(groups: ChatSessionProviderOptionGroup[]): ChatSessionInputState;
 	}
 
 	/**
@@ -321,6 +353,9 @@ declare module 'vscode' {
 		metadata?: { readonly [key: string]: any };
 	}
 
+	/**
+	 * @deprecated Use `ChatSessionChangedFile2` instead
+	 */
 	export class ChatSessionChangedFile {
 		/**
 		 * URI of the file.
@@ -468,11 +503,15 @@ declare module 'vscode' {
 	 */
 	export interface ChatSessionContentProvider {
 		/**
+		 * @deprecated
+		 *
 		 * Event that the provider can fire to signal that the options for a chat session have changed.
 		 */
 		readonly onDidChangeChatSessionOptions?: Event<ChatSessionOptionChangeEvent>;
 
 		/**
+		 * @deprecated
+		 *
 		 * Event that the provider can fire to signal that the available provider options have changed.
 		 *
 		 * When fired, the editor will re-query {@link ChatSessionContentProvider.provideChatSessionProviderOptions}
@@ -492,17 +531,26 @@ declare module 'vscode' {
 		 * @return The {@link ChatSession chat session} associated with the given URI.
 		 */
 		provideChatSessionContent(resource: Uri, token: CancellationToken, context: {
+			readonly inputState: ChatSessionInputState;
+
+			/**
+			 * @deprecated Use `inputState` instead
+			 */
 			readonly sessionOptions: ReadonlyArray<{ optionId: string; value: string | ChatSessionProviderOptionItem }>;
 		}): Thenable<ChatSession> | ChatSession;
 
 		/**
+		 * @deprecated
+		 *
 		 * @param resource Identifier of the chat session being updated.
 		 * @param updates Collection of option identifiers and their new values. Only the options that changed are included.
 		 * @param token A cancellation token that can be used to cancel the notification if the session is disposed.
 		 */
 		provideHandleOptionsChange?(resource: Uri, updates: ReadonlyArray<ChatSessionOptionUpdate>, token: CancellationToken): void;
 
 		/**
+		 * @deprecated
+		 *
 		 * Called as soon as you register (call me once)
 		 */
 		provideChatSessionProviderOptions?(token: CancellationToken): Thenable<ChatSessionProviderOptions>;
@@ -614,10 +662,15 @@ declare module 'vscode' {
 		 */
 		readonly description?: string;
 
+		/**
+		 * The currently selected option for this group. This must be one of the items provided in the `items` array.
+		 */
+		readonly selected?: ChatSessionProviderOptionItem;
+
 		/**
 		 * The selectable items within this option group.
 		 */
-		readonly items: ChatSessionProviderOptionItem[];
+		readonly items: readonly ChatSessionProviderOptionItem[];
 
 		/**
 		 * A context key expression that controls when this option group picker is visible.
@@ -654,6 +707,9 @@ declare module 'vscode' {
 		 * Optional commands.
 		 *
 		 * These commands will be displayed at the bottom of the group.
+		 *
+		 * For extensions that use the new `provideChatSessionInputState` API, these commands are passed a context object
+		 * `{ inputState: ChatSessionInputState; sessionResource: Uri | undefined }` that they can use to determine which session and options they are being invoked for.
 		 */
 		readonly commands?: Command[];
 	}
@@ -672,4 +728,21 @@ declare module 'vscode' {
 		 */
 		readonly newSessionOptions?: Record<string, string | ChatSessionProviderOptionItem>;
 	}
+
+	/**
+	 * Represents the current state of user inputs for a chat session.
+	 */
+	export interface ChatSessionInputState {
+		/**
+		 * Fired when the input state is changed by the user.
+		 */
+		readonly onDidChange: Event<void>;
+
+		/**
+		 * The groups of options to show in the UI for user input.
+		 *
+		 * To update the groups you must replace the entire `groups` array with a new array.
+		 */
+		groups: readonly ChatSessionProviderOptionGroup[];
+	}
 }

src/@types/vscode.proposed.chatSessionsProvider.d.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();