Add Ready & Merge button for Copilot PRs

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

Author: Copilot

src/github/pullRequestOverview.ts

@@ -364,6 +364,8 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				return this.deleteBranch(message);
 			case 'pr.readyForReview':
 				return this.setReadyForReview(message);
+			case 'pr.readyForReviewAndMerge':
+				return this.setReadyForReviewAndMerge(message);
 			case 'pr.approve':
 				return this.approvePullRequestMessage(message);
 			case 'pr.request-changes':
@@ -649,6 +651,25 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 			});
 	}
 
+	private async setReadyForReviewAndMerge(message: IRequestMessage<{ mergeMethod: MergeMethod }>): Promise<void> {
+		try {
+			// Step 1: Mark as ready for review
+			const readyResult = await this._item.setReadyForReview();
+
+			// Step 2: Approve the PR
+			await this._item.approve(this._folderRepositoryManager.repository, '');
+
+			// Step 3: Enable auto-merge
+			await this._item.enableAutoMerge(message.args.mergeMethod);
+
+			// Return the ready result to update the UI
+			this._replyMessage(message, readyResult);
+		} catch (e) {
+			vscode.window.showErrorMessage(`Unable to mark ready for review and merge. ${formatError(e)}`);
+			this._throwError(message, '');
+		}
+	}
+
 	private async checkoutDefaultBranch(message: IRequestMessage<string>): Promise<void> {
 		try {
 			const prBranch = this._folderRepositoryManager.repository.state.HEAD?.name;

webviews/common/context.tsx

@@ -89,6 +89,8 @@ export class PRContext {
 
 	public readyForReview = (): Promise<ReadyForReview> => this.postMessage({ command: 'pr.readyForReview' });
 
+	public readyForReviewAndMerge = (args: { mergeMethod: MergeMethod }): Promise<ReadyForReview> => this.postMessage({ command: 'pr.readyForReviewAndMerge', args });
+
 	public addReviewers = () => this.postMessage({ command: 'pr.change-reviewers' });
 	public changeProjects = (): Promise<ProjectItemsReply> => this.postMessage({ command: 'pr.change-projects' });
 	public removeProject = (project: IProjectItem) => this.postMessage({ command: 'pr.remove-project', args: project });

webviews/components/merge.tsx

@@ -281,9 +281,10 @@ export const OfferToUpdate = ({ mergeable, isSimple, isCurrentlyCheckedOut, canU
 
 };
 
-export const ReadyForReview = ({ isSimple }: { isSimple: boolean }) => {
+export const ReadyForReview = ({ isSimple, showMergeButton, mergeMethod }: { isSimple: boolean; showMergeButton?: boolean; mergeMethod?: MergeMethod }) => {
 	const [isBusy, setBusy] = useState(false);
-	const { readyForReview, updatePR } = useContext(PullRequestContext);
+	const [isMergeBusy, setMergeBusy] = useState(false);
+	const { readyForReview, readyForReviewAndMerge, updatePR } = useContext(PullRequestContext);
 
 	const markReadyForReview = useCallback(async () => {
 		try {
@@ -295,6 +296,16 @@ export const ReadyForReview = ({ isSimple }: { isSimple: boolean }) => {
 		}
 	}, [setBusy, readyForReview, updatePR]);
 
+	const markReadyAndMerge = useCallback(async () => {
+		try {
+			setMergeBusy(true);
+			const result = await readyForReviewAndMerge({ mergeMethod: mergeMethod || 'squash' });
+			updatePR(result);
+		} finally {
+			setMergeBusy(false);
+		}
+	}, [setMergeBusy, readyForReviewAndMerge, updatePR, mergeMethod]);
+
 	return (
 		<div className="ready-for-review-container">
 			<div className='ready-for-review-text-wrapper'>
@@ -305,7 +316,18 @@ export const ReadyForReview = ({ isSimple }: { isSimple: boolean }) => {
 				</div>
 			</div>
 			<div className='button-container'>
-				<button disabled={isBusy} onClick={markReadyForReview}>Ready for Review</button>
+				<button disabled={isBusy || isMergeBusy} onClick={markReadyForReview}>Ready for Review</button>
+				{showMergeButton && (
+					<button
+						className="secondary"
+						disabled={isBusy || isMergeBusy}
+						onClick={markReadyAndMerge}
+						title="Mark as ready for review, approve, and enable auto-merge with squash"
+						aria-label="Ready for Review, Approve, and Auto-Merge"
+					>
+						Ready &amp; Merge
+					</button>
+				)}
 			</div>
 		</div>
 	);
@@ -338,10 +360,16 @@ export const Merge = (pr: PullRequest) => {
 };
 
 export const PrActions = ({ pr, isSimple }: { pr: PullRequest; isSimple: boolean }) => {
-	const { hasWritePermission, canEdit, isDraft, mergeable } = pr;
+	const { hasWritePermission, canEdit, isDraft, mergeable, isCopilotOnMyBehalf, mergeMethodsAvailability } = pr;
 	if (isDraft) {
 		// Only PR author and users with push rights can mark draft as ready for review
-		return canEdit ? <ReadyForReview isSimple={isSimple} /> : null;
+		if (!canEdit) {
+			return null;
+		}
+		
+		// For Copilot-created PRs, show the "Ready & Merge" button alongside the regular button
+		const showMergeButton = isCopilotOnMyBehalf && mergeMethodsAvailability.squash;
+		return <ReadyForReview isSimple={isSimple} showMergeButton={showMergeButton} mergeMethod="squash" />;
 	}
 
 	if (mergeable === PullRequestMergeability.Mergeable && hasWritePermission && !pr.mergeQueueEntry) {