Skip to content

Fixed issues with remote agent for workspace having multiple repos #7968

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −16
Open

Fixed issues with remote agent for workspace having multiple repos #7968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions src/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ export function registerCommands(
if (activePullRequests.length >= 1) {
const result = await chooseItem<PullRequestModel>(
activePullRequests,
itemValue => itemValue.html_url,
itemValue => ({ label: itemValue.html_url }),
);
if (result) {
openPullRequestOnGitHub(result, telemetry);
Expand Down Expand Up @@ -263,7 +263,7 @@ export function registerCommands(
? (
await chooseItem(
activePullRequestsWithFolderManager,
itemValue => itemValue.activePr.html_url,
itemValue => ({ label: itemValue.activePr.html_url }),
)
)
: activePullRequestsWithFolderManager[0];
Expand Down Expand Up @@ -442,7 +442,7 @@ export function registerCommands(
}
return chooseItem<ReviewManager>(
reviewsManager.reviewManagers,
itemValue => pathLib.basename(itemValue.repository.rootUri.fsPath),
itemValue => ({ label: pathLib.basename(itemValue.repository.rootUri.fsPath) }),
{ placeHolder: vscode.l10n.t('Choose a repository to create a pull request in'), ignoreFocusOut: true },
);
}
Expand Down Expand Up @@ -794,7 +794,7 @@ export function registerCommands(
pullRequestModel = await chooseItem<PullRequestModel>(reposManager.folderManagers
.map(folderManager => folderManager.activePullRequest!)
.filter(activePR => !!activePR),
itemValue => `${itemValue.number}: ${itemValue.title}`,
itemValue => ({ label: `${itemValue.number}: ${itemValue.title}` }),
{ placeHolder: vscode.l10n.t('Choose the pull request to exit') });
} else {
pullRequestModel = pr;
Expand Down Expand Up @@ -932,7 +932,7 @@ export function registerCommands(
if (activePullRequests.length >= 1) {
issueModel = await chooseItem<PullRequestModel>(
activePullRequests,
itemValue => itemValue.title,
itemValue => ({ label: itemValue.title }),
);
}
} else {
Expand Down Expand Up @@ -1610,7 +1610,7 @@ ${contents}
.filter(activePR => !!activePR);
pr = await chooseItem<PullRequestModel>(
activePullRequests,
itemValue => `${itemValue.number}: ${itemValue.title}`,
itemValue => ({ label: `${itemValue.number}: ${itemValue.title}` }),
{ placeHolder: vscode.l10n.t('Pull request to create a link for') },
);
}
Expand Down Expand Up @@ -1666,7 +1666,7 @@ ${contents}
}
const githubRepo = await chooseItem<{ manager: FolderRepositoryManager, repo: GitHubRepository }>(
githubRepositories,
itemValue => `${itemValue.repo.remote.owner}/${itemValue.repo.remote.repositoryName}`,
itemValue => ({ label: `${itemValue.repo.remote.owner}/${itemValue.repo.remote.repositoryName}` }),
{ placeHolder: vscode.l10n.t('Which GitHub repository do you want to checkout the pull request from?') }
);
if (!githubRepo) {
Expand Down Expand Up @@ -1702,7 +1702,7 @@ ${contents}
});
return chooseItem<GitHubRepository>(
githubRepositories,
itemValue => `${itemValue.remote.owner}/${itemValue.remote.repositoryName}`,
itemValue => ({ label: `${itemValue.remote.owner}/${itemValue.remote.repositoryName}` }),
{ placeHolder: vscode.l10n.t('Which GitHub repository do you want to open?') }
);
}
Expand Down Expand Up @@ -1926,7 +1926,7 @@ ${contents}

