wip

Author: olimorris

doc/codecompanion.txt

@@ -1,4 +1,4 @@
-*codecompanion.txt*        For NVIM v0.11        Last change: 2025 December 19
+*codecompanion.txt*        For NVIM v0.11        Last change: 2025 December 21
 
 ==============================================================================
 Table of Contents                            *codecompanion-table-of-contents*
@@ -997,10 +997,9 @@ The configuration for both types of adapters is exactly the same, however they
 sit within their own tables (`adapters.http.*` and `adapters.acp.*`) and have
 different options available. HTTP adapters use `models` to allow users to
 select the specific LLM they’d like to interact with. ACP adapters use
-`commands` to allow users to customize their interaction with agents
-(e.g. enabling `yolo` mode). As there is a lot of shared functionality between
-the two adapters, it is recommend that you read this page alongside the ACP
-one.
+`commands` to allow users to customize their interaction with agents (e.g.�
+enabling `yolo` mode). As there is a lot of shared functionality between the
+two adapters, it is recommend that you read this page alongside the ACP one.
 
 
 CHANGING AN ADAPTER ~
@@ -1054,7 +1053,7 @@ the adapter’s URL, headers, parameters and other fields at runtime.
   <https://github.com/olimorris/codecompanion.nvim/discussions/601>
 Supported `env` value types: - **Plain environment variable name (string)**: if
 the value is the name of an environment variable that has already been set
-(e.g. `"HOME"` or `"GEMINI_API_KEY"`), the plugin will read the value. -
+(e.g.� `"HOME"` or `"GEMINI_API_KEY"`), the plugin will read the value. -
 **Command (string prefixed with cmd:)**: any value that starts with `cmd:` will
 be executed via the shell. Example: `"cmd:op read
 op://personal/Gemini/credential --no-newline"`. - **Function**: you can provide
@@ -2751,7 +2750,7 @@ The fastest way to copy an LLM’s code output is with `gy`. This will yank the
 nearest codeblock.
 
 
-APPLYING AN LLM’S EDITS TO A BUFFER OR FILE ~
+APPLYING AN LLM€�S EDITS TO A BUFFER OR FILE ~
 
 The |codecompanion-usage-chat-buffer-tools-files| tool, combined with the
 |codecompanion-usage-chat-buffer-variables.html-buffer| variable or
@@ -2856,19 +2855,8 @@ CodeCompanion provides comprehensive support for the ACP specification:
 
 SUPPORTED ADAPTERS
 
-  -----------------------------------------------------------------------
-  Adapter         Description             Special Features
-  --------------- ----------------------- -------------------------------
-  Claude Code     Anthropic’s Claude Code OAuth authentication, tool
-                  CLI                     output trimming
+Please see the |codecompanion-configuration-adapters-acp| page.
 
-  Gemini CLI      Google’s Gemini CLI     Multiple auth methods (OAuth,
-                                          API key, Vertex AI), YOLO mode
-
-  Auggie CLI      Augment Code CLI        Standard ACP support
-
-  Codex           OpenAI Codex            Full ACP implementation
-  -----------------------------------------------------------------------
 
 CLIENT CAPABILITIES
 
@@ -3902,8 +3890,7 @@ The plugin allows you to run tools on autopilot, with YOLO mode. This
 automatically approves any tool use instead of prompting the user, disables any
 diffs, submits errors and success messages and automatically saves any buffers
 that tools may have edited. In the chat buffer, the keymap `gty` will toggle
-YOLO mode on/off. Alternatively, set the global variable
-`vim.g.codecompanion_yolo_mode` to enable this or set it to `nil` to undo this.
+YOLO mode on/off.
 
 
 SECURITY AND APPROVALS ~
@@ -4670,7 +4657,7 @@ These handlers manage tool/function calling:
   as a great reference to understand how they’re working with the output of the
   API
 
-OPENAI’S API OUTPUT
+OPENAI€�S API OUTPUT
 
 If we reference the OpenAI documentation
 <https://platform.openai.com/docs/guides/text-generation/chat-completions-api>
@@ -5324,7 +5311,8 @@ Let’s breakdown the prompts in that workflow:
           opts = { auto_submit = false },
           content = function()
             -- Leverage YOLO mode which disables the requirement of approvals and automatically saves any edited buffer
