improve: enhance mini.files selection and fix path extraction

jdurand · jdurand · commit dda6dd37b2c4 · 2025-07-29T00:46:14.000-04:00
- Add buffer ID to mini.files.get_fs_entry() for reliable selection
- Fix path extraction from "minifiles://bufid/path" to filesystem paths
- Improve visual mode multi-file selection with comprehensive test coverage
- Enhance error handling and validation for visual selections
- Ensure proper filetype and buffer name detection in tree logic
- Add support for mini.files in is_tree_buffer detection
- Resolve raw mini.files buffer issues with path extraction
diff --git a/lua/claudecode/init.lua b/lua/claudecode/init.lua
@@ -611,8 +611,10 @@ function M._create_commands()
     local is_tree_buffer = current_ft == "NvimTree"
       or current_ft == "neo-tree"
       or current_ft == "oil"
+      or current_ft == "minifiles"
       or string.match(current_bufname, "neo%-tree")
       or string.match(current_bufname, "NvimTree")
+      or string.match(current_bufname, "minifiles://")
 
     if is_tree_buffer then
       local integrations = require("claudecode.integrations")
diff --git a/lua/claudecode/integrations.lua b/lua/claudecode/integrations.lua
@@ -276,6 +276,8 @@ function M._get_mini_files_selection()
 
   local files = {}
 
+  local bufnr = vim.api.nvim_get_current_buf()
+
   -- Check if we're in visual mode for multi-selection
   local mode = vim.fn.mode()
   if mode == "V" or mode == "v" or mode == "\22" then
@@ -285,11 +287,18 @@ function M._get_mini_files_selection()
 
     -- Process each line in the visual selection
     for line = start_line, end_line do
-      local entry_ok, entry = pcall(mini_files.get_fs_entry, nil, line)
-      if entry_ok and entry and entry.path then
+      local entry_ok, entry = pcall(mini_files.get_fs_entry, bufnr, line)
+      if entry_ok and entry and entry.path and entry.path ~= "" then
+        -- Extract real filesystem path from mini.files buffer path
+        local real_path = entry.path
+        -- Remove mini.files buffer protocol prefix if present
+        if real_path:match("^minifiles://") then
+          real_path = real_path:gsub("^minifiles://[^/]*/", "")
+        end
+
         -- Validate that the path exists
-        if vim.fn.filereadable(entry.path) == 1 or vim.fn.isdirectory(entry.path) == 1 then
-          table.insert(files, entry.path)
+        if vim.fn.filereadable(real_path) == 1 or vim.fn.isdirectory(real_path) == 1 then
+          table.insert(files, real_path)
         end
       end
     end
@@ -299,17 +308,24 @@ function M._get_mini_files_selection()
     end
   else
     -- Normal mode: get file under cursor
-    local entry_ok, entry = pcall(mini_files.get_fs_entry)
+    local entry_ok, entry = pcall(mini_files.get_fs_entry, bufnr)
     if not entry_ok or not entry then
       return {}, "Failed to get entry from mini.files"
     end
 
     if entry.path and entry.path ~= "" then
+      -- Extract real filesystem path from mini.files buffer path
+      local real_path = entry.path
+      -- Remove mini.files buffer protocol prefix if present
+      if real_path:match("^minifiles://") then
+        real_path = real_path:gsub("^minifiles://[^/]*/", "")
+      end
+      
       -- Validate that the path exists
-      if vim.fn.filereadable(entry.path) == 1 or vim.fn.isdirectory(entry.path) == 1 then
-        return { entry.path }, nil
+      if vim.fn.filereadable(real_path) == 1 or vim.fn.isdirectory(real_path) == 1 then
+        return { real_path }, nil
       else
-        return {}, "Invalid file or directory path: " .. entry.path
+        return {}, "Invalid file or directory path: " .. real_path
       end
     end
   end
diff --git a/lua/claudecode/selection.lua b/lua/claudecode/selection.lua
@@ -445,7 +445,13 @@ function M.get_visual_selection()
   local start_coords, end_coords = get_selection_coordinates()
 
   local current_buf = vim.api.nvim_get_current_buf()
