Support applying coding agent changes to local. (#7690)

Author: rebornix

package.json

@@ -1323,6 +1323,12 @@
 				"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.checkoutOnVscodeDevFromDescription",
 				"title": "%command.pr.checkoutOnVscodeDevFromDescription.title%",
@@ -3443,6 +3449,10 @@
 				{
 					"command": "pr.checkoutFromDescription",
 					"when": "chatSessionType == copilot-swe-agent"
+				},
+				{
+					"command": "pr.applyChangesFromDescription",
+					"when": "chatSessionType == copilot-swe-agent"
 				}
 			]
 		},

package.nls.json

@@ -275,6 +275,7 @@
 	"command.pr.toggleEditorCommentingOn.title": "Toggle Editor Commenting On",
 	"command.pr.toggleEditorCommentingOff.title": "Toggle Editor Commenting Off",
 	"command.pr.checkoutFromDescription.title": "Checkout",
+	"command.pr.applyChangesFromDescription.title": "Apply Changes",
 	"command.pr.checkoutOnVscodeDevFromDescription.title": "Checkout on vscode.dev",
 	"command.pr.openSessionLogFromDescription.title": "View Session",
 	"command.issue.openDescription.title": "View Issue Description",

src/commands.ts

@@ -651,6 +651,63 @@ export function registerCommands(
 		return { folderManager, pr };
 	};
 
+	const applyPullRequestChanges = async (folderManager: FolderRepositoryManager, pullRequest: PullRequestModel): Promise<void> => {
+		let patch: string | undefined;
+		try {
+			patch = await pullRequest.getPatch();
+
+			if (!patch.trim()) {
+				vscode.window.showErrorMessage(vscode.l10n.t('No patch data available for pull request #{0}', pullRequest.number.toString()));
+				return;
+			}
+
+			const tempFilePath = pathLib.join(
+				folderManager.repository.rootUri.fsPath,
+				'.git',
+				`pr-${pullRequest.number}.patch`,
+			);
+			const encoder = new TextEncoder();
+			const tempUri = vscode.Uri.file(tempFilePath);
+
+			await vscode.window.withProgress(
+				{
+					location: vscode.ProgressLocation.Notification,
+					title: vscode.l10n.t('Applying changes from PR #{0}', pullRequest.number.toString()),
+					cancellable: false
+				},
+				async (task) => {
+					await vscode.workspace.fs.writeFile(tempUri, encoder.encode(patch));
+					try {
+						await folderManager.repository.apply(tempFilePath, false);
+						task.report({ message: vscode.l10n.t('Successfully applied changes from pull request #{0}', pullRequest.number.toString()), increment: 100 });
+					} finally {
+						await vscode.workspace.fs.delete(tempUri);
+					}
+				}
+			);
+
+		} catch (error) {
+			const errorMessage = formatError(error);
+			Logger.error(`Failed to apply PR changes: ${errorMessage}`, 'Commands');
+
+			const copyGitApply = vscode.l10n.t('Copy git apply');
+			const result = await vscode.window.showErrorMessage(
+				vscode.l10n.t('Failed to apply changes from pull request: {0}', errorMessage),
+				copyGitApply
+			);
+
+			if (result === copyGitApply) {
+				if (patch) {
+					const gitApplyCommand = `git apply --3way <<'EOF'\n${patch}\nEOF`;
+					await vscode.env.clipboard.writeText(gitApplyCommand);
+					vscode.window.showInformationMessage(vscode.l10n.t('Git apply command copied to clipboard'));
+				} else {
+					vscode.window.showErrorMessage(vscode.l10n.t('Unable to copy git apply command - patch content is not available'));
+				}
+			}
+		}
+	};
+
 	function contextHasPath(ctx: OverviewContext | { path: string } | undefined): ctx is { path: string } {
 		const contextAsPath: Partial<{ path: string }> = (ctx as { path: string });
 		return !!contextAsPath.path;
@@ -684,6 +741,34 @@ export function registerCommands(
 
 	}));
 
+	context.subscriptions.push(vscode.commands.registerCommand('pr.applyChangesFromDescription', async (ctx: OverviewContext | { path: string } | undefined) => {
+		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 = Number(Buffer.from(path.substring(1), 'base64').toString('utf8'));
+			if (Number.isNaN(prNumber)) {
+				return vscode.window.showErrorMessage(vscode.l10n.t('Unable to parse pull request number.'));
+			}
+			const folderManager = reposManager.folderManagers[0];
+			const pullRequest = await folderManager.fetchById(folderManager.gitHubRepositories[0], Number(prNumber));
+			if (!pullRequest) {
+				return vscode.window.showErrorMessage(vscode.l10n.t('Unable to find pull request #{0}', prNumber.toString()));
+			}
+
+			return applyPullRequestChanges(folderManager, pullRequest);
+		}
+
+		const resolved = await resolvePr(ctx);
+		if (!resolved) {
+			return vscode.window.showErrorMessage(vscode.l10n.t('Unable to resolve pull request for applying changes.'));
+		}
+		return applyPullRequestChanges(resolved.folderManager, resolved.pr);
+
+	}));
+
 	context.subscriptions.push(
 		vscode.commands.registerCommand('pr.openChanges', async (pr: PRNode | RepositoryChangesNode | PullRequestModel | OverviewContext | undefined) => {
 			if (pr === undefined) {

src/github/pullRequestModel.ts

@@ -1483,6 +1483,26 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 		return parsed;
 	}
 
+	async getPatch(): Promise<string> {
+		const githubRepository = this.githubRepository;
+		const { octokit, remote } = await githubRepository.ensure();
+
+		const { data } = await octokit.call(octokit.api.pulls.get, {
+			owner: remote.owner,
+			repo: remote.repositoryName,
+			pull_number: this.number,
+			mediaType: {
+				format: 'diff'
+			}
+		});
+
+		if (typeof data === 'string') {
+			return data;
+		} else {
+			throw new Error('Expected diff data to be a string');
+		}
+	}
+
 	public static async getChangeModels(folderManager: FolderRepositoryManager, pullRequestModel: PullRequestModel): Promise<(RemoteFileChangeModel | InMemFileChangeModel)[]> {
 		const isCurrentPR = folderManager.activePullRequest?.number === pullRequestModel.number;
 		const changes = pullRequestModel.fileChanges.size > 0 ? pullRequestModel.fileChanges.values() : await pullRequestModel.getFileChangesInfo();