fix(tools): remove globals for better concurrent tool usage (#2680)

Author: slg95

doc/codecompanion.txt

@@ -5331,8 +5331,8 @@ required.
                 role = "user",
                 opts = { auto_submit = true },
                 -- Scope this prompt to the cmd_runner tool
-                condition = function()
-                  return _G.codecompanion_current_tool == "cmd_runner"
+                condition = function(chat)
+                  return chat.tools.tool and chat.tools.tool.name == "cmd_runner"
                 end,
                 -- Repeat until the tests pass, as indicated by the testing flag
                 -- which the cmd_runner tool sets on the chat buffer
@@ -5408,12 +5408,12 @@ Now let’s look at how we trigger the automated reflection prompts:
             role = "user",
             opts = { auto_submit = true },
             -- Scope this prompt to only run when the cmd_runner tool is active
-            condition = function()
-              return _G.codecompanion_current_tool == "cmd_runner"
+            condition = function(chat)
+              return chat.tools.tool and chat.tools.tool.name == "cmd_runner"
             end,
             -- Repeat until the tests pass, as indicated by the testing flag
             repeat_until = function(chat)
-              return chat.tools.flags.testing == true
+              return chat.tool_registry.flags.testing == true
             end,
             content = "The tests have failed. Can you edit the buffer and run the test suite again?",
           },

doc/extending/agentic-workflows.md

@@ -134,12 +134,12 @@ Now let's look at how we trigger the automated reflection prompts:
         role = "user",
         opts = { auto_submit = true },
         -- Scope this prompt to only run when the cmd_runner tool is active
-        condition = function()
-          return _G.codecompanion_current_tool == "cmd_runner"
+        condition = function(chat)
+          return chat.tools.tool and chat.tools.tool.name == "cmd_runner"
         end,
         -- Repeat until the tests pass, as indicated by the testing flag
         repeat_until = function(chat)
-          return chat.tools.flags.testing == true
+          return chat.tool_registry.flags.testing == true
         end,
         content = "The tests have failed. Can you edit the buffer and run the test suite again?",
       },

lua/codecompanion/interactions/chat/init.lua

@@ -1449,7 +1449,6 @@ function Chat:stop()
     local tool_job = self.current_tool
     self.current_tool = nil
 
-    _G.codecompanion_cancel_tool = true
     pcall(function()
       tool_job.cancel()
     end)

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

@@ -114,8 +114,6 @@ function Orchestrator.new(tools, id)
     tools = tools,
   }, { __index = Orchestrator })
 
-  _G.codecompanion_cancel_tool = false
-
   return self
 end
 
@@ -127,7 +125,6 @@ function Orchestrator:_setup_handlers()
       if not self.tool then
         return
       end
-      _G.codecompanion_current_tool = self.tool.name
       if self.tool.handlers and self.tool.handlers.setup then
         return self.tool.handlers.setup(self.tool, self.tools)
       end
@@ -234,6 +231,7 @@ end
 ---@param self CodeCompanion.Tools.Orchestrator
 ---@return nil
 function Orchestrator:_finalize_tools()
+  self.tools.tool = nil
   return utils.fire("ToolsFinished", { id = self.id, bufnr = self.tools.bufnr })
 end
 

tests/interactions/chat/test_subscribers.lua

@@ -20,7 +20,6 @@ T = new_set({
       child.lua([[
         h.teardown_chat_buffer()
         _G.chat = nil
-        _G.codecompanion_current_tool = nil
       ]])
     end,
     post_once = child.stop,

tests/interactions/chat/test_workflows.lua

@@ -17,7 +17,6 @@ T = new_set({
     post_case = function()
       child.lua([[
         _G.chat = nil
-        _G.codecompanion_current_tool = nil
       ]])
     end,
     post_once = child.stop,
@@ -66,8 +65,8 @@ T["Workflows"]["prompts are sequentially added to the chat buffer"] = function()
                 name = "Repeat On Failure",
                 role = "user",
                 opts = { auto_submit = false },
-                condition = function()
-                  return _G.codecompanion_current_tool == "cmd_runner"
+                condition = function(chat)
+                  return chat.tools.tool and chat.tools.tool.name == "cmd_runner"
                 end,
                 repeat_until = function(chat)
                   return chat.tool_registry.flags.testing == true
@@ -80,8 +79,8 @@ T["Workflows"]["prompts are sequentially added to the chat buffer"] = function()
                 name = "Success",
                 role = "user",
                 opts = { auto_submit = false },
-                condition = function()
-                  return not _G.codecompanion_current_tool
+                condition = function(chat)
+                  return not chat.tools.tool
                 end,
                 content = "Tests passed!",
               },
@@ -100,15 +99,15 @@ T["Workflows"]["prompts are sequentially added to the chat buffer"] = function()
   h.eq("First prompt", last_line)
 
   -- Mock failing tool, twice
-  child.lua([[_G.codecompanion_current_tool = "cmd_runner"]])
+  child.lua([[_G.chat.tools.tool = { name = "cmd_runner" }]])
   child.lua([[h.send_to_llm(_G.chat, "Calling a tool...")]])
   last_line = child.lua([[
     local lines = h.get_buf_lines(_G.chat.bufnr)
     return lines[#lines]
   ]])
   h.eq("The tests have failed", last_line)
 
-  child.lua([[_G.codecompanion_current_tool = "cmd_runner"]])
+  child.lua([[_G.chat.tools.tool = { name = "cmd_runner" }]])
   child.lua([[h.send_to_llm(_G.chat, "Calling a tool...")]])
   last_line = child.lua([[
     local lines = h.get_buf_lines(_G.chat.bufnr)
@@ -119,7 +118,7 @@ T["Workflows"]["prompts are sequentially added to the chat buffer"] = function()
   -- Now pass tests; unset tool after this turn
   child.lua([[
     _G.chat.tool_registry.flags.testing = true
-    h.send_to_llm(_G.chat, "Calling a tool...", function() _G.codecompanion_current_tool = nil end)
+    h.send_to_llm(_G.chat, "Calling a tool...", function() _G.chat.tools.tool = nil end)
   ]])
   last_line = child.lua([[
     local lines = h.get_buf_lines(_G.chat.bufnr)