fix tests

Author: olimorris

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

@@ -80,24 +80,23 @@ function Approvals:is_approved(bufnr, args)
     return false
   end
 
-  local tool_cfg = args.tool_name and config.interactions.chat.tools and config.interactions.chat.tools[args.tool_name]
+  local tool_cfg = args
+    and args.tool_name
+    and config.interactions.chat.tools
+    and config.interactions.chat.tools[args.tool_name]
 
-  if approvals.yolo_mode then
-    if not args or not args.tool_name then
-      return true
-    end
-
-    if tool_cfg and tool_cfg.opts then
-      -- Allow users to designate certain tools as not allowed in yolo mode
+  -- Check if tool requires command-level approval first
+  if tool_cfg and tool_cfg.opts and tool_cfg.opts.require_cmd_approval then
+    -- Yolo mode overrides cmd approval requirement
+    if approvals.yolo_mode then
+      -- But still respect allowed_in_yolo_mode = false
       if tool_cfg.opts.allowed_in_yolo_mode == false then
         return false
       end
+      return true
     end
 
-    return true
-  end
-
-  if tool_cfg and tool_cfg.opts and tool_cfg.opts.require_cmd_approval then
+    -- Not in yolo mode, check if this specific command was approved
     if not approvals[args.tool_name] then
       return false
     end
@@ -108,6 +107,22 @@ function Approvals:is_approved(bufnr, args)
     return false
   end
 
+  -- Handle yolo mode for regular tools (non-cmd-approval tools)
+  if approvals.yolo_mode then
+    if not args or not args.tool_name then
+      return true
+    end
+
+    if tool_cfg and tool_cfg.opts then
+      -- Allow users to designate certain tools as not allowed in yolo mode
+      if tool_cfg.opts.allowed_in_yolo_mode == false then
+        return false
+      end
+    end
+
+    return true
+  end
+
   if args and args.tool_name then
     return approvals[args.tool_name] == true
   end

tests/interactions/chat/tools/test_approvals.lua

@@ -8,9 +8,7 @@ local T = new_set({
     pre_case = function()
       h.child_start(child)
       child.lua([[
-        Approvals = require('codecompanion.interactions.chat.tools.approvals')
-
-        -- Mock the config module
+        -- Mock the config module BEFORE requiring approvals
         package.loaded['codecompanion.config'] = {
           interactions = {
             chat = {
@@ -25,6 +23,8 @@ local T = new_set({
             },
           },
         }
+
+        Approvals = require('codecompanion.interactions.chat.tools.approvals')
       ]])
     end,
     post_case = function()
@@ -195,7 +195,6 @@ T["yolo mode"]["respects allowed_in_yolo_mode = false"] = function()
       allowed_value = tool_cfg and tool_cfg.opts and tool_cfg.opts.allowed_in_yolo_mode
     }
   ]])
-  print("Config check:", vim.inspect(config_check))
 
   local restricted = child.lua([[
     return Approvals:is_approved(1, { tool_name = 'restricted_tool' })