Allow registering toolSets that reference disabled tools (microsoft#250167)

Needed for built-in toolsets that include some tools that are disabled by default

Author: roblourens

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

@@ -160,13 +160,13 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 		});
 	}
 
-	getTools(): Iterable<Readonly<IToolData>> {
+	getTools(includeDisabled?: boolean): Iterable<Readonly<IToolData>> {
 		const toolDatas = Iterable.map(this._tools.values(), i => i.data);
 		const extensionToolsEnabled = this._configurationService.getValue<boolean>(ChatConfiguration.ExtensionToolsEnabled);
 		return Iterable.filter(
 			toolDatas,
 			toolData => {
-				const satisfiesWhenClause = !toolData.when || this._contextKeyService.contextMatchesRules(toolData.when);
+				const satisfiesWhenClause = includeDisabled || !toolData.when || this._contextKeyService.contextMatchesRules(toolData.when);
 				const satisfiesExternalToolCheck = toolData.source.type !== 'extension' || !!extensionToolsEnabled;
 				return satisfiesWhenClause && satisfiesExternalToolCheck;
 			});
@@ -185,10 +185,10 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 		}
 	}
 
-	getToolByName(name: string): IToolData | undefined {
-		for (const toolData of this.getTools()) {
-			if (toolData.toolReferenceName === name) {
-				return toolData;
+	getToolByName(name: string, includeDisabled?: boolean): IToolData | undefined {
+		for (const tool of this.getTools(!!includeDisabled)) {
+			if (tool.toolReferenceName === name) {
+				return tool;
 			}
 		}
 		return undefined;

src/vs/workbench/contrib/chat/common/languageModelToolsService.ts

@@ -250,7 +250,7 @@ export interface ILanguageModelToolsService {
 	registerToolImplementation(id: string, tool: IToolImpl): IDisposable;
 	getTools(): Iterable<Readonly<IToolData>>;
 	getTool(id: string): IToolData | undefined;
-	getToolByName(name: string): IToolData | undefined;
+	getToolByName(name: string, includeDisabled?: boolean): IToolData | undefined;
 	invokeTool(invocation: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult>;
 	setToolAutoConfirmation(toolId: string, scope: 'workspace' | 'profile' | 'memory', autoConfirm?: boolean): void;
 	resetToolAutoConfirmation(): void;

src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts

@@ -316,7 +316,7 @@ export class LanguageModelToolsExtensionPointHandler implements IWorkbenchContri
 					const toolSets: ToolSet[] = [];
 
 					for (const toolName of toolSet.tools) {
-						const toolObj = languageModelToolsService.getToolByName(toolName);
+						const toolObj = languageModelToolsService.getToolByName(toolName, true);
 						if (toolObj) {
 							tools.push(toolObj);
 							continue;

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

@@ -102,6 +102,44 @@ suite('LanguageModelToolsService', () => {
 		assert.strictEqual(tools[1].id, 'testTool3');
 	});
 
+	test('getToolByName', () => {
+		contextKeyService.createKey('testKey', true);
+		const toolData1: IToolData = {
+			id: 'testTool1',
+			toolReferenceName: 'testTool1',
+			modelDescription: 'Test Tool 1',
+			when: ContextKeyEqualsExpr.create('testKey', false),
+			displayName: 'Test Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		const toolData2: IToolData = {
+			id: 'testTool2',
+			toolReferenceName: 'testTool2',
+			modelDescription: 'Test Tool 2',
+			when: ContextKeyEqualsExpr.create('testKey', true),
+			displayName: 'Test Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		const toolData3: IToolData = {
+			id: 'testTool3',
+			toolReferenceName: 'testTool3',
+			modelDescription: 'Test Tool 3',
+			displayName: 'Test Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		store.add(service.registerToolData(toolData1));
+		store.add(service.registerToolData(toolData2));
+		store.add(service.registerToolData(toolData3));
+
+		assert.strictEqual(service.getToolByName('testTool1'), undefined);
+		assert.strictEqual(service.getToolByName('testTool1', true)?.id, 'testTool1');
+		assert.strictEqual(service.getToolByName('testTool2')?.id, 'testTool2');
+		assert.strictEqual(service.getToolByName('testTool3')?.id, 'testTool3');
+	});
+
 	test('invokeTool', async () => {
 		const toolData: IToolData = {
 			id: 'testTool',

src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService.ts

@@ -44,7 +44,7 @@ export class MockLanguageModelToolsService implements ILanguageModelToolsService
 		return undefined;
 	}
 
-	getToolByName(name: string): IToolData | undefined {
+	getToolByName(name: string, includeDisabled?: boolean): IToolData | undefined {
 		return undefined;
 	}