Merge branch 'main' into develop

Author: olimorris

lua/codecompanion/adapters/http/anthropic.lua

@@ -157,7 +157,7 @@ return {
       local system = vim
         .iter(messages)
         :filter(function(msg)
-          return msg.role == "system"
+          return msg.role == "system" and msg.content and msg.content ~= ""
         end)
         :map(function(msg)
           return {

lua/codecompanion/init.lua

@@ -4,6 +4,8 @@ local log = require("codecompanion.utils.log")
 
 local api = vim.api
 
+local _version
+
 -- Lazy load context_utils
 local context_utils
 local function get_context(bufnr, args)
@@ -342,11 +344,37 @@ CodeCompanion.has = function(feature)
   return features
 end
 
+---Output the plugin version
+---@return string|nil
+CodeCompanion.version = function()
+  if _version then
+    return _version
+  end
+
+  local ok, version = pcall(function()
+    return require("codecompanion.utils.files")
+      .read(
+        vim.fs.joinpath(
+          string.sub(debug.getinfo(1).source, 2, string.len("/lua/codecompanion/init.lua") * -1),
+          "version.txt"
+        )
+      )
+      :gsub("%s+", "")
+  end)
+
+  if ok then
+    _version = version
+    return _version
+  end
+
+  return nil
+end
+
 ---Handle adapter configuration merging
 ---@param adapter_type string
 ---@param opts table
 ---@return nil
-local function handle_adapter_config(adapter_type, opts)
+local function adapter_config(adapter_type, opts)
   if opts and opts.adapters and opts.adapters[adapter_type] then
     if config.adapters[adapter_type].opts.show_presets then
       local adapters_util = require("codecompanion.utils.adapters")
@@ -367,8 +395,8 @@ CodeCompanion.setup = function(opts)
   -- Setup the plugin's config
   config.setup(opts)
 
-  handle_adapter_config("acp", opts)
-  handle_adapter_config("http", opts)
+  adapter_config("acp", opts)
+  adapter_config("http", opts)
 
   local cmds = require("codecompanion.commands")
   for _, cmd in ipairs(cmds) do

tests/adapters/http/test_anthropic.lua

@@ -384,6 +384,51 @@ T["Anthropic adapter"]["form_messages"]["consolidates consecutive user messages
   }, adapter.handlers.form_messages(adapter, messages).messages)
 end
 
+T["Anthropic adapter"]["form_messages"]["handles empty messages without errors"] = function()
+  local messages_with_empty_content = {
+    { content = "", role = "user" },
+    { content = "Valid message", role = "user" },
+    { content = "", role = "assistant" },
+    { content = "", role = "system" },
+  }
+
+  local result = adapter.handlers.form_messages(adapter, messages_with_empty_content)
+
+  h.eq(#result.messages, 2)
+  h.eq(result.messages[1].role, "user")
+  h.eq(result.messages[1].content[1].text, "<prompt></prompt>")
+  h.eq(result.messages[1].content[2].text, "Valid message")
+  h.eq(result.messages[2].role, "assistant")
+end
+
+T["Anthropic adapter"]["form_messages"]["filters out empty system messages"] = function()
+  local messages_with_empty_system = {
+    { content = "", role = "system" },
+    { content = "Valid system message", role = "system" },
+    { content = "User message", role = "user" },
+  }
+
+  local result = adapter.handlers.form_messages(adapter, messages_with_empty_system)
+
+  h.eq(#result.system, 1)
+  h.eq(result.system[1].text, "Valid system message")
+  h.eq(#result.messages, 1)
+  h.eq(result.messages[1].content[1].text, "User message")
+end
+
+T["Anthropic adapter"]["form_messages"]["handles all empty messages"] = function()
+  local all_empty_messages = {
+    { content = "", role = "user" },
+    { content = "", role = "system" },
+  }
+
+  local result = adapter.handlers.form_messages(adapter, all_empty_messages)
+
+  h.eq(result.system, nil)
+  h.eq(result.messages[1].role, "user")
+  h.eq(result.messages[1].content[1].text, "<prompt></prompt>")
+end
+
 T["Anthropic adapter"]["form_messages"]["can handle reasoning"] = function()
   local messages = {
     {