fix #7783 (main) (#7784) (#7785)

* move waitForQueuedToInProgress to inside invoke

* accept cancellationToken

Author: joshspicer

src/github/copilotRemoteAgent.ts

@@ -449,6 +449,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 		const result = await this.invokeRemoteAgent(
 			userPrompt,
 			summary,
+			undefined,
 			autoPushAndCommit,
 		);
 
@@ -513,7 +514,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, autoPushAndCommit = true): Promise<RemoteAgentResult> {
+	async invokeRemoteAgent(prompt: string, problemContext?: string, token?: vscode.CancellationToken, autoPushAndCommit = true): Promise<RemoteAgentResult> {
 		const capiClient = await this.copilotApi;
 		if (!capiClient) {
 			return { error: vscode.l10n.t('Failed to initialize Copilot API'), state: 'error' };
@@ -589,6 +590,8 @@ export class CopilotRemoteAgentManager extends Disposable {
 			this._onDidCreatePullRequest.fire(pull_request.number);
 			const webviewUri = await toOpenPullRequestWebviewUri({ owner, repo, pullRequestNumber: pull_request.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);
 			return {
 				state: 'success',
 				number: pull_request.number,
@@ -809,22 +812,21 @@ export class CopilotRemoteAgentManager extends Disposable {
 				this.extractFileReferences(request.references),
 				await this.extractHistory(history)
 			].join('\n\n').trim(),
+			token,
 			false,
 		);
 		if (result.state !== 'success') {
 			Logger.error(`Failed to provide new chat session item: ${result.error}`, CopilotRemoteAgentManager.ID);
 			throw new Error(`Failed to provide new chat session item: ${result.error}`);
 		}
 
-		const { number, sessionId } = result;
+		const { number } = result;
 
 		const pullRequest = await this.findPullRequestById(number, true);
 		if (!pullRequest) {
 			throw new Error(`Failed to find session for pull request: ${number}`);
 		}
 
-		await this.waitForQueuedToInProgress(sessionId, token);
-
 		const timeline = await pullRequest.getCopilotTimelineEvents(pullRequest);
 		const status = copilotEventToSessionStatus(mostRecentCopilotEvent(timeline));
 		const tooltip = await issueMarkdown(pullRequest, this.context, this.repositoriesManager);
@@ -972,6 +974,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 								const result = await this.invokeRemoteAgent(
 									prompt,
 									summary || prompt,
+									undefined,
 									false,
 								);
 								this.ephemeralChatSessions.delete(id); // TODO: Better state management
@@ -1462,7 +1465,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 
 	private async waitForQueuedToInProgress(
 		sessionId: string,
-		token: vscode.CancellationToken
+		token?: vscode.CancellationToken
 	): Promise<SessionInfo | undefined> {
 		const capi = await this.copilotApi;
 		if (!capi) {
@@ -1479,7 +1482,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 		}
 
 		Logger.appendLine(`Session ${sessionInfo.id} is queued, waiting to start...`, CopilotRemoteAgentManager.ID);
-		while (Date.now() - startTime < maxWaitTime && !token.isCancellationRequested) {
+		while (Date.now() - startTime < maxWaitTime && (!token || !token.isCancellationRequested)) {
 			const sessionInfo = await capi.getSessionInfo(sessionId);
 			if (sessionInfo?.state === 'in_progress') {
 				Logger.appendLine(`Session ${sessionInfo.id} now in progress.`, CopilotRemoteAgentManager.ID);

src/test/mocks/mockExtensionContext.ts

@@ -27,6 +27,7 @@ export class MockExtensionContext implements ExtensionContext {
 		delete(key: string): Thenable<void> {
 			throw new Error('Method not implemented.');
 		}
+
 		onDidChange!: Event<SecretStorageChangeEvent>;
 	})();
 	subscriptions: { dispose(): any }[] = [];