-            vim.g.codecompanion_yolo_mode = true
+            local approvals = require("codecompanion.interactions.chat.tools.approvals")
+            approvals:toggle_yolo_mode()
 
             -- Some clear instructions for the LLM to follow
             return [[### Instructions
@@ -6400,7 +6388,7 @@ tool to function. In the case of Anthropic, we insert additional headers.
 <
 
 Some adapter tools can be a `hybrid` in terms of their implementation. That is,
-they’re an adapter tool that requires a client-side component (i.e. a
+they’re an adapter tool that requires a client-side component (i.e.� a
 built-in tool). This is the case for the
 |codecompanion-usage-chat-buffer-tools-memory| tool from Anthropic. To allow
 for this, ensure that the tool definition in `available_tools` has

doc/extending/agentic-workflows.md

@@ -31,7 +31,8 @@ prompts = {
       opts = { auto_submit = false },
       content = function()
         -- Leverage YOLO mode which disables the requirement of approvals and automatically saves any edited buffer
-        vim.g.codecompanion_yolo_mode = true
+        local approvals = require("codecompanion.interactions.chat.tools.approvals")
+        approvals:toggle_yolo_mode()
 
         -- Some clear instructions for the LLM to follow
         return [[### Instructions

doc/usage/chat-buffer/tools.md

@@ -338,7 +338,7 @@ In the `openai_responses` adapter, the following tools are available:
 
 ### YOLO mode
 
-The plugin allows you to run tools on autopilot, with YOLO mode. This automatically approves any tool use instead of prompting the user, disables any diffs, submits errors and success messages and automatically saves any buffers that tools may have edited. In the chat buffer, the keymap `gty` will toggle YOLO mode on/off. Alternatively, set the global variable `vim.g.codecompanion_yolo_mode` to enable this or set it to `nil` to undo this.
+The plugin allows you to run tools on autopilot, with YOLO mode. This automatically approves any tool use instead of prompting the user, disables any diffs, submits errors and success messages and automatically saves any buffers that tools may have edited. In the chat buffer, the keymap `gty` will toggle YOLO mode on/off.
 
 ## Security and Approvals
 

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

@@ -1,3 +1,4 @@
+local approvals = require("codecompanion.interactions.chat.tools.approvals")
 local config = require("codecompanion.config")
 local keymaps = require("codecompanion.utils.keymaps")
 local log = require("codecompanion.utils.log")
@@ -303,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? { original_content: string[], set_keymaps?: boolean }
+---@param opts? { chat_bufnr?: number, original_content: string[], set_keymaps?: boolean }
 ---@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 {}
@@ -313,26 +314,23 @@ function M.create(bufnr_or_path, diff_id, opts)
 
   log:debug("[builtin::helpers::diff::create] Called - diff_id=%s", tostring(diff_id))
 
-  if vim.g.codecompanion_yolo_mode or not config.display.diff.enabled then
+  if approvals:is_approved(opts.chat_bufnr) or not config.display.diff.enabled then
     return nil
   end
 
   local provider = config.display.diff.provider
   local ok, diff_module = pcall(require, "codecompanion.providers.diff." .. provider)
   if not ok then
-    log:error("[builtin::helpers::diff::create] Failed to load provider '%s'", provider)
-    return nil
+    return log:error("[builtin::helpers::diff::create] Failed to load provider '%s'", provider)
   end
 
   local bufnr, winnr = M.open_buffer_and_window(bufnr_or_path)
   if not bufnr then
-    log:warn("[builtin::helpers::diff::create] Failed to open buffer/file")
-    return nil
+    return log:warn("[builtin::helpers::diff::create] Failed to open buffer/file")
   end
 
   if vim.bo[bufnr].buftype == "terminal" then
-    log:debug("[builtin::helpers::diff::create] Skipping diff - terminal buffer")
-    return nil
+    return log:debug("[builtin::helpers::diff::create] Skipping diff - terminal buffer")
   end
 
   local provider_config = config.display.diff.provider_opts[provider] or {}
@@ -386,24 +384,4 @@ function M.setup_keymaps(diff, opts)
     :set()
 end
 
----Check if a diff should be created for this context
----@param bufnr number
----@return boolean should_create
----@return string|nil reason Why diff creation was skipped
-function M.should_create(bufnr)
-  if vim.g.codecompanion_yolo_mode then
-    return false, "yolo_mode"
-  end
-
-  if not config.display.diff.enabled then
-    return false, "diff_disabled"
-  end
-
-  if vim.bo[bufnr].buftype == "terminal" then
-    return false, "terminal_buffer"
-  end
-
-  return true, nil
-end
-
 return M

lua/codecompanion/interactions/chat/helpers/wait.lua

@@ -10,13 +10,12 @@ local M = {}
 ---@param id string|number Unique identifier for the decision context
 ---@param events table Name of events to wait for. First one is considered "accept"
 ---@param callback function Callback to execute when decision is made
----@param opts? table Optional configuration
+---@param opts? { chat_bufnr?: number, notify?: string, sub_text?: string, timeout?: number }
 function M.for_decision(id, events, callback, opts)
   opts = opts or {}
 
-  -- Auto-approve if in YOLO mode
-  -- Generally, most tools will avoid us reaching this point, but it's a good fallback
-  if vim.g.codecompanion_yolo_mode then
+  local approvals = require("codecompanion.interactions.chat.tools.approvals")
+  if approvals:is_approved(opts.chat_bufnr) then
     return callback({ accepted = true, auto_approved = true })
   end
 

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

@@ -33,10 +33,10 @@ local approved = {}
 ---@class CodeCompanion.Tools.Approvals
 local Approvals = {}
 
----Add an approval to the cache
+---Always approve a given tool
 ---@param bufnr number
 ---@param args { tool_name: string }
-function Approvals:add(bufnr, args)
+function Approvals:always(bufnr, args)
   if not args or not args.tool_name then
     return
   end
@@ -64,10 +64,10 @@ function Approvals:is_approved(bufnr, args)
     end
 
     local config = require("codecompanion.config")
-    local tool_cfg = config.tools and config.tools[args.tool_name]
-    if tool_cfg and tool_cfg.args then
+    local tool_cfg = config.interactions.chat.tools and config.interactions.chat.tools[args.tool_name]
+    if tool_cfg and tool_cfg.opts then
       -- Allow users to designate certain tools as not allowed in yolo mode
-      if tool_cfg.args.allowed_in_yolo_mode == false then
+      if tool_cfg.opts.allowed_in_yolo_mode == false then
         return false
       end
     end
@@ -78,9 +78,13 @@ function Approvals:is_approved(bufnr, args)
 end
 
 ---Toggle yolo mode for a given chat buffer
----@param bufnr number
+---@param bufnr? number
 ---@return nil
 function Approvals:toggle_yolo_mode(bufnr)
+  if not bufnr or bufnr == 0 then
+    bufnr = vim.api.nvim_get_current_buf()
+  end
+
   if not approved[bufnr] then
     approved[bufnr] = {}
   end
@@ -99,4 +103,10 @@ function Approvals:reset(bufnr)
   approved[bufnr] = nil
 end
 
+---List all approvals
+---@return table<string, string[]>
+function Approvals.list()
+  return approved
+end
+
 return Approvals

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

@@ -794,6 +794,7 @@ local function edit_file(action, chat_bufnr, output_handler, opts)
   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,
   })
 
@@ -889,6 +890,7 @@ local function edit_buffer(bufnr, chat_bufnr, action, output_handler, opts)
   api.nvim_buf_set_lines(bufnr, 0, -1, false, final_lines)
 
   local should_diff = diff.create(bufnr, diff_id, {
+    chat_bufnr = chat_bufnr,
     original_content = original_content,
   })
 

lua/codecompanion/interactions/chat/tools/orchestrator.lua

@@ -283,7 +283,7 @@ function Orchestrator:setup_next_tool(input)
 
         if choice == 1 or choice == 2 then
           if choice == 1 then
-            Approvals:add(self.tools.bufnr, { tool_name = self.tool.name })
+            Approvals:always(self.tools.bufnr, { tool_name = self.tool.name })
           end
           return self:execute_tool({ cmd = cmd, input = input })
         elseif choice == 3 then

lua/codecompanion/interactions/inline/init.lua

@@ -715,7 +715,10 @@ end
 ---@return nil
 function Inline:start_diff(original_content)
   log:debug("[Inline] Starting diff with provider: %s", config.display.diff.provider)
-  if config.display.diff.enabled == false then
+
+  local approvals = require("codecompanion.interactions.chat.tools.approvals")
+
+  if approvals:is_approved(self.bufnr) or config.display.diff.enabled == false then
     return self:reset()
   end
 

lua/codecompanion/interactions/inline/keymaps.lua

@@ -1,6 +1,5 @@
 local config = require("codecompanion.config")
 local log = require("codecompanion.utils.log")
-local utils = require("codecompanion.utils")
 
 local M = {}
 
@@ -42,13 +41,14 @@ M.reject_change = {
 M.always_accept = {
   desc = "Accept and enable auto mode",
   callback = function(inline)
+    local approvals = require("codecompanion.interactions.chat.tools.approvals")
+    approvals:toggle_yolo_mode(inline.bufnr)
+
     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)
     end
-    vim.g.codecompanion_yolo_mode = true
-    log:trace("[Inline] YOLO mode enabled")
   end,
 }