Update to support new arg format from chat commands (#8472)

Author: alexr00

package.json

@@ -1426,12 +1426,24 @@
 				"category": "%command.pull.request.category%",
 				"icon": "$(git-compare)"
 			},
+			{
+				"command": "pr.checkoutFromChat",
+				"title": "%command.pr.checkoutFromChat.title%",
+				"category": "%command.pull.request.category%",
+				"icon": "$(git-compare)"
+			},
 			{
 				"command": "pr.applyChangesFromDescription",
 				"title": "%command.pr.applyChangesFromDescription.title%",
 				"category": "%command.pull.request.category%",
 				"icon": "$(git-stash-apply)"
 			},
+			{
+				"command": "pr.applyChangesFromChat",
+				"title": "%command.pr.applyChangesFromChat.title%",
+				"category": "%command.pull.request.category%",
+				"icon": "$(git-stash-apply)"
+			},
 			{
 				"command": "pr.checkoutOnVscodeDevFromDescription",
 				"title": "%command.pr.checkoutOnVscodeDevFromDescription.title%",
@@ -2172,10 +2184,18 @@
 					"command": "pr.checkoutFromDescription",
 					"when": "false"
 				},
+				{
+					"command": "pr.checkoutFromChat",
+					"when": "false"
+				},
 				{
 					"command": "pr.applyChangesFromDescription",
 					"when": "false"
 				},
+				{
+					"command": "pr.applyChangesFromChat",
+					"when": "false"
+				},
 				{
 					"command": "pr.checkoutChatSessionPullRequest",
 					"when": "false"
@@ -3613,12 +3633,12 @@
 			],
 			"chat/input/editing/sessionToolbar": [
 				{
-					"command": "pr.checkoutFromDescription",
+					"command": "pr.checkoutFromChat",
 					"group": "navigation@0",
 					"when": "chatSessionType == copilot-cloud-agent && workspaceFolderCount > 0 && github.vscode-pull-request-github.activated && !config.chat.disableAIFeatures"
 				},
 				{
-					"command": "pr.applyChangesFromDescription",
+					"command": "pr.applyChangesFromChat",
 					"group": "navigation@1",
 					"when": "chatSessionType == copilot-cloud-agent && workspaceFolderCount > 0 && github.vscode-pull-request-github.activated && !config.chat.disableAIFeatures"
 				}

package.nls.json

@@ -302,7 +302,9 @@
 	"command.pr.toggleEditorCommentingOn.title": "Toggle Editor Commenting On",
 	"command.pr.toggleEditorCommentingOff.title": "Toggle Editor Commenting Off",
 	"command.pr.checkoutFromDescription.title": "Checkout",
+	"command.pr.checkoutFromChat.title": "Checkout",
 	"command.pr.applyChangesFromDescription.title": "Apply",
+	"command.pr.applyChangesFromChat.title": "Apply",
 	"command.pr.checkoutOnVscodeDevFromDescription.title": "Checkout on vscode.dev",
 	"command.pr.checkoutOnCodespacesFromDescription.title": "Checkout on Codespaces",
 	"command.pr.openSessionLogFromDescription.title": "View Session",

src/commands.ts

@@ -606,75 +606,84 @@ export function registerCommands(
 		}
 	}
 
