fix(chat): acp model selection

Author: olimorris

lua/codecompanion/acp/init.lua

@@ -907,6 +907,8 @@ function Connection:_apply_config_options(config_options)
         end
       end
 
+      log:debug("[acp::_apply_config_options] Available Models:\n%s", available)
+
       self._models = {
         availableModels = available,
         currentModelId = opt.currentValue,

lua/codecompanion/interactions/chat/helpers/init.lua

@@ -10,21 +10,29 @@ local api = vim.api
 local fmt = string.format
 
 ---Establishes the connection, authenticates, creates a session and links the buffer.
----Runs asynchronously so the UI is not blocked during ACP initialization.
----@param chat CodeCompanion.Chat The chat instance
+---@param chat CodeCompanion.Chat
+---@param cb? function
 ---@return nil
-function M.create_acp_connection(chat)
+function M.create_acp_connection(chat, cb)
+  ---Run async so as not to block the UI
   local async_utils = require("codecompanion.utils.async")
 
+  local function call_cb()
+    if cb then
+      vim.schedule(cb)
+    end
+  end
+
   async_utils.sync(function()
     local ACPHandler = require("codecompanion.interactions.chat.acp.handler")
     local handler = ACPHandler.new(chat)
 
     if not handler:ensure_connection() then
-      return
+      return call_cb()
     end
 
     handler:ensure_session()
+    call_cb()
   end)()
 end
 

lua/codecompanion/interactions/chat/init.lua

@@ -699,7 +699,8 @@ end
 
 ---Change the adapter in the chat buffer
 ---@param adapter string
-function Chat:change_adapter(adapter)
+---@param cb? function
+function Chat:change_adapter(adapter, cb)
   local function fire()
     return utils.fire("ChatAdapter", { bufnr = self.bufnr, adapter = adapters.make_safe(self.adapter) })
   end
@@ -708,8 +709,12 @@ function Chat:change_adapter(adapter)
   self.ui.adapter = self.adapter
 
   if self.adapter.type == "acp" then
-    helpers.create_acp_connection(self)
+    helpers.create_acp_connection(self, cb)
     helpers.remove_mcp_tools(self)
+  else
+    if cb then
+      vim.schedule(cb)
+    end
   end
 
   self:set_system_prompt()

lua/codecompanion/interactions/chat/keymaps/change_adapter.lua

@@ -165,7 +165,7 @@ function M.select_model(chat)
     local acp_models = M.list_acp_models(chat.acp_connection)
     models_list = acp_models and acp_models.availableModels or nil
     if not acp_models or not models_list then
-      return log:debug("No models to select for the HTTP adapter")
+      return log:debug("No models to select for the ACP adapter")
     end
     current_model = acp_models.currentModelId
   end
@@ -233,18 +233,22 @@ function M.callback(chat)
       return
     end
 
-    if current_adapter ~= selected_adapter then
-      chat.acp_connection = nil -- Ensure we reset this
-      chat:change_adapter(selected_adapter)
-    end
+    local function on_adapter_ready()
+      -- Only force a system prompt update if the user isn't ignoring it. This
+      -- occurs when a user has initiated a chat from the prompt library
+      if not chat.opts.ignore_system_prompt then
+        M.update_system_prompt(chat)
+      end
 
-    -- Only force a system prompt update if the user isn't ignoring it. This
-    -- occurs when a user has initiated a chat from the prompt library
-    if not chat.opts.ignore_system_prompt then
-      M.update_system_prompt(chat)
+      return M.select_model(chat)
     end
 
-    return M.select_model(chat)
+    if current_adapter ~= selected_adapter then
+      chat.acp_connection = nil -- Ensure we reset this
+      chat:change_adapter(selected_adapter, on_adapter_ready)
+    else
+      return on_adapter_ready()
+    end
   end)
 end