1 files changed, 14 insertions, 1 deletions
diff --git a/packages/core/src/tools/tool-registry.ts b/packages/core/src/tools/tool-registry.ts
index 384552ca..bce51a93 100644
--- a/packages/core/src/tools/tool-registry.ts
+++ b/packages/core/src/tools/tool-registry.ts
@@ -155,7 +155,7 @@ export class ToolRegistry {
       }
     }
     // discover tools using MCP servers, if configured
-    await discoverMcpTools(this.config, this);
+    await discoverMcpTools(this.config);
   }
 
   /**
@@ -180,6 +180,19 @@ export class ToolRegistry {
   }
 
   /**
+   * Returns an array of tools registered from a specific MCP server.
+   */
+  getToolsByServer(serverName: string): Tool[] {
+    const serverTools: Tool[] = [];
+    for (const tool of this.tools.values()) {
+      if ((tool as DiscoveredMCPTool)?.serverName === serverName) {
+        serverTools.push(tool);
+      }
+    }
+    return serverTools;
+  }
+
+  /**
    * Get the definition of a specific tool.
    */
   getTool(name: string): Tool | undefined {