diff --git a/agent/tools/mcp/mcp_client.py b/agent/tools/mcp/mcp_client.py index 3148a74b..281d3616 100644 --- a/agent/tools/mcp/mcp_client.py +++ b/agent/tools/mcp/mcp_client.py @@ -6,6 +6,7 @@ MCP SDK dependency. """ import json +import os import subprocess import threading import urllib.request @@ -119,7 +120,8 @@ class McpClient: return False args = self.config.get("args", []) - env = self.config.get("env", None) + extra_env = self.config.get("env", None) + env = {**os.environ, **extra_env} if extra_env else None self._proc = subprocess.Popen( [command] + list(args), diff --git a/bridge/agent_initializer.py b/bridge/agent_initializer.py index 8e62ef7a..d580a495 100644 --- a/bridge/agent_initializer.py +++ b/bridge/agent_initializer.py @@ -382,7 +382,14 @@ class AgentInitializer: tools.append(tool) except Exception as e: logger.warning(f"[AgentInitializer] Failed to load tool {tool_name}: {e}") - + + # Add MCP tools + for mcp_tool in tool_manager._mcp_tool_instances.values(): + tools.append(mcp_tool) + if tool_manager._mcp_tool_instances and session_id is None: + logger.info(f"[AgentInitializer] Added {len(tool_manager._mcp_tool_instances)} MCP tool(s): " + f"{list(tool_manager._mcp_tool_instances.keys())}") + # Add memory tools if memory_tools: tools.extend(memory_tools)