Merge branch 'main' into pawang/improveGitBranchNaming

Author: pwang347

src/github/copilotApi.ts

@@ -21,6 +21,9 @@ const LEARN_MORE_URL = 'https://aka.ms/coding-agent-docs';
 const PREMIUM_REQUESTS_URL = 'https://docs.github.com/en/copilot/concepts/copilot-billing/understanding-and-managing-requests-in-copilot#what-are-premium-requests';
 // https://github.com/github/sweagentd/blob/59e7d9210ca3ebba029918387e525eea73cb1f4a/internal/problemstatement/problemstatement.go#L36-L53
 export const MAX_PROBLEM_STATEMENT_LENGTH = 30_000 - 50; // 50 character buffer
+// https://github.com/github/sweagentd/blob/0ad8f81a9c64754cb8a83d10777de4638bba1a6e/docs/adr/0001-create-job-api.md#post-jobsownerrepo---create-job-task
+const JOBS_API_VERSION = 'v1';
+
 export interface RemoteAgentJobPayload {
 	problem_statement: string;
 	event_type: string;
@@ -35,11 +38,14 @@ export interface RemoteAgentJobPayload {
 }
 
 export interface RemoteAgentJobResponse {
-	pull_request: {
-		html_url: string;
-		number: number;
-	}
+	job_id: string;
 	session_id: string;
+	actor: {
+		id: number;
+		login: string;
+	};
+	created_at: string;
+	updated_at: string;
 }
 
 export interface ChatSessionWithPR extends vscode.ChatSessionItem {
@@ -73,15 +79,14 @@ export class CopilotApi {
 		return `vscode-pull-request-github/${extensionVersion}`;
 	}
 
-
 	async postRemoteAgentJob(
 		owner: string,
 		name: string,
 		payload: RemoteAgentJobPayload,
 		isTruncated: boolean,
 	): Promise<RemoteAgentJobResponse> {
 		const repoSlug = `${owner}/${name}`;
-		const apiUrl = `/agents/swe/v0/jobs/${repoSlug}`;
+		const apiUrl = `/agents/swe/${JOBS_API_VERSION}/jobs/${repoSlug}`;
 		let status: number | undefined;
 
 		const problemStatementLength = payload.problem_statement.length.toString();
@@ -169,18 +174,27 @@ export class CopilotApi {
 		if (!data || typeof data !== 'object') {
 			throw new Error('Invalid response from coding agent');
 		}
-		if (!data.pull_request || typeof data.pull_request !== 'object') {
-			throw new Error('Invalid pull_request in response');
-		}
-		if (typeof data.pull_request.html_url !== 'string') {
-			throw new Error('Invalid pull_request.html_url in response');
-		}
-		if (typeof data.pull_request.number !== 'number') {
-			throw new Error('Invalid pull_request.number in response');
+		if (typeof data.job_id !== 'string') {
+			throw new Error('Invalid job_id in response');
 		}
 		if (typeof data.session_id !== 'string') {
 			throw new Error('Invalid session_id in response');
 		}
+		if (!data.actor || typeof data.actor !== 'object') {
+			throw new Error('Invalid actor in response');
+		}
+		if (typeof data.actor.id !== 'number') {
+			throw new Error('Invalid actor.id in response');
+		}
+		if (typeof data.actor.login !== 'string') {
+			throw new Error('Invalid actor.login in response');
+		}
+		if (typeof data.created_at !== 'string') {
+			throw new Error('Invalid created_at in response');
+		}
+		if (typeof data.updated_at !== 'string') {
+			throw new Error('Invalid updated_at in response');
+		}
 	}
 
 	public async getLogsFromZipUrl(logsUrl: string): Promise<string[]> {
@@ -270,9 +284,32 @@ export class CopilotApi {
 		return await logsResponse.text();
 	}
 
+	public async getJobByJobId(owner: string, repo: string, jobId: string): Promise<JobInfo | undefined> {
+		try {
+			const response = await this.makeApiCall(`/agents/swe/v1/jobs/${owner}/${repo}/${jobId}`, {
+				method: 'GET',
+				headers: {
+					'Authorization': `Bearer ${this.token}`,
+					'Content-Type': 'application/json',
+					'Accept': 'application/json',
+					'User-Agent': this.userAgent,
+				}
+			});
+			if (!response.ok) {
+				Logger.warn(`Failed to fetch job info for job ${jobId}: ${response.statusText}`, CopilotApi.ID);
+				return;
+			}
+			const data = await response.json() as JobInfo;
+			return data;
+		} catch (error) {
+			Logger.warn(`Error fetching job info for job ${jobId}: ${error}`, CopilotApi.ID);
+			return;
+		}
+	}
+
 	public async getJobBySessionId(owner: string, repo: string, sessionId: string): Promise<JobInfo | undefined> {
 		try {
-			const response = await this.makeApiCall(`/agents/swe/v0/jobs/${owner}/${repo}/session/${sessionId}`, {
+			const response = await this.makeApiCall(`/agents/swe/${JOBS_API_VERSION}/jobs/${owner}/${repo}/session/${sessionId}`, {
 				method: 'GET',
 				headers: {
 					'Authorization': `Bearer ${this.token}`,

src/github/copilotRemoteAgent.ts

@@ -19,7 +19,7 @@ import { CODING_AGENT, CODING_AGENT_AUTO_COMMIT_AND_PUSH } from '../common/setti
 import { ITelemetry } from '../common/telemetry';
 import { toOpenPullRequestWebviewUri } from '../common/uri';
 import { copilotPRStatusToSessionStatus, IAPISessionLogs, ICopilotRemoteAgentCommandArgs, ICopilotRemoteAgentCommandResponse, OctokitCommon, RemoteAgentResult, RepoInfo } from './common';
-import { ChatSessionWithPR, CopilotApi, getCopilotApi, RemoteAgentJobPayload, SessionInfo, SessionSetupStep } from './copilotApi';
+import { ChatSessionWithPR, CopilotApi, getCopilotApi, JobInfo, RemoteAgentJobPayload, SessionInfo, SessionSetupStep } from './copilotApi';
 import { CodingAgentPRAndStatus, CopilotPRWatcher, CopilotStateModel } from './copilotPrWatcher';
 import { ChatSessionContentBuilder } from './copilotRemoteAgent/chatSessionContentBuilder';
 import { GitOperationsManager } from './copilotRemoteAgent/gitOperationsManager';
@@ -94,7 +94,6 @@ export class CopilotRemoteAgentManager extends Disposable {
 				historySummaryLength: historySummary?.length.toString() || '0',
 				source,
 			});
-			stream.progress(vscode.l10n.t('Delegating to coding agent'));
 			const result = await this.invokeRemoteAgent(
 				promptSummary || prompt,
 				[
@@ -103,6 +102,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 				].join('\n\n').trim(),
 				token,
 				false,
+				stream,
 			);
 			if (result.state !== 'success') {
 				Logger.error(`Failed to provide new chat session item: ${result.error}`, CopilotRemoteAgentManager.ID);
@@ -194,7 +194,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 				stream.markdown(result);
 				stream.markdown('\n\n');
 
-				stream.progress(vscode.l10n.t('Waiting for coding agent to respond'));
+				stream.progress(vscode.l10n.t('Attaching to session'));
 
 				// Wait for new session and stream its progress
 				const newSession = await this.waitForNewSession(pullRequest, stream, token, true);
@@ -705,7 +705,7 @@ 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): Promise<RemoteAgentResult> {
+	async invokeRemoteAgent(prompt: string, problemContext?: string, token?: vscode.CancellationToken, autoPushAndCommit = true, chatStream?: vscode.ChatResponseStream): Promise<RemoteAgentResult> {
 		const capiClient = await this.copilotApi;
 		if (!capiClient) {
 			return { error: vscode.l10n.t('Failed to initialize Copilot API'), state: 'error' };
@@ -731,6 +731,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 				return { error: vscode.l10n.t('Uncommitted changes detected. Please commit or stash your changes before starting the remote agent. Enable \'{0}\' to push your changes automatically.', CODING_AGENT_AUTO_COMMIT_AND_PUSH), state: 'error' };
 			}
 			try {
+				chatStream?.progress(vscode.l10n.t('Waiting for local changes'));
 				head_ref = await this.gitOperationsManager.commitAndPushChanges(repoInfo);
 			} catch (error) {
 				return { error: error.message, state: 'error' };
@@ -755,6 +756,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 		const { problemStatement, isTruncated } = truncatePrompt(prompt, problemContext);
 
 		if (isTruncated) {
+			chatStream?.progress(vscode.l10n.t('Truncating context'));
 			const truncationResult = await vscode.window.showWarningMessage(
 				vscode.l10n.t('Prompt size exceeded'), { modal: true, detail: vscode.l10n.t('Your prompt will be truncated to fit within coding agent\'s context window. This may affect the quality of the response.') }, CONTINUE_TRUNCATION);
 			const userCancelled = token?.isCancellationRequested || !truncationResult || truncationResult !== CONTINUE_TRUNCATION;
@@ -784,19 +786,36 @@ export class CopilotRemoteAgentManager extends Disposable {
 		};
 
 		try {
-			const { pull_request, session_id } = await capiClient.postRemoteAgentJob(owner, repo, payload, isTruncated);
-			this._onDidCreatePullRequest.fire(pull_request.number);
-			const webviewUri = await toOpenPullRequestWebviewUri({ owner, repo, pullRequestNumber: pull_request.number });
+			chatStream?.progress(vscode.l10n.t('Delegating to coding agent'));
+			const response = await capiClient.postRemoteAgentJob(owner, repo, payload, isTruncated);
+
+			// 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'));
+			const jobInfo = await this.waitForJobWithPullRequest(capiClient, owner, repo, response.job_id, token);
+			if (!jobInfo || !jobInfo.pull_request) {
+				return { error: vscode.l10n.t('Failed to retrieve pull request information from job'), state: 'error' };
+			}
+
+			const { number } = jobInfo.pull_request;
+			this._onDidCreatePullRequest.fire(number);
+
+			// Find the actual PR to get the HTML URL
+			const pullRequest = await this.findPullRequestById(number, true);
+			const htmlUrl = pullRequest?.html_url || `https://github.com/${owner}/${repo}/pull/${number}`;
+
+			const webviewUri = await toOpenPullRequestWebviewUri({ owner, repo, pullRequestNumber: number });
 			const prLlmString = `The remote agent has begun work and has created a pull request. Details about the pull request are being shown to the user. If the user wants to track progress or iterate on the agent's work, they should use the pull request.`;
 
-			await this.waitForQueuedToInProgress(session_id, token);
+			chatStream?.progress(vscode.l10n.t('Attaching to session'));
+			await this.waitForQueuedToInProgress(response.session_id, token);
 			return {
 				state: 'success',
-				number: pull_request.number,
-				link: pull_request.html_url,
+				number,
+				link: htmlUrl,
 				webviewUri,
 				llmDetails: head_ref ? `Local pending changes have been pushed to branch '${head_ref}'. ${prLlmString}` : prLlmString,
-				sessionId: session_id
+				sessionId: response.session_id
 			};
 		} catch (error) {
 			return { error: error.message, state: 'error' };
@@ -1585,6 +1604,32 @@ export class CopilotRemoteAgentManager extends Disposable {
 		this._stateModel.clear();
 	}
 
+	private async waitForJobWithPullRequest(
+		capiClient: CopilotApi,
+		owner: string,
+		repo: string,
+		jobId: string,
+		token?: vscode.CancellationToken
+	): Promise<JobInfo | undefined> {
+		const maxWaitTime = 30 * 1000; // 30 seconds
+		const pollInterval = 2000; // 2 seconds
+		const startTime = Date.now();
+
+		Logger.appendLine(`Waiting for job ${jobId} to have pull request information...`, CopilotRemoteAgentManager.ID);
+
+		while (Date.now() - startTime < maxWaitTime && (!token || !token.isCancellationRequested)) {
+			const jobInfo = await capiClient.getJobByJobId(owner, repo, jobId);
+			if (jobInfo && jobInfo.pull_request && jobInfo.pull_request.number) {
+				Logger.appendLine(`Job ${jobId} now has pull request #${jobInfo.pull_request.number}`, CopilotRemoteAgentManager.ID);
+				return jobInfo;
+			}
+			await new Promise(resolve => setTimeout(resolve, pollInterval));
+		}
+
+		Logger.warn(`Timed out waiting for job ${jobId} to have pull request information`, CopilotRemoteAgentManager.ID);
+		return undefined;
+	}
+
 	public async cancelMostRecentChatSession(pullRequest: PullRequestModel): Promise<void> {
 		const capi = await this.copilotApi;
 		if (!capi) {

src/github/pullRequestOverview.ts

@@ -37,7 +37,7 @@ import { isCopilotOnMyBehalf, PullRequestModel } from './pullRequestModel';
 import { PullRequestView } from './pullRequestOverviewCommon';
 import { pickEmail, reviewersQuickPick } from './quickPicks';
 import { parseReviewers } from './utils';
-import { CancelCodingAgentReply, MergeArguments, MergeResult, PullRequest, ReviewType, SubmitReviewReply } from './views';
+import { CancelCodingAgentReply, DeleteReviewResult, MergeArguments, MergeResult, PullRequest, ReviewType, SubmitReviewReply } from './views';
 
 export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestModel> {
 	public static override ID: string = 'PullRequestOverviewPanel';
@@ -402,6 +402,8 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				return this.cancelCodingAgent(message);
 			case 'pr.openCommitChanges':
 				return this.openCommitChanges(message);
+			case 'pr.delete-review':
+				return this.deleteReview(message);
 		}
 	}
 
@@ -862,6 +864,17 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 		return this._item.deleteReviewComment(comment.id.toString());
 	}
 
+	private async deleteReview(message: IRequestMessage<void>) {
+		try {
+			const result: DeleteReviewResult = await this._item.deleteReview();
+			await this._replyMessage(message, result);
+		} catch (e) {
+			Logger.error(formatError(e), PullRequestOverviewPanel.ID);
+			vscode.window.showErrorMessage(vscode.l10n.t('Deleting review failed. {0}', formatError(e)));
+			this._throwError(message, `${formatError(e)}`);
+		}
+	}
+
 	override dispose() {
 		super.dispose();
 		disposeAll(this._prListeners);

src/github/views.ts

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { IComment } from '../common/comment';
 import { CommentEvent, ReviewEvent, SessionLinkInfo, TimelineEvent } from '../common/timelineEvent';
 import {
 	GithubItemStateEnum,
@@ -138,6 +139,11 @@ export interface MergeResult {
 	events?: TimelineEvent[];
 }
 
+export interface DeleteReviewResult {
+	deletedReviewId: number;
+	deletedReviewComments: IComment[];
+}
+
 export enum PreReviewState {
 	None = 0,
 	Available,

src/test/github/pullRequestGitHelper.test.ts

@@ -128,7 +128,7 @@ describe('PullRequestGitHelper', function () {
 			// Verify that the original local branch is preserved with its commit
 			const originalBranch = await repository.getBranch('my-branch');
 			assert.strictEqual(originalBranch.commit, 'local-commit-hash', 'Original branch should be preserved');
-			
+
 			// Verify that a unique branch was created and checked out
 			const uniqueBranch = await repository.getBranch('pr/me/100');
 			assert.strictEqual(uniqueBranch.commit, 'remote-commit-hash', 'Unique branch should have remote commit');

src/test/issues/stateManager.test.ts

@@ -11,12 +11,12 @@ import { USE_BRANCH_FOR_ISSUES, ISSUES_SETTINGS_NAMESPACE } from '../../common/s
 
 // Mock classes for testing
 class MockFolderRepositoryManager {
-	constructor(public repository: { rootUri: vscode.Uri }) {}
+	constructor(public repository: { rootUri: vscode.Uri }) { }
 }
 
 class MockSingleRepoState {
 	currentIssue?: MockCurrentIssue;
-	constructor(public folderManager: MockFolderRepositoryManager) {}
+	constructor(public folderManager: MockFolderRepositoryManager) { }
 }
 
 class MockCurrentIssue {

webviews/common/context.tsx

@@ -8,7 +8,7 @@ import { CloseResult, OpenCommitChangesArgs } from '../../common/views';
 import { IComment } from '../../src/common/comment';
 import { EventType, ReviewEvent, SessionLinkInfo, TimelineEvent } from '../../src/common/timelineEvent';
 import { IProjectItem, MergeMethod, ReadyForReview } from '../../src/github/interface';
-import { CancelCodingAgentReply, ChangeAssigneesReply, MergeArguments, MergeResult, ProjectItemsReply, PullRequest, SubmitReviewReply } from '../../src/github/views';
+import { CancelCodingAgentReply, ChangeAssigneesReply, DeleteReviewResult, MergeArguments, MergeResult, ProjectItemsReply, PullRequest, SubmitReviewReply } from '../../src/github/views';
 import { getState, setState, updateState } from './cache';
 import { getMessageHandler, MessageHandler } from './message';
 
@@ -158,6 +158,30 @@ export class PRContext {
 
 	public submit = (body: string) => this.submitReviewCommand('pr.submit', body);
 
+	public deleteReview = async () => {
+		try {
+			const result: DeleteReviewResult = await this.postMessage({ command: 'pr.delete-review' });
+
+			const state = this.pr;
+			const eventsWithoutPendingReview = state?.events.filter(event =>
+				!(event.event === EventType.Reviewed && event.id === result.deletedReviewId)
+			) ?? [];
+
+			if (state && (eventsWithoutPendingReview.length < state.events.length)) {
+				// Update the PR state to reflect the deleted review
+				state.busy = false;
+				state.pendingCommentText = '';
+				state.pendingCommentDrafts = {};
+				// Remove the deleted review from events
+				state.events = eventsWithoutPendingReview;
+				this.updatePR(state);
+			}
+			return result;
+		} catch (error) {
+			return this.updatePR({ busy: false });
+		}
+	};
+
 	public close = async (body?: string) => {
 		const { pr } = this;
 		if (!pr) {