mirror of
https://github.com/davidkaya/aryx.git
synced 2026-07-24 21:48:36 +02:00
Group MCP tools by server and LSP tools by profile in the approval popover instead of showing a flat list. Each server/profile group gets a collapsible header with a batch toggle to approve/unapprove all tools at once. Add a search filter (visible when >10 tools) and partial-state indicators for groups with mixed approval. Add groupApprovalToolsByProvider shared helper with tests. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
476 lines
16 KiB
TypeScript
476 lines
16 KiB
TypeScript
import { describe, expect, test } from 'bun:test';
|
|
|
|
import {
|
|
groupApprovalToolsByProvider,
|
|
listApprovalToolDefinitions,
|
|
normalizeWorkspaceSettings,
|
|
resolveProjectToolingSettings,
|
|
resolveToolLabel,
|
|
resolveWorkspaceToolingSettings,
|
|
validateLspProfileDefinition,
|
|
validateMcpServerDefinition,
|
|
type LspProfileDefinition,
|
|
type McpServerDefinition,
|
|
type WorkspaceToolingSettings,
|
|
} from '@shared/domain/tooling';
|
|
|
|
const TIMESTAMP = '2026-03-23T00:00:00.000Z';
|
|
|
|
describe('tooling settings helpers', () => {
|
|
test('normalizes persisted MCP and LSP definitions into trimmed stable settings', () => {
|
|
const workspaceSettings = normalizeWorkspaceSettings({
|
|
tooling: {
|
|
mcpServers: [
|
|
{
|
|
id: 'mcp-local',
|
|
name: ' Local MCP ',
|
|
transport: 'local',
|
|
command: ' node ',
|
|
args: [' --stdio ', ' --stdio ', ''],
|
|
cwd: ' C:\\workspace\\repo ',
|
|
env: { ' DEBUG ': ' true ', EMPTY: ' ' },
|
|
tools: [' git.status ', '', ' git.status '],
|
|
createdAt: TIMESTAMP,
|
|
updatedAt: TIMESTAMP,
|
|
},
|
|
{
|
|
id: 'mcp-remote',
|
|
name: ' Remote MCP ',
|
|
transport: 'http',
|
|
url: ' https://example.com/mcp ',
|
|
headers: { ' Authorization ': ' Bearer token ', Empty: ' ' },
|
|
tools: [],
|
|
timeoutMs: 1000,
|
|
createdAt: TIMESTAMP,
|
|
updatedAt: TIMESTAMP,
|
|
},
|
|
],
|
|
lspProfiles: [
|
|
{
|
|
id: 'lsp-ts',
|
|
name: ' TypeScript ',
|
|
command: ' typescript-language-server ',
|
|
args: [' --stdio ', ' --stdio ', ''],
|
|
languageId: ' typescript ',
|
|
fileExtensions: ['ts', ' .tsx ', ''],
|
|
createdAt: TIMESTAMP,
|
|
updatedAt: TIMESTAMP,
|
|
},
|
|
],
|
|
},
|
|
});
|
|
|
|
expect(workspaceSettings).toEqual({
|
|
theme: 'dark',
|
|
tooling: {
|
|
mcpServers: [
|
|
{
|
|
id: 'mcp-local',
|
|
name: 'Local MCP',
|
|
transport: 'local',
|
|
command: 'node',
|
|
args: ['--stdio'],
|
|
cwd: 'C:\\workspace\\repo',
|
|
env: { DEBUG: 'true' },
|
|
tools: ['git.status'],
|
|
createdAt: TIMESTAMP,
|
|
updatedAt: TIMESTAMP,
|
|
},
|
|
{
|
|
id: 'mcp-remote',
|
|
name: 'Remote MCP',
|
|
transport: 'http',
|
|
url: 'https://example.com/mcp',
|
|
headers: { Authorization: 'Bearer token' },
|
|
tools: [],
|
|
timeoutMs: 1000,
|
|
createdAt: TIMESTAMP,
|
|
updatedAt: TIMESTAMP,
|
|
},
|
|
],
|
|
lspProfiles: [
|
|
{
|
|
id: 'lsp-ts',
|
|
name: 'TypeScript',
|
|
command: 'typescript-language-server',
|
|
args: ['--stdio'],
|
|
languageId: 'typescript',
|
|
fileExtensions: ['.ts', '.tsx'],
|
|
createdAt: TIMESTAMP,
|
|
updatedAt: TIMESTAMP,
|
|
},
|
|
],
|
|
},
|
|
discoveredUserTooling: {
|
|
mcpServers: [],
|
|
},
|
|
});
|
|
});
|
|
|
|
test('validates required MCP transport settings', () => {
|
|
const localServer: McpServerDefinition = {
|
|
id: 'mcp-local',
|
|
name: 'Local MCP',
|
|
transport: 'local',
|
|
command: '',
|
|
args: [],
|
|
tools: ['*'],
|
|
createdAt: TIMESTAMP,
|
|
updatedAt: TIMESTAMP,
|
|
};
|
|
const remoteServer: McpServerDefinition = {
|
|
id: 'mcp-remote',
|
|
name: 'Remote MCP',
|
|
transport: 'sse',
|
|
url: 'not-a-url',
|
|
tools: ['*'],
|
|
createdAt: TIMESTAMP,
|
|
updatedAt: TIMESTAMP,
|
|
};
|
|
|
|
expect(validateMcpServerDefinition(localServer)).toBe('MCP server "Local MCP" needs a command.');
|
|
expect(validateMcpServerDefinition(remoteServer)).toBe('MCP server "Remote MCP" has an invalid URL.');
|
|
});
|
|
|
|
test('validates required LSP profile settings', () => {
|
|
const profile: LspProfileDefinition = {
|
|
id: 'lsp-empty',
|
|
name: 'TypeScript',
|
|
command: '',
|
|
args: [],
|
|
languageId: 'typescript',
|
|
fileExtensions: [],
|
|
createdAt: TIMESTAMP,
|
|
updatedAt: TIMESTAMP,
|
|
};
|
|
|
|
expect(validateLspProfileDefinition(profile)).toBe('LSP profile "TypeScript" needs a command.');
|
|
expect(
|
|
validateLspProfileDefinition({
|
|
...profile,
|
|
command: 'typescript-language-server',
|
|
args: ['--stdio'],
|
|
}),
|
|
).toBe('LSP profile "TypeScript" needs at least one file extension.');
|
|
});
|
|
|
|
test('requires the stdio flag for the TypeScript language server profile', () => {
|
|
expect(
|
|
validateLspProfileDefinition({
|
|
id: 'lsp-ts',
|
|
name: 'Typescript LSP',
|
|
command: 'typescript-language-server',
|
|
args: [],
|
|
languageId: 'typescript',
|
|
fileExtensions: ['.ts', '.tsx'],
|
|
createdAt: TIMESTAMP,
|
|
updatedAt: TIMESTAMP,
|
|
}),
|
|
).toBe('LSP profile "Typescript LSP" needs the "--stdio" argument.');
|
|
});
|
|
|
|
test('lists builtin, MCP, and LSP approval tools using runtime tool identifiers', () => {
|
|
const tools = listApprovalToolDefinitions({
|
|
mcpServers: [
|
|
{
|
|
id: 'mcp-git',
|
|
name: 'Git MCP',
|
|
transport: 'local',
|
|
command: 'node',
|
|
args: ['server.js'],
|
|
tools: ['git.status', 'git.diff'],
|
|
createdAt: TIMESTAMP,
|
|
updatedAt: TIMESTAMP,
|
|
},
|
|
{
|
|
id: 'mcp-extra',
|
|
name: 'Extra MCP',
|
|
transport: 'local',
|
|
command: 'node',
|
|
args: ['extra.js'],
|
|
tools: ['git.status'],
|
|
createdAt: TIMESTAMP,
|
|
updatedAt: TIMESTAMP,
|
|
},
|
|
],
|
|
lspProfiles: [
|
|
{
|
|
id: 'ts',
|
|
name: 'TypeScript',
|
|
command: 'typescript-language-server',
|
|
args: ['--stdio'],
|
|
languageId: 'typescript',
|
|
fileExtensions: ['.ts', '.tsx'],
|
|
createdAt: TIMESTAMP,
|
|
updatedAt: TIMESTAMP,
|
|
},
|
|
],
|
|
});
|
|
|
|
expect(tools).toContainEqual({
|
|
id: 'web_fetch',
|
|
label: 'Fetch web content',
|
|
kind: 'builtin',
|
|
providerIds: ['builtin:web_fetch'],
|
|
providerNames: ['Built-in'],
|
|
});
|
|
expect(tools).toContainEqual({
|
|
id: 'git.status',
|
|
label: 'git.status',
|
|
kind: 'mcp',
|
|
providerIds: ['mcp-git', 'mcp-extra'],
|
|
providerNames: ['Git MCP', 'Extra MCP'],
|
|
});
|
|
expect(tools).toContainEqual({
|
|
id: 'lsp_ts_hover',
|
|
label: 'TypeScript · Hover',
|
|
kind: 'lsp',
|
|
providerIds: ['ts'],
|
|
providerNames: ['TypeScript'],
|
|
});
|
|
});
|
|
|
|
test('always uses category-level builtins regardless of dynamically reported runtime tools', () => {
|
|
const tools = listApprovalToolDefinitions(
|
|
{ mcpServers: [], lspProfiles: [] },
|
|
[
|
|
{
|
|
id: 'fetch',
|
|
label: 'fetch',
|
|
description: 'Dynamic runtime tool from Copilot CLI.',
|
|
},
|
|
],
|
|
);
|
|
|
|
// Category-level builtins must always be present
|
|
expect(tools.some((tool) => tool.id === 'read')).toBe(true);
|
|
expect(tools.some((tool) => tool.id === 'write')).toBe(true);
|
|
expect(tools.some((tool) => tool.id === 'shell')).toBe(true);
|
|
expect(tools.some((tool) => tool.id === 'web_fetch')).toBe(true);
|
|
expect(tools.some((tool) => tool.id === 'store_memory')).toBe(true);
|
|
|
|
// Dynamic individual tools do NOT appear in the approval list
|
|
expect(tools.some((tool) => tool.id === 'fetch')).toBe(false);
|
|
});
|
|
|
|
test('resolves human-readable labels from the tool metadata registry', () => {
|
|
expect(resolveToolLabel('bash')).toBe('Execute shell commands');
|
|
expect(resolveToolLabel('read_bash')).toBe('Read shell output');
|
|
expect(resolveToolLabel('web_fetch')).toBe('Fetch web content');
|
|
expect(resolveToolLabel('fetch_copilot_cli_documentation')).toBe('Fetch CLI docs');
|
|
expect(resolveToolLabel('glob')).toBe('Find files by pattern');
|
|
expect(resolveToolLabel('lsp')).toBe('Language server');
|
|
expect(resolveToolLabel('shell')).toBe('Shell commands');
|
|
expect(resolveToolLabel('read')).toBe('Read files');
|
|
expect(resolveToolLabel('write')).toBe('Write files');
|
|
});
|
|
|
|
test('passes through unknown tool IDs as labels', () => {
|
|
expect(resolveToolLabel('my_custom_tool')).toBe('my_custom_tool');
|
|
expect(resolveToolLabel('')).toBe('');
|
|
});
|
|
|
|
test('fallback catalog uses 5 permission-category entries for built-in tools', () => {
|
|
const tools = listApprovalToolDefinitions({ mcpServers: [], lspProfiles: [] });
|
|
const builtinTools = tools.filter((t) => t.kind === 'builtin');
|
|
|
|
expect(builtinTools.length).toBe(5);
|
|
|
|
// Permission-kind approval categories
|
|
expect(builtinTools.some((t) => t.id === 'read')).toBe(true);
|
|
expect(builtinTools.some((t) => t.id === 'write')).toBe(true);
|
|
expect(builtinTools.some((t) => t.id === 'shell')).toBe(true);
|
|
expect(builtinTools.some((t) => t.id === 'web_fetch')).toBe(true);
|
|
expect(builtinTools.some((t) => t.id === 'store_memory')).toBe(true);
|
|
|
|
// Labels should be human-readable, not raw IDs
|
|
const readTool = builtinTools.find((t) => t.id === 'read');
|
|
expect(readTool?.label).toBe('Read files');
|
|
const writeTool = builtinTools.find((t) => t.id === 'write');
|
|
expect(writeTool?.label).toBe('Write files');
|
|
const shellTool = builtinTools.find((t) => t.id === 'shell');
|
|
expect(shellTool?.label).toBe('Shell commands');
|
|
|
|
// Individual tools should NOT appear in the approval list
|
|
expect(builtinTools.some((t) => t.id === 'bash')).toBe(false);
|
|
expect(builtinTools.some((t) => t.id === 'view')).toBe(false);
|
|
expect(builtinTools.some((t) => t.id === 'edit')).toBe(false);
|
|
expect(builtinTools.some((t) => t.id === 'grep')).toBe(false);
|
|
expect(builtinTools.some((t) => t.id === 'task')).toBe(false);
|
|
});
|
|
|
|
test('resolves workspace and project tooling with accepted discovered MCP servers', () => {
|
|
const workspaceTooling = resolveWorkspaceToolingSettings(normalizeWorkspaceSettings({
|
|
tooling: {
|
|
mcpServers: [
|
|
{
|
|
id: 'manual',
|
|
name: 'Manual MCP',
|
|
transport: 'local',
|
|
command: 'node',
|
|
args: ['manual.js'],
|
|
tools: ['manual.tool'],
|
|
createdAt: TIMESTAMP,
|
|
updatedAt: TIMESTAMP,
|
|
},
|
|
],
|
|
lspProfiles: [],
|
|
},
|
|
discoveredUserTooling: {
|
|
mcpServers: [
|
|
{
|
|
id: 'user-discovered',
|
|
name: 'User MCP',
|
|
transport: 'local',
|
|
command: 'node',
|
|
args: ['user.js'],
|
|
tools: ['user.tool'],
|
|
scope: 'user',
|
|
scannerId: 'copilot-user-mcp',
|
|
sourcePath: 'C:\\Users\\tester\\.copilot\\mcp.json',
|
|
sourceLabel: '~\\.copilot\\mcp.json',
|
|
fingerprint: 'fp-user',
|
|
status: 'accepted',
|
|
},
|
|
],
|
|
},
|
|
}));
|
|
|
|
expect(workspaceTooling.mcpServers.map((server) => server.id)).toEqual(['manual', 'user-discovered']);
|
|
|
|
const projectTooling = resolveProjectToolingSettings(
|
|
normalizeWorkspaceSettings({
|
|
tooling: {
|
|
mcpServers: [],
|
|
lspProfiles: [],
|
|
},
|
|
discoveredUserTooling: {
|
|
mcpServers: [],
|
|
},
|
|
}),
|
|
{
|
|
mcpServers: [
|
|
{
|
|
id: 'project-discovered',
|
|
name: 'Project MCP',
|
|
transport: 'http',
|
|
url: 'https://example.com/project',
|
|
headers: { Authorization: 'Bearer token' },
|
|
tools: ['project.tool'],
|
|
scope: 'project',
|
|
scannerId: 'vscode-mcp',
|
|
sourcePath: 'C:\\workspace\\repo\\.vscode\\mcp.json',
|
|
sourceLabel: '.vscode\\mcp.json',
|
|
fingerprint: 'fp-project',
|
|
status: 'accepted',
|
|
},
|
|
],
|
|
},
|
|
);
|
|
|
|
expect(projectTooling.mcpServers).toContainEqual({
|
|
id: 'project-discovered',
|
|
name: 'Project MCP',
|
|
transport: 'http',
|
|
url: 'https://example.com/project',
|
|
headers: { Authorization: 'Bearer token' },
|
|
tools: ['project.tool'],
|
|
createdAt: expect.any(String),
|
|
updatedAt: expect.any(String),
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('groupApprovalToolsByProvider', () => {
|
|
const TIMESTAMP = '2026-03-28T00:00:00.000Z';
|
|
|
|
function makeTooling(
|
|
mcpServers: McpServerDefinition[] = [],
|
|
lspProfiles: LspProfileDefinition[] = [],
|
|
): WorkspaceToolingSettings {
|
|
return { mcpServers, lspProfiles };
|
|
}
|
|
|
|
function makeMcpServer(id: string, name: string, tools: string[]): McpServerDefinition {
|
|
return { id, name, transport: 'local', command: 'node', args: [], tools, createdAt: TIMESTAMP, updatedAt: TIMESTAMP };
|
|
}
|
|
|
|
function makeLspProfile(id: string, name: string): LspProfileDefinition {
|
|
return { id, name, command: 'lsp-server', args: ['--stdio'], languageId: 'typescript', fileExtensions: ['.ts'], createdAt: TIMESTAMP, updatedAt: TIMESTAMP };
|
|
}
|
|
|
|
test('groups MCP tools by server', () => {
|
|
const tooling = makeTooling([
|
|
makeMcpServer('git', 'Git MCP', ['git.status', 'git.diff']),
|
|
makeMcpServer('fs', 'Filesystem', ['fs.read', 'fs.write']),
|
|
]);
|
|
const tools = listApprovalToolDefinitions(tooling);
|
|
const groups = groupApprovalToolsByProvider(tools, tooling);
|
|
|
|
const mcpGroups = groups.filter((g) => g.kind === 'mcp');
|
|
expect(mcpGroups.length).toBe(2);
|
|
|
|
const fsGroup = mcpGroups.find((g) => g.label === 'Filesystem');
|
|
expect(fsGroup).toBeDefined();
|
|
expect(fsGroup!.tools.map((t) => t.id).sort()).toEqual(['fs.read', 'fs.write']);
|
|
|
|
const gitGroup = mcpGroups.find((g) => g.label === 'Git MCP');
|
|
expect(gitGroup).toBeDefined();
|
|
expect(gitGroup!.tools.map((t) => t.id).sort()).toEqual(['git.diff', 'git.status']);
|
|
});
|
|
|
|
test('groups LSP tools by profile', () => {
|
|
const tooling = makeTooling([], [makeLspProfile('ts', 'TypeScript')]);
|
|
const tools = listApprovalToolDefinitions(tooling);
|
|
const groups = groupApprovalToolsByProvider(tools, tooling);
|
|
|
|
const lspGroups = groups.filter((g) => g.kind === 'lsp');
|
|
expect(lspGroups.length).toBe(1);
|
|
expect(lspGroups[0].label).toBe('TypeScript');
|
|
expect(lspGroups[0].tools.length).toBe(5);
|
|
});
|
|
|
|
test('keeps builtins in one group', () => {
|
|
const tooling = makeTooling();
|
|
const tools = listApprovalToolDefinitions(tooling);
|
|
const groups = groupApprovalToolsByProvider(tools, tooling);
|
|
|
|
const builtinGroups = groups.filter((g) => g.kind === 'builtin');
|
|
expect(builtinGroups.length).toBe(1);
|
|
expect(builtinGroups[0].label).toBe('Built-in');
|
|
expect(builtinGroups[0].tools.length).toBe(5);
|
|
});
|
|
|
|
test('multi-provider tools go into first provider group', () => {
|
|
const tooling = makeTooling([
|
|
makeMcpServer('git-a', 'Git A', ['git.status']),
|
|
makeMcpServer('git-b', 'Git B', ['git.status']),
|
|
]);
|
|
const tools = listApprovalToolDefinitions(tooling);
|
|
const groups = groupApprovalToolsByProvider(tools, tooling);
|
|
|
|
const mcpGroups = groups.filter((g) => g.kind === 'mcp');
|
|
expect(mcpGroups.length).toBe(1);
|
|
expect(mcpGroups[0].label).toBe('Git A');
|
|
expect(mcpGroups[0].tools[0].providerNames).toEqual(['Git A', 'Git B']);
|
|
});
|
|
|
|
test('sorts builtin first, then MCP by name, then LSP by name', () => {
|
|
const tooling = makeTooling(
|
|
[makeMcpServer('z', 'Zebra', ['z.tool']), makeMcpServer('a', 'Alpha', ['a.tool'])],
|
|
[makeLspProfile('ts', 'TypeScript')],
|
|
);
|
|
const tools = listApprovalToolDefinitions(tooling);
|
|
const groups = groupApprovalToolsByProvider(tools, tooling);
|
|
|
|
const kindOrder = groups.map((g) => g.kind);
|
|
expect(kindOrder[0]).toBe('builtin');
|
|
const mcpIdx = kindOrder.indexOf('mcp');
|
|
const lspIdx = kindOrder.indexOf('lsp');
|
|
expect(mcpIdx).toBeLessThan(lspIdx);
|
|
|
|
const mcpLabels = groups.filter((g) => g.kind === 'mcp').map((g) => g.label);
|
|
expect(mcpLabels).toEqual(['Alpha', 'Zebra']);
|
|
});
|
|
});
|