wip

Author: olimorris

lua/codecompanion/interactions/chat/helpers/diff.lua

@@ -304,7 +304,7 @@ end
 ---Create a diff for a buffer or file and set up keymaps
 ---@param bufnr_or_path number|string The buffer number or file path to create diff for
 ---@param diff_id number|string Unique identifier for this diff
----@param opts? { chat_bufnr?: number, original_content: string[], set_keymaps?: boolean }
+---@param opts? { chat_bufnr?: number, original_content: string[], set_keymaps?: boolean, tool_name?: string }
 ---@return table|nil diff The diff object, or nil if no diff was created
 function M.create(bufnr_or_path, diff_id, opts)
   opts = opts or {}
@@ -378,7 +378,7 @@ function M.setup_keymaps(diff, opts)
     .new({
       bufnr = diff.bufnr,
       callbacks = require("codecompanion.interactions.inline.keymaps"),
-      data = { diff = diff },
+      data = { bufnr = opts.chat_bufnr, diff = diff, tool_name = opts.tool_name },
       keymaps = inline_config.keymaps,
     })
     :set()

lua/codecompanion/interactions/chat/tools/approvals.lua

@@ -74,7 +74,11 @@ function Approvals:is_approved(bufnr, args)
     return true
   end
 
-  return approvals[args.tool_name] == true
+  if args and args.tool_name then
+    return approvals[args.tool_name] == true
+  end
+
+  return false
 end
 
 ---Toggle yolo mode for a given chat buffer

lua/codecompanion/interactions/chat/tools/builtin/insert_edit_into_file/init.lua

@@ -792,10 +792,10 @@ local function edit_file(action, chat_bufnr, output_handler, opts)
   end
 
   local diff_id = math.random(10000000)
-  local original_lines = vim.split(current_content, "\n", { plain = true })
   local should_diff = diff.create(path, diff_id, {
     chat_bufnr = chat_bufnr,
-    original_content = original_lines,
+    original_content = vim.split(current_content, "\n", { plain = true }),
+    tool_name = "insert_edit_into_file",
   })
 
   local final_success = success_response(fmt("Edited `%s` file%s", action.filepath, extract_explanation(action)))
@@ -892,6 +892,7 @@ local function edit_buffer(bufnr, chat_bufnr, action, output_handler, opts)
   local should_diff = diff.create(bufnr, diff_id, {
     chat_bufnr = chat_bufnr,
     original_content = original_content,
+    tool_name = "insert_edit_into_file",
   })
 
   local start_line = nil

lua/codecompanion/interactions/inline/init.lua

@@ -718,15 +718,15 @@ function Inline:start_diff(original_content)
 
   local approvals = require("codecompanion.interactions.chat.tools.approvals")
 
-  if approvals:is_approved(self.bufnr) or config.display.diff.enabled == false then
+  if approvals:is_approved(self.bufnr, { tool_name = "inline" }) or config.display.diff.enabled == false then
     return self:reset()
   end
 
   if self.classification.placement == "new" then
     return self:reset()
   end
 
-  self:set_keymaps(self.buffer_context.bufnr, { exclude_keymaps = { "stop" } })
+  self:set_keymaps(self.buffer_context.bufnr, { tool_name = "inline", exclude_keymaps = { "stop" } })
 
   local provider = config.display.diff.provider
   local ok, diff = pcall(require, "codecompanion.providers.diff." .. provider)

lua/codecompanion/interactions/inline/keymaps.lua

@@ -40,14 +40,14 @@ M.reject_change = {
 
 M.always_accept = {
   desc = "Accept and enable auto mode",
-  callback = function(inline)
+  callback = function(obj)
     local approvals = require("codecompanion.interactions.chat.tools.approvals")
-    approvals:toggle_yolo_mode(inline.bufnr)
+    approvals:always(obj.bufnr, { tool_name = obj.tool_name })
 
-    if inline.diff then
-      log:trace("[Inline] Auto-accepting diff for id=%s", tostring(inline.id))
-      inline.diff:accept()
-      clear_map(config.interactions.inline.keymaps, inline.diff.bufnr)
+    if obj.diff then
+      log:trace("[Inline] Auto-accepting diff for id=%s", tostring(obj.id))
+      obj.diff:accept()
+      clear_map(config.interactions.inline.keymaps, obj.diff.bufnr)
     end
   end,
 }