Merge branch 'main' into copilot/improve-commit-line-breaks

Author: alexr00

CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## 0.128.0
+
+### Changes
+
+- "Apply Suggestion with Copilot" is now available from the "Comments" view, in addition to the comment widget in the editor. When run from this context, it will open the Chat view.
+- When a PR branch is automatically deleted after merge, a notification is shown to inform you that the branch was deleted and you were switched to another branch.
+- The issue URL in the issue webview is now copyable via the right-click context menu.
+- The "Pull Request" status bar item reflects the currently selected repo when using `"scm.repositories.selectionMode": "single"`.
+
+### Fixes
+
+- timelineItem nodes can be null. https://github.com/microsoft/vscode-pull-request-github/issues/8447
+- Branch auto delete does not work with merge queues. https://github.com/microsoft/vscode-pull-request-github/issues/8435
+- Error: we couldn't find commit. https://github.com/microsoft/vscode-pull-request-github/issues/8401
+- Multi-diff button for current pull request is gone. https://github.com/microsoft/vscode-pull-request-github/issues/8387
+- Do not create notifications for copilot PRs which are in progress. https://github.com/microsoft/vscode-pull-request-github/issues/8380
+- Error viewing PR descriptions in ghe. https://github.com/microsoft/vscode-pull-request-github/issues/8378
+- Marking a file as viewed on an older commit marks the file as viewed for all versions of the file. https://github.com/microsoft/vscode-pull-request-github/issues/8313
+- Use the GH GraphQL API UpdatePullRequestBranch for pulling in updates when there are no conflicts. https://github.com/microsoft/vscode-pull-request-github/issues/8231
+- "Copilot started work" should not be the same message for CCA and CCR. https://github.com/microsoft/vscode-pull-request-github/issues/8211
+- "Edit Description" button does nothing when using the Create Issue From Selection command. https://github.com/microsoft/vscode-pull-request-github/issues/8184
+- Avatar does not show in PR details page. https://github.com/microsoft/vscode-pull-request-github/issues/8152
+
 ## 0.126.0
 
 ### Changes

package.json

