fix(adapters): increase timeout for env var cmds

Author: olimorris

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)

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
 

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 = {

lua/codecompanion/config.lua

@@ -48,6 +48,9 @@ local defaults = {
         show_presets = true,
       },
     },
+    opts = {
+      cmd_timeout = 20e3, -- Timeout for commands that resolve env variables (milliseconds)
+    },
   },
   constants = constants,
   interactions = {

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(

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

tests/config.lua

@@ -69,6 +69,9 @@ return {
         roles = { user = "user", assistant = "assistant" },
       },
     },
+    opts = {
+      cmd_timeout = 10e3,
+    },
   },
   interactions = {
     background = {},