Merge branch 'main' into copilot/adopt-comment-draft-api-proposal

alexr00 · web-flow · commit f826b0699d80 · 2025-11-11T18:30:01.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,44 @@
 # Changelog
 
+## 0.122.0
+
+### Changes
+
+- Auto-generated PR descriptions (via `githubPullRequests.pullRequestDescription`) will respect the repository PR template if there is one.
+- Icons in the Pull Requests view now render with codicons instead of Unicode characters.
+- Drafts in the Pull Requests view now render in italics instead of having a `[DRAFT]` prefix.
+
+![Pull Requests view showing codicon labels and italic draft PR titles](./documentation/changelog/0.122.0/pr-labels.png)
+
+- Emoji completions for `:smile:` style emojis are now available in review comments.
+
+![Emoji completions in review comments](./documentation/changelog/0.122.0/emoji-completions.gif)
+
+- [Markdown alert syntax](https://github.com/orgs/community/discussions/16925) is now rendered in review comments.
+
+![Markdown alerts in review comments](./documentation/changelog/0.122.0/markdown-alerts.png)
+
+- Opening an empty commit from a pull request webview shows an editor with a message instead of showing a notification.
+- Pull requests can be opened from from a url, for example: `vscode-insiders://github.vscode-pull-request-github/checkout-pull-request?uri=https://github.com/microsoft/vscode-css-languageservice/pull/460`
+- Icons are up-to-date with VS Code's latest icons.
+- If you start a review and want to cancel it, there's now a "Cancel Review" button in the pull request webview.
+
+![Cancel review button](./documentation/changelog/0.122.0/cancel-review.png)
+
+### Fixes
+
+- Reactions to code comments are not showing up (Web). https://github.com/microsoft/vscode-pull-request-github/issues/2195
+- Editing a comment freezes VS Code. https://github.com/microsoft/vscode/issues/274455
+- Github Pull Request tab won't open if branch names are reused. https://github.com/microsoft/vscode-pull-request-github/issues/8007
+- Icons are misaligned. https://github.com/microsoft/vscode-pull-request-github/issues/7998
+- "Git is not installed or otherwise not available" even though it is. https://github.com/microsoft/vscode-pull-request-github/issues/5454
+
+**_Thank You_**
+
+* [@bendrucker (Ben Drucker)](https://github.com/bendrucker): Enable all LLM tools in prompts (agent mode) [PR #6956](https://github.com/microsoft/vscode-pull-request-github/pull/6956)
+* [@gerardbalaoro (Gerard Balaoro)](https://github.com/gerardbalaoro): Make branch list timeout configurable (#2840) [PR #7927](https://github.com/microsoft/vscode-pull-request-github/pull/7927)
+* [@wankun-tcj](https://github.com/wankun-tcj): Fix avatar display issue in Pull Request tree view [PR #7851](https://github.com/microsoft/vscode-pull-request-github/pull/7851)
+
 ## 0.120.2
 
 ### Fixes
diff --git a/documentation/changelog/0.122.0/cancel-review.png b/documentation/changelog/0.122.0/cancel-review.png
diff --git a/documentation/changelog/0.122.0/emoji-completions.gif b/documentation/changelog/0.122.0/emoji-completions.gif
diff --git a/documentation/changelog/0.122.0/markdown-alerts.png b/documentation/changelog/0.122.0/markdown-alerts.png
diff --git a/documentation/changelog/0.122.0/pr-labels.png b/documentation/changelog/0.122.0/pr-labels.png
diff --git a/package.json b/package.json
@@ -3147,6 +3147,13 @@
 					"group": "1_modification@5"
 				}
 			],
+			"scm/repository": [
+				{
+					"command": "pr.create",
+					"when": "scmProvider =~ /^git|^remoteHub:github/ && scmProviderRootUri in github:reposNotInReviewMode",
+					"group": "inline"
+				}
+			],
 			"comments/commentThread/context": [
 				{
 					"command": "pr.createComment",
diff --git a/resources/icons/codicons/close.svg b/resources/icons/codicons/close.svg
@@ -1 +1 @@
-<svg width="18" height="18" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><path d="M12.1465 5.14652C12.3418 4.95127 12.6583 4.95126 12.8535 5.14652C13.0487 5.34179 13.0488 5.65831 12.8535 5.85355L9.70705 9.00004L12.8535 12.1465C13.0488 12.3418 13.0488 12.6583 12.8535 12.8536C12.6583 13.0488 12.3418 13.0488 12.1465 12.8536L9.00002 9.70707L5.85354 12.8536C5.6583 13.0488 5.34177 13.0488 5.14651 12.8536C4.95125 12.6583 4.95125 12.3418 5.14651 12.1465L8.29299 9.00004L5.14651 5.85355C4.95125 5.6583 4.95126 5.34179 5.14651 5.14652C5.34177 4.95126 5.65828 4.95126 5.85354 5.14652L9.00002 8.29301L12.1465 5.14652Z"/></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><path d="M8.70701 8.00001L12.353 4.35401C12.548 4.15901 12.548 3.84201 12.353 3.64701C12.158 3.45201 11.841 3.45201 11.646 3.64701L8.00001 7.29301L4.35401 3.64701C4.15901 3.45201 3.84201 3.45201 3.64701 3.64701C3.45201 3.84201 3.45201 4.15901 3.64701 4.35401L7.29301 8.00001L3.64701 11.646C3.45201 11.841 3.45201 12.158 3.64701 12.353C3.74501 12.451 3.87301 12.499 4.00101 12.499C4.12901 12.499 4.25701 12.45 4.35501 12.353L8.00101 8.70701L11.647 12.353C11.745 12.451 11.873 12.499 12.001 12.499C12.129 12.499 12.257 12.45 12.355 12.353C12.55 12.158 12.55 11.841 12.355 11.646L8.70901 8.00001H8.70701Z"/></svg>
diff --git a/resources/icons/codicons/trash.svg b/resources/icons/codicons/trash.svg
@@ -1 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><path d="M7 3H9C9 2.44772 8.55228 2 8 2C7.44772 2 7 2.44772 7 3ZM6 3C6 1.89543 6.89543 1 8 1C9.10457 1 10 1.89543 10 3H14C14.2761 3 14.5 3.22386 14.5 3.5C14.5 3.77614 14.2761 4 14 4H13.4364L12.2313 12.8378C12.0624 14.0765 11.0044 15 9.75422 15H6.24578C4.99561 15 3.93762 14.0765 3.76871 12.8378L2.56355 4H2C1.72386 4 1.5 3.77614 1.5 3.5C1.5 3.22386 1.72386 3 2 3H6ZM7 6.5C7 6.22386 6.77614 6 6.5 6C6.22386 6 6 6.22386 6 6.5V11.5C6 11.7761 6.22386 12 6.5 12C6.77614 12 7 11.7761 7 11.5V6.5ZM9.5 6C9.77614 6 10 6.22386 10 6.5V11.5C10 11.7761 9.77614 12 9.5 12C9.22386 12 9 11.7761 9 11.5V6.5C9 6.22386 9.22386 6 9.5 6ZM4.75954 12.7027C4.86089 13.4459 5.49568 14 6.24578 14H9.75422C10.5043 14 11.1391 13.4459 11.2405 12.7027L12.4272 4H3.57281L4.75954 12.7027Z"/></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><path d="M14 2H10C10 0.897 9.103 0 8 0C6.897 0 6 0.897 6 2H2C1.724 2 1.5 2.224 1.5 2.5C1.5 2.776 1.724 3 2 3H2.54L3.349 12.708C3.456 13.994 4.55 15 5.84 15H10.159C11.449 15 12.543 13.993 12.65 12.708L13.459 3H13.999C14.275 3 14.499 2.776 14.499 2.5C14.499 2.224 14.275 2 13.999 2H14ZM8 1C8.551 1 9 1.449 9 2H7C7 1.449 7.449 1 8 1ZM11.655 12.625C11.591 13.396 10.934 14 10.16 14H5.841C5.067 14 4.41 13.396 4.346 12.625L3.544 3H12.458L11.656 12.625H11.655ZM7 5.5V11.5C7 11.776 6.776 12 6.5 12C6.224 12 6 11.776 6 11.5V5.5C6 5.224 6.224 5 6.5 5C6.776 5 7 5.224 7 5.5ZM10 5.5V11.5C10 11.776 9.776 12 9.5 12C9.224 12 9 11.776 9 11.5V5.5C9 5.224 9.224 5 9.5 5C9.776 5 10 5.224 10 5.5Z"/></svg>
diff --git a/src/@types/vscode.proposed.chatSessionsProvider.d.ts b/src/@types/vscode.proposed.chatSessionsProvider.d.ts
@@ -123,6 +123,11 @@ declare module 'vscode' {
 		 * Statistics about the chat session.
 		 */
 		statistics?: {
+			/**
+			 * Number of files edited during the session.
+			 */
+			files: number;
+
 			/**
 			 * Number of insertions made during the session.
 			 */
diff --git a/src/extension.ts b/src/extension.ts
@@ -265,7 +265,7 @@ async function init(
 
 	await vscode.commands.executeCommand('setContext', 'github:initialized', true);
 
-	registerPostCommitCommandsProvider(reposManager, git);
+	registerPostCommitCommandsProvider(context, reposManager, git);
 
 	// Resume any pending checkout request stored before workspace reopened.
 	await resumePendingCheckout(reviewsManager, context, reposManager);
@@ -350,20 +350,20 @@ async function doRegisterBuiltinGitProvider(context: vscode.ExtensionContext, cr
 	return false;
 }
 
-function registerPostCommitCommandsProvider(reposManager: RepositoriesManager, git: GitApiImpl) {
+function registerPostCommitCommandsProvider(context: vscode.ExtensionContext, reposManager: RepositoriesManager, git: GitApiImpl) {
 	const componentId = 'GitPostCommitCommands';
 	class Provider implements PostCommitCommandsProvider {
 
 		getCommands(repository: Repository) {
-			Logger.debug(`Looking for remote. Comparing ${repository.state.remotes.length} local repo remotes with ${reposManager.folderManagers.reduce((prev, curr) => prev + curr.gitHubRepositories.length, 0)} GitHub repositories.`, componentId);
+			Logger.appendLine(`Looking for remote. Comparing ${repository.state.remotes.length} local repo remotes with ${reposManager.folderManagers.reduce((prev, curr) => prev + curr.gitHubRepositories.length, 0)} GitHub repositories.`, componentId);
 			const repoRemotes = parseRepositoryRemotes(repository);
 
 			const found = reposManager.folderManagers.find(folderManager => folderManager.findRepo(githubRepo => {
 				return !!repoRemotes.find(remote => {
 					return remote.equals(githubRepo.remote);
 				});
 			}));
-			Logger.debug(`Found ${found ? 'a repo' : 'no repos'} when getting post commit commands.`, componentId);
+			Logger.appendLine(`Found ${found ? 'a repo' : 'no repos'} when getting post commit commands.`, componentId);
 			return found ? [{
 				command: 'pr.pushAndCreate',
 				title: vscode.l10n.t('{0} Commit & Create Pull Request', '$(git-pull-request-create)'),
@@ -376,10 +376,10 @@ function registerPostCommitCommandsProvider(reposManager: RepositoriesManager, g
 		return reposManager.folderManagers.some(folderManager => folderManager.gitHubRepositories.length > 0);
 	}
 	function tryRegister(): boolean {
-		Logger.debug('Trying to register post commit commands.', 'GitPostCommitCommands');
+		Logger.appendLine('Trying to register post commit commands.', 'GitPostCommitCommands');
 		if (hasGitHubRepos()) {
-			Logger.debug('GitHub remote(s) found, registering post commit commands.', componentId);
-			git.registerPostCommitCommandsProvider(new Provider());
+			Logger.appendLine('GitHub remote(s) found, registering post commit commands.', componentId);
+			context.subscriptions.push(git.registerPostCommitCommandsProvider(new Provider()));
 			return true;
 		}
 		return false;
@@ -395,7 +395,7 @@ function registerPostCommitCommandsProvider(reposManager: RepositoriesManager, g
 }
 
 async function deferredActivateRegisterBuiltInGitProvider(context: vscode.ExtensionContext, apiImpl: GitApiImpl, credentialStore: CredentialStore) {
-	Logger.debug('Registering built in git provider.', 'Activation');
+	Logger.appendLine('Registering built in git provider.', 'Activation');
 	if (!(await doRegisterBuiltinGitProvider(context, credentialStore, apiImpl))) {
 		const extensionsChangedDisposable = vscode.extensions.onDidChange(async () => {
 			if (await doRegisterBuiltinGitProvider(context, credentialStore, apiImpl)) {
diff --git a/src/github/copilotRemoteAgent.ts b/src/github/copilotRemoteAgent.ts
@@ -1064,6 +1064,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 					const repo = pullRequest.remote.repositoryName;
 					repoInfo = `${owner}/${repo} `;
 				}
+				const fileCount = pullRequest.fileChanges.size === 0 ? (await pullRequest.getFileChangesInfo()).length : pullRequest.fileChanges.size;
 				const description = new vscode.MarkdownString(`[${repoInfo}#${pullRequest.number}](${uri.toString()} "${prLinkTitle}")`); //  pullRequest.base.ref === defaultBranch ? `PR #${pullRequest.number}`: `PR #${pullRequest.number} → ${pullRequest.base.ref}`;
 				const chatSession: ChatSessionWithPR = {
 					resource: vscode.Uri.from({ scheme: COPILOT_SWE_AGENT, path: '/' + pullRequest.number }),
@@ -1078,7 +1079,8 @@ export class CopilotRemoteAgentManager extends Disposable {
 					},
 					statistics: pullRequest.item.additions !== undefined && pullRequest.item.deletions !== undefined && (pullRequest.item.additions > 0 || pullRequest.item.deletions > 0) ? {
 						insertions: pullRequest.item.additions,
-						deletions: pullRequest.item.deletions
+						deletions: pullRequest.item.deletions,
+						files: fileCount
 					} : undefined
 				};
 				return chatSession;
diff --git a/src/github/folderRepositoryManager.ts b/src/github/folderRepositoryManager.ts
@@ -489,8 +489,10 @@ export class FolderRepositoryManager extends Disposable {
 		const activeRemotes = await this.getActiveRemotes();
 		const isAuthenticated = this.checkForAuthMatch(activeRemotes);
 		if (this.credentialStore.isAnyAuthenticated() && (activeRemotes.length === 0)) {
-			const areAllNeverGitHub = (await this.computeAllUnknownRemotes()).every(remote => GitHubManager.isNeverGitHub(vscode.Uri.parse(remote.normalizedHost).authority));
-			if (areAllNeverGitHub) {
+			const allUnknownRemotes = await this.computeAllUnknownRemotes();
+			const areAllNeverGitHub = allUnknownRemotes.every(remote => GitHubManager.isNeverGitHub(vscode.Uri.parse(remote.normalizedHost).authority));
+			if ((allUnknownRemotes.length > 0) && areAllNeverGitHub) {
+				Logger.appendLine('No GitHub remotes found and all remotes are marked as never GitHub.', this.id);
 				this.state = ReposManagerState.RepositoriesLoaded;
 				return true;
 			}
diff --git a/src/github/githubRepository.ts b/src/github/githubRepository.ts
@@ -227,13 +227,12 @@ export class GitHubRepository extends Disposable {
 
 	public async ensureCommentsController(): Promise<void> {
 		try {
+			await this.ensure();
 			if (this.commentsController) {
 				return;
 			}
-
-			await this.ensure();
 			this.commentsController = vscode.comments.createCommentController(
-				`${PullRequestCommentController.PREFIX}-${this.remote.gitProtocol.normalizeUri()?.authority}-${this.remote.owner}-${this.remote.repositoryName}`,
+				`${PullRequestCommentController.PREFIX}-${this.remote.gitProtocol.normalizeUri()?.authority}-${this.remote.remoteName}-${this.remote.owner}-${this.remote.repositoryName}`,
 				`Pull Request (${this.remote.owner}/${this.remote.repositoryName})`,
 			);
 			this.commentsHandler = new PRCommentControllerRegistry(this.commentsController, this.telemetry);
diff --git a/src/view/pullRequestCommentControllerRegistry.ts b/src/view/pullRequestCommentControllerRegistry.ts
@@ -14,15 +14,19 @@ import { GHPRComment } from '../github/prComment';
 import { PullRequestModel } from '../github/pullRequestModel';
 import { CommentReactionHandler } from '../github/utils';
 
-interface PullRequestCommentHandlerInfo {
+interface PullRequestCommentHandlerInfo extends vscode.Disposable {
 	handler: PullRequestCommentController & CommentReactionHandler;
 	refCount: number;
-	dispose: () => void;
+}
+
+interface PRCommentingRangeProviderInfo extends vscode.Disposable {
+	provider: vscode.CommentingRangeProvider2;
+	refCount: number;
 }
 
 export class PRCommentControllerRegistry extends Disposable implements vscode.CommentingRangeProvider, CommentReactionHandler {
 	private _prCommentHandlers: { [key: number]: PullRequestCommentHandlerInfo } = {};
-	private _prCommentingRangeProviders: { [key: number]: vscode.CommentingRangeProvider2 } = {};
+	private _prCommentingRangeProviders: { [key: number]: PRCommentingRangeProviderInfo } = {};
 	private readonly _activeChangeListeners: Map<FolderRepositoryManager, vscode.Disposable> = new Map();
 	public readonly resourceHints = { schemes: [Schemes.Pr] };
 
@@ -40,8 +44,8 @@ export class PRCommentControllerRegistry extends Disposable implements vscode.Co
 			return;
 		}
 
-		const provideCommentingRanges = this._prCommentingRangeProviders[params.prNumber].provideCommentingRanges.bind(
-			this._prCommentingRangeProviders[params.prNumber],
+		const provideCommentingRanges = this._prCommentingRangeProviders[params.prNumber].provider.provideCommentingRanges.bind(
+			this._prCommentingRangeProviders[params.prNumber].provider,
 		);
 
 		return provideCommentingRanges(document, token);
@@ -108,13 +112,27 @@ export class PRCommentControllerRegistry extends Disposable implements vscode.Co
 	}
 
 	public registerCommentingRangeProvider(prNumber: number, provider: vscode.CommentingRangeProvider2): vscode.Disposable {
-		this._prCommentingRangeProviders[prNumber] = provider;
+		if (this._prCommentingRangeProviders[prNumber]) {
+			this._prCommentingRangeProviders[prNumber].refCount += 1;
+			return this._prCommentingRangeProviders[prNumber];
+		}
 
-		return {
+		this._prCommentingRangeProviders[prNumber] = {
+			provider,
+			refCount: 1,
 			dispose: () => {
-				delete this._prCommentingRangeProviders[prNumber];
+				if (!this._prCommentingRangeProviders[prNumber]) {
+					return;
+				}
+
+				this._prCommentingRangeProviders[prNumber].refCount -= 1;
+				if (this._prCommentingRangeProviders[prNumber].refCount === 0) {
+					delete this._prCommentingRangeProviders[prNumber];
+				}
 			}
 		};
+
+		return this._prCommentingRangeProviders[prNumber];
 	}
 
 	override dispose() {
diff --git a/src/view/reviewManager.ts b/src/view/reviewManager.ts
@@ -75,6 +75,11 @@ export class ReviewManager extends Disposable {
 	 * explicit user action from something like reloading on an existing PR branch.
 	 */
 	private justSwitchedToReviewMode: boolean = false;
+	/**
+	 * The last pull request the user explicitly switched to via the switch method.
+	 * Used to enter review mode for this PR regardless of its state (open/closed/merged).
+	 */
+	private _switchedToPullRequest?: PullRequestModel;
 
 	public get switchingToReviewMode(): boolean {
 		return this._switchingToReviewMode;
@@ -481,13 +486,16 @@ export class ReviewManager extends Disposable {
 
 		const useReviewConfiguration = getReviewMode();
 
-		if (pr.isClosed && !useReviewConfiguration.closed) {
+		// If this is the PR the user explicitly switched to, always use review mode regardless of state
+		const isSwitchedToPullRequest = this._switchedToPullRequest?.number === pr.number;
+
+		if (pr.isClosed && !useReviewConfiguration.closed && !isSwitchedToPullRequest) {
 			Logger.appendLine('This PR is closed', this.id);
 			await this.clear(true);
 			return;
 		}
 
-		if (pr.isMerged && !useReviewConfiguration.merged) {
+		if (pr.isMerged && !useReviewConfiguration.merged && !isSwitchedToPullRequest) {
 			Logger.appendLine('This PR is merged', this.id);
 			await this.clear(true);
 			return;
@@ -1090,6 +1098,7 @@ export class ReviewManager extends Disposable {
 		this.statusBarItem.command = undefined;
 		this.statusBarItem.show();
 		this.switchingToReviewMode = true;
+		this._switchedToPullRequest = pr;
 
 		try {
 			await vscode.window.withProgress({ location: vscode.ProgressLocation.Notification }, async (progress) => {
@@ -1243,6 +1252,7 @@ export class ReviewManager extends Disposable {
 
 			this._prNumber = undefined;
 			this._folderRepoManager.activePullRequest = undefined;
+			this._switchedToPullRequest = undefined;
 
 			if (this._statusBarItem) {
 				this._statusBarItem.hide();
diff --git a/webviews/components/merge.tsx b/webviews/components/merge.tsx
@@ -244,18 +244,20 @@ export const MergeStatus = ({ mergeable, isSimple, canUpdateBranch }: { mergeabl
 		}
 	}
 	return (
-		<div className="status-item status-section">
-			{icon}
-			<p>
-				{summary}
-			</p>
-			{(action && canUpdateBranch) ?
-				<div className="button-container">
-					<button className="secondary" onClick={onClick} disabled={busy} >
-						{action}
-					</button>
-				</div>
-			: null}
+		<div className="status-section">
+			<div className="status-item">
+				{icon}
+				<p>
+					{summary}
+				</p>
+				{(action && canUpdateBranch) ?
+					<div className="button-container">
+						<button className="secondary" onClick={onClick} disabled={busy} >
+							{action}
+						</button>
+					</div>
+				: null}
+			</div>
 		</div>
 	);
 };
diff --git a/webviews/components/sidebar.tsx b/webviews/components/sidebar.tsx
@@ -288,12 +288,14 @@ function CollapsedLabel(props: PullRequest) {
 		</span>
 	);
 
-	const PillContainer = ({ items, getKey, getColor, getText }: {
-		items: any[],
-		getKey: (item: any) => string,
-		getColor: (item: any) => { backgroundColor: string; textColor: string; borderColor: string },
-		getText: (item: any) => string
-	}) => {
+	interface PillContainerProps<T> {
+		items: T[];
+		getKey: (item: T) => string;
+		getColor: (item: T) => { backgroundColor: string; textColor: string; borderColor: string };
+		getText: (item: T) => string;
+	}
+
+	const PillContainer = <T,>({ items, getKey, getColor, getText }: PillContainerProps<T>) => {
 		const containerRef = useRef<HTMLSpanElement>(null);
 		const [visibleCount, setVisibleCount] = useState(items.length);
 
@@ -381,7 +383,7 @@ function CollapsedLabel(props: PullRequest) {
 					items={labels}
 					getKey={l => l.name}
 					getColor={l => gitHubLabelColor(l.color, props?.isDarkTheme, false)}
-					getText={l => l.name}
+					getText={l => l.displayName}
 				/>
 			),
 			count: labels.length

Original file line number	Diff line number	Diff line change
`@@ -3147,6 +3147,13 @@`
`3147`	`3147`	`"group": "1_modification@5"`
`3148`	`3148`	`}`
`3149`	`3149`	`],`
	`3150`	`+ "scm/repository": [`
	`3151`	`+ {`
	`3152`	`+ "command": "pr.create",`
	`3153`	`+ "when": "scmProvider =~ /^git\|^remoteHub:github/ && scmProviderRootUri in github:reposNotInReviewMode",`
	`3154`	`+ "group": "inline"`
	`3155`	`+ }`
	`3156`	`+ ],`
`3150`	`3157`	`"comments/commentThread/context": [`
`3151`	`3158`	`{`
`3152`	`3159`	`"command": "pr.createComment",`