tool set tweaks (microsoft#249952)

* tweak tool set template
* tweak tool set tools enum configuration

Co-authored-by: João Moreno <[email protected]>

Author: jrieken

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

@@ -24,7 +24,7 @@ import { IExtensionService } from '../../../../services/extensions/common/extens
 import { ILifecycleService, LifecyclePhase } from '../../../../services/lifecycle/common/lifecycle.js';
 import { IUserDataProfileService } from '../../../../services/userDataProfile/common/userDataProfile.js';
 import { CHAT_CATEGORY } from '../actions/chatActions.js';
-import { ILanguageModelToolsService, IToolData, ToolSet } from '../../common/languageModelToolsService.js';
+import { ILanguageModelToolsService, IToolData, ToolDataSource, ToolSet } from '../../common/languageModelToolsService.js';
 import { IRawToolSetContribution } from '../../common/tools/languageModelToolsContribution.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { Codicon, getAllCodicons } from '../../../../../base/common/codicons.js';
@@ -46,7 +46,7 @@ const toolSetsSchema: IJSONSchema = {
 	allowTrailingCommas: true,
 	defaultSnippets: [{
 		label: localize('schema.default', "Empty tool set"),
-		body: { '${1:toolSetName}': { 'tools': ['${2:toolName}'], 'description': '${3:description}', 'icon': '${4:$(tools)}' } }
+		body: { '${1:toolSetName}': { 'tools': ['${2:someTool}', '${3:anotherTool}'], 'description': '${4:description}', 'icon': '${5:tools}' } }
 	}],
 	type: 'object',
 	description: localize('toolsetSchema.json', 'User tool sets configuration'),
@@ -150,19 +150,52 @@ export class UserToolSetsContributions extends Disposable implements IWorkbenchC
 			const tools = toolsObs.read(r);
 			const toolSets = this._languageModelToolsService.toolSets.read(r);
 
-			toolEnumValues.length = 0;
-			toolEnumDescriptions.length = 0;
 
+			type ToolDesc = {
+				name: string;
+				sourceLabel: string;
+				sourceOrdinal: number;
+				description: string;
+			};
+
+			const data: ToolDesc[] = [];
 			for (const tool of tools) {
-				if (tool.toolReferenceName && tool.canBeReferencedInPrompt) {
-					toolEnumValues.push(tool.toolReferenceName);
-					toolEnumDescriptions.push(localize('tooldesc', "{0} - {1}", tool.source.label, tool.userDescription ?? tool.modelDescription));
+				if (tool.canBeReferencedInPrompt) {
+					data.push({
+						name: tool.toolReferenceName ?? tool.displayName,
+						sourceLabel: ToolDataSource.classify(tool.source).label,
+						sourceOrdinal: ToolDataSource.classify(tool.source).ordinal,
+						description: tool.userDescription ?? tool.modelDescription
+					});
 				}
 			}
 			for (const toolSet of toolSets) {
-				toolEnumValues.push(toolSet.toolReferenceName);
-				toolEnumDescriptions.push(localize('toolsetdesc', "{0} - {1}", toolSet.source.label, toolSet.description ?? toolSet.displayName ?? ''));
+				data.push({
+					name: toolSet.toolReferenceName,
+					sourceLabel: ToolDataSource.classify(toolSet.source).label,
+					sourceOrdinal: ToolDataSource.classify(toolSet.source).ordinal,
+					description: toolSet.description ?? toolSet.displayName
+				});
+			}
+
+			toolEnumValues.length = 0;
+			toolEnumDescriptions.length = 0;
+
+			data.sort((a, b) => {
+				if (a.sourceOrdinal !== b.sourceOrdinal) {
+					return a.sourceOrdinal - b.sourceOrdinal;
+				}
+				if (a.sourceLabel !== b.sourceLabel) {
+					return a.sourceLabel.localeCompare(b.sourceLabel);
+				}
+				return a.name.localeCompare(b.name);
+			});
+
+			for (const item of data) {
+				toolEnumValues.push(item.name);
+				toolEnumDescriptions.push(localize('tool.description', "{1} ({0})\n\n{2}", item.sourceLabel, item.name, item.description));
 			}
+
 			store.clear(); // reset old schema
 			reg.registerSchema(toolSetSchemaId, toolSetsSchema, store);
 		}));
@@ -364,10 +397,11 @@ export class ConfigureToolSets extends Action2 {
 					'// {',
 					'// \t"toolSetName": {',
 					'// \t\t"tools": [',
-					'// \t\t\t"toolName"',
+					'// \t\t\t"someTool",',
+					'// \t\t\t"anotherTool"',
 					'// \t\t],',
 					'// \t\t"description": "description",',
-					'// \t\t"icon": "$(tools)"',
+					'// \t\t"icon": "tools"',
 					'// \t}',
 					'// }',
 				].join('\n'));