From eb5a2f6cca547e5a7a29121dff1cf2d730c627aa Mon Sep 17 00:00:00 2001
From: yetone <yetoneful@gmail.com>
Date: Mon, 17 Mar 2025 05:00:03 +0800
Subject: [PATCH] fix: missing tool use (#1610)

---
 lua/avante/providers/claude.lua | 9 ++++++++-
 lua/avante/providers/openai.lua | 5 ++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lua/avante/providers/claude.lua b/lua/avante/providers/claude.lua
index 7dda129..fc3b015 100644
--- a/lua/avante/providers/claude.lua
+++ b/lua/avante/providers/claude.lua
@@ -77,6 +77,7 @@ function M:parse_messages(opts)
     end
   end
 
+  local has_tool_use = false
   for idx, message in ipairs(opts.messages) do
     local content_items = message.content
     local message_content = {}
@@ -102,8 +103,14 @@ function M:parse_messages(opts)
         elseif type(item) == "table" and item.type == "image" then
           table.insert(message_content, { type = "image", source = item.source })
         elseif not provider_conf.disable_tools and type(item) == "table" and item.type == "tool_use" then
+          has_tool_use = true
           table.insert(message_content, { type = "tool_use", name = item.name, id = item.id, input = item.input })
-        elseif not provider_conf.disable_tools and type(item) == "table" and item.type == "tool_result" then
+        elseif
+          not provider_conf.disable_tools
+          and type(item) == "table"
+          and item.type == "tool_result"
+          and has_tool_use
+        then
           table.insert(
             message_content,
             { type = "tool_result", tool_use_id = item.tool_use_id, content = item.content, is_error = item.is_error }
diff --git a/lua/avante/providers/openai.lua b/lua/avante/providers/openai.lua
index 4ce57cc..1015306 100644
--- a/lua/avante/providers/openai.lua
+++ b/lua/avante/providers/openai.lua
@@ -81,6 +81,8 @@ function M:parse_messages(opts)
     table.insert(messages, { role = "system", content = opts.system_prompt })
   end
 
+  local has_tool_use = false
+
   vim.iter(opts.messages):each(function(msg)
     if type(msg.content) == "string" then
       table.insert(messages, { role = self.role_map[msg.role], content = msg.content })
@@ -101,12 +103,13 @@ function M:parse_messages(opts)
             },
           })
         elseif item.type == "tool_use" then
+          has_tool_use = true
           table.insert(tool_calls, {
             id = item.id,
             type = "function",
             ["function"] = { name = item.name, arguments = vim.json.encode(item.input) },
           })
-        elseif item.type == "tool_result" then
+        elseif item.type == "tool_result" and has_tool_use then
           table.insert(
             tool_results,
             { tool_call_id = item.tool_use_id, content = item.is_error and "Error: " .. item.content or item.content }