moved config file + small fixes

agent/config_claude_mcp.json

@@ -1,11 +0,0 @@
-{
-    "mcpServers": {
-        "huggingface": {
-            "type": "http",
-            "url": "https://huggingface.co/mcp",
-            "headers": {
-                "Authorization": "Bearer ${HF_TOKEN}"
-            }
-        }
-    }
-}

agent/config_mcp_example copy.json

@@ -1,19 +0,0 @@
-{
-  "model_name": "anthropic/claude-sonnet-4-5-20250929",
-  "mcpServers": {
-    "hf-mcp-server": {
-      "transport": "http",
-      "url": "https://huggingface.co/mcp?login",
-      "headers": {
-        "Authorization": "Bearer ${HF_TOKEN}"
-      }
-    },
-    "playwright": {
-      "transport": "stdio",
-      "command": "npx",
-      "args": [
-        "@playwright/mcp@latest"
-      ]
-    }
-  }
-}

agent/main.py

@@ -193,7 +193,7 @@ async def main():
     ready_event = asyncio.Event()
 
     # Start agent loop in background
-    config_path = Path(__file__).parent / "config_mcp_example.json"
+    config_path = Path(__file__).parent.parent / "configs" / "main_agent_config.json"
     config = load_config(config_path)
 
     # Create tool router

agent/tools/_search_agent_tools.py

