fix cloud agent branch detection (#1786)

* fix cloud agent branch detection

* Update src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/platform/github/common/githubAPI.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: joshspicer

src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts

@@ -9,7 +9,7 @@ import { Uri } from 'vscode';
 import { IGitExtensionService } from '../../../platform/git/common/gitExtensionService';
 import { IGitService } from '../../../platform/git/common/gitService';
 import { PullRequestSearchItem, SessionInfo } from '../../../platform/github/common/githubAPI';
-import { IOctoKitService, JobInfo, RemoteAgentJobPayload } from '../../../platform/github/common/githubService';
+import { IOctoKitService, JobInfo, RemoteAgentJobPayload, RemoteAgentJobResponse } from '../../../platform/github/common/githubService';
 import { ILogService } from '../../../platform/log/common/logService';
 import { ITelemetryService } from '../../../platform/telemetry/common/telemetry';
 import { Disposable, toDisposable } from '../../../util/vs/base/common/lifecycle';
@@ -1001,6 +1001,11 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
 		}
 	}
 
+	// https://github.com/github/sweagentd/blob/main/docs/adr/0001-create-job-api.md
+	private validateRemoteAgentJobResponse(response: unknown): response is RemoteAgentJobResponse {
+		return typeof response === 'object' && response !== null && 'job_id' in response && 'session_id' in response;
+	}
+
 	private async waitForJobWithPullRequest(
 		owner: string,
 		repo: string,
@@ -1056,16 +1061,19 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
 		if (!base_ref) {
 			return { error: vscode.l10n.t('Unable to determine the current branch.'), state: 'error' };
 		}
-		let head_ref: string | undefined; // This is the ref cloud agent starts work from (omitted unless we push local changes)
+		let head_ref: string | undefined; // TODO: UNUSED! This is the ref cloud agent starts work from (omitted unless we push local changes)
 
+		// TODO: Make this automatic instead of a fatal error.
 		const remoteName =
 			repo?.state.HEAD?.upstream?.remote ??
 			currentRepository?.upstreamRemote ??
 			repo?.state.remotes?.[0]?.name;
 
 		if (repo && remoteName && base_ref) {
 			try {
-				const remoteBranches = await repo.getBranches({ remote: true });
+				const remoteBranches =
+					(await repo.getBranches({ remote: true }))
+						.filter(b => b.remote); // Has an associated remote
 				const expectedRemoteBranch = `${remoteName}/${base_ref}`;
 				const alternateNames = new Set<string>([
 					expectedRemoteBranch,
@@ -1079,7 +1087,10 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
 					if (branch.remote && branch.remote !== remoteName) {
 						return false;
 					}
-					const candidateName = branch.remote ? `${branch.remote}/${branch.name}` : branch.name;
+					const candidateName =
+						(branch.remote && branch.name.startsWith(branch.remote + '/'))
+							? branch.name
+							: `${branch.remote}/${branch.name}`;
 					return alternateNames.has(candidateName);
 				});
 
@@ -1138,7 +1149,10 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
 			chatStream?.progress(vscode.l10n.t('Delegating to cloud agent'));
 			this.logService.trace(`Invoking cloud agent job with payload: ${JSON.stringify(payload)}`);
 			const response = await this._octoKitService.postCopilotAgentJob(repoId.org, repoId.repo, JOBS_API_VERSION, payload);
-
+			if (!this.validateRemoteAgentJobResponse(response)) {
+				const statusCode = response?.status;
+				return { error: vscode.l10n.t(`Received invalid response ${statusCode ? statusCode + ' ' : ''}from cloud agent.`), innerError: `Response ${JSON.stringify(response)}`, state: 'error' };
+			}
 			// For v1 API, we need to fetch the job details to get the PR info
 			// Since the PR might not be created immediately, we need to poll for it
 			chatStream?.progress(vscode.l10n.t('Creating pull request'));

src/extension/chatSessions/vscode/copilotCodingAgentUtils.ts

@@ -11,6 +11,7 @@ import { UriHandlerPaths, UriHandlers } from './chatSessionsUriHandler';
 export const MAX_PROBLEM_STATEMENT_LENGTH = 30_000 - 50; // 50 character buffer
 export const CONTINUE_TRUNCATION = vscode.l10n.t('Continue with truncation');
 export const body_suffix = vscode.l10n.t('Created from VS Code via the [GitHub Pull Request](https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github) extension.');
+// https://github.com/github/sweagentd/blob/main/docs/adr/0001-create-job-api.md
 export const JOBS_API_VERSION = 'v1';
 type RemoteAgentSuccessResult = { link: string; state: 'success'; number: number; webviewUri: vscode.Uri; llmDetails: string; sessionId: string };
 type RemoteAgentErrorResult = { error: string; innerError?: string; state: 'error' };

src/platform/github/common/githubAPI.ts

@@ -86,7 +86,8 @@ export async function makeGitHubAPIRequest(
 	body?: { [key: string]: any },
 	version?: string,
 	type: 'json' | 'text' = 'json',
-	userAgent?: string) {
+	userAgent?: string,
+	returnStatusCodeOnError: boolean = false) {
 	const headers: any = {
 		'Accept': 'application/vnd.github+json',
 	};
@@ -106,6 +107,10 @@ export async function makeGitHubAPIRequest(
 		body: body ? JSON.stringify(body) : undefined
 	});
 	if (!response.ok) {
+		logService.error(`[GitHubAPI] ${method} ${host}/${routeSlug} - Status: ${response?.status}`);
+		if (returnStatusCodeOnError) {
+			return { status: response.status };
+		}
 		return undefined;
 	}
 

src/platform/github/common/githubService.ts

@@ -102,6 +102,10 @@ export interface RemoteAgentJobResponse {
 	updated_at: string;
 }
 
+export interface ErrorResponseWithStatusCode {
+	status: number;
+}
+
 export interface RemoteAgentJobPayload {
 	problem_statement: string;
 	event_type: string;
@@ -199,7 +203,7 @@ export interface IOctoKitService {
 		name: string,
 		apiVersion: string,
 		payload: RemoteAgentJobPayload,
-	): Promise<RemoteAgentJobResponse>;
+	): Promise<RemoteAgentJobResponse | ErrorResponseWithStatusCode>;
 
 	/**
 	 * Gets a job by its job ID.
@@ -317,8 +321,8 @@ export class BaseOctoKitService {
 		return makeGitHubAPIRequest(this._fetcherService, this._logService, this._telemetryService, 'https://api.githubcopilot.com', `agents/sessions/${sessionId}`, 'GET', token, undefined, undefined, 'text');
 	}
 
-	protected async postCopilotAgentJobWithToken(owner: string, name: string, apiVersion: string, userAgent: string, payload: RemoteAgentJobPayload, token: string): Promise<RemoteAgentJobResponse> {
-		return makeGitHubAPIRequest(this._fetcherService, this._logService, this._telemetryService, 'https://api.githubcopilot.com', `agents/swe/${apiVersion}/jobs/${owner}/${name}`, 'POST', token, payload, undefined, undefined, userAgent);
+	protected async postCopilotAgentJobWithToken(owner: string, name: string, apiVersion: string, userAgent: string, payload: RemoteAgentJobPayload, token: string) {
+		return makeGitHubAPIRequest(this._fetcherService, this._logService, this._telemetryService, 'https://api.githubcopilot.com', `agents/swe/${apiVersion}/jobs/${owner}/${name}`, 'POST', token, payload, undefined, undefined, userAgent, true);
 	}
 
 	protected async getJobByJobIdWithToken(owner: string, repo: string, jobId: string, userAgent: string, token: string): Promise<JobInfo> {

src/platform/github/common/octoKitServiceImpl.ts

@@ -8,7 +8,7 @@ import { ILogService } from '../../log/common/logService';
 import { IFetcherService } from '../../networking/common/fetcherService';
 import { ITelemetryService } from '../../telemetry/common/telemetry';
 import { PullRequestComment, PullRequestSearchItem, SessionInfo } from './githubAPI';
-import { BaseOctoKitService, CustomAgentDetails, CustomAgentListItem, IOctoKitService, IOctoKitUser, JobInfo, PullRequestFile, RemoteAgentJobPayload, RemoteAgentJobResponse } from './githubService';
+import { BaseOctoKitService, CustomAgentDetails, CustomAgentListItem, ErrorResponseWithStatusCode, IOctoKitService, IOctoKitUser, JobInfo, PullRequestFile, RemoteAgentJobPayload, RemoteAgentJobResponse } from './githubService';
 
 export class OctoKitService extends BaseOctoKitService implements IOctoKitService {
 	declare readonly _serviceBrand: undefined;
@@ -95,7 +95,7 @@ export class OctoKitService extends BaseOctoKitService implements IOctoKitServic
 		return response;
 	}
 
-	async postCopilotAgentJob(owner: string, name: string, apiVersion: string, payload: RemoteAgentJobPayload): Promise<RemoteAgentJobResponse> {
+	async postCopilotAgentJob(owner: string, name: string, apiVersion: string, payload: RemoteAgentJobPayload): Promise<RemoteAgentJobResponse | ErrorResponseWithStatusCode> {
 		const authToken = (await this._authService.getAnyGitHubSession())?.accessToken;
 		if (!authToken) {
 			throw new Error('No authentication token available');