1 files changed, 5 insertions, 9 deletions
diff --git a/packages/core/src/config/config.ts b/packages/core/src/config/config.ts
index 7b0be08d..46e5123c 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 {
   });
 }
 
-function createToolRegistry(config: Config): Promise<ToolRegistry> {
+export function createToolRegistry(config: Config): Promise<ToolRegistry> {
   const registry = new ToolRegistry(config);
   const targetDir = config.getTargetDir();
   const tools = config.getCoreTools()
@@ -281,12 +281,8 @@ function createToolRegistry(config: Config): Promise<ToolRegistry> {
   registerCoreTool(ShellTool, config);
   registerCoreTool(MemoryTool);
   registerCoreTool(WebSearchTool, config);
-
-  // 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);
+  return (async () => {
+    await registry.discoverTools();
+    return registry;
+  })();
 }