feat: listen to DirChanged

Author: ravitemer

lua/mcphub/config.lua

@@ -1,6 +1,6 @@
 local M = {}
 
-local SHUTDOWN_DELAY = 10 * 60 * 1000 -- 10 minutes
+local SHUTDOWN_DELAY = 60 * 1000 -- 1 minute
 
 ---@class MCPHub.WorkspaceConfig
 ---@field enabled boolean Master switch for workspace-specific hubs

lua/mcphub/hub.lua

@@ -329,6 +329,52 @@ function MCPHub:start()
     end)
 end
 
+--- Handle directory changes - reconnect to appropriate workspace hub
+function MCPHub:handle_directory_change()
+    if not State.config.workspace.enabled then
+        return
+    end
+
+    log.debug("Directory changed, checking if workspace hub should change")
+
+    -- Resolve new context for current directory
+    local new_context = self:resolve_context()
+    if not new_context then
+        log.warn("Failed to resolve context after directory change")
+        return
+    end
+
+    -- Compare with current context
+    local current_context = State.current_hub
+    if not current_context then
+        log.debug("No current hub context, starting new hub")
+        self:start()
+        return
+    end
+
+    vim.notify("Dir changed")
+
+    -- Check if we need to switch hubs
+    local needs_switch = false
+    local reason = ""
+
+    if new_context.port ~= current_context.port then
+        needs_switch = true
+        reason = string.format("port change (%d -> %d)", current_context.port, new_context.port)
+    end
+
+    if needs_switch then
+        log.debug("Switching hub due to: " .. reason)
+        -- self:restart(nil, reason)
+        self:stop_sse()
+        vim.schedule(function()
+            self:start()
+        end)
+    else
+        log.debug("No hub switch needed - context unchanged")
+    end
+end
+
 function MCPHub:handle_hub_ready()
     self.ready = true
     self.is_restarting = false
@@ -1150,8 +1196,6 @@ function MCPHub:hard_refresh(callback)
     if not self:ensure_ready() then
         return
     end
-    -- Make sure to update the cache as well
-    config_manager.refresh_config()
     self:api_request("GET", "refresh", {
         callback = function(response, err)
             if err then
@@ -1189,7 +1233,10 @@ function MCPHub:handle_hub_stopping()
     end
 end
 
-function MCPHub:restart(callback)
+--- Restart the MCP Hub server
+--- @param callback function|nil Optional callback to execute after restart
+--- @param reason string|nil Optional reason for the restart
+function MCPHub:restart(callback, reason)
     if not self:ensure_ready() then
         return self:start()
     end

lua/mcphub/init.lua

@@ -151,7 +151,7 @@ function M.setup(opts)
         end
     end
 
-    -- Setup cleanup
+    -- Setup cleanup and directory change handling
     local group = vim.api.nvim_create_augroup("mcphub_cleanup", {
         clear = true,
     })
@@ -165,6 +165,21 @@ function M.setup(opts)
         end,
     })
 
+    -- Handle directory changes for workspace-aware mode
+    if config.workspace.enabled then
+        vim.api.nvim_create_autocmd("DirChanged", {
+            group = group,
+            callback = vim.schedule_wrap(function()
+                if State.hub_instance then
+                    -- Small delay to ensure directory change is complete
+                    vim.defer_fn(function()
+                        State.hub_instance:handle_directory_change()
+                    end, 100)
+                end
+            end),
+        })
+    end
+
     -- Start version check
     local ok, job = pcall(function()
         ---@diagnostic disable-next-line: missing-fields

lua/mcphub/utils/renderer.lua

@@ -39,6 +39,25 @@ function M.render_servers_grouped(servers, lines, current_line, view)
             current_line = current_line + 1
         end
     end
+    -- Show empty project group if no marker files are found
+    if #config_files == 1 and State.config.workspace.enabled then
+        table.insert(lines, Text.empty_line())
+        current_line = current_line + 1
+        local is_global = false
+        local icon = is_global and Text.icons.globe or Text.icons.folder
+        local prefix = icon .. " " .. (is_global and "Global" or "Project") .. " "
+        local header_line = NuiLine():append(prefix, Text.highlights.title)
+        table.insert(lines, Text.pad_line(header_line))
+        current_line = current_line + 1
+        local line = NuiLine()
+        local look_for = table.concat(State.config.workspace.look_for or {}, ", ")
+        line:append(
+            string.format("Could not find any local config files [%s] in the path", look_for),
+            Text.highlights.muted
+        )
+        table.insert(lines, Text.pad_line(line, nil, 4))
+        current_line = current_line + 1
+    end
 
     return current_line
 end
@@ -85,7 +104,10 @@ function M.render_server_group(config_source, servers, lines, current_line, view
         table.insert(
             lines,
             Text.pad_line(
-                NuiLine():append("No servers found (Install from Marketplace)", Text.highlights.muted),
+                NuiLine():append(
+                    string.format("No servers found in `%s` (Install from Marketplace)", config_source),
+                    Text.highlights.muted
+                ),
                 nil,
                 4
             )