fix(chat): buffers with duplicate short_paths (#2665)

Author: olimorris

lua/codecompanion/interactions/chat/variables/buffer.lua

@@ -121,8 +121,8 @@ function Variable.replace(prefix, message, bufnr)
   local result = message
 
   -- Handle #{buffer:filename}{param} - display option with parameters
-  local display_option_with_params_pattern = prefix .. "{buffer:([^}]*)}{[^}]*}"
-  result = result:gsub(display_option_with_params_pattern, function(target)
+  local display = prefix .. "{buffer:([^}]*)}{[^}]*}"
+  result = result:gsub(display, function(target)
     local found = Variable._find_buffer(target)
     if found then
       local bufname = buf_utils.name_from_bufnr(found)

lua/codecompanion/providers/completion/init.lua

@@ -35,7 +35,7 @@ local function _vars_cache_setup()
 
   _vars_aug = api.nvim_create_augroup("codecompanion.chat.variables", { clear = true })
 
-  -- Invalidate the cache on the following events
+  -- Keep track of the current buffer state across Neovim
   api.nvim_create_autocmd({
     "BufAdd",
     "BufDelete",
@@ -334,7 +334,7 @@ function M.variables()
     :map(function(buf)
       local name
       if name_counts[buf.name] > 1 then
-        name = buf.short_path
+        name = buf.relative_path
       else
         name = buf.name
       end