Merge branch 'main' into copilot/confirmation-popup-for-cancel-button

Author: alexr00

.github/copilot-instructions.md

@@ -20,8 +20,8 @@
 - **Commands**: When adding a new command, consider whether it should be available in the command palette, context menus, or both. Add the appropriate menu entries in `package.json` to ensure the command is properly included, or excluded (command palette), from menus.
 
 ## Pull Request Guidelines
-- Never touch the yarn.lock file.
-- Run `yarn run lint` and also `npm run hygiene` and fix any errors or warnings before committing.
+- Never touch the package-lock.json file.
+- Run `npm run lint` and also `npm run hygiene` and fix any errors or warnings before committing.
 
 ## Testing
 - Use `describe` and `it` blocks from Mocha for structuring tests.

.husky/pre-commit

@@ -1,11 +1,37 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-npm run hygiene
+# Hygiene reads staged contents while ESLint checks the working tree, so they can run concurrently.
+node ./build/hygiene.js &
+hygiene_pid=$!
+lint_pid=''
 
 # Lint only staged TS/TSX files instead of the whole repo (much faster).
 # Stream a NUL-delimited list directly to xargs -0 so paths with spaces/newlines
 # are handled safely (command substitution would strip NUL bytes).
 if git diff --cached --name-only --diff-filter=ACMR -- '*.ts' '*.tsx' | grep -q .; then
-	git diff --cached --name-only --diff-filter=ACMR -z -- '*.ts' '*.tsx' | xargs -0 npx eslint --fix --cache
+	git diff --cached --name-only --diff-filter=ACMR -z -- '*.ts' '*.tsx' | xargs -0 node ./node_modules/eslint/bin/eslint.js --fix --cache &
+	lint_pid=$!
 fi
+
+hygiene_status=0
+if wait "$hygiene_pid"; then
+	:
+else
+	hygiene_status=$?
+fi
+
+lint_status=0
+if [ -n "$lint_pid" ]; then
+	if wait "$lint_pid"; then
+		:
+	else
+		lint_status=$?
+	fi
+fi
+
+if [ "$hygiene_status" -ne 0 ]; then
+	exit "$hygiene_status"
+fi
+
+exit "$lint_status"

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.160.0
+
+### Changes
+
+- Added a `"githubIssues.issueCompletionFormatEditor"` setting to control the format of issue completions in the editor, mirroring the existing `"githubIssues.issueCompletionFormatScm"` setting. It defaults to `${issueNumberLabel}`, which inserts only the issue number (e.g. `#421`) so that GitHub's auto-close references keep working.
+
+### Fixes
+
+- "Delete local branches" is showing branches that have already been deleted. https://github.com/microsoft/vscode-pull-request-github/issues/8815
+
 ## 0.158.0
 
 ### Changes

package-lock.json

@@ -41,7 +41,7 @@
 		"treeItemMarkdownLabel",
 		"treeViewMarkdownMessage"
 	],
-	"version": "0.158.0",
+	"version": "0.160.0",
 	"publisher": "GitHub",
 	"engines": {
 		"node": ">=20",
@@ -751,6 +751,11 @@
 					"default": "${issueTitle}\nFixes ${issueNumberLabel}",
 					"markdownDescription": "%githubIssues.issueCompletionFormatScm.markdownDescription%"
 				},
+				"githubIssues.issueCompletionFormatEditor": {
+					"type": "string",
+					"default": "${issueNumberLabel}",
+					"markdownDescription": "%githubIssues.issueCompletionFormatEditor.markdownDescription%"
+				},
 				"githubIssues.workingIssueFormatScm": {
 					"type": "string",
 					"default": "${issueTitle} \nFixes ${issueNumberLabel}",
@@ -829,6 +834,11 @@
 					"default": "author",
 					"description": "%githubIssues.issueAvatarDisplay.description%"
 				},
