Merge pull request #50 from editor-code-assistant/revert-revert-async-server-download

Revert "Merge pull request #49 from editor-code-assistant/revert-asyn…

Author: joaopluigi

docs/configuration.md

@@ -21,15 +21,15 @@ require("eca").setup({
   usage_string_format = "{messageCost} / {sessionCost}",
 
   -- === BEHAVIOR ===
-  behaviour = {
+  behavior = {
     -- Set keymaps automatically
     auto_set_keymaps = true,
 
     -- Focus sidebar automatically when opening
     auto_focus_sidebar = true,
 
     -- Start server automatically
-    auto_start_server = true,
+    auto_start_server = false,
 
     -- Download server automatically if not found
     auto_download = true,
@@ -114,7 +114,7 @@ require("eca").setup({
 ### Minimalist
 ```lua
 require("eca").setup({
-  behaviour = { show_status_updates = false },
+  behavior = { show_status_updates = false },
   windows = { width = 30 },
   chat = {
     headers = {
@@ -128,7 +128,7 @@ require("eca").setup({
 ### Visual/UX focused
 ```lua
 require("eca").setup({
-  behaviour = { auto_focus_sidebar = true },
+  behavior = { auto_focus_sidebar = true },
   windows = {
     width = 50,
     wrap = true,
@@ -149,7 +149,7 @@ require("eca").setup({
 require("eca").setup({
   debug = true,
   server_args = "--log-level debug",
-  behaviour = {
+  behavior = {
     auto_start_server = true,
     show_status_updates = true,
   },
@@ -164,7 +164,7 @@ require("eca").setup({
 ### Performance-oriented
 ```lua
 require("eca").setup({
-  behaviour = {
+  behavior = {
     auto_focus_sidebar = false,
     show_status_updates = false,
   },

docs/installation.md

@@ -53,7 +53,7 @@ Advanced setup example:
   opts = {
     debug = false,
     server_path = "",
-    behaviour = {
+    behavior = {
       auto_set_keymaps = true,
       auto_focus_sidebar = true,
     },

docs/troubleshooting.md

@@ -36,7 +36,7 @@ Solutions:
 Symptoms: `<leader>ec` doesn't open chat
 
 Solutions:
-- Ensure `behaviour.auto_set_keymaps = true`
+- Ensure `behavior.auto_set_keymaps = true`
 - Confirm your `<leader>` key (default: `\`)
 - Configure shortcuts manually:
 
@@ -61,5 +61,5 @@ Symptoms: Lag when typing, slow responses
 
 Solutions:
 - Reduce window width: `windows.width = 25`
-- Disable visual updates: `behaviour.show_status_updates = false`
+- Disable visual updates: `behavior.show_status_updates = false`
 - Use the minimalist configuration preset

lua/eca/api.lua

@@ -11,6 +11,11 @@ local M = {}
 function M.chat(opts)
   opts = opts or {}
   local eca = require("eca")
+
+  if not M.is_server_running() then
+    M.start_server()
+  end
+
   eca.open_sidebar(opts)
 end
 

lua/eca/commands.lua

@@ -343,6 +343,50 @@ 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/config.lua

@@ -20,10 +20,10 @@ M._defaults = {
     file = "",
     max_file_size_mb = 10, -- Maximum log file size in MB before warning
   },
-  behaviour = {
+  behavior = {
     auto_set_keymaps = true,
     auto_focus_sidebar = true,
-    auto_start_server = true, -- Automatically start server on setup
+    auto_start_server = false, -- Automatically start server on setup
     auto_download = true, -- Automatically download server if not found
     show_status_updates = true, -- Show status updates in notifications
   },

lua/eca/init.lua

@@ -32,7 +32,7 @@ function H.keymaps()
     require("eca.api").focus()
   end, { noremap = true })
 
-  if Config.behaviour.auto_set_keymaps then
+  if Config.behavior and Config.behavior.auto_set_keymaps then
     Utils.safe_keymap_set({ "n", "v" }, Config.mappings.chat, function()
       require("eca.api").chat()
     end, { desc = "eca: open chat" })
@@ -245,10 +245,12 @@ function M.setup(opts)
   M.state = require("eca.state").new()
   M.server = Server.new()
   M.mediator = require("eca.mediator").new(M.server, M.state)
-  -- Start server automatically in background
-  vim.defer_fn(function()
-    M.server:start()
-  end, 100) -- Small delay to ensure everything is loaded
+
+  if Config.behavior and Config.behavior.auto_start_server then
+    vim.defer_fn(function()
+      M.server:start()
+    end, 100) -- Small delay to ensure everything is loaded
+  end
 
   M.did_setup = true
 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

lua/eca/path_finder.lua

@@ -100,7 +100,7 @@ function M:_write_version_file(version)
     file:write(version)
     file:close()
   else
-    Logger.notify("Could not write version file: " .. self._version_file, vim.log.levels.WARN)
+    Logger.warn("Could not write version file: " .. self._version_file)
   end
 end
 
@@ -136,7 +136,7 @@ function M:_download_latest_server(server_path, version)
 
   local download_path = self._cache_dir .. "/" .. artifact_name
 
-  Logger.notify("Downloading latest ECA server version from: " .. download_url, vim.log.levels.INFO)
+  Logger.debug("Downloading latest ECA server version from: " .. download_url)
 
   -- Ensure cache directory exists
   vim.fn.mkdir(self._cache_dir, "p")
@@ -150,8 +150,7 @@ function M:_download_latest_server(server_path, version)
 
   local download_result = os.execute(download_cmd)
   if download_result ~= 0 then
-    Logger.notify("Failed to download ECA server from: " .. download_url, vim.log.levels.ERROR)
-    return false
+    error("Failed to download ECA server from: " .. download_url)
   end
 
   -- Extract if it's a zip file
@@ -161,44 +160,32 @@ function M:_download_latest_server(server_path, version)
 
     local extract_result = os.execute(extract_cmd)
     if extract_result ~= 0 then
-      Logger.notify("Failed to extract ECA server", vim.log.levels.ERROR)
-      return false
+      error("Failed to extract ECA server")
     end
 
     -- Remove the zip file after extraction
     os.remove(download_path)
   end
 
   -- Make executable (if not Windows)
-  if not vim.loop.os_uname().sysname:lower():match("windows") then
+  if not uv.os_uname().sysname:lower():match("windows") then
     os.execute("chmod +x " .. vim.fn.shellescape(server_path))
   end
 
   if not Utils.file_exists(server_path) then
-    Logger.notify("ECA server binary not found after download and extraction", vim.log.levels.ERROR)
-    return false
+    error("ECA server binary not found after download and extraction")
   end
 
   -- Write version file
   self:_write_version_file(version)
 
-  Logger.notify("ECA server downloaded successfully", vim.log.levels.INFO)
+  Logger.debug("ECA server downloaded successfully")
+
   return true
 end
 
 ---@return string
 function M:find()
-  -- Check for custom server path first
-  local custom_path = Config.server_path
-  if custom_path and custom_path:gsub("%s+", "") ~= "" then
-    if Utils.file_exists(custom_path) then
-      Logger.debug("Using custom server path: " .. custom_path)
-      return custom_path
-    else
-      Logger.notify("Custom server path does not exist: " .. custom_path, vim.log.levels.WARN)
-    end
-  end
-
   local server_path = self:_get_extension_server_path()
   local latest_version = self:_get_latest_version()
   local current_version = self:_read_version_file()
@@ -215,13 +202,18 @@ function M:find()
   -- Download if server doesn't exist or version is outdated
   if not server_exists or (latest_version and current_version ~= latest_version) then
     if not latest_version then
-      Logger.notify("Could not check for latest version, using existing server", vim.log.levels.WARN)
+      Logger.warn("Could not check for latest version, using existing server")
       return server_path
     end
 
-    local success = self:_download_latest_server(server_path, latest_version)
-    if not success then
-      error("Failed to download ECA server")
+    local success
+
+    local ok, err = pcall(function()
+      success = self:_download_latest_server(server_path, latest_version)
+    end)
+
+    if not ok or not success then
+      error((err and tostring(err)) or "Failed to download ECA server")
     end
   end