@@ -2828,7 +2828,7 @@
 				},
 				{
 					"command": "pr.openChanges",
-					"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /(pullrequest|description)/ && config.multiDiffEditor.experimental.enabled",
+					"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /(pullrequest|description)/",
 					"group": "2_pullrequest@1"
 				},
 				{
@@ -2863,7 +2863,7 @@
 				},
 				{
 					"command": "issue.chatSummarizeIssue",
-					"when": "view == pr:github && viewItem =~ /pullrequest/ && github.copilot-chat.activated && config.githubPullRequests.experimental.chat",
+					"when": "view == pr:github && viewItem =~ /pullrequest/ && github.copilot-chat.activated && config.githubPullRequests.experimental.chat && !config.chat.disableAIFeatures",
 					"group": "5_pullrequest@2"
 				},
 				{
@@ -2873,7 +2873,7 @@
 				},
 				{
 					"command": "pr.openChanges",
-					"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /(pullrequest|description)/ && config.multiDiffEditor.experimental.enabled",
+					"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /(pullrequest|description)/",
 					"group": "inline@0"
 				},
 				{
@@ -2889,7 +2889,7 @@
 				{
 					"command": "notification.chatSummarizeNotification",
 					"group": "issues_0@0",
-					"when": "view == notifications:github && (viewItem == 'Issue' || viewItem == 'PullRequest') && config.githubPullRequests.experimental.notificationsView && config.githubPullRequests.experimental.chat"
+					"when": "view == notifications:github && (viewItem == 'Issue' || viewItem == 'PullRequest') && config.githubPullRequests.experimental.notificationsView && config.githubPullRequests.experimental.chat && !config.chat.disableAIFeatures"
 				},
 				{
 					"command": "notification.openOnGitHub",
@@ -3037,17 +3037,17 @@
 				},
 				{
 					"command": "issue.chatSummarizeIssue",
-					"when": "view == issues:github && viewItem =~ /^(link)?(current|continue)?issue/ && github.copilot-chat.activated && config.githubPullRequests.experimental.chat",
+					"when": "view == issues:github && viewItem =~ /^(link)?(current|continue)?issue/ && github.copilot-chat.activated && config.githubPullRequests.experimental.chat && !config.chat.disableAIFeatures",
 					"group": "issues_1@0"
 				},
 				{
 					"command": "issue.chatSuggestFix",
-					"when": "view == issues:github && viewItem =~ /^(link)?(current|continue)?issue/ && github.copilot-chat.activated && config.githubPullRequests.experimental.chat",
+					"when": "view == issues:github && viewItem =~ /^(link)?(current|continue)?issue/ && github.copilot-chat.activated && config.githubPullRequests.experimental.chat && !config.chat.disableAIFeatures",
 					"group": "issues_1@1"
 				},
 				{
 					"command": "issue.assignToCodingAgent",
-					"when": "view == issues:github && viewItem =~ /^(link)?(current|continue)?issue/ && config.githubPullRequests.codingAgent.enabled",
+					"when": "view == issues:github && viewItem =~ /^(link)?(current|continue)?issue/ && config.githubPullRequests.codingAgent.enabled && !config.chat.disableAIFeatures",
 					"group": "issues_1@2"
 				},
 				{
@@ -3100,6 +3100,11 @@
 					"command": "pr.unresolveReviewThreadFromView",
 					"group": "context@1",
 					"when": "commentController =~ /^github-(browse|review)/ && commentThread =~ /canUnresolve/"
+				},
+				{
+					"command": "pr.applySuggestionWithCopilot",
+					"group": "context@2",
+					"when": "commentController =~ /^github-review/ && !config.chat.disableAIFeatures"
 				}
 			],
 			"editor/title": [
@@ -3256,7 +3261,7 @@
 				},
 				{
 					"command": "pr.applySuggestionWithCopilot",
-					"when": "commentController =~ /^github-review/ && !(comment =~ /hasSuggestion/)"
+					"when": "commentController =~ /^github-review/ && !config.chat.disableAIFeatures"
 				}
 			],
 			"comments/comment/title": [
@@ -3268,7 +3273,7 @@
 				{
 					"command": "pr.applySuggestionWithCopilot",
 					"group": "overflow@0",
-					"when": "commentController =~ /^github-review/ && !(comment =~ /hasSuggestion/)"
+					"when": "commentController =~ /^github-review/ && !config.chat.disableAIFeatures"
 				},
 				{
 					"command": "pr.editComment",
@@ -3552,7 +3557,7 @@
 				},
 				{
 					"command": "pr.copyPrLink",
-					"when": "webviewId == PullRequestOverview && github:copyMenu"
+					"when": "(webviewId == PullRequestOverview || webviewId == IssueOverview) && github:copyMenu"
 				},
 				{
 					"command": "pr.copyVscodeDevPrLink",
@@ -3597,25 +3602,25 @@
 			"chat/chatSessions": [
 				{
 					"command": "pr.openChanges",
-					"when": "chatSessionType == copilot-cloud-agent",
+					"when": "chatSessionType == copilot-cloud-agent && !config.chat.disableAIFeatures",
 					"group": "inline"
 				},
 				{
 					"command": "pr.checkoutChatSessionPullRequest",
-					"when": "chatSessionType == copilot-cloud-agent",
+					"when": "chatSessionType == copilot-cloud-agent && !config.chat.disableAIFeatures",
 					"group": "context"
 				}
 			],
 			"chat/input/editing/sessionToolbar": [
 				{
 					"command": "pr.checkoutFromDescription",
 					"group": "navigation@0",
-					"when": "chatSessionType == copilot-cloud-agent && workspaceFolderCount > 0 && github.vscode-pull-request-github.activated"
+					"when": "chatSessionType == copilot-cloud-agent && workspaceFolderCount > 0 && github.vscode-pull-request-github.activated && !config.chat.disableAIFeatures"
 				},
 				{
 					"command": "pr.applyChangesFromDescription",
 					"group": "navigation@1",
-					"when": "chatSessionType == copilot-cloud-agent && workspaceFolderCount > 0 && github.vscode-pull-request-github.activated"
+					"when": "chatSessionType == copilot-cloud-agent && workspaceFolderCount > 0 && github.vscode-pull-request-github.activated && !config.chat.disableAIFeatures"
 				}
 			]
 		},

package.nls.json

@@ -41,7 +41,7 @@
 	"githubPullRequests.fileAutoReveal.description": "Automatically reveal open files in the pull request changes tree.",
 	"githubPullRequests.defaultDeletionMethod.selectLocalBranch.description": "When true, the option to delete the local branch will be selected by default when deleting a branch from a pull request.",
 	"githubPullRequests.defaultDeletionMethod.selectRemote.description": "When true, the option to delete the remote will be selected by default when deleting a branch from a pull request.",
-	"githubPullRequests.deleteBranchAfterMerge.description": "Automatically delete the branch after merging a pull request. This setting only applies when the pull request is merged through this extension.",
+	"githubPullRequests.deleteBranchAfterMerge.description": "Automatically delete the branch after merging a pull request. This setting only applies when the pull request is merged through this extension. When using merge queues, this will only delete the local branch.",
 	"githubPullRequests.terminalLinksHandler.description": "Default handler for terminal links.",
 	"githubPullRequests.terminalLinksHandler.github": "Create the pull request on GitHub.",
 	"githubPullRequests.terminalLinksHandler.vscode": "Create the pull request in VS Code.",
@@ -274,7 +274,7 @@
 	"command.pr.goToPreviousDiffInPr.title": "Go to Previous Diff in Pull Request",
 	"command.pr.copyCommentLink.title": "Copy Comment Link",
 	"command.pr.applySuggestion.title": "Apply Suggestion",
-	"command.pr.applySuggestionWithCopilot.title": "Apply Suggestion With Copilot",
+	"command.pr.applySuggestionWithCopilot.title": "Apply Suggestion Using AI",
 	"command.pr.addAssigneesToNewPr.title": "Add Assignees",
 	"command.pr.addReviewersToNewPr.title": "Add Reviewers",
 	"command.pr.addLabelsToNewPr.title": "Apply Labels",

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

@@ -171,8 +171,8 @@ declare module 'vscode' {
 		pastTenseMessage?: string | MarkdownString;
 		isConfirmed?: boolean;
 		isComplete?: boolean;
-		toolSpecificData?: ChatTerminalToolInvocationData | ChatMcpToolInvocationData;
-		subAgentInvocationId?: string;
+		toolSpecificData?: ChatTerminalToolInvocationData;
+		fromSubAgent?: boolean;
 		presentation?: 'hidden' | 'hiddenAfterComplete' | undefined;
 
 		constructor(toolName: string, toolCallId: string, isError?: boolean);
@@ -244,7 +244,7 @@ declare module 'vscode' {
 		constructor(uris: Uri[], callback: () => Thenable<unknown>);
 	}
 
-	export type ExtendedChatResponsePart = ChatResponsePart | ChatResponseTextEditPart | ChatResponseNotebookEditPart | ChatResponseWorkspaceEditPart | ChatResponseConfirmationPart | ChatResponseCodeCitationPart | ChatResponseReferencePart2 | ChatResponseMovePart | ChatResponseExtensionsPart | ChatResponsePullRequestPart | ChatToolInvocationPart | ChatResponseMultiDiffPart | ChatResponseThinkingProgressPart | ChatResponseExternalEditPart;
+	export type ExtendedChatResponsePart = ChatResponsePart | ChatResponseTextEditPart | ChatResponseNotebookEditPart | ChatResponseConfirmationPart | ChatResponseCodeCitationPart | ChatResponseReferencePart2 | ChatResponseMovePart | ChatResponseExtensionsPart | ChatResponsePullRequestPart | ChatPrepareToolInvocationPart | ChatToolInvocationPart | ChatResponseMultiDiffPart | ChatResponseThinkingProgressPart | ChatResponseExternalEditPart;
 	export class ChatResponseWarningPart {
 		value: MarkdownString;
 		constructor(value: string | MarkdownString);