From 2521ae8168e473b063181ea453bb4f53fda41611 Mon Sep 17 00:00:00 2001 From: Josh Spicer <23246594+joshspicer@users.noreply.github.com> Date: Fri, 24 Oct 2025 14:34:56 -0700 Subject: [PATCH 1/3] activeCallback uses waitForQueuedToInProgres (related https://github.com/microsoft/vscode-pull-request-github/commit/503e2b3a00c0ee7649867bc2343702e5f77ee1e7) --- .../copilotCloudSessionContentBuilder.ts | 2 +- .../vscode-node/copilotCloudSessionsProvider.ts | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/extension/chatSessions/vscode-node/copilotCloudSessionContentBuilder.ts b/src/extension/chatSessions/vscode-node/copilotCloudSessionContentBuilder.ts index a5553996fd..30df7b683c 100644 --- a/src/extension/chatSessions/vscode-node/copilotCloudSessionContentBuilder.ts +++ b/src/extension/chatSessions/vscode-node/copilotCloudSessionContentBuilder.ts @@ -159,7 +159,7 @@ export class ChatSessionContentBuilder { private async createResponseTurn(pullRequest: PullRequestSearchItem, logs: string, session: SessionInfo): Promise { if (logs.trim().length > 0) { return await this.parseSessionLogsIntoResponseTurn(pullRequest, logs, session); - } else if (session.state === 'in_progress') { + } else if (session.state === 'in_progress' || session.state === 'queued') { // For in-progress sessions without logs, create a placeholder response const placeholderParts = [new ChatResponseProgressPart('Session is initializing...')]; const responseResult: ChatResult = {}; diff --git a/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts b/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts index ba034898f1..7dac16c213 100644 --- a/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts +++ b/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts @@ -334,19 +334,20 @@ export class CopilotChatSessionsProvider extends Disposable implements vscode.Ch pr: PullRequestSearchItem ): ((stream: vscode.ChatResponseStream, token: vscode.CancellationToken) => Thenable) | undefined { // Only the latest in-progress session gets activeResponseCallback - const inProgressSession = sessions + const pendingSession = sessions .slice() .sort((a, b) => new Date(b.created_at).getTime() - new Date(a.created_at).getTime()) - .find(session => session.state === 'in_progress'); + .find(session => session.state === 'in_progress' || session.state === 'queued'); - if (inProgressSession) { - return this.createActiveResponseCallback(pr, inProgressSession.id); + if (pendingSession) { + return this.createActiveResponseCallback(pr, pendingSession.id); } return undefined; } private createActiveResponseCallback(pr: PullRequestSearchItem, sessionId: string): (stream: vscode.ChatResponseStream, token: vscode.CancellationToken) => Thenable { return async (stream: vscode.ChatResponseStream, token: vscode.CancellationToken) => { + await this.waitForQueuedToInProgress(sessionId, token); return this.streamSessionLogs(stream, pr, sessionId, token); }; } @@ -845,6 +846,10 @@ export class CopilotChatSessionsProvider extends Disposable implements vscode.Ch } while (waitForQueuedCount <= waitForQueuedMaxRetries && (!token || !token.isCancellationRequested)); if (!sessionInfo || sessionInfo.state !== 'queued') { + if (sessionInfo.state === 'in_progress') { + this.logService.trace('Session already in progress'); + return sessionInfo; + } // Failure this.logService.trace('Failed to find queued session'); return; @@ -863,6 +868,7 @@ export class CopilotChatSessionsProvider extends Disposable implements vscode.Ch } await new Promise(resolve => setTimeout(resolve, pollInterval)); } + this.logService.error(`Timed out waiting for session ${sessionId} to transition from queued to in_progress.`); } private async waitForNewSession( From 8222232e20dee981d145f3a36fd25413956c7105 Mon Sep 17 00:00:00 2001 From: Josh Spicer <23246594+joshspicer@users.noreply.github.com> Date: Fri, 24 Oct 2025 14:48:29 -0700 Subject: [PATCH 2/3] do not await attaching to in progress session during creation --- .../chatSessions/vscode-node/copilotCloudSessionsProvider.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts b/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts index 7dac16c213..5e9d2817ad 100644 --- a/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts +++ b/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts @@ -1127,9 +1127,6 @@ export class CopilotChatSessionsProvider extends Disposable implements vscode.Ch const webviewUri = await toOpenPullRequestWebviewUri({ owner: pullRequest.repository.owner.login, repo: pullRequest.repository.name, 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.`; - - chatStream?.progress(vscode.l10n.t('Attaching to session')); - await this.waitForQueuedToInProgress(response.session_id, token); return { state: 'success', number, From e1672fb5f01c1cbf371088b5b3a1de36c17d3a27 Mon Sep 17 00:00:00 2001 From: Josh Spicer <23246594+joshspicer@users.noreply.github.com> Date: Fri, 24 Oct 2025 14:55:54 -0700 Subject: [PATCH 3/3] bring back null check --- .../chatSessions/vscode-node/copilotCloudSessionsProvider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts b/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts index 5e9d2817ad..f5b63e3a0c 100644 --- a/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts +++ b/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts @@ -846,7 +846,7 @@ export class CopilotChatSessionsProvider extends Disposable implements vscode.Ch } while (waitForQueuedCount <= waitForQueuedMaxRetries && (!token || !token.isCancellationRequested)); if (!sessionInfo || sessionInfo.state !== 'queued') { - if (sessionInfo.state === 'in_progress') { + if (sessionInfo?.state === 'in_progress') { this.logService.trace('Session already in progress'); return sessionInfo; }