Revert "Merge pull request #47 from editor-code-assistant/select-model-and-behavior"

This reverts commit 9c90bad, reversing
changes made to 8ae1e0a.

Author: joaopluigi

lua/eca/commands.lua

@@ -343,50 +343,6 @@ function M.setup()
     desc = "Emergency fix for treesitter issues in ECA chat",
   })
 
-  vim.api.nvim_create_user_command("EcaChatSelectModel", function()
-    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
-        chat.mediator:update_selected_model(choice)
-      end
-    end)
-  end, {
-    desc = "Select current ECA Chat model",
-  })
-
-  vim.api.nvim_create_user_command("EcaChatSelectBehavior", function()
-    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
-        chat.mediator:update_selected_behavior(choice)
-      end
-    end)
-  end, {
-    desc = "Select current ECA Chat behavior",
-  })
-
   Logger.debug("ECA commands registered")
 end
 

lua/eca/mediator.lua

@@ -26,30 +26,14 @@ 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

lua/eca/server.lua

@@ -98,7 +98,7 @@ end
 ---in testing
 ---@param opts? eca.ServerStartOpts
 function M:start(opts)
-  opts = vim.tbl_deep_extend("force", { initialize = true }, opts or {})
+  opts = opts or { initialize = true }
 
   local this_file = debug.getinfo(1, "S").source:sub(2)
   local proj_root = vim.fn.fnamemodify(this_file, ":p:h:h:h")
@@ -112,7 +112,7 @@ function M:start(opts)
 
   local lua_cmd = string.format("lua ServerPath.run(%s)", Utils.lua_quote(Config.server_path or ""))
 
-  local cmd = { nvim_exe, "--headless", "--noplugin", (opts.clean and " --clean" or ""), "-u", script_path, "-c", lua_cmd }
+  local cmd = { nvim_exe, "--headless", "--noplugin", "-u", script_path, "-c", lua_cmd }
 
   vim.system(cmd, { text = true }, function(out)
     if out.code ~= 0 then

lua/eca/sidebar.lua

@@ -1279,8 +1279,6 @@ function M:_send_message(message)
     requestId = tostring(os.time()),
     message = message,
     contexts = contexts or {},
-    model = self.mediator:selected_model(),
-    behavior = self.mediator:selected_behavior(),
   }, function(err, result)
     if err then
       print("err is " .. err)

lua/eca/state.lua

@@ -168,7 +168,7 @@ end
 function State:_update_usage(usage)
   self.usage = {
     tokens = {
-      limit = (usage.limit and usage.limit.context) or self.usage.tokens.limit,
+      limit = (usage.limit and usage.limit.output) or self.usage.tokens.limit,
       session = usage.sessionTokens or self.usage.tokens.session,
     },
     costs = {
@@ -198,28 +198,4 @@ function State:_update_tools(tool)
   end)
 end
 
-function State:update_selected_model(model)
-  if not model or type(model) ~= "string" then
-    return
-  end
-
-  self.config.models.selected = model
-
-  vim.schedule(function()
-    require("eca.observer").notify({ type = "state/updated", content = { config = vim.deepcopy(self.config) } })
-  end)
-end
-
-function State:update_selected_behavior(behavior)
-  if not behavior or type(behavior) ~= "string" then
-    return
-  end
-
-  self.config.behaviors.selected = behavior
-
-  vim.schedule(function()
-    require("eca.observer").notify({ type = "state/updated", content = { config = vim.deepcopy(self.config) } })
-  end)
-end
-
 return State

scripts/server_path.lua

@@ -3,19 +3,9 @@ local ServerPath = {}
 -- Setup if headless
 if #vim.api.nvim_list_uis() == 0 then
   _G.ServerPath = ServerPath
-
-  -- hijack to make server tests work on CI using --clean mode
-  local eca_available = pcall(require, "eca")
-  if not eca_available then
-    vim.cmd([[let &rtp.=','.getcwd()]])
-    vim.cmd('set rtp+=deps/nui.nvim')
-    vim.cmd('set rtp+=deps/eca-nvim')
-  end
-
   vim.o.swapfile = false
   vim.o.backup = false
   vim.o.writebackup = false
-
   require("eca").setup({})
 end
 

tests/test_select_commands.lua

@@ -40,7 +40,7 @@ end
 T["server"] = MiniTest.new_set()
 
 T["server"]["start"] = function()
-  child.lua("_G.server:start({ clean = true })")
+  child.lua("_G.server:start()")
   child.lua([[
     _G.server_started = vim.wait(10000, function()
       return _G.server and _G.server:is_running()
@@ -52,7 +52,7 @@ T["server"]["start"] = function()
 end
 
 T["server"]["start without initialize"] = function()
-  child.lua("_G.server:start({ clean = true, initialize = false })")
+  child.lua("_G.server:start({ initialize = false })")
   child.lua([[
     _G.server_started = vim.wait(10000, function()
       return _G.server and _G.server:is_running()
@@ -67,7 +67,7 @@ T["server"]["start with inexistent path"] = function()
   child.lua([[
     Config = require("eca.config")
     Config.setup({ server_path = "non-existing-path" } )
-    _G.server:start({ clean = true })
+    _G.server:start()
   ]])
   child.lua([[
     _G.server_started = vim.wait(1000, function()

tests/test_server_integration.lua

@@ -9,7 +9,6 @@ local function setup_test_environment()
       "nvim",
       "--headless",
       "--noplugin",
-      "--clean",
       "--cmd",
       [[lua package.preload["eca.path_finder"] = function()
         local M = {}