mirror of
https://github.com/davidkaya/aryx.git
synced 2026-08-06 19:58:43 +02:00
feat: auto-discover MCP servers from project and user config files
Scan .vscode/mcp.json, .mcp.json, .copilot/mcp.json (project-level) and ~/.copilot/mcp.json (user-level) for MCP server definitions. Discovered servers require explicit user acceptance before activation. Backend: - Add ConfigScannerRegistry with per-format scanners and substitution - Add discovered tooling domain model with fingerprint-based change detection - Integrate scanning into workspace load, project add, and project selection - Merge accepted discovered MCPs into effective runtime tooling - Extend sidecar contracts with env/headers for real-world MCP configs - Add IPC channels for accept/dismiss/rescan operations Frontend: - Add DiscoveredToolingModal for reviewing pending MCP servers - Auto-show modal when pending discoveries exist on load or project switch - Add amber badge on sidebar project headers for pending discoveries - Add discovered MCP section in Settings panel with accept/dismiss/rescan - Group InlinePills tool dropdown by Workspace MCP / User MCP / Project MCP - Pass effective project tooling (including accepted discoveries) to ChatPane Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
@@ -0,0 +1,120 @@
|
||||
import { describe, expect, test } from 'bun:test';
|
||||
|
||||
import type { DiscoveredLocalMcpServer } from '@shared/domain/discoveredTooling';
|
||||
import { listPendingDiscoveredMcpServers, normalizeDiscoveredToolingState, type DiscoveredToolingState } from '@shared/domain/discoveredTooling';
|
||||
import { resolveProjectToolingSettings, createWorkspaceSettings, type WorkspaceSettings } from '@shared/domain/tooling';
|
||||
|
||||
function makeDiscoveredServer(
|
||||
overrides: Partial<DiscoveredLocalMcpServer> & { id: string; name: string },
|
||||
): DiscoveredLocalMcpServer {
|
||||
return {
|
||||
transport: 'local',
|
||||
command: 'test-cmd',
|
||||
args: [],
|
||||
tools: [],
|
||||
scope: 'user',
|
||||
scannerId: 'test-scanner',
|
||||
sourcePath: '/test/path',
|
||||
sourceLabel: 'test config',
|
||||
fingerprint: 'fnv1a_00000001',
|
||||
status: 'pending',
|
||||
...overrides,
|
||||
};
|
||||
}
|
||||
|
||||
describe('frontend discovered tooling integration', () => {
|
||||
test('pending discovery detection drives modal visibility', () => {
|
||||
const emptyState: DiscoveredToolingState = { mcpServers: [], lastScannedAt: undefined };
|
||||
expect(listPendingDiscoveredMcpServers(emptyState)).toHaveLength(0);
|
||||
|
||||
const withPending: DiscoveredToolingState = {
|
||||
mcpServers: [
|
||||
makeDiscoveredServer({ id: 'discovered_user_test_scanner_alpha', name: 'alpha', status: 'pending' }),
|
||||
makeDiscoveredServer({ id: 'discovered_user_test_scanner_beta', name: 'beta', status: 'accepted' }),
|
||||
],
|
||||
};
|
||||
expect(listPendingDiscoveredMcpServers(withPending)).toHaveLength(1);
|
||||
expect(listPendingDiscoveredMcpServers(withPending)[0].name).toBe('alpha');
|
||||
});
|
||||
|
||||
test('effective project tooling merges accepted discovered MCPs for session UI', () => {
|
||||
const settings: WorkspaceSettings = {
|
||||
...createWorkspaceSettings(),
|
||||
discoveredUserTooling: normalizeDiscoveredToolingState({
|
||||
mcpServers: [
|
||||
makeDiscoveredServer({
|
||||
id: 'discovered_user_ws_scanner_user_mcp',
|
||||
name: 'user-mcp',
|
||||
status: 'accepted',
|
||||
scope: 'user',
|
||||
}),
|
||||
],
|
||||
}),
|
||||
};
|
||||
|
||||
const projectTooling = normalizeDiscoveredToolingState({
|
||||
mcpServers: [
|
||||
makeDiscoveredServer({
|
||||
id: 'discovered_project_proj_scanner_proj_mcp',
|
||||
name: 'proj-mcp',
|
||||
status: 'accepted',
|
||||
scope: 'project',
|
||||
}),
|
||||
],
|
||||
});
|
||||
|
||||
const effective = resolveProjectToolingSettings(settings, projectTooling);
|
||||
const serverIds = effective.mcpServers.map((s) => s.id);
|
||||
|
||||
expect(serverIds).toContain('discovered_user_ws_scanner_user_mcp');
|
||||
expect(serverIds).toContain('discovered_project_proj_scanner_proj_mcp');
|
||||
});
|
||||
|
||||
test('MCP server IDs are correctly categorized by prefix for tool grouping', () => {
|
||||
const settings: WorkspaceSettings = {
|
||||
...createWorkspaceSettings(),
|
||||
tooling: {
|
||||
mcpServers: [
|
||||
{ id: 'mcp-manual', name: 'manual', transport: 'local', command: 'cmd', args: [], tools: [], createdAt: '', updatedAt: '' },
|
||||
],
|
||||
lspProfiles: [],
|
||||
},
|
||||
discoveredUserTooling: normalizeDiscoveredToolingState({
|
||||
mcpServers: [
|
||||
makeDiscoveredServer({
|
||||
id: 'discovered_user_ws_scanner_user_srv',
|
||||
name: 'user-srv',
|
||||
status: 'accepted',
|
||||
scope: 'user',
|
||||
}),
|
||||
],
|
||||
}),
|
||||
};
|
||||
|
||||
const projectTooling = normalizeDiscoveredToolingState({
|
||||
mcpServers: [
|
||||
makeDiscoveredServer({
|
||||
id: 'discovered_project_proj_scanner_proj_srv',
|
||||
name: 'proj-srv',
|
||||
status: 'accepted',
|
||||
scope: 'project',
|
||||
}),
|
||||
],
|
||||
});
|
||||
|
||||
const effective = resolveProjectToolingSettings(settings, projectTooling);
|
||||
|
||||
const workspaceMcp = effective.mcpServers.filter((s) => !s.id.startsWith('discovered_'));
|
||||
const userDiscovered = effective.mcpServers.filter((s) => s.id.startsWith('discovered_user_'));
|
||||
const projectDiscovered = effective.mcpServers.filter((s) => s.id.startsWith('discovered_project_'));
|
||||
|
||||
expect(workspaceMcp).toHaveLength(1);
|
||||
expect(workspaceMcp[0].name).toBe('manual');
|
||||
|
||||
expect(userDiscovered).toHaveLength(1);
|
||||
expect(userDiscovered[0].name).toBe('user-srv');
|
||||
|
||||
expect(projectDiscovered).toHaveLength(1);
|
||||
expect(projectDiscovered[0].name).toBe('proj-srv');
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user