diff --git a/lua/avante/config.lua b/lua/avante/config.lua
index 074189d..4942851 100644
--- a/lua/avante/config.lua
+++ b/lua/avante/config.lua
@@ -282,7 +282,7 @@ M._defaults = {
use_ReAct_prompt = true,
extra_request_body = {
temperature = 0.75,
- max_tokens = 8192,
+ max_tokens = 65536,
},
},
---@type AvanteSupportedProvider
diff --git a/lua/avante/llm_tools/replace_in_file.lua b/lua/avante/llm_tools/replace_in_file.lua
index 7a6f85f..b91ad58 100644
--- a/lua/avante/llm_tools/replace_in_file.lua
+++ b/lua/avante/llm_tools/replace_in_file.lua
@@ -33,11 +33,11 @@ M.param = {
description = [[
One or more SEARCH/REPLACE blocks following this exact format:
\`\`\`
- <<<<<<< SEARCH
+ ------- SEARCH
[exact content to find]
=======
[new content to replace with]
- >>>>>>> REPLACE
+ +++++++ REPLACE
\`\`\`
Critical rules:
1. SEARCH content must match the associated file section to find EXACTLY:
@@ -85,7 +85,7 @@ M.returns = {
---@param diff string
---@return string
local function fix_diff(diff)
- local has_search_line = diff:match("^%s*<<<<<<<* SEARCH") ~= nil
+ local has_search_line = diff:match("^%s*-------* SEARCH") ~= nil
if has_search_line then return diff end
local fixed_diff_lines = {}
@@ -93,10 +93,10 @@ local function fix_diff(diff)
local first_line = lines[1]
if first_line and first_line:match("^%s*```") then
table.insert(fixed_diff_lines, first_line)
- table.insert(fixed_diff_lines, "<<<<<<< SEARCH")
+ table.insert(fixed_diff_lines, "------- SEARCH")
fixed_diff_lines = vim.list_extend(fixed_diff_lines, lines, 2)
else
- table.insert(fixed_diff_lines, "<<<<<<< SEARCH")
+ table.insert(fixed_diff_lines, "------- SEARCH")
fixed_diff_lines = vim.list_extend(fixed_diff_lines, lines, 1)
end
return table.concat(fixed_diff_lines, "\n")
@@ -125,7 +125,7 @@ function M.func(opts, on_log, on_complete, session_ctx)
local rough_diff_blocks = {}
for _, line in ipairs(diff_lines) do
- if line:match("^%s*<<<<<<<* SEARCH") then
+ if line:match("^%s*-------* SEARCH") then
is_searching = true
is_replacing = false
current_search = {}
@@ -133,7 +133,7 @@ function M.func(opts, on_log, on_complete, session_ctx)
is_searching = false
is_replacing = true
current_replace = {}
- elseif line:match("^%s*>>>>>>>* REPLACE") and is_replacing then
+ elseif line:match("^%s*+++++++* REPLACE") and is_replacing then
is_replacing = false
table.insert(
rough_diff_blocks,
diff --git a/lua/avante/llm_tools/str_replace.lua b/lua/avante/llm_tools/str_replace.lua
index fa7a330..d744d3d 100644
--- a/lua/avante/llm_tools/str_replace.lua
+++ b/lua/avante/llm_tools/str_replace.lua
@@ -57,8 +57,8 @@ M.returns = {
---@type AvanteLLMToolFunc<{ path: string, old_str: string, new_str: string, streaming?: boolean, tool_use_id?: string }>
function M.func(opts, on_log, on_complete, session_ctx)
local replace_in_file = require("avante.llm_tools.replace_in_file")
- local diff = "<<<<<<< SEARCH\n" .. opts.old_str .. "\n=======\n" .. opts.new_str
- if not opts.streaming then diff = diff .. "\n>>>>>>> REPLACE" end
+ local diff = "------- SEARCH\n" .. opts.old_str .. "\n=======\n" .. opts.new_str
+ if not opts.streaming then diff = diff .. "\n+++++++ REPLACE" end
local new_opts = {
path = opts.path,
diff = diff,
diff --git a/lua/avante/providers/gemini.lua b/lua/avante/providers/gemini.lua
index 5c13392..c8a5ac9 100644
--- a/lua/avante/providers/gemini.lua
+++ b/lua/avante/providers/gemini.lua
@@ -123,6 +123,12 @@ function M:parse_messages(opts)
end
end
if tool_use then
+ table.insert(contents, {
+ role = "model",
+ parts = {
+ { text = Utils.tool_use_to_xml(tool_use.content[1]) },
+ },
+ })
role = "user"
table.insert(parts, {
text = "["
@@ -187,9 +193,11 @@ function M.prepare_request_body(provider_instance, prompt_opts, provider_conf, r
request_body.temperature = nil
request_body.max_tokens = nil
+ local use_ReAct_prompt = provider_conf.use_ReAct_prompt == true
+
local disable_tools = provider_conf.disable_tools or false
- if not disable_tools and prompt_opts.tools then
+ if not use_ReAct_prompt and not disable_tools and prompt_opts.tools then
local function_declarations = {}
for _, tool in ipairs(prompt_opts.tools) do
table.insert(function_declarations, provider_instance:transform_to_function_declaration(tool))
@@ -229,7 +237,7 @@ function M:parse_response(ctx, data_stream, _, opts)
if json.candidates and #json.candidates > 0 then
local candidate = json.candidates[1]
---@type AvanteLLMToolUse[]
- local tool_use_list = {}
+ ctx.tool_use_list = ctx.tool_use_list or {}
-- Check if candidate.content and candidate.content.parts exist before iterating
if candidate.content and candidate.content.parts then
@@ -245,7 +253,7 @@ function M:parse_response(ctx, data_stream, _, opts)
name = part.functionCall.name,
input_json = vim.json.encode(part.functionCall.args),
}
- table.insert(tool_use_list, tool_use)
+ table.insert(ctx.tool_use_list, tool_use)
OpenAI:add_tool_use_message(tool_use, "generated", opts)
end
end
@@ -262,7 +270,7 @@ function M:parse_response(ctx, data_stream, _, opts)
-- The tool_use list is added to the table in llm.lua
opts.on_stop(vim.tbl_deep_extend("force", { reason = "tool_use" }, stop_details))
elseif reason_str == "STOP" then
- if #tool_use_list > 0 then
+ if ctx.tool_use_list and #ctx.tool_use_list > 0 then
-- Natural stop, but tools were found in this final chunk.
opts.on_stop(vim.tbl_deep_extend("force", { reason = "tool_use" }, stop_details))
else
diff --git a/lua/avante/providers/openai.lua b/lua/avante/providers/openai.lua
index 10e03ce..9ef7dd9 100644
--- a/lua/avante/providers/openai.lua
+++ b/lua/avante/providers/openai.lua
@@ -226,6 +226,8 @@ function M:add_text_message(ctx, text, state, opts)
if llm_tool_names == nil then llm_tool_names = LlmTools.get_tool_names() end
if ctx.content == nil then ctx.content = "" end
ctx.content = ctx.content .. text
+ local content = ctx.content:gsub("", ""):gsub("", "")
+ ctx.content = content
local msg = HistoryMessage:new({
role = "assistant",
content = ctx.content,
diff --git a/lua/avante/utils/init.lua b/lua/avante/utils/init.lua
index 32819b1..f259463 100644
--- a/lua/avante/utils/init.lua
+++ b/lua/avante/utils/init.lua
@@ -1424,6 +1424,16 @@ function M.get_tool_use_message(message, messages)
return nil
end
+---@param tool_use AvanteLLMToolUse
+function M.tool_use_to_xml(tool_use)
+ local xml = string.format("<%s>\n", tool_use.name)
+ for k, v in pairs(tool_use.input or {}) do
+ xml = xml .. string.format("<%s>%s\n", k, tostring(v), k)
+ end
+ xml = xml .. ""
+ return xml
+end
+
---@param tool_use AvanteLLMToolUse
function M.is_replace_func_call_tool_use(tool_use)
local is_replace_func_call = false
diff --git a/lua/avante/utils/prompts.lua b/lua/avante/utils/prompts.lua
index 067be0e..ffc4a1d 100644
--- a/lua/avante/utils/prompts.lua
+++ b/lua/avante/utils/prompts.lua
@@ -26,11 +26,13 @@ Tool use is formatted using XML-style tags. The tool name is enclosed in opening
For example:
-
-src/main.js
-
+
+
+I have completed the task...
+
+
-Always adhere to this format for the tool use to ensure proper parsing and execution.
+ALWAYS ADHERE TO this format for the tool use to ensure proper parsing and execution.
# Tools
@@ -107,22 +109,22 @@ Parameters:
src/components/App.tsx
-<<<<<<< SEARCH
+------- SEARCH
import React from 'react';
=======
import React, { useState } from 'react';
->>>>>>> REPLACE
++++++++ REPLACE
-<<<<<<< SEARCH
+------- SEARCH
function handleSubmit() {
saveData();
setLoading(false);
}
=======
->>>>>>> REPLACE
++++++++ REPLACE
-<<<<<<< SEARCH
+------- SEARCH
return (
=======
@@ -133,7 +135,7 @@ function handleSubmit() {
return (