Prompt for local branch cleanup after GitHub auto-delete

[Copilot]

When GitHub automatically deleted a merged PR’s remote branch, VS Code skipped local cleanup, leaving the PR branch checked out.

Changes

• Centralize post-merge branch cleanup.
• Preserve extension-configured automatic deletion.
• When GitHub’s delete_branch_on_merge is enabled, open the existing deletion picker for local cleanup.
• Apply the behavior to both PR webview merge paths.
• Report merge success before prompting and prevent cleanup failures from masking successful merges.

if (deleteBranchAfterMerge) {
  await autoDeleteBranchesAfterMerge(...);
} else if (metadata.delete_branch_on_merge) {
  return deleteBranch(...);
}

• Fixes If you have merges set to automatically delete the branch on merge, no prompt happens in vs code to delete the local branch and switch back like it does with manual button clicking. #8892

[azure-pipelines]

Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

[Alex Ross (alexr00)]

We don't want to key off of github "delete on merge" setting.

[Alex Ross (alexr00)]

Copilot I don't see any more commits

[Copilot]

Copilot I don't see any more commits

Addressed in 494f592: cleanup prompting now follows any successful merge when extension automatic cleanup is disabled, without reading GitHub’s delete-on-merge setting.

[Copilot]

Pull request overview

This PR addresses a merge-flow gap where, if GitHub auto-deletes the remote branch after merging, the extension can skip the local cleanup flow (leaving the PR branch checked out). It centralizes post-merge branch cleanup behavior and ensures merge success is reported before any cleanup prompting occurs.

Changes:

• Introduces a centralized handleBranchDeletionAfterMerge helper to coordinate post-merge cleanup (auto-delete vs. prompt based on repo metadata).
• Updates both merge entry points (PR overview webview + activity bar view) to report merge success first, then perform/prompt for cleanup without masking a successful merge on cleanup failure.
• Adds a test to ensure the local deletion picker is shown when GitHub’s delete_branch_on_merge is enabled.

Show a summary per file

File	Description
src/test/github/pullRequestOverview.test.ts	Adds coverage asserting the deletion picker is shown and merge success is replied before prompting.
src/github/pullRequestReviewCommon.ts	Centralizes post-merge cleanup logic and adds guarded error logging for cleanup failures.
src/github/pullRequestOverview.ts	Uses the centralized cleanup helper after replying merge success, then posts cleanup messages if needed.
src/github/activityBarViewProvider.ts	Aligns the activity bar merge flow with the centralized post-merge cleanup behavior.
src/@types/vscode.proposed.chatParticipantAdditions.d.ts	Updates the proposed chat participant type definition for auto-mode routing resolution.

Review details

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

• Files reviewed: 4/5 changed files
• Comments generated: 1
• Review effort level: Lite