more tools picker tweaks (microsoft#249957)

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

Author: jrieken

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

@@ -75,23 +75,37 @@ class ToolsContextPickerPick implements IChatContextPickerItem {
 
 		for (const entry of widget.input.selectedToolsModel.entries.get()) {
 
-			const label = entry.toolReferenceName ?? entry.displayName;
-			const item: Pick = {
-				toolInfo: ToolDataSource.classify(entry.source),
-				label,
-				description: label !== entry.displayName ? entry.displayName : undefined,
-				asAttachment: (): IChatRequestToolEntry | IChatRequestToolSetEntry => {
-					return {
-						kind: entry instanceof ToolSet ? 'toolset' : 'tool',
-						id: entry.id,
-						name: entry.displayName,
-						fullName: entry.displayName,
-						value: undefined,
-					};
-				}
-			};
-
-			items.push(item);
+			if (entry instanceof ToolSet) {
+				items.push({
+					toolInfo: ToolDataSource.classify(entry.source),
+					label: entry.toolReferenceName,
+					description: entry.description,
+					asAttachment: (): IChatRequestToolSetEntry => {
+						return {
+							kind: 'toolset',
+							id: entry.id,
+							icon: entry.icon,
+							name: entry.displayName,
+							value: undefined,
+						};
+					}
+				});
+			} else {
+				items.push({
+					toolInfo: ToolDataSource.classify(entry.source),
+					label: entry.toolReferenceName ?? entry.displayName,
+					description: entry.userDescription ?? entry.modelDescription,
+					asAttachment: (): IChatRequestToolEntry => {
+						return {
+							kind: 'tool',
+							id: entry.id,
+							icon: ThemeIcon.isThemeIcon(entry.icon) ? entry.icon : undefined,
+							name: entry.displayName,
+							value: undefined,
+						};
+					}
+				});
+			}
 		}
 
 		items.sort((a, b) => {

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

@@ -117,7 +117,6 @@ export async function showToolsPicker(
 	for (const [toolSetOrTool, picked] of toolsEntries) {
 
 		let bucket: BucketPick | undefined;
-		let description: string | undefined;
 		const buttons: ActionableButton[] = [];
 
 		if (toolSetOrTool.source.type === 'mcp') {
@@ -193,8 +192,8 @@ export async function showToolsPicker(
 				type: 'item',
 				picked,
 				toolset: toolSetOrTool,
-				label: toolSetOrTool.displayName,
-				description: description ?? toolSetOrTool.description,
+				label: toolSetOrTool.toolReferenceName,
+				description: toolSetOrTool.description,
 				indented: true,
 				buttons
 
@@ -206,7 +205,7 @@ export async function showToolsPicker(
 				picked,
 				tool: toolSetOrTool,
 				label: toolSetOrTool.toolReferenceName ?? toolSetOrTool.displayName,
-				description: toolSetOrTool.userDescription,
+				description: toolSetOrTool.userDescription ?? toolSetOrTool.modelDescription,
 				indented: true,
 			});
 		}