Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

polish add tools gesture #244868

Merged
merged 1 commit into from
Mar 27, 2025
Merged

polish add tools gesture #244868

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 38 additions & 15 deletions src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,24 @@ export class AttachToolsAction extends Action2 {
const enum BucketOrdinal { Extension, Mcp, Other }
type BucketPick = IQuickPickItem & { picked: boolean; ordinal: BucketOrdinal; status?: string; children: ToolPick[]; source: ToolDataSource };
type ToolPick = IQuickPickItem & { picked: boolean; tool: IToolData; parent: BucketPick };
type AddPick = IQuickPickItem & { add: 'server' | 'ext'; pickable: false };
type AddPick = IQuickPickItem & { pickable: false; run: () => void };
type MyPick = ToolPick | BucketPick | AddPick;

const addMcpPick: AddPick = { type: 'item', label: localize('addServer', "Add MCP Server..."), iconClass: ThemeIcon.asClassName(Codicon.add), pickable: false, run: () => commandService.executeCommand(AddConfigurationAction.ID) };
const addExpPick: AddPick = { type: 'item', label: localize('addExtension', "Install Extension..."), iconClass: ThemeIcon.asClassName(Codicon.add), pickable: false, run: () => extensionWorkbenchService.openSearch('@tag:language-model-tools') };
const addPick: AddPick = {
type: 'item', label: localize('addAny', "Add More Tools..."), iconClass: ThemeIcon.asClassName(Codicon.add), pickable: false, run: async () => {
const pick = await quickPickService.pick(
[addMcpPick, addExpPick],
{
canPickMany: false,
title: localize('noTools', "Add tools to chat")
}
);
pick?.run();
}
};

const defaultBucket: BucketPick = {
type: 'item',
children: [],
Expand Down Expand Up @@ -225,14 +240,13 @@ export class AttachToolsAction extends Action2 {
function isToolPick(obj: any): obj is ToolPick {
return Boolean((obj as ToolPick).tool);
}
function isAddPick(obj: any): obj is AddPick {
return Boolean((obj as AddPick).run);
}

const store = new DisposableStore();
const picker = store.add(quickPickService.createQuickPick<MyPick>({ useSeparators: true }));

const picks: (MyPick | IQuickPickSeparator)[] = [
{ add: 'server', type: 'item', label: localize('addServer', "Add MCP Server..."), iconClass: ThemeIcon.asClassName(Codicon.add), pickable: false },
{ add: 'ext', type: 'item', label: localize('addExtension', "Install Extension..."), iconClass: ThemeIcon.asClassName(Codicon.add), pickable: false },
];
const picks: (MyPick | IQuickPickSeparator)[] = [];

for (const bucket of Array.from(toolBuckets.values()).sort((a, b) => a.ordinal - b.ordinal)) {
picks.push({
Expand All @@ -244,12 +258,27 @@ export class AttachToolsAction extends Action2 {
picks.push(...bucket.children);
}


const picker = store.add(quickPickService.createQuickPick<MyPick>({ useSeparators: true }));
picker.placeholder = localize('placeholder', "Select tools that are available to chat");
picker.canSelectMany = true;
picker.keepScrollPosition = true;
picker.matchOnDescription = true;

if (picks.length === 0) {
picker.placeholder = localize('noTools', "Add tools to chat");
picker.canSelectMany = false;
picks.push(
addMcpPick,
addExpPick,
);
} else {
picks.push(
{ type: 'separator' },
addPick,
);
}


let lastSelectedItems = new Set<MyPick>();
let ignoreEvent = false;

Expand Down Expand Up @@ -287,15 +316,9 @@ export class AttachToolsAction extends Action2 {
return;
}

const addPick = selectedPicks.find(p => 'add' in p);
const addPick = selectedPicks.find(isAddPick);
if (addPick) {
if (addPick.add === 'ext') {
extensionWorkbenchService.openSearch('@tag:language-model-tools');
} else if (addPick.add === 'server') {
commandService.executeCommand(AddConfigurationAction.ID);
} else {
assertNever(addPick.add);
}
addPick.run();
picker.hide();
return;
}
Expand Down
Loading