make commands use current chat instead of state directly

Author: joaopluigi

lua/eca/commands.lua

@@ -344,29 +344,43 @@ function M.setup()
   })
 
   vim.api.nvim_create_user_command("EcaChatSelectModel", function()
-    local state = require("eca.state"):new()
-    local models = state.config.models.list
+    local eca = require("eca")
+
+    if not eca or not eca.current or not eca.current.sidebar then
+      Logger.notify("No active ECA sidebar found", vim.log.levels.WARN)
+      return
+    end
+
+    local chat = eca.current.sidebar
+    local models = chat.mediator:models()
 
     vim.ui.select(models, {
       prompt = "Select ECA Chat Model:",
     }, function(choice)
       if choice then
-        state:update_selected_model(choice)
+        chat.mediator:update_selected_model(choice)
       end
     end)
   end, {
     desc = "Select current ECA Chat model",
   })
 
   vim.api.nvim_create_user_command("EcaChatSelectBehavior", function()
-    local state = require("eca.state"):new()
-    local behaviors = state.config.behaviors.list
+    local eca = require("eca")
+
+    if not eca or not eca.current or not eca.current.sidebar then
+      Logger.notify("No active ECA sidebar found", vim.log.levels.WARN)
+      return
+    end
+
+    local chat = eca.current.sidebar
+    local behaviors = chat.mediator:behaviors()
 
     vim.ui.select(behaviors, {
       prompt = "Select ECA Chat Behavior:",
     }, function(choice)
       if choice then
-        state:update_selected_behavior(choice)
+        chat.mediator:update_selected_behavior(choice)
       end
     end)
   end, {

lua/eca/mediator.lua

@@ -26,14 +26,30 @@ function mediator:send(method, params, callback)
   self.server:send_request(method, params, callback)
 end
 
+function mediator:behaviors()
+  return self.state.config.behaviors.list
+end
+
 function mediator:selected_behavior()
   return self.state.config.behaviors.selected
 end
 
+function mediator:update_selected_behavior(behavior)
+  self.state:update_selected_behavior(behavior)
+end
+
+function mediator:models()
+  return self.state.config.models.list
+end
+
 function mediator:selected_model()
   return self.state.config.models.selected
 end
 
+function mediator:update_selected_model(model)
+  self.state:update_selected_model(model)
+end
+
 function mediator:tokens_session()
   return self.state.usage.tokens.session
 end

tests/test_select_commands.lua

@@ -2,36 +2,43 @@ local MiniTest = require("mini.test")
 local eq = MiniTest.expect.equality
 local child = MiniTest.new_child_neovim()
 
+local function setup_test_environment()
+  -- Setup commands
+  require('eca.commands').setup()
+
+  -- Initialize everything
+  _G.Server = require('eca.server').new()
+  _G.State = require('eca.state').new()
+  _G.Mediator = require('eca.mediator').new(_G.Server, _G.State)
+  _G.Sidebar = require('eca.sidebar').new(1, _G.Mediator)
+  _G.Eca = require('eca')
+  _G.Eca.current = { sidebar = _G.Sidebar }
+
+  -- Mock vim.ui.select for testing
+  _G.selected_choice = nil
+  _G.shown_items = nil
+  _G.shown_prompt = nil
+  _G.original_select = vim.ui.select
+
+  _G.mock_select = function(choice)
+    _G.selected_choice = choice
+    vim.ui.select = function(items, opts, on_choice)
+      _G.shown_items = items
+      _G.shown_prompt = opts.prompt
+      on_choice(choice)
+    end
+  end
+
+  _G.restore_select = function()
+    vim.ui.select = _G.original_select
+  end
+end
+
 local T = MiniTest.new_set({
   hooks = {
     pre_case = function()
       child.restart({ "-u", "scripts/minimal_init.lua" })
-      child.lua([[
-        -- Setup commands
-        require('eca.commands').setup()
-
-        -- Instantiate state singleton
-        _G.State = require('eca.state').new()
-
-        -- Mock vim.ui.select for testing
-        _G.selected_choice = nil
-        _G.shown_items = nil
-        _G.shown_prompt = nil
-        _G.original_select = vim.ui.select
-
-        _G.mock_select = function(choice)
-          _G.selected_choice = choice
-          vim.ui.select = function(items, opts, on_choice)
-            _G.shown_items = items
-            _G.shown_prompt = opts.prompt
-            on_choice(choice)
-          end
-        end
-
-        _G.restore_select = function()
-          vim.ui.select = _G.original_select
-        end
-      ]])
+      child.lua_func(setup_test_environment)
     end,
     post_case = function()
       child.lua([[_G.restore_select()]])