Merge pull request #1 from lattenwald/claude/review-upstream-changes-cXKcu

fix(codecompanion): add additionalProperties to tool_input of use_mcp_tool (ravitemer#264)

Author: lattenwald

lua/mcphub/extensions/codecompanion/tools.lua

@@ -113,6 +113,7 @@ local tool_schemas = {
                     tool_input = {
                         description = "Input object for the tool call",
                         type = "object",
+                        additionalProperties = false,
                     },
                 },
                 required = { "server_name", "tool_name", "tool_input" },

lua/mcphub/hub.lua

@@ -342,6 +342,7 @@ function MCPHub:start()
 
     -- Make sure to load after the config is refreshed to avoid double reading of config files
     native.setup(config.native_servers)
+    self:fire_servers_updated()
 
     -- Step 3: Check if server is already running on the resolved port and is of same version in cases of plugin updated
     self:check_server(function(is_running, is_our_server, is_same_version)

lua/mcphub/native/neovim/files/environment.lua

@@ -33,7 +33,11 @@ return {
 
         -- Format workspace files
         local workspace_files = vim.tbl_map(function(file)
-            return string.format("%s (%s, %.2fKB)", file.name, file.type, file.size / 1024)
+            if file.type == "link" and file.symlink_target then
+                return string.format("%s (symlink -> %s, %.2fKB)", file.name, file.symlink_target, file.size / 1024)
+            else
+                return string.format("%s (%s, %.2fKB)", file.name, file.type, file.size / 1024)
+            end
         end, dir_info.files)
 
         local text = string.format(

lua/mcphub/native/neovim/utils/buffer.lua

@@ -2,35 +2,61 @@ local M = {}
 
 ---@class FileInfo
 ---@field name string # File name or path
----@field type string # File type (file/directory/etc)
+---@field type string # File type (file/directory/link/etc)
 ---@field size number # File size in bytes
 ---@field modified number # Last modification timestamp
+---@field symlink_target string|nil # If type is 'link', the target path
 
 ---@class DirectoryInfo
 ---@field path string # Current directory path
 ---@field is_git boolean # Whether the directory is a git repository
 ---@field files FileInfo[] # List of files in the directory
 
+---@param path? string # Directory path to scan (defaults to current working directory)
+---@return DirectoryInfo
 ---@param path? string # Directory path to scan (defaults to current working directory)
 ---@return DirectoryInfo
 function M.get_directory_info(path)
     path = path or vim.loop.cwd()
-    -- Check if git repo
-    local is_git = vim.fn.system("git rev-parse --is-inside-work-tree 2>/dev/null"):match("true")
+
+    -- Normalize path separators
+    path = vim.fn.fnamemodify(path, ":p:h")
+
+    -- Check if the specified path is a git repo
+    -- Use -C flag to specify directory instead of cd command for better cross-platform support
+    local is_git = vim.fn
+        .system(string.format("git -C %s rev-parse --is-inside-work-tree 2>/dev/null", vim.fn.shellescape(path)))
+        :match("true")
     local files = {}
 
     if is_git then
-        -- Use git ls-files for git-aware listing
-        local git_files = vim.fn.systemlist("git ls-files --cached --others --exclude-standard")
+        -- Use git ls-files for git-aware listing in the specified directory
+        local git_files = vim.fn.systemlist(
+            string.format("git -C %s ls-files --cached --others --exclude-standard", vim.fn.shellescape(path))
+        )
         for _, file in ipairs(git_files) do
-            local stat = vim.loop.fs_stat(file)
-            if stat then
-                table.insert(files, {
+            -- Build full path using cross-platform path joining
+            local full_path = vim.fs.joinpath and vim.fs.joinpath(path, file) or (path .. "/" .. file)
+
+            -- Use lstat to detect symlinks without following them
+            local lstat = vim.loop.fs_lstat(full_path)
+            if lstat then
+                local file_info = {
                     name = file,
-                    type = stat.type,
-                    size = stat.size,
-                    modified = stat.mtime.sec,
-                })
+                    type = lstat.type,
+                    size = lstat.size,
+                    modified = lstat.mtime.sec,
+                }
+
+                -- If it's a symlink, get the target path
+                if lstat.type == "link" then
+                    local target = vim.loop.fs_readlink(full_path)
+                    if target then
+                        file_info.symlink_target = target
+                    end
+                end
+
+                table.insert(files, file_info)
             end
         end
     else
@@ -43,14 +69,28 @@ function M.get_directory_info(path)
                     break
                 end
 
-                local stat = vim.loop.fs_stat(name)
-                if stat then
-                    table.insert(files, {
+                -- Build full path using cross-platform path joining
+                local full_path = vim.fs.joinpath and vim.fs.joinpath(path, name) or (path .. "/" .. name)
+
+                -- Use lstat to detect symlinks without following them
+                local lstat = vim.loop.fs_lstat(full_path)
+                if lstat then
+                    local file_info = {
                         name = name,
-                        type = type or stat.type,
-                        size = stat.size,
-                        modified = stat.mtime.sec,
-                    })
+                        type = type or lstat.type,
+                        size = lstat.size,
+                        modified = lstat.mtime.sec,
+                    }
+
+                    -- If it's a symlink, get the target path
+                    if lstat.type == "link" then
+                        local target = vim.loop.fs_readlink(full_path)
+                        if target then
+                            file_info.symlink_target = target
+                        end
+                    end
+
+                    table.insert(files, file_info)
                 end
             end
         end

lua/mcphub/utils/ui.lua

@@ -110,15 +110,27 @@ function M.multiline_input(title, content, on_save, opts)
             end
         end
         -- Close the window
-        vim.api.nvim_win_close(win, true)
+        if vim.api.nvim_win_is_valid(win) then
+            vim.api.nvim_win_close(win, true)
+        end
+
+        if vim.api.nvim_buf_is_valid(bufnr) then
+            vim.api.nvim_buf_delete(bufnr, { force = true })
+        end
         -- -- Call save callback if content changed
         -- if content ~= new_content then
         on_save(new_content)
         -- end
     end
 
     local function close_window()
-        vim.api.nvim_win_close(win, true)
+        if vim.api.nvim_win_is_valid(win) then
+            vim.api.nvim_win_close(win, true)
+        end
+
+        if vim.api.nvim_buf_is_valid(bufnr) then
+            vim.api.nvim_buf_delete(bufnr, { force = true })
+        end
         if opts.on_cancel then
             opts.on_cancel()
         end
@@ -356,8 +368,7 @@ function M.confirm(message, opts)
 
         -- Enhanced window options with better styling
         win_opts.style = "minimal"
-        win_opts.border = vim.o.winborder ~= "" and vim.o.winborder
-            or { "╭", "─", "╮", "│", "╯", "─", "╰", "│" }
+        win_opts.border = vim.o.winborder == "" and { "╭", "─", "╮", "│", "╯", "─", "╰", "│" } or nil
         win_opts.title_pos = "center"
         win_opts.title = {
             { " MCPHUB Confirmation ", Text.highlights.header_btn },
@@ -388,9 +399,11 @@ function M.confirm(message, opts)
 
             vim.schedule(function()
                 if vim.api.nvim_win_is_valid(win) then
-                    if vim.api.nvim_win_is_valid(win) then
-                        vim.api.nvim_win_close(win, true)
-                    end
+                    vim.api.nvim_win_close(win, true)
+                end
+
+                if vim.api.nvim_buf_is_valid(bufnr) then
+                    vim.api.nvim_buf_delete(bufnr, { force = true })
                 end
                 callback(confirmed, cancelled)
             end)
@@ -605,6 +618,13 @@ function M.open_auth_popup(server_name, auth_url)
         if vim.api.nvim_win_is_valid(input_win) then
             vim.api.nvim_win_close(input_win, true)
         end
+
+        if vim.api.nvim_buf_is_valid(info_buf) then
+            vim.api.nvim_buf_delete(info_buf, { force = true })
+        end
+        if vim.api.nvim_buf_is_valid(input_buf) then
+            vim.api.nvim_buf_delete(input_buf, { force = true })
+        end
         -- Return focus to MCPHub window
         if State.ui_instance and State.ui_instance.window then
             vim.api.nvim_set_current_win(State.ui_instance.window)