From 72beaf85f5d88ae9825919686ceb24a9c1992e93 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 26 Aug 2026 14:11:38 -0700 Subject: [PATCH] agentHost: fix provider extraction conflicts (Written by Copilot) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- src/vs/platform/agentHost/node/agentService.ts | 2 +- src/vs/platform/agentHost/test/node/agentService.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/platform/agentHost/node/agentService.ts b/src/vs/platform/agentHost/node/agentService.ts index 1408cd840549d0..eefdf2a2cac0c9 100644 --- a/src/vs/platform/agentHost/node/agentService.ts +++ b/src/vs/platform/agentHost/node/agentService.ts @@ -4406,7 +4406,7 @@ export class AgentService extends Disposable implements IAgentService { const sessionArchived = ((sessionState?.status ?? 0) & SessionStatus.IsArchived) === SessionStatus.IsArchived; const turn = chatState?.turns.at(-1); const errorPart = getErrorResponsePart(turn); - const provider = this._findProviderForSession(sessionChannel); + const provider = this._providerService.getProviderForSession(sessionChannel); if (chatState?.activeTurn) { this._stateManager.rejectClientAction(channel, action, origin, 'Cannot resume while a turn is active.'); return; diff --git a/src/vs/platform/agentHost/test/node/agentService.test.ts b/src/vs/platform/agentHost/test/node/agentService.test.ts index 13a6169ed1ec61..10df6315329b8a 100644 --- a/src/vs/platform/agentHost/test/node/agentService.test.ts +++ b/src/vs/platform/agentHost/test/node/agentService.test.ts @@ -554,7 +554,7 @@ suite('AgentService (node dispatcher)', () => { suite('failed turn resume', () => { async function createErroredTurn(): Promise<{ session: URI; chat: string }> { - service.registerProvider(copilotAgent); + registerTestAgentProvider(service, copilotAgent); const session = await service.createSession({ provider: 'copilot' }); const chat = buildDefaultChatUri(session.toString()); const stateManager = getStateManager(service);