wip

Author: olimorris

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

@@ -314,7 +314,7 @@ function M.create(bufnr_or_path, diff_id, opts)
 
   log:debug("[builtin::helpers::diff::create] Called - diff_id=%s", tostring(diff_id))
 
-  if approvals:is_approved(opts.chat_bufnr) or not config.display.diff.enabled then
+  if approvals:is_approved(opts.chat_bufnr, { tool_name = opts.tool_name }) or not config.display.diff.enabled then
     return nil
   end
 

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

@@ -889,6 +889,16 @@ local function edit_buffer(bufnr, chat_bufnr, action, output_handler, opts)
   local final_lines = vim.split(dry_run_result.final_content, "\n", { plain = true })
   api.nvim_buf_set_lines(bufnr, 0, -1, false, final_lines)
 
+  local success = success_response(fmt("Edited `%s` buffer%s", display_name, extract_explanation(action)))
+
+  if approvals:is_approved(chat_bufnr, { tool_name = "insert_edit_into_file" }) then
+    api.nvim_buf_call(bufnr, function()
+      vim.cmd("silent write")
+    end)
+
+    return output_handler(success)
+  end
+
   local should_diff = diff.create(bufnr, diff_id, {
     chat_bufnr = chat_bufnr,
     original_content = original_content,
@@ -904,16 +914,6 @@ local function edit_buffer(bufnr, chat_bufnr, action, output_handler, opts)
     ui_utils.scroll_to_line(bufnr, start_line)
   end
 
-  local success = success_response(fmt("Edited `%s` buffer%s", display_name, extract_explanation(action)))
-
-  if approvals:is_approved(chat_bufnr, { tool_name = "insert_edit_into_file" }) then
-    api.nvim_buf_call(bufnr, function()
-      vim.cmd("silent write")
-    end)
-
-    return output_handler(success)
-  end
-
   if should_diff and opts.require_confirmation_after then
     return handle_user_decision({
       diff_id = diff_id,