fix: get cwd in contexts directly

Storing it does not work in the end so have to do it like this.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>

Author: deathbeam

lua/CopilotChat/config.lua

@@ -6,7 +6,6 @@ local utils = require('CopilotChat.utils')
 --- @class CopilotChat.config.source
 --- @field bufnr number
 --- @field winnr number
---- @field cwd string
 
 ---@class CopilotChat.config.selection.diagnostic
 ---@field content string
@@ -190,9 +189,10 @@ return {
     file = {
       description = 'Includes content of provided file in chat context. Supports input.',
       input = function(callback, source)
+        local cwd = utils.win_cwd(source.winnr)
         local files = vim.tbl_filter(function(file)
           return vim.fn.isdirectory(file) == 0
-        end, vim.fn.glob(source.cwd .. '/**/*', false, true))
+        end, vim.fn.glob(cwd .. '/**/*', false, true))
 
         vim.ui.select(files, {
           prompt = 'Select a file> ',
@@ -213,7 +213,7 @@ return {
         }, callback)
       end,
       resolve = function(input, source)
-        return context.files(input, source.cwd)
+        return context.files(input, source.winnr)
       end,
     },
     git = {
@@ -225,7 +225,7 @@ return {
       end,
       resolve = function(input, source)
         return {
-          context.gitdiff(input, source.cwd),
+          context.gitdiff(input, source.winnr),
         }
       end,
     },

lua/CopilotChat/context.lua

@@ -191,9 +191,10 @@ end
 
 --- Get list of all files in workspace
 ---@param pattern string?
----@param cwd string
+---@param winnr number
 ---@return table<CopilotChat.copilot.embed>
-function M.files(pattern, cwd)
+function M.files(pattern, winnr)
+  local cwd = utils.win_cwd(winnr)
   local search = cwd .. '/' .. (pattern or '**/*')
   local files = vim.tbl_filter(function(file)
     return vim.fn.isdirectory(file) == 0
@@ -265,10 +266,11 @@ end
 
 --- Get current git diff
 ---@param type string?
----@param cwd string
+---@param winnr number
 ---@return CopilotChat.copilot.embed?
-function M.gitdiff(type, cwd)
+function M.gitdiff(type, winnr)
   type = type or 'unstaged'
+  local cwd = utils.win_cwd(winnr)
   local cmd = 'git -C ' .. cwd .. ' diff --no-color --no-ext-diff'
 
   if type == 'staged' then

lua/CopilotChat/init.lua

@@ -92,16 +92,9 @@ end
 local function update_selection()
   local prev_winnr = vim.fn.win_getid(vim.fn.winnr('#'))
   if prev_winnr ~= state.chat.winnr and vim.fn.win_gettype(prev_winnr) == '' then
-    -- TODO: This is a hack to get the cwd of the previous window properly, its actually baffling I have to do this
-    local current_win = vim.api.nvim_get_current_win()
-    vim.api.nvim_set_current_win(prev_winnr)
-    local cwd = vim.fn.getcwd()
-    vim.api.nvim_set_current_win(current_win)
-
     state.source = {
       bufnr = vim.api.nvim_win_get_buf(prev_winnr),
       winnr = prev_winnr,
-      cwd = cwd,
     }
   end
 

lua/CopilotChat/utils.lua

@@ -168,4 +168,25 @@ function M.quick_hash(str)
   return #str .. str:sub(1, 32) .. str:sub(-32)
 end
 
+--- Get current working directory for target window
+--- TODO: This is a hack to get the cwd of the previous window properly, its actually baffling I have to do this
+---@param winnr number The buffer number
+---@return string
+function M.win_cwd(winnr)
+  if not winnr or not vim.api.nvim_win_is_valid(winnr) then
+    return '.'
+  end
+
+  local current_win = vim.api.nvim_get_current_win()
+  vim.api.nvim_set_current_win(winnr)
+  local dir = vim.fn.getcwd()
+  vim.api.nvim_set_current_win(current_win)
+
+  if not dir or dir == '' then
+    return '.'
+  end
+
+  return dir
+end
+
 return M