From 5f6f6a95a2de30373665aae5472e2a5bb2bc25fb Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Mon, 2 Jun 2025 23:37:02 -0700 Subject: Refactor: Make MCP server discovery non-blocking (#716) --- packages/core/src/config/config.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'packages/core/src/config') diff --git a/packages/core/src/config/config.ts b/packages/core/src/config/config.ts index 46e5123c..7b0be08d 100644 --- a/packages/core/src/config/config.ts +++ b/packages/core/src/config/config.ts @@ -254,7 +254,7 @@ export function createServerConfig(params: ConfigParameters): Config { }); } -export function createToolRegistry(config: Config): Promise { +function createToolRegistry(config: Config): Promise { const registry = new ToolRegistry(config); const targetDir = config.getTargetDir(); const tools = config.getCoreTools() @@ -281,8 +281,12 @@ export function createToolRegistry(config: Config): Promise { registerCoreTool(ShellTool, config); registerCoreTool(MemoryTool); registerCoreTool(WebSearchTool, config); - return (async () => { - await registry.discoverTools(); - return registry; - })(); + + // This is async, but we can't wait for it to finish because when we register + // discovered tools, we need to see if existing tools already exist in order to + // avoid duplicates. + registry.discoverTools(); + + // Maintain an async registry return so it's easy in the future to add async behavior to this instantiation. + return Promise.resolve(registry); } -- cgit v1.2.3