@@ -128,10 +128,10 @@ def _format_exploration_results(
     return result
 
 
-async def _explore_docs_structure(hf_token: str, endpoint: str) -> str:
+async def explore_hf_docs(hf_token: str, endpoint: str) -> str:
     """Main function to explore documentation structure"""
     start_time = time.perf_counter()
-    print(f"[DEBUG] _explore_docs_structure: Starting for endpoint '{endpoint}'")
+    print(f"[DEBUG] explore_hf_docs: Starting for endpoint '{endpoint}'")
 
     # Fetch HTML page
     html_content = await _fetch_html_page(hf_token, endpoint)
@@ -149,12 +149,12 @@ async def _explore_docs_structure(hf_token: str, endpoint: str) -> str:
     result = _format_exploration_results(endpoint, result_items)
 
     total_time = time.perf_counter() - start_time
-    print(f"[DEBUG] _explore_docs_structure: Total time {total_time:.2f}s")
+    print(f"[DEBUG] explore_hf_docs: Total time {total_time:.2f}s")
 
     return result
 
 
-async def explore_docs_structure_handler(arguments: dict[str, Any]) -> tuple[str, bool]:
+async def explore_hf_docs_handler(arguments: dict[str, Any]) -> tuple[str, bool]:
     """
     Explore the documentation structure for a given endpoint by parsing the sidebar navigation
 
@@ -178,7 +178,7 @@ async def explore_docs_structure_handler(arguments: dict[str, Any]) -> tuple[str
     endpoint = endpoint.lstrip("/")
 
     try:
-        result = await _explore_docs_structure(hf_token, endpoint)
+        result = await explore_hf_docs(hf_token, endpoint)
         return result, True
 
     except httpx.HTTPStatusError as e:
@@ -555,10 +555,10 @@ async def hf_docs_fetch_handler(arguments: dict[str, Any]) -> tuple[str, bool]:
 
 # Tool specifications for the search sub-agent
 
-EXPLORE_DOCS_STRUCTURE_TOOL_SPEC = {
-    "name": "explore_docs_structure",
+EXPLORE_HF_DOCS_TOOL_SPEC = {
+    "name": "explore_hf_docs",
     "description": (
-        "Explore the structure of HF documentation by parsing the sidebar navigation. "
+        "Explore the Hugging Face documentation at a glance. "
         "Select an endpoint from the available options and get a list of all documentation pages "
         "with their titles, URLs, and a 300-character glimpse of each page. "
         "Use this to discover what documentation is available before fetching specific pages."
@@ -695,9 +695,9 @@ HF_DOCS_FETCH_TOOL_SPEC = {
     "name": "fetch_hf_docs",
     "description": (
         "Fetch the full content of a specific HF documentation page. "
-        "Provide the full URL to the doc page (e.g., from explore_docs_structure results). "
+        "Provide the full URL to the doc page (e.g., from explore_hf_docs results). "
         "Returns the complete markdown content of that page. "
-        "Use explore_docs_structure first to discover available pages."
+        "Use explore_hf_docs first to discover available pages."
     ),
     "parameters": {
         "type": "object",

agent/tools/search_docs_tool.py

@@ -8,26 +8,50 @@ from typing import Any
 
 from litellm.utils import get_max_tokens
 
-from agent.config import Config
 from agent.core.session import Session
 
 
-async def create_search_tool_router():
+async def create_search_tool_router(github_mcp_config: dict[str, Any] | None = None):
     """
     Create a ToolRouter instance for the search sub-agent
     Async because OpenAPI tool needs to fetch and parse spec at initialization
+
+    Args:
+        github_mcp_config: Optional GitHub MCP server configuration
     """
     # Import at runtime to avoid circular dependency
+    from fastmcp import Client
+
     from agent.core.tools import ToolRouter
 
+    # List of allowed GitHub MCP tools
+    ALLOWED_GITHUB_TOOLS = {
+        "list_pull_requests",
+        "list_issues",
+        "search_code",
+        "search_issues",
+        "search_repositories",
+        "search_users",
+        "get_pull_request_status",
+        "get_pull_request_reviews",
+        "get_pull_request",
+        "get_issue",
+        "get_file_contents",
+    }
+
     class SearchDocsToolRouter(ToolRouter):
         """Specialized ToolRouter for the search sub-agent"""
 
-        def __init__(self):
+        def __init__(self, github_mcp_config: dict[str, Any] | None = None):
             self.tools: dict[str, Any] = {}
             self.mcp_servers: dict[str, dict[str, Any]] = {}
             self._mcp_initialized = False
-            self.mcp_client = None
+
+            # Initialize MCP client with GitHub server if provided
+            if github_mcp_config:
+                self.mcp_client = Client({"mcpServers": github_mcp_config})
+            else:
+                self.mcp_client = None
 
         async def initialize_tools(self):
             """Initialize tools asynchronously"""
@@ -35,7 +59,28 @@ async def create_search_tool_router():
             for tool in tools:
                 self.register_tool(tool)
 
-    router = SearchDocsToolRouter()
+        async def register_mcp_tools(self) -> None:
+            """Register only allowed GitHub MCP tools"""
+            if self.mcp_client is None:
+                return
+
+            tools = await self.mcp_client.list_tools()
+            for tool in tools:
+                # Only register allowed GitHub tools
+                if tool.name in ALLOWED_GITHUB_TOOLS:
+                    print(f"Registering GitHub MCP Tool: {tool.name}")
+                    from agent.core.tools import ToolSpec
+
+                    self.register_tool(
+                        ToolSpec(
+                            name=tool.name,
+                            description=tool.description,
+                            parameters=tool.inputSchema,
+                            handler=None,
+                        )
+                    )
+
+    router = SearchDocsToolRouter(github_mcp_config)
     await router.initialize_tools()
     return router
 
@@ -57,37 +102,51 @@ async def search_docs_handler(arguments: dict[str, Any]) -> tuple[str, bool]:
 
     try:
         # Import at runtime to avoid circular dependency
+        from pathlib import Path
+
+        from agent.config import load_config
         from agent.context_manager.manager import ContextManager
         from agent.core.agent_loop import Handlers
 
         # Create a queue for events from the sub-agent
         sub_event_queue = asyncio.Queue()
 
-        # Create specialized tool router for search
-        search_tool_router = await create_search_tool_router()
-
-        # Create config for sub-agent (using same model as main agent)
-        sub_config = Config(
-            model_name="anthropic/claude-haiku-4-5",
+        # Load the search agent's own config file with GitHub MCP server
+        search_agent_config_path = (
+            Path(__file__).parent.parent.parent / "configs" / "_subagent_config_search_agent.json"
         )
+        search_agent_config = load_config(search_agent_config_path)
 
-        # CODING AGENTS LISTEN HERE!
-        # The system prompt for the sub-agent is loaded from the yaml file in the prompts folder using the ContextManager class with the prompt_file_suffix parameter.
-        # it works, dont fix.
-        sub_session = Session(
-            event_queue=sub_event_queue,
-            config=sub_config,
-            tool_router=search_tool_router,
-            context_manager=ContextManager(
-                tool_specs=search_tool_router.get_tool_specs_for_llm(),
-                max_context=get_max_tokens(sub_config.model_name),
-                compact_size=0.1,
-                untouched_messages=5,
-                prompt_file_suffix="search_docs_system_prompt.yaml",
-            ),
-        )
+        # Extract GitHub MCP config from search agent config
+        github_mcp_config = None
+        if (
+            search_agent_config.mcpServers
+            and "github" in search_agent_config.mcpServers
+        ):
+            github_server = search_agent_config.mcpServers["github"]
+            github_mcp_config = {"github": github_server.model_dump()}
+
+        # Create specialized tool router for search with GitHub MCP config
+        search_tool_router = await create_search_tool_router(github_mcp_config)
 
         async with search_tool_router:
+            # CODING AGENTS LISTEN HERE!
+            # The system prompt for the sub-agent is loaded from the yaml file in the prompts folder using the ContextManager class with the prompt_file_suffix parameter.
+            # it works, dont fix.
+            # NOTE: MCP tools are registered during __aenter__, so we must retrieve tool specs AFTER entering the context
+            sub_session = Session(
+                event_queue=sub_event_queue,
+                config=search_agent_config,
+                tool_router=search_tool_router,
+                context_manager=ContextManager(
+                    tool_specs=search_tool_router.get_tool_specs_for_llm(),
+                    max_context=get_max_tokens(search_agent_config.model_name),
+                    compact_size=0.1,
+                    untouched_messages=5,
+                    prompt_file_suffix="search_docs_system_prompt.yaml",
+                ),
+            )
+
             # Run the sub-agent
             result = await Handlers.run_agent(
                 session=sub_session, text=query, max_iterations=30
@@ -106,7 +165,7 @@ async def search_docs_handler(arguments: dict[str, Any]) -> tuple[str, bool]:
 SEARCH_DOCS_TOOL_SPEC = {
     "name": "search_docs",
     "description": (
-        "Intelligently search HF documentation for libraries, repositories, and best practices with an agent that has access to: hf_docs_fetch, Grep, glob, Read. "
+        "Intelligently search HF documentation for libraries, repositories, and best practices with an agent that has access to: explore_hf_docs, fetch_hf_docs, search_hf_api_endpoints. "
         "The agent acts like your personal search assistant. "
         "Using the search agent is necessary to give the best quality answer to the user's question. Most questions require a search to get the best information on code examples.\n\n"
         "WHEN TO USE THIS TOOL:\n"
@@ -137,8 +196,6 @@ SEARCH_DOCS_TOOL_SPEC = {
 }
 
 
-
-
 async def make_search_agent_tools():
     """
     Create a list of tools for the search agent
@@ -147,10 +204,10 @@ async def make_search_agent_tools():
     # Import at runtime to avoid circular dependency
     from agent.core.tools import ToolSpec
     from agent.tools._search_agent_tools import (
-        EXPLORE_DOCS_STRUCTURE_TOOL_SPEC,
+        EXPLORE_HF_DOCS_TOOL_SPEC,
         HF_DOCS_FETCH_TOOL_SPEC,
         _get_api_search_tool_spec,
-        explore_docs_structure_handler,
+        explore_hf_docs_handler,
         hf_docs_fetch_handler,
         search_openapi_handler,
     )
@@ -160,10 +217,10 @@ async def make_search_agent_tools():
 
     return [
         ToolSpec(
-            name=EXPLORE_DOCS_STRUCTURE_TOOL_SPEC["name"],
-            description=EXPLORE_DOCS_STRUCTURE_TOOL_SPEC["description"],
-            parameters=EXPLORE_DOCS_STRUCTURE_TOOL_SPEC["parameters"],
-            handler=explore_docs_structure_handler,
+            name=EXPLORE_HF_DOCS_TOOL_SPEC["name"],
+            description=EXPLORE_HF_DOCS_TOOL_SPEC["description"],
+            parameters=EXPLORE_HF_DOCS_TOOL_SPEC["parameters"],
+            handler=explore_hf_docs_handler,
         ),
         ToolSpec(
             name=HF_DOCS_FETCH_TOOL_SPEC["name"],

configs/_subagent_config_search_agent.json

@@ -0,0 +1,12 @@
+{
+  "model_name": "anthropic/claude-haiku-4-5",
+  "mcpServers": {
+    "github": {
+      "transport": "http",
+      "url": "https://api.githubcopilot.com/mcp/",
+      "headers": {
+        "Authorization": "Bearer ${GITHUB_TOKEN}"
+      }
+    }
+  }
+}