Merge branch 'main' into feat/context-limit-detection

Author: olimorris

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [19.9.0](https://github.com/olimorris/codecompanion.nvim/compare/v19.8.0...v19.9.0) (2026-04-04)
+
+
+### Features
+
+* **acp:** make connection async ([#2978](https://github.com/olimorris/codecompanion.nvim/issues/2978)) ([7684102](https://github.com/olimorris/codecompanion.nvim/commit/7684102be54d56997c5090e9931bd043929af173))
+* **chat:** `buffers` editor context can be configured ([#2970](https://github.com/olimorris/codecompanion.nvim/issues/2970)) ([65328ef](https://github.com/olimorris/codecompanion.nvim/commit/65328efc76966f1cb76d39dfba23d540a011a370))
+
+
+### Bug Fixes
+
+* **acp:** support session/set_config_option for models ([#2977](https://github.com/olimorris/codecompanion.nvim/issues/2977)) ([7ee8557](https://github.com/olimorris/codecompanion.nvim/commit/7ee85571c21cfced765126d5f5001796dcad1cf0)), closes [#2969](https://github.com/olimorris/codecompanion.nvim/issues/2969)
+* **chat:** duplicate rules ([#2976](https://github.com/olimorris/codecompanion.nvim/issues/2976)) ([eadd050](https://github.com/olimorris/codecompanion.nvim/commit/eadd05011e6941bcd8a614e7702748b358d07722))
+
 ## [19.8.0](https://github.com/olimorris/codecompanion.nvim/compare/v19.7.0...v19.8.0) (2026-03-30)
 
 

lua/codecompanion/adapters/http/ollama/get_models.lua

@@ -5,13 +5,12 @@ local log = require("codecompanion.utils.log")
 
 local CONSTANTS = {
   TIMEOUT = 3000, -- 3 seconds
-  POLL_INTERVAL = 10,
 }
 
----Whether there are already some requests running.
-local running = false
+---@type table<string, boolean>
+local _running = {}
 
-M = {}
+local M = {}
 
 ---@type table<string, table<string, { formatted_name: string?, opts: {can_reason: boolean, has_vision: boolean, can_use_tools: boolean} }>>
 local _cached_models = {}
@@ -20,85 +19,104 @@ local _cached_models = {}
 
 ---@param url string
 ---@param opts? OllamaGetModelsOpts
+---@return table|string|nil
 local function get_cached_models(url, opts)
-  assert(_cached_models[url] ~= nil, "Model info is not available in the cache.")
   local models = _cached_models[url]
+  if not models or vim.tbl_isempty(models) then
+    return opts and opts.last and "" or {}
+  end
   if opts and opts.last then
     return vim.tbl_keys(models)[1]
-  else
-    return models
   end
+  return models
+end
+
+---Build auth headers from adapter env vars
+---@param adapter CodeCompanion.HTTPAdapter
+---@return table
+local function build_headers(adapter)
+  local headers = adapter_utils.set_env_vars(adapter, adapter.headers) or {}
+
+  if adapter.env_replaced.api_key then
+    local prefix = adapter.env_replaced.authorization or "Bearer"
+    headers["Authorization"] = prefix .. " " .. adapter.env_replaced.api_key
+  end
+
+  return headers
+end
+
+---Parse capabilities from a model info response
+---@param output table The curl response
+---@return { can_reason: boolean, can_use_tools: boolean, has_vision: boolean }
+local function parse_capabilities(output)
+  local opts = {}
+  if output.status ~= 200 then
+    return opts
+  end
+
+  local ok, json = pcall(vim.json.decode, output.body, { array = true, object = true })
+  if not ok then
+    return opts
+  end
+
+  local capabilities = json.capabilities or {}
+  opts.can_reason = vim.list_contains(capabilities, "thinking")
+  opts.can_use_tools = vim.list_contains(capabilities, "tools")
+  opts.has_vision = vim.list_contains(capabilities, "vision")
+
+  return opts
 end
 
 ---Fetch model list and model info.
----Aborts if there's another fetch job running.
----Returns the number of models if the fetches are fired.
+---Aborts if there's another fetch job running for this URL.
 ---@param adapter CodeCompanion.HTTPAdapter Ollama adapter with env var replaced.
----@param opts OllamaGetModelsOpts
-local function fetch_async(adapter, opts)
+local function fetch_models(adapter)
   assert(adapter ~= nil)
-  if running then
+  local url = adapter.env_replaced.url
+
+  if _running[url] then
     return
   end
-  local url = adapter.env_replaced.url
-  running = true
+  _running[url] = true
   _cached_models[url] = _cached_models[url] or {}
 
-  local headers = adapter_utils.set_env_vars(adapter, adapter.headers) or {}
-
-  local auth_header = "Bearer "
-  if adapter.env_replaced.authorization then
-    auth_header = adapter.env_replaced.authorization .. " "
-  end
-  if adapter.env_replaced.api_key then
-    headers["Authorization"] = auth_header .. adapter.env_replaced.api_key
-  end
+  local headers = build_headers(adapter)
 
   pcall(function()
-    local job = Curl.get(url .. "/api/tags", {
+    Curl.get(url .. "/api/tags", {
       headers = headers,
       insecure = config.adapters.http.opts.allow_insecure,
       proxy = config.adapters.http.opts.proxy,
       timeout = CONSTANTS.TIMEOUT,
       callback = function(response)
         if response.status ~= 200 then
+          _running[url] = false
           return log:error("Could not get the Ollama models from " .. url .. "/api/tags.\nError: %s", response)
         end
 
         local ok, json = pcall(vim.json.decode, response.body)
         if not ok then
+          _running[url] = false
           return log:error("Could not parse the response from " .. url .. "/api/tags")
         end
 
-        -- A container for pending requests.
-        -- New jobs are added on creation and removed on completion.
-        local jobs = {}
+        local pending = {}
 
         for _, model_obj in ipairs(json.models) do
-          jobs[model_obj.name] = Curl.post(url .. "/api/show", {
+          pending[model_obj.name] = Curl.post(url .. "/api/show", {
+            body = vim.json.encode({ model = model_obj.name }),
             headers = headers,
             insecure = config.adapters.http.opts.allow_insecure,
             proxy = config.adapters.http.opts.proxy,
-            body = vim.json.encode({ model = model_obj.name }),
             timeout = CONSTANTS.TIMEOUT,
             callback = function(output)
-              _cached_models[url][model_obj.name] = { formatted_name = model_obj.name, opts = {} }
-              if output.status == 200 then
-                local ok, model_info_json = pcall(vim.json.decode, output.body, { array = true, object = true })
-                if ok then
-                  _cached_models[url][model_obj.name].opts.can_reason =
-                    vim.list_contains(model_info_json.capabilities or {}, "thinking")
-                  _cached_models[url][model_obj.name].opts.has_vision =
-                    vim.list_contains(model_info_json.capabilities or {}, "vision")
-                  _cached_models[url][model_obj.name].opts.can_use_tools =
-                    vim.list_contains(model_info_json.capabilities or {}, "tools")
-                end
-              end
-              jobs[model_obj.name] = nil
-              if vim.tbl_isempty(jobs) then
-                -- when the last curl request job is removed,
-                -- mark the current `fetch_async` job as finished
-                running = false
+              _cached_models[url][model_obj.name] = {
+                formatted_name = model_obj.name,
+                opts = parse_capabilities(output),
+              }
+              pending[model_obj.name] = nil
+              if vim.tbl_isempty(pending) then
+                _running[url] = false
               end
             end,
           })
@@ -107,8 +125,7 @@ local function fetch_async(adapter, opts)
     })
     if adapter.opts.cache_adapter == false then
       vim.wait(CONSTANTS.TIMEOUT, function()
-        local models = _cached_models[url]
-        return models ~= nil and not vim.tbl_isempty(models) and not running
+        return not _running[url]
       end)
     end
   end)
@@ -128,14 +145,13 @@ function M.choices(self, opts)
   adapter_utils.get_env_vars(adapter, { timeout = config.adapters.opts.cmd_timeout })
   local url = adapter.env_replaced.url
   local is_uninitialised = _cached_models[url] == nil
-
   local should_block = (adapter.opts.cache_adapter == false) or is_uninitialised or not opts.async
 
-  fetch_async(adapter, { async = not should_block }) -- should_block means NO async
+  fetch_models(adapter)
 
-  if should_block and running then
+  if should_block and _running[url] then
     vim.wait(CONSTANTS.TIMEOUT, function()
-      return not running
+      return not _running[url]
     end)
   end
   return get_cached_models(url, opts)
@@ -150,11 +166,11 @@ function M.check_thinking_capability(self, model)
   if type(model) == "function" then
     model = model(self)
   end
-  local _choices = self.schema.model.choices
-  if type(_choices) == "function" then
-    _choices = _choices(self)
+  local choices = self.schema.model.choices
+  if type(choices) == "function" then
+    choices = choices(self)
   end
-  if _choices and _choices[model] and _choices[model].opts and _choices[model].opts.can_reason then
+  if choices and choices[model] and choices[model].opts and choices[model].opts.can_reason then
     return true
   end
   return false

lua/codecompanion/adapters/http/ollama/init.lua

@@ -12,10 +12,10 @@ return {
     user = "user",
   },
   opts = {
+    cache_adapter = true, -- Cache the resolved adapter to prevent multiple resolutions
     stream = true,
     tools = true,
     vision = true,
-    cache_adapter = true, -- Cache the resolved adapter to prevent multiple resolutions
   },
   features = {
     text = true,

lua/codecompanion/http.lua

@@ -244,7 +244,7 @@ function Client:send_sync(payload, opts)
     adapter = {
       name = adapter.name,
       formatted_name = adapter.formatted_name,
-      model = type(adapter.schema.model.default) == "function" and adapter.schema.model.default()
+      model = type(adapter.schema.model.default) == "function" and adapter.schema.model.default(adapter)
         or adapter.schema.model.default
         or "",
     },
@@ -449,7 +449,7 @@ function Client:request(payload, actions, opts)
   opts.adapter = {
     name = adapter.name,
     formatted_name = adapter.formatted_name,
-    model = type(adapter.schema.model.default) == "function" and adapter.schema.model.default()
+    model = type(adapter.schema.model.default) == "function" and adapter.schema.model.default(adapter)
       or adapter.schema.model.default
       or "",
   }

lua/codecompanion/interactions/chat/acp/handler.lua

@@ -221,6 +221,8 @@ end
 function ACPHandler:process_tool_call(tool_call)
   local id = tool_call.toolCallId
 
+  log:trace("[ACP::Handler] Processing tool call %s", tool_call)
+
   local merged = merge_tool_call(self.tools[id], tool_call)
   tool_call = merged
 

lua/codecompanion/interactions/chat/ui/folds.lua

@@ -123,9 +123,6 @@ function Folds:_delete(bufnr, line)
       end
     end)
   end)
-  if not ok then
-    log:trace("[Folds] Failed to delete exact fold at line %d: %s", line, err)
-  end
 end
 
 ---Create a new fold

version.txt

@@ -1 +1 @@
-19.8.0
+19.9.0