feat: buffer state with context dir

Author: Robitx

after/ftplugin/gpchat.lua

@@ -103,6 +103,18 @@ vim.api.nvim_create_autocmd({ "BufEnter", "TextChanged", "InsertLeave" }, {
 			M.helpers.delete_file(filename)
 		end
 
+		local context_dir = headers["contextDir"] or "?"
+		local new_context_dir = nil
+		if context_dir ~= "?" and context_dir ~= "" then
+			local full_path = vim.fn.fnamemodify(context_dir, ":p")
+			if vim.fn.isdirectory(full_path) == 1 then
+				new_context_dir = vim.fn.resolve(full_path)
+			else
+				M.logger.warning("gpchat: contextDir " .. full_path .. " is not a directory")
+			end
+		end
+		M.buffer_state.set(buf, "context_dir", new_context_dir)
+
 		M.helpers.save_buffer(buf, "gpchat TextChanged InsertLeave autocmd")
 	end,
 })

lua/gp/buffer_state.lua

@@ -0,0 +1,39 @@
+local logger = require("gp.logger")
+
+local M = {}
+
+local state = {}
+
+---@param buf number # buffer number
+M.clear = function(buf)
+	logger.debug("buffer state[" .. buf .. "] clear: current state: " .. vim.inspect(state[buf]))
+	state[buf] = nil
+end
+
+---@param buf number # buffer number
+---@return table # buffer state
+M.get = function(buf)
+	logger.debug("buffer state[" .. buf .. "]: get: " .. vim.inspect(state[buf]))
+	return state[buf] or {}
+end
+
+---@param buf number # buffer number
+---@param key string # key to get
+---@return any # value of the key
+M.get_key = function(buf, key)
+	local value = state[buf] and state[buf][key] or nil
+	logger.debug("buffer state[" .. buf .. "] get_key: key '" .. key .. "' value: " .. vim.inspect(value))
+	return value
+end
+
+---@param buf number # buffer number
+---@param key string # key to set
+---@param value any # value to set
+M.set = function(buf, key, value)
+	logger.debug("buffer state[" .. buf .. "]: set: key '" .. key .. "' to value: " .. vim.inspect(value))
+	state[buf] = state[buf] or {}
+	state[buf][key] = value
+	logger.debug("buffer state[" .. buf .. "]: set: updated state: " .. vim.inspect(state[buf]))
+end
+
+return M

lua/gp/defaults.lua

@@ -18,7 +18,7 @@ M.chat_help = [[
 # Response generation can be terminated by using `{{stop_shortcut}}` or :{{cmd_prefix}}ChatStop command.
 # Chats are saved automatically. To delete this chat, use `{{delete_shortcut}}` or :{{cmd_prefix}}ChatDelete.
 # Be cautious of very long chats. Start a fresh chat by using `{{new_shortcut}}` or :{{cmd_prefix}}ChatNew.
-# See available macros by typing @ in the chat. Toggle this	help by using `{{help_shortcut}}` or :{{cmd_prefix}}ChatHelp.]]
+# Add context macros by typing @ in the chat. Toggle this help by `{{help_shortcut}}` or :{{cmd_prefix}}ChatHelp.]]
 
 M.chat_template = [[
 ---

lua/gp/init.lua

@@ -28,6 +28,7 @@ local M = {
 	vault = require("gp.vault"), -- handles secrets
 	whisper = require("gp.whisper"), -- whisper module
 	macro = require("gp.macro"), -- builder for macro completion
+	buffer_state = require("gp.buffer_state"), -- buffer state module
 }
 
 --------------------------------------------------------------------------------
@@ -267,6 +268,23 @@ M.setup = function(opts)
 		end,
 	})
 
+	vim.api.nvim_create_autocmd("BufEnter", {
+		callback = function(ev)
+			local buf = ev.buf
+			local context_dir = M.buffer_state.get_key(buf, "context_dir")
+			context_dir = context_dir or M.helpers.find_git_root()
+			if context_dir == "" then
+				context_dir = vim.fn.getcwd()
+			end
+
+			local full_path = vim.fn.fnamemodify(context_dir, ":p")
+			if vim.fn.isdirectory(full_path) == 1 then
+				full_path = vim.fn.resolve(full_path)
+				M.buffer_state.set(buf, "context_dir", full_path)
+			end
+		end,
+	})
+
 	if vim.fn.executable("curl") == 0 then
 		M.logger.error("curl is not installed, run :checkhealth gp")
 	end
@@ -695,9 +713,16 @@ M.new_chat = function(params, toggle, system_prompt, agent)
 		system_prompt = ""
 	end
 
+	local context_dir = M.buffer_state.get_key(vim.api.nvim_get_current_buf(), "context_dir")
+	context_dir = context_dir or M.helpers.find_git_root()
+	if context_dir == "" then
+		context_dir = vim.fn.getcwd()
+	end
+	context_dir = "contextDir: " .. context_dir .. "\n"
+
 	local template = M.render.template(M.config.chat_template or require("gp.defaults").chat_template, {
 		["{{filename}}"] = string.match(filename, "([^/]+)$"),
-		["{{optional_headers}}"] = model .. provider .. system_prompt,
+		["{{optional_headers}}"] = model .. provider .. system_prompt .. context_dir,
 		["{{user_prefix}}"] = M.config.chat_user_prefix,
 		["{{respond_shortcut}}"] = M.config.chat_shortcut_respond.shortcut,
 		["{{cmd_prefix}}"] = M.config.cmd_prefix,
@@ -1065,8 +1090,6 @@ M.chat_header_lines = function(lines)
 		return lines, 0, 0
 	end
 
-	local header_lines = table.concat(vim.list_slice(lines, 0, header_end + 1), "\n")
-
 	local help_template = M.render.template(M.defaults.chat_help, {
 		["{{user_prefix}}"] = M.config.chat_user_prefix,
 		["{{respond_shortcut}}"] = M.config.chat_shortcut_respond.shortcut,

lua/gp/macro.lua

@@ -1,10 +1,12 @@
 local logger = require("gp.logger")
+local buffer_state = require("gp.buffer_state")
 
 ---@class gp.Macro_cmd_params
 ---@field arg_lead string
 ---@field cmd_line string
 ---@field cursor_pos number
 ---@field cropped_line string
+---@field state table
 
 ---@class gp.Macro_parser_result
 ---@field template string
@@ -65,7 +67,7 @@ M.build_parser = function(macros)
 		local result = {
 			template = " " .. template .. " ",
 			artifacts = artifacts or {},
-			state = state or {},
+			state = state or buffer_state.get(vim.api.nvim_get_current_buf()),
 		}
 		logger.debug("macro parser input: " .. vim.inspect(result))
 
@@ -103,6 +105,7 @@ M.build_completion = function(macros, raw)
 			cmd_line = cmd_line,
 			cursor_pos = cursor_pos,
 			cropped_line = cropped_line,
+			state = buffer_state.get(vim.api.nvim_get_current_buf()),
 		}
 
 		cropped_line = " " .. cropped_line