add refresh capability and enable toggle

Author: olimorris

lua/codecompanion/config.lua

@@ -478,6 +478,7 @@ If you are providing code changes, use the insert_edit_into_file tool (if availa
         },
       },
       mcp = {
+        enabled = true,
         servers = {},
       },
       keymaps = {

lua/codecompanion/interactions/chat/init.lua

@@ -526,7 +526,9 @@ function Chat.new(args)
 
   self:update_metadata()
 
-  require("codecompanion.interactions.chat.mcp").start_servers()
+  if config.interactions.chat.mcp.enabled then
+    require("codecompanion.interactions.chat.mcp").start_servers()
+  end
 
   -- Likely this hasn't been set by the time the user opens the chat buffer
   if not _G.codecompanion_current_context then

lua/codecompanion/interactions/chat/mcp/client.lua

@@ -65,18 +65,21 @@ StdioTransport.static.methods = {
   schedule_wrap = { default = vim.schedule_wrap },
 }
 
+---@class CodeCompanion.MCP.StdioTransportArgs
+---@field name string
+---@field cfg CodeCompanion.MCP.ServerConfig
+---@field methods? table<string, function> Optional method overrides for testing
+
 ---Create a new StdioTransport for the given server configuration.
----@param name string
----@param cfg CodeCompanion.MCP.ServerConfig
----@param methods? table<string, function> Optional method overrides for testing
+---@param args CodeCompanion.MCP.StdioTransportArgs
 ---@return CodeCompanion.MCP.StdioTransport
-function StdioTransport:new(name, cfg, methods)
+function StdioTransport.new(args)
   return setmetatable({
-    name = name,
-    cmd = cfg.cmd,
-    env = cfg.env,
-    methods = transform_static_methods(StdioTransport, methods),
-  }, self)
+    name = args.name,
+    cmd = args.cfg.cmd,
+    env = args.cfg.env,
+    methods = transform_static_methods(StdioTransport, args.methods),
+  }, StdioTransport)
 end
 
 ---Start the underlying process and attach stdout/stderr callbacks.
@@ -245,8 +248,8 @@ Client.__index = Client
 Client.static = {}
 Client.static.methods = {
   new_transport = {
-    default = function(name, cfg, methods)
-      return StdioTransport:new(name, cfg, methods)
+    default = function(args)
+      return StdioTransport.new(args)
     end,
   },
   json_decode = { default = vim.json.decode },
@@ -255,25 +258,36 @@ Client.static.methods = {
   defer_fn = { default = vim.defer_fn },
 }
 
+---@class CodeCompanion.MCP.ClientArgs
+---@field name string
+---@field cfg CodeCompanion.MCP.ServerConfig
+---@field methods? table<string, function> Optional method overrides for testing
+
 ---Create a new MCP client instance bound to the provided server configuration.
----@param name string
----@param cfg CodeCompanion.MCP.ServerConfig
----@param methods? table<string, function> Optional method overrides for testing
+---@param args CodeCompanion.MCP.ClientArgs
 ---@return CodeCompanion.MCP.Client
-function Client:new(name, cfg, methods)
-  local static_methods = transform_static_methods(Client, methods)
-  return setmetatable({
-    name = name,
-    cfg = cfg,
+function Client.new(args)
+  local static_methods = transform_static_methods(Client, args.methods)
+  local self = setmetatable({
+    name = args.name,
+    cfg = args.cfg,
     ready = false,
-    transport = static_methods.new_transport(name, cfg, methods),
+    transport = static_methods.new_transport({ name = args.name, cfg = args.cfg, methods = args.methods }),
     resp_handlers = {},
-    server_request_handlers = {
-      ["ping"] = self._handle_server_ping,
-      ["roots/list"] = self._handler_server_roots_list,
-    },
+    server_request_handlers = {},
     methods = static_methods,
-  }, self)
+  }, Client)
+
+  self.server_request_handlers = {
+    ["ping"] = function()
+      return self:_handle_server_ping()
+    end,
+    ["roots/list"] = function()
+      return self:_handle_server_roots_list()
+    end,
+  }
+
+  return self
 end
 
 ---Start the client.
@@ -531,7 +545,7 @@ end
 
 ---Handler for 'roots/list' server requests.
 ---@return "result" | "error", table
-function Client:_handler_server_roots_list()
+function Client:_handle_server_roots_list()
   if not self.cfg.roots then
     return "error", { code = CONSTANTS.JSONRPC.ERROR_METHOD_NOT_FOUND, message = "roots capability not enabled" }
   end

lua/codecompanion/interactions/chat/mcp/init.lua

@@ -30,7 +30,7 @@ function M.start_servers()
   local mcp_cfg = require("codecompanion.config").interactions.chat.mcp
   for name, cfg in pairs(mcp_cfg.servers or {}) do
     if not clients[name] then
-      local client = Client:new(name, cfg)
+      local client = Client.new({ name = name, cfg = cfg })
       clients[name] = client
     end
   end
@@ -58,6 +58,35 @@ function M.stop_servers()
   clients = {}
 end
 
+---Restart all MCP servers
+---@return nil
+function M.restart_servers()
+  M.stop_servers()
+  M.start_servers()
+end
+
+---Refresh configuration and restart servers
+---This allows users to update their MCP config and apply changes without restarting Neovim
+---@return nil
+function M.refresh()
+  M.stop_servers()
+
+  -- Clear cached tool groups and tools from config
+  local chat_tools = require("codecompanion.config").interactions.chat.tools
+  for name, _ in pairs(chat_tools.groups) do
+    if name:match("^mcp:") then
+      chat_tools.groups[name] = nil
+    end
+  end
+  for name, tool in pairs(chat_tools) do
+    if type(tool) == "table" and vim.tbl_get(tool, "opts", "_mcp_info") then
+      chat_tools[name] = nil
+    end
+  end
+
+  M.start_servers()
+end
+
 ---Get status of all MCP servers
 ---@return table<string, { ready: boolean, tool_count: number, started: boolean }>
 function M.get_status()

tests/config.lua

@@ -357,7 +357,9 @@ return {
           },
         },
       },
