Revert "Address code review feedback: extract helper and improve error handling"

This reverts commit f5d0f99.

Author: alexr00

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

@@ -345,7 +345,7 @@ export namespace PullRequestReviewCommon {
 		const deletedBranchTypes: string[] = [];
 
 		if (selectedActions) {
-			const isBranchActiveForDeletion = branchInfo && isBranchActive(folderRepositoryManager, item, branchInfo.branch);
+			const isBranchActive = item.equals(folderRepositoryManager.activePullRequest) || (folderRepositoryManager.repository.state.HEAD?.name && folderRepositoryManager.repository.state.HEAD.name === branchInfo?.branch);
 
 			const promises = selectedActions.map(async action => {
 				switch (action.type) {
@@ -359,7 +359,7 @@ export namespace PullRequestReviewCommon {
 						}
 						return;
 					case 'local':
-						if (isBranchActiveForDeletion) {
+						if (isBranchActive) {
 							if (folderRepositoryManager.repository.state.workingTreeChanges.length) {
 								const yes = vscode.l10n.t('Yes');
 								const response = await vscode.window.showWarningMessage(
@@ -405,14 +405,6 @@ export namespace PullRequestReviewCommon {
 		}
 	}
 
-	/**
-	 * Check if a pull request's branch is currently active (checked out).
-	 */
-	function isBranchActive(folderRepositoryManager: FolderRepositoryManager, item: PullRequestModel, branchName: string): boolean {
-		return item.equals(folderRepositoryManager.activePullRequest) ||
-			(folderRepositoryManager.repository.state.HEAD?.name === branchName);
-	}
-
 	/**
 	 * 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 +422,50 @@ export namespace PullRequestReviewCommon {
 			.getConfiguration(PR_SETTINGS_NAMESPACE)
 			.get<boolean>(`${DEFAULT_DELETION_METHOD}.${SELECT_REMOTE}`, true);
 
-		const deletionTasks: Promise<void>[] = [];
+		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) {
-				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'))
+				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) {
-			deletionTasks.push(
+			const isBranchActive = item.equals(folderRepositoryManager.activePullRequest) ||
+				(folderRepositoryManager.repository.state.HEAD?.name && folderRepositoryManager.repository.state.HEAD.name === branchInfo.branch);
+
+			promises.push(
 				(async () => {
-					if (isBranchActive(folderRepositoryManager, item, branchInfo.branch)) {
+					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'))
+				})().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) {
-			deletionTasks.push(
-				folderRepositoryManager.repository.removeRemote(branchInfo.remote)
-					.catch(e => Logger.warn(`Failed to delete remote ${branchInfo.remote} for PR #${item.number}: ${e}`, 'PullRequestReviewCommon'))
+			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(deletionTasks);
+		await Promise.all(promises);
 	}
 }