diff --git a/lua/avante/suggestion.lua b/lua/avante/suggestion.lua
index 8a9da64..e7c864c 100644
--- a/lua/avante/suggestion.lua
+++ b/lua/avante/suggestion.lua
@@ -3,6 +3,7 @@ local Llm = require("avante.llm")
 local Highlights = require("avante.highlights")
 local Config = require("avante.config")
 local Providers = require("avante.providers")
+local HistoryMessage = require("avante.history_message")
 local api = vim.api
 local fn = vim.fn
 
@@ -75,7 +76,7 @@ function Suggestion:suggest()
   local provider = Providers[Config.auto_suggestions_provider or Config.provider]
 
   ---@type AvanteLLMMessage[]
-  local history_messages = {
+  local llm_messages = {
     {
       role = "user",
       content = [[
@@ -132,6 +133,8 @@ L5:     pass
     },
   }
 
+  local history_messages = vim.iter(llm_messages):map(function(msg) return HistoryMessage:new(msg) end):totable()
+
   local diagnostics = Utils.get_diagnostics(bufnr)
 
   Llm.stream({