Refactor to reuse deleteBranch logic via shared performBranchDeletion helper

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

Author: Copilot

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

@@ -105,6 +105,7 @@ declare module 'vscode' {
 		isComplete?: boolean;
 		toolSpecificData?: ChatTerminalToolInvocationData;
 		fromSubAgent?: boolean;
+		presentation?: 'hidden' | 'hiddenAfterComplete' | undefined;
 
 		constructor(toolName: string, toolCallId: string, isError?: boolean);
 	}

src/github/pullRequestReviewCommon.ts

@@ -350,15 +350,11 @@ export namespace PullRequestReviewCommon {
 			const promises = selectedActions.map(async action => {
 				switch (action.type) {
 					case 'remoteHead':
-						await folderRepositoryManager.deleteBranch(item);
+						await performBranchDeletion(folderRepositoryManager, item, branchInfo, defaultBranch, 'remoteHead');
 						deletedBranchTypes.push(action.type);
-						await folderRepositoryManager.repository.fetch({ prune: true });
-						// If we're in a remote repository, then we should checkout the default branch.
-						if (folderRepositoryManager.repository.rootUri.scheme === Schemes.VscodeVfs) {
-							await folderRepositoryManager.repository.checkout(defaultBranch);
-						}
 						return;
 					case 'local':
+						// Interactive deletion has special handling for dirty working tree
 						if (isBranchActiveForDeletion) {
 							if (folderRepositoryManager.repository.state.workingTreeChanges.length) {
 								const yes = vscode.l10n.t('Yes');
@@ -373,16 +369,18 @@ export namespace PullRequestReviewCommon {
 									return;
 								}
 							}
-							await folderRepositoryManager.checkoutDefaultBranch(defaultBranch);
 						}
-						await folderRepositoryManager.repository.deleteBranch(branchInfo!.branch, true);
-						return deletedBranchTypes.push(action.type);
+						await performBranchDeletion(folderRepositoryManager, item, branchInfo, defaultBranch, 'local', isBranchActiveForDeletion);
+						deletedBranchTypes.push(action.type);
+						return;
 					case 'remote':
+						await performBranchDeletion(folderRepositoryManager, item, branchInfo, defaultBranch, 'remote');
 						deletedBranchTypes.push(action.type);
-						return folderRepositoryManager.repository.removeRemote(branchInfo!.remote!);
+						return;
 					case 'suspend':
+						await performBranchDeletion(folderRepositoryManager, item, branchInfo, defaultBranch, 'suspend');
 						deletedBranchTypes.push(action.type);
-						return vscode.commands.executeCommand('github.codespaces.disconnectSuspend');
+						return;
 				}
 			});
 
@@ -413,6 +411,47 @@ export namespace PullRequestReviewCommon {
 			(folderRepositoryManager.repository.state.HEAD?.name === branchName);
 	}
 
+	/**
+	 * Core branch deletion logic shared between interactive and automatic deletion.
+	 * @param folderRepositoryManager The folder repository manager
+	 * @param item The pull request model
+	 * @param branchInfo Branch information for the pull request
+	 * @param defaultBranch The default branch name
+	 * @param actionType The type of deletion action to perform
+	 * @param checkoutBeforeDelete If true, checkout default branch before deleting local branch (for active branches)
+	 */
+	async function performBranchDeletion(
+		folderRepositoryManager: FolderRepositoryManager,
+		item: PullRequestModel,
+		branchInfo: { branch: string; remote?: string; createdForPullRequest?: boolean; remoteInUse?: boolean } | undefined,
+		defaultBranch: string,
+		actionType: 'remoteHead' | 'local' | 'remote' | 'suspend',
+		checkoutBeforeDelete: boolean = false
+	): Promise<void> {
+		switch (actionType) {
+			case 'remoteHead':
+				await folderRepositoryManager.deleteBranch(item);
+				await folderRepositoryManager.repository.fetch({ prune: true });
+				// If we're in a remote repository, then we should checkout the default branch.
+				if (folderRepositoryManager.repository.rootUri.scheme === Schemes.VscodeVfs) {
+					await folderRepositoryManager.repository.checkout(defaultBranch);
+				}
+				break;
+			case 'local':
+				if (checkoutBeforeDelete) {
+					await folderRepositoryManager.checkoutDefaultBranch(defaultBranch);
+				}
+				await folderRepositoryManager.repository.deleteBranch(branchInfo!.branch, true);
+				break;
+			case 'remote':
+				await folderRepositoryManager.repository.removeRemote(branchInfo!.remote!);
+				break;
+			case 'suspend':
+				await vscode.commands.executeCommand('github.codespaces.disconnectSuspend');
+				break;
+		}
+	}
+
 	/**
 	 * Automatically delete branches after merge based on user preferences.
 	 * This function does not show any prompts - it uses the default deletion method preferences.
@@ -430,41 +469,38 @@ export namespace PullRequestReviewCommon {
 			.getConfiguration(PR_SETTINGS_NAMESPACE)
 			.get<boolean>(`${DEFAULT_DELETION_METHOD}.${SELECT_REMOTE}`, true);
 
-		const deletionTasks: Promise<void>[] = [];
+		// Build list of actions to execute based on preferences
+		const actions: Array<{ type: 'remoteHead' | 'local' | 'remote'; checkoutFirst?: boolean }> = [];
 
 		// Delete remote head branch if it's not the default branch
 		if (item.isResolved()) {
 			const isDefaultBranch = defaultBranch === item.head.ref;
 			if (!isDefaultBranch && !item.isRemoteHeadDeleted) {
-				deletionTasks.push(
-					folderRepositoryManager.deleteBranch(item)
-						.then(() => folderRepositoryManager.repository.fetch({ prune: true }))
-						.catch(e => Logger.warn(`Failed to delete remote branch for PR #${item.number}: ${e}`, 'PullRequestReviewCommon'))
-				);
+				actions.push({ type: 'remoteHead' });
 			}
 		}
 
 		// Delete local branch if preference is set
 		if (branchInfo && deleteLocalBranch) {
-			deletionTasks.push(
-				(async () => {
-					if (isBranchActive(folderRepositoryManager, item, branchInfo.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'))
-			);
+			const needsCheckout = isBranchActive(folderRepositoryManager, item, branchInfo.branch);
+			actions.push({ type: 'local', checkoutFirst: needsCheckout });
 		}
 
 		// Delete remote if it's no longer used and preference is set
 		if (branchInfo && branchInfo.remote && branchInfo.createdForPullRequest && !branchInfo.remoteInUse && deleteRemote) {
-			deletionTasks.push(
-				folderRepositoryManager.repository.removeRemote(branchInfo.remote)
-					.catch(e => Logger.warn(`Failed to delete remote ${branchInfo.remote} for PR #${item.number}: ${e}`, 'PullRequestReviewCommon'))
-			);
+			actions.push({ type: 'remote' });
 		}
 
-		// Execute all deletions in parallel
-		await Promise.all(deletionTasks);
+		// Execute deletions with error handling
+		try {
+			await Promise.all(
+				actions.map(action =>
+					performBranchDeletion(folderRepositoryManager, item, branchInfo, defaultBranch, action.type, action.checkoutFirst)
+						.catch(e => Logger.warn(`Failed to delete ${action.type} for PR #${item.number}: ${e}`, 'PullRequestReviewCommon'))
+				)
+			);
+		} catch (e) {
+			Logger.warn(`Failed to auto-delete branches for PR #${item.number}: ${e}`, 'PullRequestReviewCommon');
+		}
 	}
 }