diff --git a/src/Infrastructure/BotSharp.MCP/Hooks/MCPToolAgentHook.cs b/src/Infrastructure/BotSharp.MCP/Hooks/MCPToolAgentHook.cs
index e0599910..8b866f49 100644
--- a/src/Infrastructure/BotSharp.MCP/Hooks/MCPToolAgentHook.cs
+++ b/src/Infrastructure/BotSharp.MCP/Hooks/MCPToolAgentHook.cs
@@ -61,7 +61,7 @@ public class MCPToolAgentHook : AgentHookBase
                 {
                     var funDef = AIFunctionUtilities.MapToFunctionDef(tool);
                     functionDefs.Add(funDef);
-                }*/
+                }
             }
         }
 
diff --git a/src/Infrastructure/BotSharp.MCP/McpPlugin.cs b/src/Infrastructure/BotSharp.MCP/McpPlugin.cs
index 8edc3642..f84e7531 100644
--- a/src/Infrastructure/BotSharp.MCP/McpPlugin.cs
+++ b/src/Infrastructure/BotSharp.MCP/McpPlugin.cs
@@ -56,6 +56,6 @@ public class McpPlugin : IBotSharpPlugin
                 var funcTool = new McpToolAdapter(provider, tool, clientManager);
                 return funcTool;
             });
-        }*/
+        }
     }
 }
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
index 83459ccf..58170dfa 100644
--- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
+++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
@@ -181,7 +181,7 @@ public class AgentController : ControllerBase
         var tools = await client.ListToolsAsync();
          
         return tools.Where(x => !string.IsNullOrWhiteSpace(x.Name))
-            .OrderBy(x => x.Name).ToList();*/
+            .OrderBy(x => x.Name).ToList();
     }
 
     [HttpGet("/agent/labels")]