Skip to content

agentHost: fix provider extraction conflicts #332818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roblourens merged 1 commit into from
Aug 26, 2026
+2 −2
Merged

agentHost: fix provider extraction conflicts #332818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/vs/platform/agentHost/node/agentService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/vs/platform/agentHost/test/node/agentService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down