From fe8e34ce86353b0d1b5301245d3ec691a738a2df Mon Sep 17 00:00:00 2001
From: yetone <yetoneful@gmail.com>
Date: Tue, 3 Jun 2025 17:47:09 +0800
Subject: [PATCH] feat: gemini support ReAct (#2125)

---
 lua/avante/config.lua           |  1 +
 lua/avante/providers/gemini.lua | 42 +++++++++++++++++++++++++++++----
 lua/avante/utils/prompts.lua    | 12 ++++++++++
 3 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/lua/avante/config.lua b/lua/avante/config.lua
index 157c966..074189d 100644
--- a/lua/avante/config.lua
+++ b/lua/avante/config.lua
@@ -279,6 +279,7 @@ M._defaults = {
       endpoint = "https://generativelanguage.googleapis.com/v1beta/models",
       model = "gemini-2.0-flash",
       timeout = 30000, -- Timeout in milliseconds
+      use_ReAct_prompt = true,
       extra_request_body = {
         temperature = 0.75,
         max_tokens = 8192,
diff --git a/lua/avante/providers/gemini.lua b/lua/avante/providers/gemini.lua
index 0450252..5c13392 100644
--- a/lua/avante/providers/gemini.lua
+++ b/lua/avante/providers/gemini.lua
@@ -2,6 +2,7 @@ local Utils = require("avante.utils")
 local Providers = require("avante.providers")
 local Clipboard = require("avante.clipboard")
 local OpenAI = require("avante.providers").openai
+local Prompts = require("avante.utils.prompts")
 
 ---@class AvanteProviderFunctor
 local M = {}
@@ -33,6 +34,9 @@ function M:transform_to_function_declaration(tool)
 end
 
 function M:parse_messages(opts)
+  local provider_conf, _ = Providers.parse_config(self)
+  local use_ReAct_prompt = provider_conf.use_ReAct_prompt == true
+
   local contents = {}
   local prev_role = nil
 
@@ -72,7 +76,7 @@ function M:parse_messages(opts)
               data = item.source.data,
             },
           })
-        elseif type(item) == "table" and item.type == "tool_use" then
+        elseif type(item) == "table" and item.type == "tool_use" and not use_ReAct_prompt then
           tool_id_to_name[item.id] = item.name
           role = "model"
           table.insert(parts, {
@@ -81,7 +85,7 @@ function M:parse_messages(opts)
               args = item.input,
             },
           })
-        elseif type(item) == "table" and item.type == "tool_result" then
+        elseif type(item) == "table" and item.type == "tool_result" and not use_ReAct_prompt then
           role = "function"
           local ok, content = pcall(vim.json.decode, item.content)
           if not ok then content = item.content end
@@ -107,8 +111,34 @@ function M:parse_messages(opts)
           table.insert(parts, { text = item.data })
         end
       end
+      if not provider_conf.disable_tools and use_ReAct_prompt then
+        if content_items[1].type == "tool_result" then
+          local tool_use = nil
+          for _, msg_ in ipairs(opts.messages) do
+            if type(msg_.content) == "table" and #msg_.content > 0 then
+              if msg_.content[1].type == "tool_use" and msg_.content[1].id == content_items[1].tool_use_id then
+                tool_use = msg_
+                break
+              end
+            end
+          end
+          if tool_use then
+            role = "user"
+            table.insert(parts, {
+              text = "["
+                .. tool_use.content[1].name
+                .. " for '"
+                .. (tool_use.content[1].input.path or tool_use.content[1].input.rel_path or "")
+                .. "'] Result:",
+            })
+            table.insert(parts, {
+              text = content_items[1].content,
+            })
+          end
+        end
+      end
     end
-    table.insert(contents, { role = M.role_map[role] or role, parts = parts })
+    if #parts > 0 then table.insert(contents, { role = M.role_map[role] or role, parts = parts }) end
   end)
 
   if Clipboard.support_paste_image() and opts.image_paths then
@@ -124,12 +154,16 @@ function M:parse_messages(opts)
     end
   end
 
+  local system_prompt = opts.system_prompt
+
+  if use_ReAct_prompt then system_prompt = Prompts.get_ReAct_system_prompt(provider_conf, opts) end
+
   return {
     systemInstruction = {
       role = "user",
       parts = {
         {
-          text = opts.system_prompt,
+          text = system_prompt,
         },
       },
     },
diff --git a/lua/avante/utils/prompts.lua b/lua/avante/utils/prompts.lua
index 091d469..067be0e 100644
--- a/lua/avante/utils/prompts.lua
+++ b/lua/avante/utils/prompts.lua
@@ -136,6 +136,18 @@ return (
 >>>>>>> REPLACE
 </diff>
 </replace_in_file>
+
+## Example 4: Complete current task
+
+<attempt_completion>
+<result>
+I've successfully created the requested React component with the following features:
+- Responsive layout
+- Dark/light mode toggle
+- Form validation
+- API integration
+</result>
+</attempt_completion>
 ]]
   end
   return system_prompt