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

refactor(sidebar): use helpers when working with history

Browse Source 
Do not poke directly into avante.HistoryMessage instances, use
appropriate helpers instead.
This commit is contained in:
Dmitry Torokhov
2025-07-17 22:35:26 -07:00
committed by yetone
parent 86e8563125
commit 2d9f8fd252
3 changed files with 47 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lua/avante/sidebar.lua
View File

@@ -1724,8 +1724,7 @@ local function _get_message_lines(message, messages, ctx)
return res
end
if message.message.role == "assistant" then
local content = message.message.content
if type(content) == "table" and content[1].type == "tool_use" then return lines end
if History.Helpers.is_tool_use_message(message) then return lines end
local text = table.concat(vim.tbl_map(function(line) return tostring(line) end, lines), "\n")
local transformed = transform_result_content(text, ctx.prev_filepath)
ctx.prev_filepath = transformed.current_filepath
@@ -2081,12 +2080,9 @@ function Sidebar:add_history_messages(messages)
end
local last_message = messages[#messages]
if last_message then
local content = last_message.message.content
if type(content) == "table" and content[1].type == "tool_use" then
if History.Helpers.is_tool_use_message(last_message) then
self.current_state = "tool calling"
elseif type(content) == "table" and content[1].type == "thinking" then
self.current_state = "thinking"
elseif type(content) == "table" and content[1].type == "redacted_thinking" then
elseif History.Helpers.is_thinking_message(last_message) then
self.current_state = "thinking"
else
self.current_state = "generating"
@@ -2514,24 +2510,18 @@ function Sidebar:create_input_container()
---@param state AvanteLLMToolUseState
local function on_tool_log(tool_id, tool_name, log, state)
if state == "generating" then on_state_change("tool calling") end
local tool_use_message = nil
for idx = #self.chat_history.messages, 1, -1 do
local message = self.chat_history.messages[idx]
local content = message.message.content
if type(content) == "table" and content[1].type == "tool_use" and content[1].id == tool_id then
tool_use_message = message
break
end
end
local tool_use_message = History.Helpers.get_tool_use_message(tool_id, self.chat_history.messages)
if not tool_use_message then
-- Utils.debug("tool_use message not found", tool_id, tool_name)
return
end
local tool_use_logs = tool_use_message.tool_use_logs or {}
local content = string.format("[%s]: %s", tool_name, log)
table.insert(tool_use_logs, content)
local orig_is_calling = tool_use_message.is_calling
tool_use_message.tool_use_logs = tool_use_logs
local orig_is_calling = tool_use_message.is_calling
tool_use_message.is_calling = true
self:update_content("")
tool_use_message.is_calling = orig_is_calling
@@ -2539,20 +2529,13 @@ function Sidebar:create_input_container()
end
local function set_tool_use_store(tool_id, key, value)
local tool_use_message = nil
for idx = #self.chat_history.messages, 1, -1 do
local message = self.chat_history.messages[idx]
local content = message.message.content
if type(content) == "table" and content[1].type == "tool_use" and content[1].id == tool_id then
tool_use_message = message
break
end
local tool_use_message = History.Helpers.get_tool_use_message(tool_id, self.chat_history.messages)
if tool_use_message then
local tool_use_store = tool_use_message.tool_use_store or {}
tool_use_store[key] = value
tool_use_message.tool_use_store = tool_use_store
self:save_history()
end
if not tool_use_message then return end
local tool_use_store = tool_use_message.tool_use_store or {}
tool_use_store[key] = value
tool_use_message.tool_use_store = tool_use_store
self:save_history()
end
---@type AvanteLLMStopCallback