-	context.subscriptions.push(vscode.commands.registerCommand('pr.checkoutFromDescription', async (ctx: OverviewContext | { path: string } | undefined, metadata?: SessionMetadata) => {
+	type ChatCommandArgs = { path: string } | [{ path: string } | undefined, SessionMetadata | undefined] | undefined;
+
+	function parseChatCommandArgs(ctxOrArgs: ChatCommandArgs, metadataArg?: SessionMetadata): { ctx: { path: string } | undefined; metadata: SessionMetadata | undefined } {
+		if (Array.isArray(ctxOrArgs)) {
+			return { ctx: ctxOrArgs[0], metadata: ctxOrArgs[1] };
+		}
+		return { ctx: ctxOrArgs, metadata: metadataArg };
+	}
+
+	async function resolvePrFromChat(ctx: { path: string }, metadata: SessionMetadata | undefined): Promise<{ folderManager: FolderRepositoryManager; pullRequest: PullRequestModel; prNumber: number } | undefined> {
+		const prNumber = prNumberFromUriPath(ctx.path);
+		if (!prNumber) {
+			return undefined;
+		}
+		const result = getFolderManagerFromMetadata(metadata);
+		if (!result) {
+			return undefined;
+		}
+		const { folderManager, githubRepo } = result;
+		const pullRequest = await folderManager.fetchById(githubRepo, prNumber);
+		if (!pullRequest) {
+			return undefined;
+		}
+		return { folderManager, pullRequest, prNumber };
+	}
+
+	context.subscriptions.push(vscode.commands.registerCommand('pr.checkoutFromChat', async (ctxOrArgs: ChatCommandArgs, metadataArg?: SessionMetadata) => {
+		const { ctx, metadata } = parseChatCommandArgs(ctxOrArgs, metadataArg);
 		if (!ctx) {
 			return vscode.window.showErrorMessage(vscode.l10n.t('No pull request context provided for checkout.'));
 		}
 
-		if (contextHasPath(ctx)) {
-			const { path } = ctx;
-			const prNumber = prNumberFromUriPath(path);
-			if (!prNumber) {
-				return vscode.window.showErrorMessage(vscode.l10n.t('No pull request number found in context path.'));
-			}
-			// Use metadata to find the correct repository if available
-			const result = getFolderManagerFromMetadata(metadata);
-			if (!result) {
-				return vscode.window.showErrorMessage(vscode.l10n.t('Unable to find repository manager.'));
-			}
-			const { folderManager, githubRepo } = result;
-			const pullRequest = await folderManager.fetchById(githubRepo, Number(prNumber));
-			if (!pullRequest) {
-				return vscode.window.showErrorMessage(vscode.l10n.t('Unable to find pull request #{0}', prNumber.toString()));
-			}
+		const resolved = await resolvePrFromChat(ctx, metadata);
+		if (!resolved) {
+			return vscode.window.showErrorMessage(vscode.l10n.t('Unable to find pull request from chat context.'));
+		}
 
-			return reviewsManager.switchToPr(folderManager, pullRequest, folderManager.repository, true);
+		return reviewsManager.switchToPr(resolved.folderManager, resolved.pullRequest, resolved.folderManager.repository, true);
+	}));
+
+	context.subscriptions.push(vscode.commands.registerCommand('pr.checkoutFromDescription', async (ctx: OverviewContext | undefined) => {
+		if (!ctx) {
+			return vscode.window.showErrorMessage(vscode.l10n.t('No pull request context provided for checkout.'));
 		}
 
 		const resolved = await resolvePr(ctx);
 		if (!resolved) {
 			return vscode.window.showErrorMessage(vscode.l10n.t('Unable to resolve pull request for checkout.'));
 		}
 		return reviewsManager.switchToPr(resolved.folderManager, resolved.pr, resolved.folderManager.repository, true);
-
 	}));
 
-	context.subscriptions.push(vscode.commands.registerCommand('pr.applyChangesFromDescription', async (ctx: OverviewContext | { path: string } | undefined, metadata?: SessionMetadata) => {
+	context.subscriptions.push(vscode.commands.registerCommand('pr.applyChangesFromChat', async (ctxOrArgs: ChatCommandArgs, metadataArg?: SessionMetadata) => {
+		const { ctx, metadata } = parseChatCommandArgs(ctxOrArgs, metadataArg);
 		if (!ctx) {
 			return vscode.window.showErrorMessage(vscode.l10n.t('No pull request context provided for applying changes.'));
 		}
 
-		if (contextHasPath(ctx)) {
-			const { path } = ctx;
-			const prNumber = prNumberFromUriPath(path);
-			if (!prNumber) {
-				return vscode.window.showErrorMessage(vscode.l10n.t('Unable to parse pull request number.'));
-			}
-
-			await vscode.window.withProgress(
-				{
-					location: vscode.ProgressLocation.Notification,
-					title: vscode.l10n.t('Applying changes from pull request #{0}', prNumber.toString()),
-					cancellable: false
-				},
-				async (task) => {
-					task.report({ increment: 30 });
-
-					// Use metadata to find the correct repository if available
-					const result = getFolderManagerFromMetadata(metadata);
-					if (!result) {
-						return vscode.window.showErrorMessage(vscode.l10n.t('Unable to find repository manager.'));
-					}
-					const { folderManager, githubRepo } = result;
-					const pullRequest = await folderManager.fetchById(githubRepo, Number(prNumber));
-					if (!pullRequest) {
-						return vscode.window.showErrorMessage(vscode.l10n.t('Unable to find pull request #{0}', prNumber.toString()));
-					}
+		const resolved = await resolvePrFromChat(ctx, metadata);
+		if (!resolved) {
+			return vscode.window.showErrorMessage(vscode.l10n.t('Unable to find pull request from chat context.'));
+		}
 
-					return applyPullRequestChanges(task, folderManager, pullRequest);
-				});
+		await vscode.window.withProgress(
+			{
+				location: vscode.ProgressLocation.Notification,
+				title: vscode.l10n.t('Applying changes from pull request #{0}', resolved.prNumber.toString()),
+				cancellable: false
+			},
+			async (task) => {
+				task.report({ increment: 30 });
+				return applyPullRequestChanges(task, resolved.folderManager, resolved.pullRequest);
+			});
+	}));
 
-			return;
+	context.subscriptions.push(vscode.commands.registerCommand('pr.applyChangesFromDescription', async (ctx: OverviewContext | undefined) => {
+		if (!ctx) {
+			return vscode.window.showErrorMessage(vscode.l10n.t('No pull request context provided for applying changes.'));
 		}
 
 		await vscode.window.withProgress(