Also adopt in focus view

Author: alexr00

package.json

@@ -2064,6 +2064,10 @@
 					"command": "pr.readyForReview",
 					"when": "gitHubOpenRepositoryCount != 0 && github:inReviewMode"
 				},
+				{
+					"command": "pr.readyForReviewAndMerge",
+					"when": "false"
+				},
 				{
 					"command": "pr.openPullRequestOnGitHub",
 					"when": "gitHubOpenRepositoryCount != 0 && github:inReviewMode"
@@ -3534,11 +3538,11 @@
 				},
 				{
 					"command": "pr.readyForReview",
-					"when": "webviewId == PullRequestOverview && github:readyForReviewMenu"
+					"when": "(webviewId == PullRequestOverview || webviewId == 'github:activePullRequest') && github:readyForReviewMenu"
 				},
 				{
 					"command": "pr.readyForReviewAndMerge",
-					"when": "webviewId == PullRequestOverview && github:readyForReviewMenu && github:readyForReviewMenuWithMerge"
+					"when": "(webviewId == PullRequestOverview || webviewId == 'github:activePullRequest') && github:readyForReviewMenu && github:readyForReviewMenuWithMerge"
 				},
 				{
 					"command": "pr.openChanges",

package.nls.json

@@ -193,8 +193,8 @@
 	"command.pr.dismissNotification.title": "Dismiss Notification",
 	"command.pr.markAllCopilotNotificationsAsRead.title": "Dismiss All Copilot Notifications",
 	"command.pr.merge.title": "Merge Pull Request",
-	"command.pr.readyForReview.title": "Mark Pull Request Ready For Review",
-	"command.pr.readyForReviewAndMerge.title": "Mark Pull Request Ready, Approve, and Auto-Merge",
+	"command.pr.readyForReview.title": "Ready for Review",
+	"command.pr.readyForReviewAndMerge.title": "Ready, Approve, and Auto-Merge",
 	"command.pr.openPullRequestOnGitHub.title": "Open Pull Request on GitHub",
 	"command.pr.openAllDiffs.title": "Open All Diffs",
 	"command.pr.refreshPullRequest.title": "Refresh Pull Request",

src/github/activityBarViewProvider.ts

@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 import { openPullRequestOnGitHub } from '../commands';
 import { FolderRepositoryManager } from './folderRepositoryManager';
 import { GithubItemStateEnum, IAccount, isITeam, ITeam, PullRequestMergeability, reviewerId, ReviewEventEnum, ReviewState } from './interface';
-import { PullRequestModel } from './pullRequestModel';
+import { isCopilotOnMyBehalf, PullRequestModel } from './pullRequestModel';
 import { getDefaultMergeMethod } from './pullRequestOverview';
 import { PullRequestView } from './pullRequestOverviewCommon';
 import { isInCodespaces, parseReviewers } from './utils';
@@ -212,7 +212,7 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 				this.registerPrSpecificListeners(pullRequestModel);
 			}
 			this._item = pullRequestModel;
-			const [pullRequest, repositoryAccess, timelineEvents, requestedReviewers, branchInfo, defaultBranch, currentUser, viewerCanEdit, hasReviewDraft] = await Promise.all([
+			const [pullRequest, repositoryAccess, timelineEvents, requestedReviewers, branchInfo, defaultBranch, currentUser, viewerCanEdit, hasReviewDraft, coAuthors] = await Promise.all([
 				this._folderRepositoryManager.resolvePullRequest(
 					pullRequestModel.remote.owner,
 					pullRequestModel.remote.repositoryName,
@@ -226,6 +226,7 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 				this._folderRepositoryManager.getCurrentUser(pullRequestModel.githubRepository),
 				pullRequestModel.canEdit(),
 				pullRequestModel.validateDraftMode(),
+				pullRequestModel.getCoAuthors(),
 				ensureEmojis(this._folderRepositoryManager.context)
 			]);
 
@@ -308,7 +309,8 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 				isDarkTheme: vscode.window.activeColorTheme.kind === vscode.ColorThemeKind.Dark,
 				isEnterprise: pullRequest.githubRepository.remote.isEnterprise,
 				hasReviewDraft,
-				currentUserReviewState: reviewState
+				currentUserReviewState: reviewState,
+				isCopilotOnMyBehalf: await isCopilotOnMyBehalf(pullRequest, currentUser, coAuthors)
 			};
 
 			this._postMessage({

webviews/activityBarView/index.css

@@ -75,7 +75,17 @@ form,
 	width: 100%;
 }
 
-.button-container button {
+.button-container>button {
+	width: 100%;
+}
+
+.button-container:has(> .dropdown-container) {
+	display: flex;
+	min-width: 0;
+}
+
+.dropdown-container {
+	flex-grow: 1;
 	width: 100%;
 }
 

webviews/components/merge.tsx

@@ -310,21 +310,21 @@ export const ReadyForReview = ({ isSimple, isCopilotOnMyBehalf, mergeMethod }: {
 
 	const allOptions = useCallback(() => {
 		const actions: { label: string; value: string; action: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void }[] = [
-			{ 
-				label: 'Ready for Review', 
-				value: 'ready', 
-				action: markReadyForReview 
+			{
+				label: 'Ready for Review',
+				value: 'ready',
+				action: markReadyForReview
 			}
 		];
-		
+
 		if (isCopilotOnMyBehalf) {
-			actions.push({ 
-				label: 'Ready, Approve, and Auto-Merge', 
-				value: 'readyAndMerge', 
-				action: markReadyAndMerge 
+			actions.push({
+				label: 'Ready, Approve, and Auto-Merge',
+				value: 'readyAndMerge',
+				action: markReadyAndMerge
 			});
 		}
-		
+
 		return actions;
 	}, [isCopilotOnMyBehalf, markReadyForReview, markReadyAndMerge]);