Update agent coder to use mcp server

Author: gopar

cecli/coders/agent_coder.py

@@ -22,7 +22,7 @@
     normalize_vector,
 )
 from cecli.helpers.skills import SkillsManager
-from cecli.mcp import LocalServer
+from cecli.mcp import LocalServer, McpServerManager
 from cecli.repo import ANY_GIT_ERROR
 from cecli.tools.utils.registry import ToolRegistry
 
@@ -197,14 +197,17 @@ async def initialize_mcp_tools(self):
             local_tools = self.get_local_tool_schemas()
             if not local_tools:
                 return
+
             local_server_config = {"name": server_name}
             local_server = LocalServer(local_server_config)
-            if not self.mcp_servers:
-                self.mcp_servers = []
-            if not any(isinstance(s, LocalServer) for s in self.mcp_servers):
-                self.mcp_servers.append(local_server)
+
+            if not self.mcp_manager:
+                self.mcp_manager = McpServerManager()
+            if not self.mcp_manager.get_server(server_name):
+                await self.mcp_manager.add_server(local_server)
             if not self.mcp_tools:
                 self.mcp_tools = []
+
             if server_name not in [name for name, _ in self.mcp_tools]:
                 self.mcp_tools.append((local_server.name, local_tools))
 
@@ -245,9 +248,7 @@ async def _execute_local_tool_calls(self, tool_calls_list):
                             t.get("function", {}).get("name") == norm_tool_name
                             for t in server_tools
                         ):
-                            server = next(
-                                (s for s in self.mcp_servers if s.name == server_name), None
-                            )
+                            server = self.mcp_manager.get_server(server_name)
                             if server:
                                 for params in parsed_args_list:
                                     tasks.append(
@@ -943,7 +944,7 @@ async def _execute_tool_with_registry(self, norm_tool_name, params):
         if self.mcp_tools:
             for server_name, server_tools in self.mcp_tools:
                 if any(t.get("function", {}).get("name") == norm_tool_name for t in server_tools):
-                    server = next((s for s in self.mcp_servers if s.name == server_name), None)
+                    server = self.mcp_manager.get_server(server_name)
                     if server:
                         return await self._execute_mcp_tool(server, norm_tool_name, params)
                     else:

cecli/mcp/manager.py

@@ -188,6 +188,30 @@ async def disconnect_server(self, name: str) -> bool:
             self._log_warning(f"Error disconnecting from MCP server {name}: {e}")
             return False
 
+    async def add_server(self, server: McpServer, connect: bool = False) -> bool:
+        """
+        Add a new MCP server to the manager.
+
+        Args:
+            server: McpServer instance to add
+            connect: Whether to immediately connect to the server
+
+        Returns:
+            Boolean indicating success or failure
+        """
+        existing_server = self.get_server(server.name)
+        if existing_server:
+            self._log_warning(f"MCP server with name '{server.name}' already exists")
+            return False
+
+        self._servers.append(server)
+        self._log_verbose(f"Added MCP server: {server.name}")
+
+        if connect:
+            return await self.connect_server(server.name)
+
+        return True
+
     @property
     def connected_servers(self) -> list["McpServer"]:
         """Get the list of successfully connected servers."""

tests/basic/test_coder.py

@@ -1721,7 +1721,6 @@ async def test_process_tool_calls_user_rejects(self):
             # Create coder with mock MCP tools
             coder = await Coder.create(self.GPT35, "diff", io=io, mcp_manager=manager)
             coder.mcp_tools = [("test_server", [{"function": {"name": "test_tool"}}])]
-            coder.mcp_servers = [mock_server]
 
             # Test process_tool_calls
             result = await coder.process_tool_calls(response)