-      mcp = {},
+      mcp = {
+        enabled = true,
+      },
       opts = {
         blank_prompt = "",
         debounce = 0,

tests/interactions/chat/mcp/test_mcp_client.lua

@@ -48,7 +48,7 @@ local T = MiniTest.new_set({
             callback = function() tools_loaded = true end,
           })
 
-          CLI = Client:new("testMcp", { cmd = { "test-mcp" } }, { new_transport = mock_new_transport })
+          CLI = Client.new({ name = "testMcp", cfg = { cmd = { "test-mcp" } }, methods = { new_transport = mock_new_transport } })
           CLI:start()
           vim.wait(1000, function() return tools_loaded end)
         end
@@ -84,7 +84,7 @@ T["MCP Client"]["start() starts and initializes the client once"] = function()
     TRANSPORT:expect_jsonrpc_notify("notifications/initialized", function() end)
 
     setup_tool_list()
-    CLI = Client:new("testMcp", { cmd = { "test-mcp" } }, { new_transport = mock_new_transport })
+    CLI = Client.new({ name = "testMcp", cfg = { cmd = { "test-mcp" } }, methods = { new_transport = mock_new_transport } })
     CLI:start()
     CLI:start()  -- repeated call should be no-op
     CLI:start()
@@ -290,10 +290,14 @@ T["MCP Client"]["roots capability is declared when roots config is provided"] =
       { uri = "file:///home/user/project2", name = "Project 2" },
     }
 
-    CLI = Client:new("testMcp", {
-      cmd = { "test-mcp" },
-      roots = function() return roots end,
-    }, { new_transport = mock_new_transport })
+    CLI = Client.new({
+      name = "testMcp",
+      cfg = {
+        cmd = { "test-mcp" },
+        roots = function() return roots end,
+      },
+      methods = { new_transport = mock_new_transport },
+    })
     CLI:start()
     vim.wait(1000, function() return CLI.ready end)
 
@@ -331,13 +335,17 @@ T["MCP Client"]["roots list changed notification is sent when roots change"] = f
     local current_roots
 
     local notify_roots_list_changed
-    CLI = Client:new("testMcp", {
-      cmd = { "test-mcp" },
-      roots = function() return current_roots end,
-      register_roots_list_changed = function(notify)
-        notify_roots_list_changed = notify
-      end,
-    }, { new_transport = mock_new_transport })
+    CLI = Client.new({
+      name = "testMcp",
+      cfg = {
+        cmd = { "test-mcp" },
+        roots = function() return current_roots end,
+        register_roots_list_changed = function(notify)
+          notify_roots_list_changed = notify
+        end,
+      },
+      methods = { new_transport = mock_new_transport },
+    })
     CLI:start()
     vim.wait(1000, function() return CLI.ready end)
 
@@ -370,7 +378,7 @@ T["MCP Client"]["transport closed automatically on initialization failure"] = fu
       return "error", { code = -32603, message = "Initialization failed" }
     end)
 
-    CLI = Client:new("testMcp", { cmd = { "test-mcp" } }, { new_transport = mock_new_transport })
+    CLI = Client.new({ name = "testMcp", cfg = { cmd = { "test-mcp" } }, methods = { new_transport = mock_new_transport } })
     CLI:start()
     vim.wait(1000, function() return TRANSPORT:all_handlers_consumed() end)
     vim.wait(1000, function() return not CLI.ready end)

tests/interactions/chat/mcp/test_mcp_tools.lua

@@ -30,10 +30,10 @@ local T = MiniTest.new_set({
           return not vim.startswith(tool.name, "math_")
         end):totable()
 
-        Client.static.methods.new_transport.default = function(name, cfg)
+        Client.static.methods.new_transport.default = function(args)
           local transport
           local tools
-          if cfg.cmd[1] == "math_mcp" then
+          if args.cfg.cmd[1] == "math_mcp" then
             transport = MATH_MCP_TRANSPORT
             tools = MATH_MCP_TOOLS
           else