From b42442a4d0f0d67b84ae9d276a09283167ae2b48 Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Wed, 18 Mar 2026 16:16:33 +0100 Subject: [PATCH] fix: update ChatToolInvocation to use chatStreamToolCallId if available, to align tool ids in core and the extension. --- .../contrib/chat/browser/tools/languageModelToolsService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.ts b/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.ts index 3b85fb792dd..da8919f2528 100644 --- a/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.ts +++ b/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.ts @@ -583,7 +583,7 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo toolInvocation.transitionFromStreaming(preparedInvocation, dto.parameters, autoConfirmed); } else { // Create a new tool invocation (no streaming phase) - toolInvocation = new ChatToolInvocation(preparedInvocation, tool.data, dto.callId, dto.subAgentInvocationId, dto.parameters); + toolInvocation = new ChatToolInvocation(preparedInvocation, tool.data, dto.chatStreamToolCallId ?? dto.callId, dto.subAgentInvocationId, dto.parameters); if (autoConfirmed) { IChatToolInvocation.confirmWith(toolInvocation, autoConfirmed); }