CarGDev/avante.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(history): make use of get_tool_(use|result)_data() in llm.lua

Browse Source 
Simplify the code locating viewed files as well as code locating last
completion attempt by using these new helpers.

Also avoid using "goto" in simple loops.
This commit is contained in:
Dmitry Torokhov
2025-07-13 21:05:14 -07:00
committed by yetone
parent 47ad90b389
commit 36e116795d
1 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lua/avante/llm.lua
View File

@@ -238,9 +238,7 @@ function M.agent_loop(opts)
if memory then stream_options.memory = memory.content end if memory then stream_options.memory = memory.content end
local new_history_messages = {} local new_history_messages = {}
for _, msg in ipairs(history_messages) do for _, msg in ipairs(history_messages) do
if compaction_history_message_uuids[msg.uuid] then goto continue end if not compaction_history_message_uuids[msg.uuid] then table.insert(new_history_messages, msg) end
table.insert(new_history_messages, msg)
::continue::
end end
history_messages = new_history_messages history_messages = new_history_messages
M._stream(stream_options) M._stream(stream_options)
@@ -270,40 +268,27 @@ function M.generate_prompts(opts)
local system_info = Utils.get_system_info() local system_info = Utils.get_system_info()
local selected_files = opts.selected_files or {} local selected_files = opts.selected_files or {}
if opts.selected_filepaths then if opts.selected_filepaths then
for _, filepath in ipairs(opts.selected_filepaths) do for _, filepath in ipairs(opts.selected_filepaths) do
local lines, error = Utils.read_file_from_buf_or_disk(filepath) local lines, error = Utils.read_file_from_buf_or_disk(filepath)
lines = lines or {}
local filetype = Utils.get_filetype(filepath)
if error ~= nil then if error ~= nil then
Utils.error("error reading file: " .. error) Utils.error("error reading file: " .. error)
else else
local content = table.concat(lines, "\n") local content = table.concat(lines or {}, "\n")
local filetype = Utils.get_filetype(filepath)
table.insert(selected_files, { path = filepath, content = content, file_type = filetype }) table.insert(selected_files, { path = filepath, content = content, file_type = filetype })
end end
end end
end end
local viewed_files = {} local viewed_files = {}
if opts.history_messages then if opts.history_messages then
for _, message in ipairs(opts.history_messages) do for _, message in ipairs(opts.history_messages) do
local content = message.message.content local use = History.Helpers.get_tool_use_data(message)
if type(content) ~= "table" then goto continue end if use and use.name == "view" and use.input.path then
for _, item in ipairs(content) do local uniform_path = Utils.uniform_path(use.input.path)
if type(item) ~= "table" then goto continue1 end viewed_files[uniform_path] = use.id
if item.type ~= "tool_use" then goto continue1 end
local tool_name = item.name
if tool_name ~= "view" then goto continue1 end
local path = item.input.path
if path then
local uniform_path = Utils.uniform_path(path)
viewed_files[uniform_path] = item.id
end
::continue1::
end end
::continue::
end end
end end
@@ -884,12 +869,13 @@ function M._stream(opts)
local completed_attempt_completion_tool_use = nil local completed_attempt_completion_tool_use = nil
for idx = #history_messages, 1, -1 do for idx = #history_messages, 1, -1 do
local message = history_messages[idx] local message = history_messages[idx]
if message.is_user_submission then break end if not message.is_user_submission then
if not History.Helpers.is_tool_use_message(message) then goto continue end local use = History.Helpers.get_tool_use_data(message)
if message.message.content[1].name ~= "attempt_completion" then break end if use and use.name == "attempt_completion" then
completed_attempt_completion_tool_use = message completed_attempt_completion_tool_use = message
if message then break end break
::continue:: end
end
end end
local unfinished_todos = {} local unfinished_todos = {}
if opts.get_todos then if opts.get_todos then