-  local file_path = vim.api.nvim_buf_get_name(current_buf)
+  local raw_file_path = vim.api.nvim_buf_get_name(current_buf)
+
+  -- Extract real filesystem path from mini.files buffer path if needed
+  local file_path = raw_file_path
+  if file_path:match("^minifiles://") then
+    file_path = file_path:gsub("^minifiles://[^/]*/", "")
+  end
 
   local lines_content = vim.api.nvim_buf_get_lines(
     current_buf,
@@ -490,7 +496,13 @@ end
 function M.get_cursor_position()
   local cursor_pos = vim.api.nvim_win_get_cursor(0)
   local current_buf = vim.api.nvim_get_current_buf()
-  local file_path = vim.api.nvim_buf_get_name(current_buf)
+  local raw_file_path = vim.api.nvim_buf_get_name(current_buf)
+  
+  -- Extract real filesystem path from mini.files buffer path if needed
+  local file_path = raw_file_path
+  if file_path:match("^minifiles://") then
+    file_path = file_path:gsub("^minifiles://[^/]*/", "")
+  end
 
   return {
     text = "",
@@ -584,7 +596,13 @@ function M.get_range_selection(line1, line2)
   end
 
   local current_buf = vim.api.nvim_get_current_buf()
-  local file_path = vim.api.nvim_buf_get_name(current_buf)
+  local raw_file_path = vim.api.nvim_buf_get_name(current_buf)
+  
+  -- Extract real filesystem path from mini.files buffer path if needed
+  local file_path = raw_file_path
+  if file_path:match("^minifiles://") then
+    file_path = file_path:gsub("^minifiles://[^/]*/", "")
+  end
 
   -- Get the total number of lines in the buffer
   local total_lines = vim.api.nvim_buf_line_count(current_buf)
@@ -668,7 +686,14 @@ function M.send_at_mention_for_visual_selection(line1, line2)
   end
 
   -- Sanity check: ensure the selection is for the current buffer
-  local current_buf_name = vim.api.nvim_buf_get_name(vim.api.nvim_get_current_buf())
+  local raw_current_buf_name = vim.api.nvim_buf_get_name(vim.api.nvim_get_current_buf())
+
+  -- Extract real filesystem path from mini.files buffer path if needed
+  local current_buf_name = raw_current_buf_name
+  if current_buf_name:match("^minifiles://") then
+    current_buf_name = current_buf_name:gsub("^minifiles://[^/]*/", "")
+  end
+
   if sel_to_send.filePath ~= current_buf_name then
     logger.warn(
       "selection",
diff --git a/tests/unit/mini_files_integration_spec.lua b/tests/unit/mini_files_integration_spec.lua
@@ -42,6 +42,11 @@ describe("mini.files integration", function()
           return 0
         end,
       },
+      api = {
+        nvim_get_current_buf = function()
+          return 1 -- Mock buffer ID
+        end
+      },
       bo = { filetype = "minifiles" },
     }
 
@@ -57,7 +62,11 @@ describe("mini.files integration", function()
     it("should get single file under cursor", function()
       -- Mock mini.files module
       local mock_mini_files = {
-        get_fs_entry = function()
+        get_fs_entry = function(buf_id)
+          -- Verify buffer ID is passed correctly
+          if buf_id ~= 1 then
+            return nil
+          end
           return { path = "/Users/test/project/main.lua" }
         end,
       }
@@ -74,7 +83,11 @@ describe("mini.files integration", function()
     it("should get directory under cursor", function()
       -- Mock mini.files module
       local mock_mini_files = {
-        get_fs_entry = function()
+        get_fs_entry = function(buf_id)
+          -- Verify buffer ID is passed correctly
+          if buf_id ~= 1 then
+            return nil
+          end
           return { path = "/Users/test/project/src" }
         end,
       }
@@ -88,6 +101,89 @@ describe("mini.files integration", function()
       expect(files[1]).to_be("/Users/test/project/src")
     end)
 
+    it("should handle mini.files buffer path format", function()
+      -- Mock mini.files module that returns buffer-style paths
+      local mock_mini_files = {
+        get_fs_entry = function(buf_id)
+          if buf_id ~= 1 then
+            return nil
+          end
+          return { path = "minifiles://42//Users/test/project/buffer_file.lua" }
+        end,
+      }
+      package.loaded["mini.files"] = mock_mini_files
+
+      local files, err = integrations._get_mini_files_selection()
+
+      expect(err).to_be_nil()
+      expect(files).to_be_table()
+      expect(#files).to_be(1)
+      expect(files[1]).to_be("/Users/test/project/buffer_file.lua")
+    end)
+
+    it("should handle various mini.files buffer path formats", function()
+      -- Test different buffer path formats that could occur
+      local test_cases = {
+        { input = "minifiles://42/Users/test/file.lua", expected = "Users/test/file.lua" },
+        { input = "minifiles://42//Users/test/file.lua", expected = "/Users/test/file.lua" },
+        { input = "minifiles://123///Users/test/file.lua", expected = "//Users/test/file.lua" },
+        { input = "/Users/test/normal_path.lua", expected = "/Users/test/normal_path.lua" },
+      }
+
+      for i, test_case in ipairs(test_cases) do
+        local mock_mini_files = {
+          get_fs_entry = function(buf_id)
+            if buf_id ~= 1 then
+              return nil
+            end
+            return { path = test_case.input }
+          end,
+        }
+        package.loaded["mini.files"] = mock_mini_files
+
+        local files, err = integrations._get_mini_files_selection()
+
+        expect(err).to_be_nil()
+        expect(files).to_be_table()
+        expect(#files).to_be(1)
+        expect(files[1]).to_be(test_case.expected)
+      end
+    end)
+
+    it("should handle mini.files buffer paths in visual mode", function()
+      mock_vim.fn.mode = function()
+        return "V" -- Visual line mode
+      end
+
+      -- Mock mini.files module that returns buffer-style paths
+      local mock_mini_files = {
+        get_fs_entry = function(buf_id, line)
+          if buf_id ~= 1 then
+            return nil
+          end
+          
+          if line == 1 then
+            return { path = "minifiles://42//Users/test/project/visual1.lua" }
+          elseif line == 2 then
+            return { path = "minifiles://42//Users/test/project/visual2.txt" }
+          elseif line == 3 then
+            return { path = "minifiles://42//Users/test/project/src" }
+          end
+          return nil
+        end,
+      }
+      package.loaded["mini.files"] = mock_mini_files
+
+      local files, err = integrations._get_mini_files_selection()
+
+      expect(err).to_be_nil()
+      expect(files).to_be_table()
+      expect(#files).to_be(3)
+      expect(files[1]).to_be("/Users/test/project/visual1.lua") 
+      expect(files[2]).to_be("/Users/test/project/visual2.txt")
+      expect(files[3]).to_be("/Users/test/project/src")
+    end)
+
     it("should get multiple files in visual mode", function()
       mock_vim.fn.mode = function()
         return "V" -- Visual line mode
@@ -96,6 +192,11 @@ describe("mini.files integration", function()
       -- Mock mini.files module
       local mock_mini_files = {
         get_fs_entry = function(buf_id, line)
+          -- Verify buffer ID is passed correctly
+          if buf_id ~= 1 then
+            return nil
+          end
+          
           if line == 1 then
             return { path = "/Users/test/project/file1.lua" }
           elseif line == 2 then
@@ -147,6 +248,51 @@ describe("mini.files integration", function()
       expect(files[2]).to_be("/Users/test/project/src")
     end)
 
+    it("should handle visual mode with buffer ID correctly", function()
+      mock_vim.fn.mode = function()
+        return "v" -- Visual character mode
+      end
+
+      -- Mock different buffer ID to test parameter passing
+      mock_vim.api.nvim_get_current_buf = function()
+        return 42 -- Different buffer ID
+      end
+
+      -- Mock mini.files module that validates buffer ID
+      local mock_mini_files = {
+        get_fs_entry = function(buf_id, line)
+          -- Should receive buffer ID 42
+          if buf_id ~= 42 then
+            error("Expected buffer ID 42, got " .. tostring(buf_id))
+          end
+          
+          if line == 1 then
+            return { path = "/Users/test/project/selected1.lua" }
+          elseif line == 2 then
+            return { path = "/Users/test/project/selected2.txt" }
+          elseif line == 3 then
+            return { path = "/Users/test/project/selected3.lua" }
+          end
+          return nil
+        end,
+      }
+      package.loaded["mini.files"] = mock_mini_files
+
+      local files, err = integrations._get_mini_files_selection()
+
+      expect(err).to_be_nil()
+      expect(files).to_be_table()
+      expect(#files).to_be(3)
+      expect(files[1]).to_be("/Users/test/project/selected1.lua")
+      expect(files[2]).to_be("/Users/test/project/selected2.txt")
+      expect(files[3]).to_be("/Users/test/project/selected3.lua")
+      
+      -- Reset buffer ID for other tests
+      mock_vim.api.nvim_get_current_buf = function()
+        return 1
+      end
+    end)
+
     it("should handle empty entry under cursor", function()
       -- Mock mini.files module
       local mock_mini_files = {
@@ -279,4 +425,4 @@ describe("mini.files integration", function()
       expect(files).to_be_nil()
     end)
   end)
-end)
+end)
