[gh-392] Remove local server when not in agent mode

Author: gopar

cecli/coders/agent_coder.py

@@ -165,7 +165,6 @@ def _get_agent_config(self):
             config["tools_excludelist"].append("removeskill")
 
         self._initialize_skills_manager(config)
-        self._initialize_mcp_tools()
         return config
 
     def _initialize_skills_manager(self, config):
@@ -203,26 +202,30 @@ def get_local_tool_schemas(self):
                 schemas.append(tool_module.SCHEMA)
         return schemas
 
-    async def _initialize_mcp_tools(self):
+    async def initialize_mcp_tools(self):
         if not self.mcp_manager:
             self.mcp_manager = McpServerManager()
 
         server_name = "Local"
         server = self.mcp_manager.get_server(server_name)
 
-        # We have already initialized local server, no need to duplicate work
-        if server is not None:
+        # We have already initialized local server and its connected
+        # then no need to duplicate work
+        if server is not None and server.is_connected:
             return
 
         # If we dont have any tools for local server to use, no point in creating it then
         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 server is None:
+            local_server_config = {"name": server_name}
+            local_server = LocalServer(local_server_config)
 
-        await self.mcp_manager.add_server(local_server, connect=True)
+            await self.mcp_manager.add_server(local_server, connect=True)
+        else:
+            await self.mcp_manager.connect_server(server_name)
 
     async def _execute_local_tool_calls(self, tool_calls_list):
         tool_responses = []

cecli/coders/base_coder.py

@@ -255,6 +255,8 @@ async def create(
                 # Transfer TUI app weak reference
                 res.tui = from_coder.tui
 
+            await res.initialize_mcp_tools()
+
             res.original_kwargs = dict(kwargs)
             return res
 
@@ -2742,6 +2744,12 @@ async def _execute_all_tool_calls():
 
         return tool_responses
 
+    async def initialize_mcp_tools(self):
+        """
+        Any setup that needs to happen for MCP Servers so that coder can use it properly
+        """
+        pass
+
     @property
     def mcp_tools(self):
         if not self.mcp_manager:

cecli/main.py

@@ -37,7 +37,7 @@
 
 from cecli import __version__, models, urls, utils
 from cecli.args import get_parser
-from cecli.coders import Coder
+from cecli.coders import AgentCoder, Coder
 from cecli.coders.base_coder import UnknownEditFormat
 from cecli.commands import Commands, SwitchCoderSignal
 from cecli.deprecated_args import handle_deprecated_model_args
@@ -1189,17 +1189,28 @@ def apply_model_overrides(model_name):
             return await graceful_exit(coder)
         except SwitchCoderSignal as switch:
             coder.ok_to_warm_cache = False
+
             if hasattr(switch, "placeholder") and switch.placeholder is not None:
                 io.placeholder = switch.placeholder
             kwargs = dict(io=io, from_coder=coder)
             kwargs.update(switch.kwargs)
+
             if "show_announcements" in kwargs:
                 del kwargs["show_announcements"]
             kwargs["num_cache_warming_pings"] = 0
             kwargs["args"] = coder.args
+
+            if kwargs["edit_format"] != AgentCoder.edit_format and (
+                coder := kwargs.get("from_coder")
+            ):
+                if coder.mcp_manager.get_server("Local"):
+                    await coder.mcp_manager.disconnect_server("Local")
+
             coder = await Coder.create(**kwargs)
+
             if switch.kwargs.get("show_announcements") is False:
                 coder.suppress_announcements_for_next_prompt = True
+
         except SystemExit:
             sys.settrace(None)
             return await graceful_exit(coder)