Merge branch 'main' into develop

Author: olimorris

README.md

@@ -30,7 +30,7 @@ Thank you to the following people:
 
 - :speech_balloon: [Copilot Chat](https://github.com/features/copilot) meets [Zed AI](https://zed.dev/blog/zed-ai), in Neovim
 - :electric_plug: Support for LLMs from Anthropic, Copilot, GitHub Models, DeepSeek, Gemini, Mistral AI, Novita, Ollama, OpenAI, Azure OpenAI, HuggingFace and xAI (or [bring your own](https://codecompanion.olimorris.dev/extending/adapters.html))
-- :robot: Support for [Agent Client Protocol](https://agentclientprotocol.com/overview/introduction), enabling coding with agents like [Augment Code](https://docs.augmentcode.com/cli/overview), [Cagent](https://github.com/docker/cagent) from Docker, [Claude Code](https://docs.anthropic.com/en/docs/claude-code/overview), [Codex](https://openai.com/codex), [Gemini CLI](https://github.com/google-gemini/gemini-cli), [Goose](https://block.github.io/goose/), [Kimi CLI](https://github.com/MoonshotAI/kimi-cli), [Mistral Vibe](https://github.com/mistralai/mistral-vibe) and [OpenCode](https://opencode.ai)
+- :robot: Support for [Agent Client Protocol](https://agentclientprotocol.com/overview/introduction), enabling coding with agents like [Augment Code](https://docs.augmentcode.com/cli/overview), [Cagent](https://github.com/docker/cagent) from Docker, [Claude Code](https://docs.anthropic.com/en/docs/claude-code/overview), [Codex](https://openai.com/codex), [Gemini CLI](https://github.com/google-gemini/gemini-cli), [Goose](https://block.github.io/goose/), [Kimi CLI](https://github.com/MoonshotAI/kimi-cli), [Kiro](https://kiro.dev/docs/cli/), [Mistral Vibe](https://github.com/mistralai/mistral-vibe) and [OpenCode](https://opencode.ai)
 - :heart_hands: User contributed and supported [adapters](https://codecompanion.olimorris.dev/configuration/adapters#community-adapters)
 - :rocket: [Inline transformations](https://codecompanion.olimorris.dev/usage/inline-assistant.html), code creation and refactoring
 - :art: [Variables](https://codecompanion.olimorris.dev/usage/chat-buffer/variables.html), [Slash Commands](https://codecompanion.olimorris.dev/usage/chat-buffer/slash-commands.html), [Tools](https://codecompanion.olimorris.dev/usage/chat-buffer/tools.html) and [Workflows](https://codecompanion.olimorris.dev/usage/workflows.html) to improve LLM output

doc/codecompanion.txt

@@ -1211,6 +1211,14 @@ CLI in order to setup your API key. Then ensure that in your chat buffer you
 select the `mistral_vibe` adapter.
 
 
+SETUP: KIRO CLI ~
+
+Install Kiro cli <https://kiro.dev/docs/cli/> as per their instructions. Then
+open it and login (if installation doesn’t already prompt you to login). the
+codecompanion adapter will execute `kiro-cli acp`, make sure to have it
+available on your PATH.
+
+
 SETUP: OPENCODE ~
 
 To use OpenCode <https://opencode.ai> in CodeCompanion, ensure you’ve

doc/configuration/adapters-acp.md

@@ -272,6 +272,10 @@ To use [Goose](https://block.github.io/goose/) in CodeCompanion, ensure you've f
 
 Install [Kimi CLI](https://github.com/MoonshotAI/kimi-cli?tab=readme-ov-file#installation) as per their instructions. Then in the CLI, run `kimi` followed by `/login` to configure your API key. Then ensure that in your chat buffer you select the `kimi_cli` adapter.
 
+## Setup: Kiro CLI
+
+Install [Kiro cli](https://kiro.dev/docs/cli/) as per their instructions. Then open it and login (if installation doesn't already prompt you to login). the codecompanion adapter will execute `kiro-cli acp`, make sure to have it available on your PATH.
+
 ## Setup: Mistral Vibe
 
 To use [Mistral Vibe](https://github.com/mistralai/mistral-vibe) in CodeCompanion, ensure you've followed their documentation to [install](https://github.com/mistralai/mistral-vibe). Then run `vibe --setup` in your CLI in order to setup your API key. Then ensure that in your chat buffer you select the `mistral_vibe` adapter.

lua/codecompanion/adapters/acp/kiro.lua

@@ -0,0 +1,66 @@
+local helpers = require("codecompanion.adapters.acp.helpers")
+
+---@class CodeCompanion.ACPAdapter.Kiro: CodeCompanion.ACPAdapter
+return {
+  name = "kiro",
+  formatted_name = "Kiro",
+  type = "acp",
+  roles = {
+    llm = "assistant",
+    user = "user",
+  },
+  opts = {
+    vision = true,
+  },
+  commands = {
+    default = {
+      "kiro-cli",
+      "acp",
+    },
+  },
+  defaults = {
+    mcpServers = {},
+    timeout = 20000, -- 20 seconds
+  },
+  parameters = {
+    protocolVersion = 1,
+    clientCapabilities = {
+      fs = { readTextFile = true, writeTextFile = true },
+    },
+    clientInfo = {
+      name = "CodeCompanion.nvim",
+      version = "1.0.0",
+    },
+  },
+  handlers = {
+    ---@param self CodeCompanion.ACPAdapter
+    ---@return boolean
+    setup = function(self)
+      return true
+    end,
+
+    ---Manually handle authentication
+    ---@param self CodeCompanion.ACPAdapter
+    ---@return boolean
+    auth = function(self)
+      -- kiro-cli handles authentication exclusively through its kiro-cli CLI interface
+      -- Users are expected to login there and then can use the ACP after. auth is therefore
+      -- declared a success here to work around attempted authentication.
+      return true
+    end,
+
+    ---@param self CodeCompanion.ACPAdapter
+    ---@param messages table
+    ---@param capabilities table
+    ---@return table
+    form_messages = function(self, messages, capabilities)
+      return helpers.form_messages(self, messages, capabilities)
+    end,
+
+    ---Function to run when the request has completed. Useful to catch errors
+    ---@param self CodeCompanion.ACPAdapter
+    ---@param code number
+    ---@return nil
+    on_exit = function(self, code) end,
+  },
+}

lua/codecompanion/adapters/http/openai_compatible.lua

@@ -43,12 +43,7 @@ local function get_models(self, opts)
   adapter_utils.get_env_vars(adapter, { timeout = config.adapters.opts.cmd_timeout })
   local url = adapter.env_replaced.url .. adapter.env_replaced.models_endpoint
 
-  local headers = {
-    ["content-type"] = "application/json",
-  }
-  if adapter.env_replaced.api_key then
-    headers["Authorization"] = "Bearer " .. adapter.env_replaced.api_key
-  end
+  local headers = adapter_utils.set_env_vars(adapter, adapter.headers) or {}
 
   local ok, response, json
 

lua/codecompanion/adapters/http/openai_responses.lua

@@ -181,7 +181,12 @@ return {
                 }
 
                 -- If next message is also from user with text content, combine them
-                if next_msg and next_msg.role == m.role and type(next_msg.content) == "string" then
+                if
+                  next_msg
+                  and next_msg.role == m.role
+                  and type(next_msg.content) == "string"
+                  and not (next_msg._meta and next_msg._meta.tag == "image")
+                then
                   table.insert(combined_content, {
                     type = "input_text",
                     text = next_msg.content,

lua/codecompanion/config.lua

@@ -43,6 +43,7 @@ local defaults = {
       gemini_cli = "gemini_cli",
       goose = "goose",
       kimi_cli = "kimi_cli",
+      kiro = "kiro",
       mistral_vibe = "mistral_vibe",
       opencode = "opencode",
       opts = {

lua/codecompanion/utils/init.lua

@@ -108,14 +108,20 @@ function M.extract_all_placeholders(prompts)
   return all_placeholders
 end
 
+---@param str string The string to escape percent signs in for gsub replacement
+---@return string The escaped string, safe for use as a gsub replacement
+local function escape_gsub_replacement(str)
+  return (str:gsub("%%", "%%%%"))
+end
+
 ---Replace any placeholders (e.g. ${placeholder}) in a string or table
 ---@param t table|string The content to process
 ---@param replacements table<string, string> Map of placeholder names to replacement values
 ---@return string|nil The replaced string if input was string, or nil if input was table (modified in place)
 function M.replace_placeholders(t, replacements)
   if type(t) == "string" then
     for placeholder, replacement in pairs(replacements) do
-      t = t:gsub("%${" .. vim.pesc(placeholder) .. "}", replacement)
+      t = t:gsub("%${" .. vim.pesc(placeholder) .. "}", escape_gsub_replacement(replacement))
     end
     return t
   else
@@ -124,7 +130,7 @@ function M.replace_placeholders(t, replacements)
         M.replace_placeholders(value, replacements)
       elseif type(value) == "string" then
         for placeholder, replacement in pairs(replacements) do
-          value = value:gsub("%${" .. vim.pesc(placeholder) .. "}", replacement)
+          value = value:gsub("%${" .. vim.pesc(placeholder) .. "}", escape_gsub_replacement(replacement))
         end
         t[key] = value
       end

tests/adapters/http/test_openai_responses.lua

@@ -153,6 +153,74 @@ T["Responses"]["build_messages"]["images"] = function()
   h.eq(expected, adapter.handlers.request.build_messages(adapter, messages))
 end
 
+T["Responses"]["build_messages"]["multiple consecutive images are not merged as text"] = function()
+  local messages = {
+    {
+      content = "img1_base64",
+      role = "user",
+      opts = { visible = false },
+      context = { mimetype = "image/png" },
+      _meta = { tag = "image" },
+    },
+    {
+      content = "img2_base64",
+      role = "user",
+      opts = { visible = false },
+      context = { mimetype = "image/png" },
+      _meta = { tag = "image" },
+    },
+    {
+      content = "img3_base64",
+      role = "user",
+      opts = { visible = false },
+      context = { mimetype = "image/png" },
+      _meta = { tag = "image" },
+    },
+    {
+      content = "How many images do you see?",
+      role = "user",
+    },
+  }
+
+  local expected = {
+    input = {
+      {
+        role = "user",
+        content = {
+          {
+            type = "input_image",
+            image_url = "data:image/png;base64,img1_base64",
+          },
+        },
+      },
+      {
+        role = "user",
+        content = {
+          {
+            type = "input_image",
+            image_url = "data:image/png;base64,img2_base64",
+          },
+        },
+      },
+      {
+        role = "user",
+        content = {
+          {
+            type = "input_image",
+            image_url = "data:image/png;base64,img3_base64",
+          },
+          {
+            type = "input_text",
+            text = "How many images do you see?",
+          },
+        },
+      },
+    },
+  }
+
+  h.eq(expected, adapter.handlers.request.build_messages(adapter, messages))
+end
+
 T["Responses"]["build_messages"]["format tool calls"] = function()
   local messages = {
     {

tests/utils/test_utils.lua

@@ -200,6 +200,26 @@ T["Utils"]["replace_placeholders()"]["handles special characters in placeholder
   h.eq(result, "Value: test")
 end
 
+T["Utils"]["replace_placeholders()"]["handles percent signs in replacement values"] = function()
+  local result = child.lua([[
+    return utils.replace_placeholders(
+      '(<a href="https://my.test.page/tester.php?login=${email}" title="Test Page">%20</a>)',
+      { email = "testuser%40testing.org" }
+    )
+  ]])
+  h.eq(result, '(<a href="https://my.test.page/tester.php?login=testuser%40testing.org" title="Test Page">%20</a>)')
+end
+
+T["Utils"]["replace_placeholders()"]["handles simple percent signs in replacement"] = function()
+  local result = child.lua([[
+    return utils.replace_placeholders(
+      "Encoded: ${value}",
+      { value = "%20" }
+    )
+  ]])
+  h.eq(result, "Encoded: %20")
+end
+
 T["Utils"]["resolve_nested_value()"] = MiniTest.new_set()
 
 T["Utils"]["resolve_nested_value()"]["resolves top-level value"] = function()