Add autoDeleteBranchesAfterMerge function for silent branch deletion

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

Author: Copilot

src/github/activityBarViewProvider.ts

@@ -415,7 +415,7 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 				const deleteBranchAfterMerge = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<boolean>(DELETE_BRANCH_AFTER_MERGE, false);
 				if (deleteBranchAfterMerge) {
 					// Automatically delete the branch after successful merge
-					await PullRequestReviewCommon.deleteBranch(this._folderRepositoryManager, this._item);
+					await PullRequestReviewCommon.autoDeleteBranchesAfterMerge(this._folderRepositoryManager, this._item);
 				}
 			}
 

src/github/pullRequestOverview.ts

@@ -631,7 +631,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				const deleteBranchAfterMerge = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<boolean>(DELETE_BRANCH_AFTER_MERGE, false);
 				if (deleteBranchAfterMerge) {
 					// Automatically delete the branch after successful merge
-					await PullRequestReviewCommon.deleteBranch(this._folderRepositoryManager, this._item);
+					await PullRequestReviewCommon.autoDeleteBranchesAfterMerge(this._folderRepositoryManager, this._item);
 				}
 			}
 

src/github/pullRequestReviewCommon.ts

@@ -9,6 +9,7 @@ import { FolderRepositoryManager } from './folderRepositoryManager';
 import { IAccount, isITeam, ITeam, MergeMethod, PullRequestMergeability, reviewerId, ReviewState } from './interface';
 import { PullRequestModel } from './pullRequestModel';
 import { PullRequest, ReadyForReviewReply, ReviewType, SubmitReviewReply } from './views';
+import Logger from '../common/logger';
 import { DEFAULT_DELETION_METHOD, PR_SETTINGS_NAMESPACE, SELECT_LOCAL_BRANCH, SELECT_REMOTE } from '../common/settingKeys';
 import { ReviewEvent, TimelineEvent } from '../common/timelineEvent';
 import { Schemes } from '../common/uri';
@@ -403,4 +404,68 @@ export namespace PullRequestReviewCommon {
 			};
 		}
 	}
+
+	/**
+	 * Automatically delete branches after merge based on user preferences.
+	 * This function does not show any prompts - it uses the default deletion method preferences.
+	 */
+	export async function autoDeleteBranchesAfterMerge(folderRepositoryManager: FolderRepositoryManager, item: PullRequestModel): Promise<void> {
+		const branchInfo = await folderRepositoryManager.getBranchNameForPullRequest(item);
+		const defaultBranch = await folderRepositoryManager.getPullRequestRepositoryDefaultBranch(item);
+
+		// Get user preferences for automatic deletion
+		const deleteLocalBranch = vscode.workspace
+			.getConfiguration(PR_SETTINGS_NAMESPACE)
+			.get<boolean>(`${DEFAULT_DELETION_METHOD}.${SELECT_LOCAL_BRANCH}`, true);
+
+		const deleteRemote = vscode.workspace
+			.getConfiguration(PR_SETTINGS_NAMESPACE)
+			.get<boolean>(`${DEFAULT_DELETION_METHOD}.${SELECT_REMOTE}`, true);
+
+		const promises: Promise<void>[] = [];
+
+		// Delete remote head branch if it's not the default branch
+		if (item.isResolved()) {
+			const isDefaultBranch = defaultBranch === item.head.ref;
+			if (!isDefaultBranch && !item.isRemoteHeadDeleted) {
+				promises.push(
+					folderRepositoryManager.deleteBranch(item).then(() => {
+						return folderRepositoryManager.repository.fetch({ prune: true });
+					}).catch(e => {
+						Logger.warn(`Failed to delete remote branch for PR #${item.number}: ${e}`, 'PullRequestReviewCommon');
+					})
+				);
+			}
+		}
+
+		// Delete local branch if preference is set
+		if (branchInfo && deleteLocalBranch) {
+			const isBranchActive = item.equals(folderRepositoryManager.activePullRequest) ||
+				(folderRepositoryManager.repository.state.HEAD?.name && folderRepositoryManager.repository.state.HEAD.name === branchInfo.branch);
+
+			promises.push(
+				(async () => {
+					if (isBranchActive) {
+						// Checkout default branch before deleting the active branch
+						await folderRepositoryManager.checkoutDefaultBranch(defaultBranch);
+					}
+					await folderRepositoryManager.repository.deleteBranch(branchInfo.branch, true);
+				})().catch(e => {
+					Logger.warn(`Failed to delete local branch ${branchInfo.branch} for PR #${item.number}: ${e}`, 'PullRequestReviewCommon');
+				})
+			);
+		}
+
+		// Delete remote if it's no longer used and preference is set
+		if (branchInfo && branchInfo.remote && branchInfo.createdForPullRequest && !branchInfo.remoteInUse && deleteRemote) {
+			promises.push(
+				folderRepositoryManager.repository.removeRemote(branchInfo.remote).catch(e => {
+					Logger.warn(`Failed to delete remote ${branchInfo.remote} for PR #${item.number}: ${e}`, 'PullRequestReviewCommon');
+				})
+			);
+		}
+
+		// Execute all deletions in parallel
+		await Promise.all(promises);
+	}
 }