fix microsoft/vscode-copilot#18806 (#7137)

Author: joshspicer

src/github/copilotApi.ts

@@ -12,6 +12,10 @@ import { OctokitCommon } from './common';
 import { CredentialStore } from './credentials';
 import { LoggingOctokit } from './loggingOctokit';
 import { hasEnterpriseUri } from './utils';
+import Logger from '../common/logger';
+
+const LEARN_MORE_URL = 'https://docs.github.com/en/copilot/how-tos/agents/copilot-coding-agent';
+const PREMIUM_REQUESTS_URL = 'https://docs.github.com/en/copilot/concepts/copilot-billing/understanding-and-managing-requests-in-copilot#what-are-premium-requests';
 
 export interface RemoteAgentJobPayload {
 	problem_statement: string;
@@ -33,6 +37,8 @@ export interface RemoteAgentJobResponse {
 }
 
 export class CopilotApi {
+	protected static readonly ID = 'copilotApi';
+
 	constructor(private octokit: LoggingOctokit, private token: string) { }
 
 	private get baseUrl(): string {
@@ -57,7 +63,7 @@ export class CopilotApi {
 			body: JSON.stringify(payload)
 		});
 		if (!response.ok) {
-			throw new Error(this.formatRemoteAgentJobError(response.status));
+			throw new Error(await this.formatRemoteAgentJobError(response.status, repoSlug, response));
 		}
 		const data = await response.json();
 		this.validateRemoteAgentJobResponse(data);
@@ -66,22 +72,23 @@ export class CopilotApi {
 
 
 	// https://github.com/github/sweagentd/blob/371ea6db280b9aecf790ccc20660e39a7ecb8d1c/internal/api/jobapi/handler.go#L110-L120
-	private formatRemoteAgentJobError(status: number) {
+	private async formatRemoteAgentJobError(status: number, repoSlug: string, response: Response): Promise<string> {
 		switch (status) {
 			case 400:
 				return vscode.l10n.t('Bad request');
 			case 401:
 				return vscode.l10n.t('Unauthorized');
 			case 402:
-				return vscode.l10n.t('Premium request quota exceeded');
+				return vscode.l10n.t('[Premium request]({0}) quota exceeded', PREMIUM_REQUESTS_URL);
 			case 403:
-				return vscode.l10n.t('GitHub Coding Agent is not enabled for this repository');
+				return vscode.l10n.t('[GitHub Coding Agent]({0}) is not enabled for repository \'{1}\'', LEARN_MORE_URL, repoSlug);
 			case 404:
-				return vscode.l10n.t('Repository not found');
+				return vscode.l10n.t('Repository \'{0}\' not found', repoSlug);
 			case 409:
 				return vscode.l10n.t('A Coding Agent pull request already exists');
 			case 500:
-				return vscode.l10n.t('Server error');
+				Logger.error(`Server error in remote agent job: ${await response.text()}`, CopilotApi.ID);
+				return vscode.l10n.t('Server error. Please try again later.');
 			default:
 				return vscode.l10n.t('Error: {0}', status);
 		}

src/github/copilotRemoteAgent.ts

@@ -9,12 +9,13 @@ import { AuthProvider } from '../common/authentication';
 import { COPILOT_LOGINS } from '../common/copilot';
 import { commands } from '../common/executeCommands';
 import { Disposable } from '../common/lifecycle';
-import { Remote } from '../common/remote';
+import { GitHubRemote, Remote } from '../common/remote';
 import { CODING_AGENT, CODING_AGENT_AUTO_COMMIT_AND_PUSH, CODING_AGENT_ENABLED } from '../common/settingKeys';
 import { toOpenPullRequestWebviewUri } from '../common/uri';
 import { CopilotApi, RemoteAgentJobPayload } from './copilotApi';
 import { CopilotPRWatcher, CopilotStateModel } from './copilotPrWatcher';
 import { CredentialStore } from './credentials';
+import { FolderRepositoryManager } from './folderRepositoryManager';
 import { RepositoriesManager } from './repositoriesManager';
 
 type RemoteAgentSuccessResult = { link: string; state: 'success'; number: number; webviewUri: vscode.Uri; llmDetails: string };
@@ -115,13 +116,12 @@ export class CopilotRemoteAgentManager extends Disposable {
 			return false;
 		}
 
-		const { owner, repo } = repoInfo;
-		const folderManager = this.getFolderManagerForRepo(owner, repo);
+		const { fm } = repoInfo;
 
 		try {
 			// Ensure assignable users are loaded
-			await folderManager.getAssignableUsers();
-			const allAssignableUsers = folderManager.getAllAssignableUsers();
+			await fm.getAssignableUsers();
+			const allAssignableUsers = fm.getAllAssignableUsers();
 
 			if (!allAssignableUsers) {
 				return false;
@@ -169,33 +169,32 @@ export class CopilotRemoteAgentManager extends Disposable {
 			.getConfiguration(CODING_AGENT).get(CODING_AGENT_AUTO_COMMIT_AND_PUSH, false);
 	}
 
-	private getFolderManagerForRepo(owner?: string, repo?: string) {
-		let folderManager = (owner && repo)
-			? this.repositoriesManager.getManagerForRepository(owner, repo)
-			: undefined;
-		if (!folderManager && this.repositoriesManager.folderManagers.length > 0) {
-			folderManager = this.repositoriesManager.folderManagers[0];
-		}
-		if (!folderManager) {
-			throw new Error('No folder manager found for the repository. Open a workspace with a Git repository.');
+	async repoInfo(): Promise<{ owner: string; repo: string; baseRef: string; remote: GitHubRemote; repository: Repository; fm: FolderRepositoryManager } | undefined> {
+		if (!this.repositoriesManager.folderManagers.length) {
+			return;
 		}
-		return folderManager;
-	}
-
-	async repoInfo(): Promise<{ owner: string; repo: string; remote: string; baseRef: string; repository: Repository } | undefined> {
-		const fm = this.getFolderManagerForRepo();
+		const fm = this.repositoriesManager.folderManagers[0];
 		const repository = fm?.repository;
-		if (!fm || !repository) {
+		if (!repository) {
 			return;
 		}
-		const { owner, repo } = await fm.getPullRequestDefaults();
-		const remotes = repository.state.remotes;
+
 		const baseRef = repository.state.HEAD?.name; // TODO: Consider edge cases
-		const remote = remotes.find(r => r.name === 'origin')?.name || remotes.find(r => r.pushUrl)?.name;
-		if (!owner || !repo || !remote || !baseRef || !repository) {
+		const ghRemotes = await fm.getGitHubRemotes();
+		if (!ghRemotes || ghRemotes.length === 0) {
 			return;
 		}
-		return { owner, repo, remote, baseRef, repository };
+
+		const remote =
+			ghRemotes.find(remote => remote.remoteName === 'origin')
+			|| ghRemotes[0]; // Fallback to the first remote
+
+		// Extract repo data from target remote
+		const { owner, repositoryName: repo } = remote;
+		if (!owner || !repo || !baseRef || !repository) {
+			return;
+		}
+		return { owner, repo, baseRef, remote, repository, fm };
 	}
 
 	async commandImpl(args?: ICopilotRemoteAgentCommandArgs): Promise<string | undefined> {
@@ -214,9 +213,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 		}
 		const { repository, owner, repo } = repoInfo;
 		const repoName = `${owner}/${repo}`; // TODO: Make sure this is where we'll push to
-
 		const hasChanges = repository.state.workingTreeChanges.length > 0 || repository.state.indexChanges.length > 0;
-
 		const learnMoreCb = async () => {
 			vscode.env.openExternal(vscode.Uri.parse('https://docs.github.com/copilot/using-github-copilot/coding-agent'));
 		};
@@ -301,7 +298,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 
 		const repoInfo = await this.repoInfo();
 		if (!repoInfo) {
-			return { error: vscode.l10n.t('No repository information found. Please open a workspace with a Git repository.'), state: 'error' };
+			return { error: vscode.l10n.t('No repository information found. Please open a workspace with a GitHub repository.'), state: 'error' };
 		}
 		const { owner, repo, remote, repository, baseRef } = repoInfo;
 
@@ -327,7 +324,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 						return { error: vscode.l10n.t('Could not \'git commit\' pending changes. If GPG signing or git hooks are enabled, please first commit or stash your changes and try again. ({0})', e.message), state: 'error' };
 					}
 				}
-				await repository.push(remote, asyncBranch, true);
+				await repository.push(remote.remoteName, asyncBranch, true);
 				ref = asyncBranch;
 			} catch (e) {
 				return { error: vscode.l10n.t('Could not auto-push pending changes. Manually commit or stash your changes and try again. ({0})', e.message), state: 'error' };

src/lm/tools/copilotRemoteAgentTool.ts

@@ -25,7 +25,7 @@ export class CopilotRemoteAgentTool implements vscode.LanguageModelTool<CopilotR
 
 	async prepareInvocation(options: vscode.LanguageModelToolInvocationPrepareOptions<CopilotRemoteAgentToolParameters>): Promise<vscode.PreparedToolInvocation> {
 		const { title } = options.input;
-		
+
 		// Check if the coding agent is available (enabled and assignable)
 		const isAvailable = await this.manager.isAvailable();
 		if (!isAvailable) {
@@ -39,7 +39,7 @@ export class CopilotRemoteAgentTool implements vscode.LanguageModelTool<CopilotR
 			invocationMessage: vscode.l10n.t('Launching coding agent'),
 			confirmationMessages: {
 				message: targetRepo && autoPushEnabled
-					? vscode.l10n.t('The coding agent will continue work on "**{0}**" in a new branch on "**{1}/{2}**". Any uncommitted changes will be **automatically pushed to your default remote ({3})** and included.', title, targetRepo.owner, targetRepo.repo, targetRepo.remote)
+					? vscode.l10n.t('The coding agent will continue work on "**{0}**" in a new branch on "**{1}/{2}**". Any uncommitted changes will be **automatically pushed**.', title, targetRepo.owner, targetRepo.repo)
 					: vscode.l10n.t('The coding agent will start working on "**{0}**"', title),
 				title: vscode.l10n.t('Start coding agent?'),
 			}