Skip to content

Checkout PR at the end of a completed chat session #7641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshspicer merged 2 commits into from
Aug 22, 2025
Merged

Checkout PR at the end of a completed chat session #7641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2600aa6
checkout from session chat
joshspicer Aug 22, 2025
d5d45b6
guard for chat session type
joshspicer Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1320,7 +1320,8 @@
{
"command": "pr.checkoutFromDescription",
"title": "%command.pr.checkoutFromDescription.title%",
"category": "%command.pull.request.category%"
"category": "%command.pull.request.category%",
"icon": "$(git-compare)"
},
{
"command": "pr.checkoutOnVscodeDevFromDescription",
Expand Down Expand Up @@ -3410,6 +3411,12 @@
"when": "chatSessionType == copilot-swe-agent",
"group": "context"
}
],
"chat/multiDiff/context": [
{
"command": "pr.checkoutFromDescription",
"when": "chatSessionType == copilot-swe-agent"
}
]
},
"colors": [
Expand Down
22 changes: 19 additions & 3 deletions src/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,11 +651,27 @@ export function registerCommands(
return { folderManager, pr };
};

context.subscriptions.push(vscode.commands.registerCommand('pr.checkoutFromDescription', async (context: OverviewContext | undefined) => {
if (!context) {
context.subscriptions.push(vscode.commands.registerCommand('pr.checkoutFromDescription', async (ctx: OverviewContext | { path: string } | undefined) => {
if (!ctx) {
return vscode.window.showErrorMessage(vscode.l10n.t('No pull request context provided for checkout.'));
}
const resolved = await resolvePr(context);

if ('path' in 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));
Comment on lines +665 to +666
Copy link
Member

@alexr00 alexr00 Aug 25, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not going to work for multi-repo. You can easily end up getting the wrong PR. In fully multi repo (usually multiroot workspace) setup, you could get a PR from an unrelated repo.

If there are multiple folder managers and github repos, it would be better to actually find the correct repo to fetch from. You can probably use getManagerForFile:

vscode-pull-request-github/src/github/repositoriesManager.ts

Lines 144 to 145 in aa02ca6

getManagerForFile(uri: vscode.Uri): FolderRepositoryManager | undefined {
if (uri.scheme === 'untitled') {

if (!pullRequest) {
return vscode.window.showErrorMessage(vscode.l10n.t('Unable to find pull request #{0}', prNumber.toString()));
}

return switchToPr(folderManager, pullRequest, folderManager.repository, true);
}

const resolved = await resolvePr(ctx);
if (!resolved) {
return vscode.window.showErrorMessage(vscode.l10n.t('Unable to resolve pull request for checkout.'));
}
Expand Down