tweak labels and grouping of tools and tool sets (microsoft#249895)

Author: jrieken

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

@@ -96,6 +96,9 @@ class ToolsContextPickerPick implements IChatContextPickerItem {
 
 		items.sort((a, b) => {
 			let res = a.toolInfo.ordinal - b.toolInfo.ordinal;
+			if (res === 0) {
+				res = a.toolInfo.label.localeCompare(b.toolInfo.label);
+			}
 			if (res === 0) {
 				res = a.label.localeCompare(b.label);
 			}
@@ -105,7 +108,6 @@ class ToolsContextPickerPick implements IChatContextPickerItem {
 		let lastGroupLabel: string | undefined;
 		const picks: (IQuickPickSeparator | Pick)[] = [];
 
-
 		for (const item of items) {
 			if (lastGroupLabel !== item.toolInfo.label) {
 				picks.push({ type: 'separator', label: item.toolInfo.label });

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

@@ -164,7 +164,7 @@ export async function showToolsPicker(
 			const key = ToolDataSource.toKey(toolSetOrTool.source);
 			bucket = toolBuckets.get(key) ?? {
 				type: 'item',
-				label: toolSetOrTool.source.label,
+				label: localize('ext', 'Extension: {0}', toolSetOrTool.source.label),
 				ordinal: BucketOrdinal.Extension,
 				picked: false,
 				alwaysShow: true,

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

@@ -21,6 +21,7 @@ import { PromptElementJSON, stringifyPromptElementJSON } from './tools/promptTsx
 import { VSBuffer } from '../../../../base/common/buffer.js';
 import { derived, IObservable, IReader, ITransaction, ObservableSet } from '../../../../base/common/observable.js';
 import { Iterable } from '../../../../base/common/iterator.js';
+import { localize } from '../../../../nls.js';
 
 export interface IToolData {
 	id: string;
@@ -91,13 +92,13 @@ export namespace ToolDataSource {
 
 	export function classify(source: ToolDataSource): { readonly ordinal: number; readonly label: string } {
 		if (source.type === 'internal') {
-			return { ordinal: 3, label: 'Built-In' };
+			return { ordinal: 1, label: localize('builtin', 'Built-In') };
 		} else if (source.type === 'mcp') {
-			return { ordinal: 1, label: 'MCP Servers' };
+			return { ordinal: 2, label: localize('mcp', 'MCP Server: {0}', source.label) };
 		} else if (source.type === 'user') {
-			return { ordinal: 0, label: 'User Defined' };
+			return { ordinal: 0, label: localize('user', 'User Defined') };
 		} else {
-			return { ordinal: 2, label: 'Extensions' };
+			return { ordinal: 3, label: localize('ext', 'Extension: {0}', source.label) };
 		}
 	}
 }