Pick correct tools for more cases (microsoft#250210)

And some cleanup
Fix microsoft/vscode-copilot#17806

Author: roblourens

src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts

@@ -260,16 +260,9 @@ export function registerChatTitleActions() {
 			const request = chatModel?.getRequests().find(candidate => candidate.id === item.requestId);
 			const languageModelId = widget?.input.currentLanguageModel;
 
-			let userSelectedTools: Record<string, boolean> | undefined;
-			if (widget?.input.currentMode === ChatMode.Agent) {
-				userSelectedTools = {};
-				for (const [tool, enablement] of widget.input.selectedToolsModel.asEnablementMap()) {
-					userSelectedTools[tool.id] = enablement;
-				}
-			}
 			chatService.resendRequest(request!, {
 				userSelectedModelId: languageModelId,
-				userSelectedTools,
+				userSelectedTools: widget?.getUserSelectedTools(),
 				attempt: (request?.attempt ?? -1) + 1,
 				mode: widget?.input.currentMode,
 			});

src/vs/workbench/contrib/chat/browser/chat.ts

@@ -205,6 +205,7 @@ export interface IChatWidget {
 	focusLastMessage(): void;
 	focusInput(): void;
 	hasInputFocus(): boolean;
+	getUserSelectedTools(): Record<string, boolean> | undefined;
 	getCodeBlockInfoForEditor(uri: URI): IChatCodeBlockInfo | undefined;
 	getCodeBlockInfosForResponse(response: IChatResponseViewModel): IChatCodeBlockInfo[];
 	getFileTreeInfosForResponse(response: IChatResponseViewModel): IChatFileTreeInfo[];

src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.ts

@@ -10,8 +10,6 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { IChatProgressRenderableResponseContent } from '../../common/chatModel.js';
 import { IChatConfirmation, IChatSendRequestOptions, IChatService } from '../../common/chatService.js';
 import { isResponseVM } from '../../common/chatViewModel.js';
-import { ChatMode } from '../../common/constants.js';
-import { ILanguageModelToolsService } from '../../common/languageModelToolsService.js';
 import { IChatWidgetService } from '../chat.js';
 import { ChatConfirmationWidget } from './chatConfirmationWidget.js';
 import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
@@ -28,7 +26,6 @@ export class ChatConfirmationContentPart extends Disposable implements IChatCont
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IChatService private readonly chatService: IChatService,
 		@IChatWidgetService chatWidgetService: IChatWidgetService,
-		@ILanguageModelToolsService private readonly toolsService: ILanguageModelToolsService,
 	) {
 		super();
 
@@ -59,14 +56,7 @@ export class ChatConfirmationContentPart extends Disposable implements IChatCont
 				const widget = chatWidgetService.getWidgetBySessionId(element.sessionId);
 				options.userSelectedModelId = widget?.input.currentLanguageModel;
 				options.mode = widget?.input.currentMode;
-				if (widget?.input.currentMode2.customTools) {
-					options.userSelectedTools = this.toolsService.toEnablementMap(widget.input.currentMode2.customTools);
-				} else if (widget?.input.currentMode === ChatMode.Agent) {
-					options.userSelectedTools = {};
-					for (const [tool, enablement] of widget.input.selectedToolsModel.asEnablementMap()) {
-						options.userSelectedTools[tool.id] = enablement;
-					}
-				}
+				options.userSelectedTools = widget?.getUserSelectedTools();
 
 				if (await this.chatService.sendRequest(element.sessionId, prompt, options)) {
 					confirmation.isUsed = true;

src/vs/workbench/contrib/chat/browser/chatContentParts/chatErrorConfirmationPart.ts

@@ -61,6 +61,7 @@ export class ChatErrorConfirmationContentPart extends Disposable implements ICha
 				options.confirmation = buttonData.label;
 				const widget = chatWidgetService.getWidgetBySessionId(element.sessionId);
 				options.userSelectedModelId = widget?.input.currentLanguageModel;
+				options.userSelectedTools = widget?.getUserSelectedTools();
 				options.mode = widget?.input.currentMode;
 				if (await chatService.sendRequest(element.sessionId, prompt, options)) {
 					this._onDidChangeHeight.fire();

src/vs/workbench/contrib/chat/browser/chatSetup.ts

@@ -324,7 +324,11 @@ class SetupAgent extends Disposable implements IChatAgentImplementation {
 			}
 		}
 
-		await chatService.resendRequest(requestModel, { mode, userSelectedModelId: languageModel });
+		await chatService.resendRequest(requestModel, {
+			mode,
+			userSelectedModelId: languageModel,
+			userSelectedTools: widget?.getUserSelectedTools()
+		});
 	}
 
 	private whenLanguageModelReady(languageModelsService: ILanguageModelsService): Promise<unknown> | void {

src/vs/workbench/contrib/chat/browser/chatWidget.ts

@@ -1324,16 +1324,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 			this.input.validateCurrentMode();
 
-			let userSelectedTools: Record<string, boolean> | undefined;
-			if (this.input.currentMode2.customTools) {
-				userSelectedTools = this.toolsService.toEnablementMap(this.input.currentMode2.customTools);
-			} else if (this.input.currentMode === ChatMode.Agent) {
-				userSelectedTools = {};
-				for (const [tool, enablement] of this.inputPart.selectedToolsModel.asEnablementMap()) {
-					userSelectedTools[tool.id] = enablement;
-				}
-			}
-
 			const result = await this.chatService.sendRequest(this.viewModel.sessionId, requestInputs.input, {
 				mode: this.inputPart.currentMode,
 				userSelectedModelId: this.inputPart.currentLanguageModel,
@@ -1342,7 +1332,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				parserContext: { selectedAgent: this._lastSelectedAgent, mode: this.inputPart.currentMode },
 				attachedContext: requestInputs.attachedContext,
 				noCommandDetection: options?.noCommandDetection,
-				userSelectedTools,
+				userSelectedTools: this.getUserSelectedTools(),
 			});
 
 			if (result) {
@@ -1367,6 +1357,20 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		return undefined;
 	}
 
+	getUserSelectedTools(): Record<string, boolean> | undefined {
+		if (this.input.currentMode2.customTools) {
+			return this.toolsService.toEnablementMap(this.input.currentMode2.customTools);
+		} else if (this.input.currentMode === ChatMode.Agent) {
+			const userSelectedTools: Record<string, boolean> = {};
+			for (const [tool, enablement] of this.inputPart.selectedToolsModel.asEnablementMap()) {
+				userSelectedTools[tool.id] = enablement;
+			}
+			return userSelectedTools;
+		}
+
+		return undefined;
+	}
+
 	getCodeBlockInfosForResponse(response: IChatResponseViewModel): IChatCodeBlockInfo[] {
 		return this.renderer.getCodeBlockInfosForResponse(response);
 	}