fix(chat): prevent duplicate references

Author: olimorris

lua/codecompanion/adapters/ollama.lua

@@ -123,10 +123,7 @@ return {
         local ok, json = pcall(vim.json.decode, data, { luanil = { object = true } })
 
         if not ok then
-          return {
-            status = "error",
-            output = string.format("Error malformed json: %s", json),
-          }
+          return { status = "error" }
         end
 
         local message = json.message
@@ -136,8 +133,6 @@ return {
           output.role = message.role or nil
         end
 
-        -- log:trace("----- For Adapter test creation -----\nOutput: %s\n ---------- // END ----------", output)
-
         return {
           status = "success",
           output = output,

lua/codecompanion/strategies/chat/init.lua

@@ -699,23 +699,22 @@ function Chat:submit(opts)
           end
 
           local result = self.adapter.handlers.chat_output(self.adapter, data)
-          if result and result.status == CONSTANTS.STATUS_SUCCESS then
-            if result.output.role then
-              result.output.role = config.constants.LLM_ROLE
+          if result and result.status then
+            self.status = result.status
+            if self.status == CONSTANTS.STATUS_SUCCESS then
+              if result.output.role then
+                result.output.role = config.constants.LLM_ROLE
+              end
+              table.insert(output, result.output.content)
+              self:add_buf_message(result.output)
             end
-            self.status = CONSTANTS.STATUS_SUCCESS
-            table.insert(output, result.output.content)
-            self:add_buf_message(result.output)
           end
         end
       end,
       done = function()
         self:done(output)
       end,
-    }, {
-      bufnr = bufnr,
-      strategy = "chat",
-    })
+    }, { bufnr = bufnr, strategy = "chat" })
 end
 
 ---Increment the cycle count in the chat buffer
@@ -738,6 +737,11 @@ end
 function Chat:done(output)
   self.current_request = nil
 
+  -- Commonly, a status may not be set if the message exceeds a token limit
+  if not self.status or self.status == "" then
+    return self:reset()
+  end
+
   if output and not vim.tbl_isempty(output) then
     self:add_message({
       role = config.constants.LLM_ROLE,
@@ -750,6 +754,7 @@ function Chat:done(output)
 
   local assistant_range = self.header_line
   self:set_range(-2)
+
   self.ui:display_tokens(self.parser, self.header_line)
   self.references:render()
 

tests/strategies/chat/test_references.lua

@@ -150,9 +150,11 @@ T["References"]["Can be pinned"] = function()
   h.eq(#chat.messages, 5, "There are four messages")
   h.eq(chat.messages[#chat.messages].content, "Basic Slash Command")
 
-  chat:done({})
+  chat.status = "success"
+  chat:done({ content = "Some data" })
 
   local buffer = h.get_buf_lines(chat.bufnr)
+
   h.eq("> Sharing:", buffer[3])
   h.eq(string.format("> - %s<buf>pinned example</buf>", icon), buffer[8])
   h.eq("> - <buf>unpinned example</buf>", buffer[9])