+				"githubIssues.showIssueNumberInTree": {
+					"type": "boolean",
+					"default": false,
+					"description": "%githubIssues.showIssueNumberInTree.description%"
+				},
 				"githubPullRequests.focusedMode": {
 					"properties": {
 						"oneOf": [
@@ -4323,7 +4333,7 @@
 		"debounce": "^1.2.1",
 		"events": "3.2.0",
 		"fast-deep-equal": "^3.1.3",
-		"js-yaml": "^4.2.0",
+		"js-yaml": "^4.3.0",
 		"jsonc-parser": "^3.3.1",
 		"lru-cache": "6.0.0",
 		"markdown-it": "^14.2.0",

package.json

@@ -31,7 +31,7 @@
 	"githubPullRequests.autoRepositoryDetection.markdownDescription": "Controls which repositories are automatically detected and opened by the extension.",
 	"githubPullRequests.autoRepositoryDetection.workspace": "Only detect repositories within the current workspace folders.",
 	"githubPullRequests.autoRepositoryDetection.true": "Detect all repositories found by the Git extension, including those outside workspace folders.",
-	"githubPullRequests.queries.markdownDescription": "Specifies what queries should be used in the GitHub Pull Requests tree. All queries are made against **the currently opened repos**. Each query object has a `label` that will be shown in the tree and a search `query` using [GitHub search syntax](https://help.github.com/en/articles/understanding-the-search-syntax). By default these queries define the categories \"Copilot on My Behalf\", \"Local Pull Request Branches\", \"Waiting For My Review\", \"Assigned To Me\" and \"Created By Me\". If you want to preserve these, make sure they are still in the array when you modify the setting. \n\n**Variables available:**\n - `${user}` - currently logged in user \n - `${owner}` - repository owner, ex. `microsoft` in `microsoft/vscode` \n - `${repository}` - repository name, ex. `vscode` in `microsoft/vscode` \n - `${today-Nd}` - date N days ago, ex. `${today-7d}` becomes `2025-01-04`\n\n**Example custom queries:**\n```json\n\"githubPullRequests.queries\": [\n  {\n    \"label\": \"Waiting For My Review\",\n    \"query\": \"is:open review-requested:${user}\"\n  },\n  {\n    \"label\": \"Mentioned Me\",\n    \"query\": \"is:open mentions:${user}\"\n  },\n  {\n    \"label\": \"Recent Activity\",\n    \"query\": \"is:open updated:>${today-7d}\"\n  }\n]\n```",
+	"githubPullRequests.queries.markdownDescription": "Specifies what queries should be used in the GitHub Pull Requests tree. All queries are made against **the currently opened repos**. Each query object has a `label` that will be shown in the tree and a search `query` using [GitHub search syntax](https://help.github.com/en/articles/understanding-the-search-syntax). By default these queries define the categories \"Copilot on My Behalf\", \"Local Pull Request Branches\", \"Waiting For My Review\", \"Assigned To Me\" and \"Created By Me\". If you want to preserve these, make sure they are still in the array when you modify the setting. \n\n**Variables available:**\n - `${user}` - currently logged in user \n - `${owner}` - repository owner, ex. `microsoft` in `microsoft/vscode` \n - `${repository}` - repository name, ex. `vscode` in `microsoft/vscode` \n - `${today-Nd}` - date N days ago, ex. `${today-7d}` becomes `2025-01-04`\n\n**Matching multiple values:** Queries use GitHub's advanced search, where a space between qualifiers means `AND`. To match any one of several values (for example several authors), combine them with `OR`, ex. `author:name1 OR author:name2 OR author:name3`.\n\n**Example custom queries:**\n```json\n\"githubPullRequests.queries\": [\n  {\n    \"label\": \"Waiting For My Review\",\n    \"query\": \"is:open review-requested:${user}\"\n  },\n  {\n    \"label\": \"Mentioned Me\",\n    \"query\": \"is:open mentions:${user}\"\n  },\n  {\n    \"label\": \"Created By My Team\",\n    \"query\": \"is:open author:name1 OR author:name2 OR author:name3\"\n  },\n  {\n    \"label\": \"Recent Activity\",\n    \"query\": \"is:open updated:>${today-7d}\"\n  }\n]\n```",
 	"githubPullRequests.queries.label.description": "The label to display for the query in the Pull Requests tree.",
 	"githubPullRequests.queries.query.description": "The GitHub search query for finding pull requests. Use GitHub search syntax with variables like ${user}, ${owner}, ${repository}. Example: 'is:open author:${user}' finds your open pull requests.",
 	"githubPullRequests.queries.copilotOnMyBehalf": "Copilot on My Behalf",
@@ -158,6 +158,12 @@
 			"Do not translate what's inside of the ${...}. It is an internal syntax for the extension."
 		]
 	},
+	"githubIssues.issueCompletionFormatEditor.markdownDescription": {
+		"message": "Sets the format of issue completions in the editor. \n- `${user}` will be replaced with the currently logged in username \n- `${issueNumber}` will be replaced with the current issue number \n- `${issueNumberLabel}` will be replaced with a label formatted as #number or owner/repository#number, depending on whether the issue is in the current repository \n- `${issueTitle}` will be replaced with the issue title",
+		"comment": [
+			"Do not translate what's inside of the ${...}. It is an internal syntax for the extension."
+		]
+	},
 	"githubIssues.workingIssueFormatScm.markdownDescription": {
 		"message": "Sets the format of the commit message that is set in the SCM inputbox when you **Start Working on an Issue**. Defaults to `${issueTitle} \nFixes ${issueNumberLabel}`",
 		"comment": [
@@ -177,6 +183,7 @@
 	"githubIssues.issueAvatarDisplay.description": "Controls which avatar to display in the issue list.",
 	"githubIssues.issueAvatarDisplay.author": "Show the avatar of the issue creator.",
 	"githubIssues.issueAvatarDisplay.assignee": "Show the avatar of the first assignee (show GitHub icon if no assignees).",
+	"githubIssues.showIssueNumberInTree.description": "Shows the issue number in the tree view.",
 	"githubPullRequests.focusedMode.description": "The layout to use when a pull request is checked out. Set to false to prevent layout changes.",
 	"githubPullRequests.focusedMode.firstDiff": "Show the first diff in the pull request. If there are no changes, show the overview.",
 	"githubPullRequests.focusedMode.overview": "Show the overview of the pull request.",

package.nls.json

@@ -331,6 +331,11 @@ declare module 'vscode' {
 		 */
 		result?: string;
 
+		/**
+		 * The display name of the model used by the subagent.
+		 */
+		modelName?: string;
+
 		constructor(description?: string, agentName?: string, prompt?: string, result?: string);
 	}
 

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

@@ -62,12 +62,14 @@ export const WORKING_BASE_BRANCH = 'workingBaseBranch';
 export const WORKING_ISSUE_FORMAT_SCM = 'workingIssueFormatScm';
 export const IGNORE_COMPLETION_TRIGGER = 'ignoreCompletionTrigger';
 export const ISSUE_COMPLETION_FORMAT_SCM = 'issueCompletionFormatScm';
+export const ISSUE_COMPLETION_FORMAT_EDITOR = 'issueCompletionFormatEditor';
 export const CREATE_ISSUE_TRIGGERS = 'createIssueTriggers';
 export const DEFAULT = 'default';
 export const IGNORE_MILESTONES = 'ignoreMilestones';
 export const ALLOW_FETCH = 'allowFetch';
 export const ALWAYS_PROMPT_FOR_NEW_ISSUE_REPO = 'alwaysPromptForNewIssueRepo';
 export const ISSUE_AVATAR_DISPLAY = 'issueAvatarDisplay';
+export const SHOW_ISSUE_NUMBER_IN_TREE = 'showIssueNumberInTree';
 export const EXPERIMENTAL_CHAT = 'experimental.chat';
 export const EXPERIMENTAL_USE_QUICK_CHAT = 'experimental.useQuickChat';
 export const EXPERIMENTAL_NOTIFICATIONS_PAGE_SIZE = 'experimental.notificationsViewPageSize';

src/common/settingKeys.ts

@@ -2099,13 +2099,19 @@ export class FolderRepositoryManager extends Disposable {
 		const deleteConfig = async (branch: string) => {
 			await PullRequestGitHelper.associateBaseBranchWithBranch(this.repository, branch, undefined);
 			await PullRequestGitHelper.associateBranchWithPullRequest(this.repository, undefined, branch);
+			if (this.repository.unsetConfig) {
+				const prefix = `branch.${branch}.`;
+				const remaining = (await this.repository.getConfigs()).filter(config => config.key.startsWith(prefix));
+				for (const config of remaining) {
+					try {
+						await this.repository.unsetConfig(config.key);
+					} catch (e) {
+						Logger.error(`Failed to remove leftover git config ${config.key}: ${e}`, this.id);
+					}
+				}
+			}
 		};
 
-		// delete configs first since that can't be parallelized
-		for (const pick of picks) {
-			await deleteConfig(pick.label);
-		}
-
 		// batch deleting the branches to avoid consuming all available resources
 		await batchPromiseAll(picks, 5, async (pick) => {
 			try {
@@ -2126,11 +2132,50 @@ export class FolderRepositoryManager extends Disposable {
 				}
 			}
 		});
+
+		// Git removes the whole config section when deleting a branch, including keys with multiple values.
+		// Recreate deleted branches when a provider leaves config behind so Git can perform that cleanup again.
+		const configsAfterDeletion = await this.repository.getConfigs();
+		const branchesNeedingConfigCleanup = picks.filter(pick => {
+			const prefix = `branch.${pick.label}.`;
+			return configsAfterDeletion.some(config => config.key.startsWith(prefix));
+		});
+		const branchesNeedingRetry = new Set(needsRetry?.map(pick => pick.label));
+		for (const pick of branchesNeedingConfigCleanup) {
+			if (!branchesNeedingRetry.has(pick.label)) {
+				try {
+					await this.repository.createBranch(pick.label, false, 'HEAD');
+					await this.repository.deleteBranch(pick.label, true);
+				} catch (e) {
+					Logger.error(`Failed to remove leftover git config section for ${pick.label}: ${e}`, this.id);
+				}
+			}
+		}
+
+		// Config operations can't be parallelized. Clean up any keys left by providers that don't remove sections.
+		for (const pick of picks) {
+			if (!branchesNeedingRetry.has(pick.label)) {
+				await deleteConfig(pick.label);
+			}
+		}
 		if (needsRetry && needsRetry.length) {
 			await this.deleteBranches(needsRetry, nonExistantBranches, progress, totalBranches, deletedBranches);
 		}
 	}
 
+	private async deleteRemotes(picks: readonly vscode.QuickPickItem[]): Promise<{ label: string; error: unknown }[]> {
+		const failures: { label: string; error: unknown }[] = [];
+		for (const pick of picks) {
+			try {
+				await this.repository.removeRemote(pick.label);
+			} catch (error) {
+				Logger.error(`Failed to delete remote ${pick.label}: ${formatError(error)}`, this.id);
+				failures.push({ label: pick.label, error });
+			}
+		}
+		return failures;
+	}
+
 	async deleteLocalBranchesNRemotes() {
 		return new Promise<void>(async resolve => {
 			const quickPick = vscode.window.createQuickPick();
@@ -2238,13 +2283,14 @@ export class FolderRepositoryManager extends Disposable {
 					}
 					await deleteBranchesAndShowRemoteStep();
 				} else {
-					// batch deleting the remotes to avoid consuming all available resources
 					const picks = quickPick.selectedItems;
 					if (picks.length) {
 						await vscode.window.withProgress({ location: vscode.ProgressLocation.Notification, title: vscode.l10n.t('Deleting {0} remotes...', picks.length) }, async () => {
-							await batchPromiseAll(picks, 5, async pick => {
-								await this.repository.removeRemote(pick.label);
-							});
+							const failures = await this.deleteRemotes(picks);
+							if (failures.length) {
+								const message = failures.map(({ label, error }) => `${label}: ${formatError(error)}`).join('\n');
+								await vscode.window.showErrorMessage(vscode.l10n.t('Deleting remotes failed:\n{0}', message));
+							}
 						});
 					}
 					quickPick.hide();

src/github/folderRepositoryManager.ts

@@ -6,6 +6,7 @@
 import * as vscode from 'vscode';
 import {
 	IGNORE_COMPLETION_TRIGGER,
+	ISSUE_COMPLETION_FORMAT_EDITOR,
 	ISSUE_COMPLETION_FORMAT_SCM,
 	ISSUES_SETTINGS_NAMESPACE,
 } from '../common/settingKeys';
@@ -208,11 +209,15 @@ export class IssueCompletionProvider implements vscode.CompletionItemProvider {
 		if (document.languageId === 'markdown') {
 			item.insertText = `[${getIssueNumberLabel(issue, repo)}](${issue.html_url})`;
 		} else {
-			const configuration = vscode.workspace
+			let completionFormatSetting = ISSUE_COMPLETION_FORMAT_EDITOR;
+			if (document.uri.path.match(/git\/scm\d\/input/)) {
+				completionFormatSetting = ISSUE_COMPLETION_FORMAT_SCM;
+			}
+			const completionFormat = vscode.workspace
 				.getConfiguration(ISSUES_SETTINGS_NAMESPACE)
-				.get(ISSUE_COMPLETION_FORMAT_SCM);
-			if (document.uri.path.match(/git\/scm\d\/input/) && typeof configuration === 'string') {
-				item.insertText = variableSubstitution(configuration, issue, repo);
+				.get(completionFormatSetting);
+			if (typeof completionFormat === 'string') {
+				item.insertText = variableSubstitution(completionFormat, issue, repo);
 			} else {
 				item.insertText = `${getIssueNumberLabel(issue, repo)}`;
 			}