Merge branch 'main' into feat/new-diff

olimorris · web-flow · commit 2ba48a3746d2 · 2025-12-28T17:17:03.000Z
diff --git a/.github/workflows/require-checklist.yml b/.github/workflows/require-checklist.yml
@@ -13,6 +13,6 @@ jobs:
     steps:
       - uses: mheap/require-checklist-action@v2
         with:
-          requireChecklist: false
+          requireChecklist: true
           skipDescriptionRegex: .*\(optional\).*
           skipDescriptionRegexFlags: i
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [18.3.1](https://github.com/olimorris/codecompanion.nvim/compare/v18.3.0...v18.3.1) (2025-12-28)
+
+
+### Bug Fixes
+
+* **adapters:** increase timeout for env var cmds ([#2601](https://github.com/olimorris/codecompanion.nvim/issues/2601)) ([c265e25](https://github.com/olimorris/codecompanion.nvim/commit/c265e25786ca0f2d1a07b4ceaa120ecbafcc5204)), closes [#2594](https://github.com/olimorris/codecompanion.nvim/issues/2594)
+* **chat:** remove images from title prompt ([#2586](https://github.com/olimorris/codecompanion.nvim/issues/2586)) ([274b2c6](https://github.com/olimorris/codecompanion.nvim/commit/274b2c69ea17d7f417999b132d81d63eb2cdb73f))
+
 ## [18.3.0](https://github.com/olimorris/codecompanion.nvim/compare/v18.2.1...v18.3.0) (2025-12-22)
 
 
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@
 Thank you to the following people:
 
 <p align="center">
-<!-- sponsors --><a href="https://github.com/unicell"><img src="https:&#x2F;&#x2F;github.com&#x2F;unicell.png" width="60px" alt="User avatar: Qiu Yu" /></a><a href="https://github.com/adam-e-trepanier"><img src="https:&#x2F;&#x2F;github.com&#x2F;adam-e-trepanier.png" width="60px" alt="User avatar: Adam Trepanier" /></a><a href="https://github.com/jfgordon2"><img src="https:&#x2F;&#x2F;github.com&#x2F;jfgordon2.png" width="60px" alt="User avatar: Jeff Gordon" /></a><a href="https://github.com/prettymuchbryce"><img src="https:&#x2F;&#x2F;github.com&#x2F;prettymuchbryce.png" width="60px" alt="User avatar: Bryce Neal" /></a><a href="https://github.com/pratyushmittal"><img src="https:&#x2F;&#x2F;github.com&#x2F;pratyushmittal.png" width="60px" alt="User avatar: Pratyush Mittal" /></a><a href="https://github.com/JuanCrg90"><img src="https:&#x2F;&#x2F;github.com&#x2F;JuanCrg90.png" width="60px" alt="User avatar: Juan Carlos Ruiz" /></a><a href="https://github.com/Alexander-Garcia"><img src="https:&#x2F;&#x2F;github.com&#x2F;Alexander-Garcia.png" width="60px" alt="User avatar: Alexander Garcia" /></a><a href="https://github.com/LumenYoung"><img src="https:&#x2F;&#x2F;github.com&#x2F;LumenYoung.png" width="60px" alt="User avatar: Lumen Yang" /></a><a href="https://github.com/JPFrancoia"><img src="https:&#x2F;&#x2F;github.com&#x2F;JPFrancoia.png" width="60px" alt="User avatar: JPFrancoia" /></a><a href="https://github.com/jinzhongjia"><img src="https:&#x2F;&#x2F;github.com&#x2F;jinzhongjia.png" width="60px" alt="User avatar: jinzhongjia" /></a><a href="https://github.com/mrjones2014"><img src="https:&#x2F;&#x2F;github.com&#x2F;mrjones2014.png" width="60px" alt="User avatar: Mat" /></a><a href="https://github.com/Jahn16"><img src="https:&#x2F;&#x2F;github.com&#x2F;Jahn16.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/pixlmint"><img src="https:&#x2F;&#x2F;github.com&#x2F;pixlmint.png" width="60px" alt="User avatar: Christian Gröber" /></a><!-- sponsors -->
+<!-- sponsors --><a href="https://github.com/unicell"><img src="https:&#x2F;&#x2F;github.com&#x2F;unicell.png" width="60px" alt="User avatar: Qiu Yu" /></a><a href="https://github.com/adam-e-trepanier"><img src="https:&#x2F;&#x2F;github.com&#x2F;adam-e-trepanier.png" width="60px" alt="User avatar: Adam Trepanier" /></a><a href="https://github.com/jfgordon2"><img src="https:&#x2F;&#x2F;github.com&#x2F;jfgordon2.png" width="60px" alt="User avatar: Jeff Gordon" /></a><a href="https://github.com/prettymuchbryce"><img src="https:&#x2F;&#x2F;github.com&#x2F;prettymuchbryce.png" width="60px" alt="User avatar: Bryce Neal" /></a><a href="https://github.com/pratyushmittal"><img src="https:&#x2F;&#x2F;github.com&#x2F;pratyushmittal.png" width="60px" alt="User avatar: Pratyush Mittal" /></a><a href="https://github.com/JuanCrg90"><img src="https:&#x2F;&#x2F;github.com&#x2F;JuanCrg90.png" width="60px" alt="User avatar: Juan Carlos Ruiz" /></a><a href="https://github.com/Alexander-Garcia"><img src="https:&#x2F;&#x2F;github.com&#x2F;Alexander-Garcia.png" width="60px" alt="User avatar: Alexander Garcia" /></a><a href="https://github.com/LumenYoung"><img src="https:&#x2F;&#x2F;github.com&#x2F;LumenYoung.png" width="60px" alt="User avatar: Lumen Yang" /></a><a href="https://github.com/JPFrancoia"><img src="https:&#x2F;&#x2F;github.com&#x2F;JPFrancoia.png" width="60px" alt="User avatar: JPFrancoia" /></a><a href="https://github.com/pixlmint"><img src="https:&#x2F;&#x2F;github.com&#x2F;pixlmint.png" width="60px" alt="User avatar: Christian Gröber" /></a><!-- sponsors -->
 </p>
 
 <p align="center">If <i>you</i> love CodeCompanion and use it in your workflow, please consider <a href="https://github.com/sponsors/olimorris">sponsoring me</a></p>
diff --git a/doc/configuration/adapters-acp.md b/doc/configuration/adapters-acp.md
@@ -6,6 +6,20 @@ description: Learn how to configure ACP adapters like Claude Code, Gemini CLI an
 
 This section contains configuration which is specific to Agent Client Protocol (ACP) adapters only. There is a lot of shared functionality between ACP and [http](/configuration/adapters-http) adapters. Therefore it's recommended you read the two pages together.
 
+## Changing an Adapter
+
+You can select an ACP adapter to be the default for all chat interactions:
+
+```lua
+require("codecompanion").setup({
+  interactions = {
+    chat = {
+      adapter = "gemini_cli",
+    },
+  },
+}),
+```
+
 ## Changing Adapter Settings
 
 To change any of the default settings for an ACP adapter, you can extend it in your CodeCompanion setup. For example, to change the timeout and authentication method for the Gemini CLI adapter, you can do the following:
diff --git a/doc/configuration/rules.md b/doc/configuration/rules.md
@@ -254,7 +254,7 @@ require("codecompanion").setup({
 
 Parsers allow CodeCompanion to transform rules, affecting how they are shared in the chat buffer. This is particularly useful if you reference files in your rules. Currently, the plugin has two in-built parsers:
 
-- `claude` - which will import files into the chat buffer in the same way Claude Code [does](https://docs.anthropic.com/en/docs/claude-code/memory#claude-md-imports). Note, this requires rules to be `markdown` files
+- `claude` - which will import files into the chat buffer in the same way Claude Code [does](https://code.claude.com/docs/en/memory#claude-md-imports). Note, this requires rules to be `markdown` files
 - `CodeCompanion` - parses rules in the same ways as `claude` but allows for a system prompts to be extracted via a H2 "System Prompt" header
 - `none` - a blank parser which can be used to overwrite parsers that have been set on the default rules groups
 
diff --git a/lua/codecompanion/acp/init.lua b/lua/codecompanion/acp/init.lua
@@ -21,6 +21,7 @@
 local METHODS = require("codecompanion.acp.methods")
 local PromptBuilder = require("codecompanion.acp.prompt_builder")
 local adapter_utils = require("codecompanion.utils.adapters")
+local config = require("codecompanion.config")
 local log = require("codecompanion.utils.log")
 
 local TIMEOUTS = {
@@ -348,7 +349,7 @@ end
 ---@return CodeCompanion.ACPAdapter
 function Connection:prepare_adapter()
   local adapter = vim.deepcopy(self.adapter)
-  adapter = adapter_utils.get_env_vars(adapter)
+  adapter = adapter_utils.get_env_vars(adapter, { timeout = config.adapters.opts.cmd_timeout })
   adapter.parameters = adapter_utils.set_env_vars(adapter, adapter.parameters)
   adapter.defaults.auth_method = adapter_utils.set_env_vars(adapter, adapter.defaults.auth_method)
   adapter.defaults.mcpServers = adapter_utils.set_env_vars(adapter, adapter.defaults.mcpServers)
diff --git a/lua/codecompanion/adapters/http/ollama/get_models.lua b/lua/codecompanion/adapters/http/ollama/get_models.lua
@@ -126,7 +126,7 @@ function M.choices(self, opts)
     log:error("Could not resolve Ollama adapter in the `choices` function")
     return {}
   end
-  adapter_utils.get_env_vars(adapter)
+  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
 
diff --git a/lua/codecompanion/adapters/http/openai_compatible.lua b/lua/codecompanion/adapters/http/openai_compatible.lua
@@ -40,7 +40,7 @@ local function get_models(self, opts)
     return {}
   end
 
-  adapter_utils.get_env_vars(adapter)
+  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 = {
diff --git a/lua/codecompanion/config.lua b/lua/codecompanion/config.lua
@@ -48,6 +48,9 @@ local defaults = {
         show_presets = true,
       },
     },
+    opts = {
+      cmd_timeout = 10e3, -- Timeout for commands that resolve env variables (milliseconds)
+    },
   },
   constants = constants,
   interactions = {
diff --git a/lua/codecompanion/http.lua b/lua/codecompanion/http.lua
@@ -181,7 +181,7 @@ function Client:send_sync(payload, opts)
     return nil, { message = "Failed to setup adapter", stderr = "setup=false" }
   end
 
-  adapter = adapter_utils.get_env_vars(adapter)
+  adapter = adapter_utils.get_env_vars(adapter, { timeout = config.adapters.opts.cmd_timeout })
 
   local body = self.methods.encode(
     vim.tbl_extend(
@@ -307,7 +307,7 @@ function Client:request(payload, actions, opts)
     return log:error("Failed to setup adapter")
   end
 
-  adapter = adapter_utils.get_env_vars(adapter)
+  adapter = adapter_utils.get_env_vars(adapter, { timeout = config.adapters.opts.cmd_timeout })
 
   local body = self.methods.encode(
     vim.tbl_extend(
diff --git a/lua/codecompanion/interactions/inline/init.lua b/lua/codecompanion/interactions/inline/init.lua
@@ -419,10 +419,6 @@ local _streaming = true
 function Inline:submit(prompt)
   log:info("[Inline] Request started")
 
-  if self.buffer_context.is_visual then
-    pcall(vim.cmd.normal, { vim.fn.mode(), bang = true })
-  end
-
   -- Inline editing only works with streaming off - We should remember the current status
   _streaming = self.adapter.opts.stream
   self.adapter.opts.stream = false
diff --git a/lua/codecompanion/utils/adapters.lua b/lua/codecompanion/utils/adapters.lua
@@ -215,17 +215,16 @@ end
 
 ---Run the command in the environment variable
 ---@param var string
+---@param timeout number
 ---@return string|nil
-local function run_cmd(var)
+local function run_cmd(var, timeout)
   log:trace("[Adapters] Detected cmd in environment variable")
 
-  local timeout_ms = 5000 -- 5 second timeout
-
   local cmd = var:sub(5)
 
   local shell_cmd = require("codecompanion.utils.os").build_shell_command(cmd)
 
-  local obj = vim.system(shell_cmd, { text = true, timeout = timeout_ms })
+  local obj = vim.system(shell_cmd, { text = true, timeout = timeout })
   if not obj then
     return log:error("[Adapters] Could not execute cmd: %s", cmd)
   end
@@ -302,8 +301,9 @@ end
 
 ---Get the variables from the env key of the adapter
 ---@param adapter table
+---@param args? { timeout: number }
 ---@return table
-function M.get_env_vars(adapter)
+function M.get_env_vars(adapter, args)
   local env_vars = adapter.env or {}
 
   if not env_vars then
@@ -314,7 +314,8 @@ function M.get_env_vars(adapter)
 
   for k, v in pairs(env_vars) do
     if type(v) == "string" and is_cmd(v) then
-      adapter.env_replaced[k] = run_cmd(v)
+      local timeout = (args and args.timeout) or 5000
+      adapter.env_replaced[k] = run_cmd(v, timeout)
     elseif type(v) == "string" and is_env_var(v) then
       adapter.env_replaced[k] = get_env_var(v)
     elseif type(v) == "function" then
diff --git a/tests/config.lua b/tests/config.lua
@@ -69,6 +69,9 @@ return {
         roles = { user = "user", assistant = "assistant" },
       },
     },
+    opts = {
+      cmd_timeout = 10e3,
+    },
   },
   interactions = {
     background = {},