const pr = await chooseItem<PullRequestModel>(
activePullRequests,
itemValue => `${itemValue.number}: ${itemValue.title}`,
itemValue => ({ label: `${itemValue.number}: ${itemValue.title}` }),
{ placeHolder: vscode.l10n.t('Pull request to create a link for') },
);
if (pr) {
Expand Down
21 changes: 16 additions & 5 deletions src/github/copilotRemoteAgent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ export class CopilotRemoteAgentManager extends Disposable {
private chooseFolderManager(): Promise<FolderRepositoryManager | undefined> {
return chooseItem<FolderRepositoryManager>(
this.repositoriesManager.folderManagers,
itemValue => pathLib.basename(itemValue.repository.rootUri.fsPath),
itemValue => ({ label: pathLib.basename(itemValue.repository.rootUri.fsPath) }),
);
}

Expand Down Expand Up @@ -461,7 +461,7 @@ export class CopilotRemoteAgentManager extends Disposable {

const result = await chooseItem<GitHubRemote>(
ghRemotes,
itemValue => `${itemValue.remoteName} (${itemValue.owner}/${itemValue.repositoryName})`,
itemValue => ({ label: itemValue.remoteName, description: `(${itemValue.owner}/${itemValue.repositoryName})` }),
{
title: vscode.l10n.t('Coding agent will create pull requests against the selected remote.'),
}
Expand Down Expand Up @@ -665,6 +665,8 @@ export class CopilotRemoteAgentManager extends Disposable {
summary,
undefined,
autoPushAndCommit,
undefined,
fm
);

if (result.state !== 'success') {
Expand Down Expand Up @@ -728,15 +730,15 @@ export class CopilotRemoteAgentManager extends Disposable {
return vscode.l10n.t('🚀 Coding agent will continue work in [#{0}]({1}). Track progress [here]({2}).', number, link, webviewUri.toString());
}

async invokeRemoteAgent(prompt: string, problemContext?: string, token?: vscode.CancellationToken, autoPushAndCommit = true, chatStream?: vscode.ChatResponseStream): Promise<RemoteAgentResult> {
async invokeRemoteAgent(prompt: string, problemContext?: string, token?: vscode.CancellationToken, autoPushAndCommit = true, chatStream?: vscode.ChatResponseStream, fm?: FolderRepositoryManager): Promise<RemoteAgentResult> {
const capiClient = await this.copilotApi;
if (!capiClient) {
return { error: vscode.l10n.t('Failed to initialize Copilot API. Please try again later.'), state: 'error' };
}

await this.promptAndUpdatePreferredGitHubRemote(true);

const repoInfo = await this.repoInfo();
const repoInfo = await this.repoInfo(fm);
if (!repoInfo) {
return { error: vscode.l10n.t('No repository information found. Please open a workspace with a GitHub repository.'), state: 'error' };
}
Expand Down Expand Up @@ -1108,7 +1110,16 @@ export class CopilotRemoteAgentManager extends Disposable {

const uri = await toOpenPullRequestWebviewUri({ owner: pullRequest.remote.owner, repo: pullRequest.remote.repositoryName, pullRequestNumber: pullRequest.number });
const prLinkTitle = vscode.l10n.t('Open pull request in VS Code');
const description = new vscode.MarkdownString(`[#${pullRequest.number}](${uri.toString()} "${prLinkTitle}")`); // pullRequest.base.ref === defaultBranch ? `PR #${pullRequest.number}`: `PR #${pullRequest.number} → ${pullRequest.base.ref}`;

// If we have multiple repositories, include the repo name in the link text
// e.g., 'owner/repo #123' instead of just '#123'
let repoInfo = '';
if (this.repositoriesManager.folderManagers.length > 1) {
const owner = pullRequest.remote.owner;
const repo = pullRequest.remote.repositoryName;
repoInfo = `${owner}/${repo} `;
}
const description = new vscode.MarkdownString(`[${repoInfo}#${pullRequest.number}](${uri.toString()} "${prLinkTitle}")`); // pullRequest.base.ref === defaultBranch ? `PR #${pullRequest.number}`: `PR #${pullRequest.number} → ${pullRequest.base.ref}`;
return {
id: `${pullRequest.number}`,
label: pullRequest.title || `Session ${pullRequest.number}`,
Expand Down
4 changes: 2 additions & 2 deletions src/github/quickPicks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { formatError } from '../common/utils';

export async function chooseItem<T>(
itemsToChooseFrom: T[],
propertyGetter: (itemValue: T) => string,
propertyGetter: (itemValue: T) => { label: string; description?: string; },
options?: vscode.QuickPickOptions,
): Promise<T | undefined> {
if (itemsToChooseFrom.length === 0) {
Expand All @@ -34,7 +34,7 @@ export async function chooseItem<T>(
}
const items: Item[] = itemsToChooseFrom.map(currentItem => {
return {
label: propertyGetter(currentItem),
...propertyGetter(currentItem),
itemValue: currentItem,
};
});
Expand Down