Merge branch 'async-server-download' into select-model-and-behavior

joaopluigi · joaopluigi · commit dc066c47ca97 · 2025-10-07T13:27:51.000-03:00
diff --git a/docs/configuration.md b/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,
   },
diff --git a/docs/installation.md b/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,
     },
diff --git a/docs/troubleshooting.md b/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
diff --git a/lua/eca/api.lua b/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
 
diff --git a/lua/eca/config.lua b/lua/eca/config.lua
@@ -20,7 +20,7 @@ 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 = false, -- Automatically start server on setup
diff --git a/lua/eca/init.lua b/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" })
@@ -246,7 +246,7 @@ function M.setup(opts)
   M.server = Server.new()
   M.mediator = require("eca.mediator").new(M.server, M.state)
 
-  if Config.behaviour and Config.behaviour.auto_start_server then
+  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
diff --git a/lua/eca/path_finder.lua b/lua/eca/path_finder.lua
@@ -1,6 +1,5 @@
 local uv = vim.uv or vim.loop
 local Utils = require("eca.utils")
-local Config = require("eca.config")
 local Logger = require("eca.logger")
 
 ---@class eca.PathFinder
@@ -188,12 +187,10 @@ end
 function M:find(custom_path)
   -- Check for custom server path first
   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)
+    if not Utils.file_exists(custom_path) then
+      error("Custom server path does not exist: " .. custom_path)
     end
+    return custom_path
   end
 
   local server_path = self:_get_extension_server_path()
diff --git a/lua/eca/server.lua b/lua/eca/server.lua
@@ -110,9 +110,9 @@ function M:start(opts)
     nvim_exe = "nvim"
   end
 
-  local lua_cmd = string.format("lua ServerPath.run(%s)", Config.server_path or "")
+  local lua_cmd = string.format("lua ServerPath.run(%s)", Utils.lua_quote(Config.server_path or ""))
 
-  local cmd = { nvim_exe, "--headless", "--noplugin", "-u", script_path, "-c", lua_cmd }
+  local cmd = { nvim_exe, "--headless", "--noplugin", "--clean", "-u", script_path, "-c", lua_cmd }
 
   vim.system(cmd, { text = true }, function(out)
     if out.code ~= 0 then
@@ -253,12 +253,6 @@ end
 ---@param params table
 ---@param callback? function
 function M:send_request(method, params, callback)
-  if not self:is_running() then
-    Logger.error("ECA server is not running")
-    if callback then
-      callback("Server not running", nil)
-    end
-  end
   local id = self:get_next_id()
   local message = {
     jsonrpc = "2.0",
@@ -272,6 +266,15 @@ function M:send_request(method, params, callback)
 
   local json = vim.json.encode(message)
   table.insert(self.messages, { content = json, content_length = #json })
+
+  if not self:is_running() then
+    Logger.error("ECA server is not running")
+    if callback then
+      callback("Server not running", nil)
+    end
+    return
+  end
+
   local content = string.format("Content-Length: %d\r\n\r\n%s", #json, json)
   self.process:write(content)
 end
diff --git a/lua/eca/sidebar.lua b/lua/eca/sidebar.lua
@@ -1223,7 +1223,7 @@ function M:_update_welcome_content()
   local cfg_msg = (cfg.message and cfg.message ~= "" and cfg.message) or nil
   local welcome_message = cfg_msg or (self.mediator and self.mediator:welcome_message() or nil)
 
-  local lines = { "Waiting for welcome message from ECA server..." }
+  local lines = { "Waiting for server to start..." }
 
   if welcome_message and welcome_message ~= "" then
     lines = Utils.split_lines(welcome_message)
diff --git a/lua/eca/utils.lua b/lua/eca/utils.lua
@@ -118,4 +118,11 @@ function M.constants()
   return CONSTANTS
 end
 
+---@param str string
+---@return string
+function M.lua_quote(str)
+  -- Escape backslashes and double quotes for Lua string literal
+  return '"' .. tostring(str):gsub('\\', '\\\\'):gsub('"', '\\"') .. '"'
+end
+
 return M
diff --git a/plugin-spec.lua b/plugin-spec.lua
@@ -17,7 +17,7 @@ return {
         file = "", -- Empty string uses default path
         max_file_size_mb = 10,
       },
-      behaviour = {
+      behavior = {
         auto_set_keymaps = true,
         auto_focus_sidebar = true,
       },
diff --git a/scripts/server_path.lua b/scripts/server_path.lua
@@ -1,7 +1,16 @@
 local ServerPath = {}
 
--- Export module
-_G.ServerPath = ServerPath
+-- Setup if headless
+if #vim.api.nvim_list_uis() == 0 then
+  _G.ServerPath = ServerPath
+  vim.cmd([[let &rtp.=','.getcwd()]])
+  vim.cmd('set rtp+=deps/nui.nvim')
+  vim.cmd('set rtp+=deps/eca-nvim')
+  vim.o.swapfile = false
+  vim.o.backup = false
+  vim.o.writebackup = false
+  require("eca").setup({})
+end
 
 ServerPath.run = function(custom_path)
   local path_finder = require("eca.path_finder"):new()
diff --git a/tests/test_server_integration.lua b/tests/test_server_integration.lua
@@ -38,71 +38,45 @@ local function sleep(ms)
 end
 
 T["server"] = MiniTest.new_set()
+
 T["server"]["start"] = function()
-  child.lua("_G.server.start({cmd = {'fake'}})")
-  eq(child.lua_get("_G.server.process"), vim.NIL)
-  child.lua([[ 
-    _G.server:start()
-    _G.server_started = vim.wait(5000, function()
+  child.lua("_G.server:start()")
+  child.lua([[
+    _G.server_started = vim.wait(10000, function()
       return _G.server and _G.server:is_running()
-    end, 50)
+    end, 100)
   ]])
   eq(child.lua_get("_G.server_started"), true)
-  eq(child.lua_get("_G.server:is_running()"), true)
+  sleep(1000)
+  eq(child.lua_get("_G.server.initialized"), true)
 end
 
-T["server"]["initialize"] = function()
-  local test_cases = {
-    {
-      method = "initialize",
-      want = {
-        chatBehaviors = { "agent", "plan" },
-        chatDefaultBehavior = "agent",
-        chatDefaultModel = "anthropic/claude-sonnet-4-20250514",
-        chatWelcomeMessage = "Welcome to ECA!\n\nType '/' for commands\n\n",
-        models = {
-          "anthropic/claude-3-5-haiku-20241022",
-          "anthropic/claude-opus-4-1-20250805",
-          "anthropic/claude-opus-4-20250514",
-          "anthropic/claude-sonnet-4-20250514",
-          "github-copilot/claude-sonnet-4",
-          "github-copilot/gpt-4.1",
-          "github-copilot/gpt-5",
-          "github-copilot/gpt-5-mini",
-          "openai/gpt-4.1",
-          "openai/gpt-5",
-          "openai/gpt-5-mini",
-          "openai/gpt-5-nano",
-          "openai/o3",
-          "openai/o4-mini",
-        },
-      },
-    },
-    { method = "not a command", want = vim.NIL },
-  }
-  for i, test_case in ipairs(test_cases) do
-    if i == 1 then
-      test_case = test_cases[i + 1]
-    end
-    child.lua("_G.method = " .. vim.inspect(test_case.method))
-    child.lua("_G.server:start({initialize = false})")
-    -- Wait for async server start
-    child.lua([[ 
-      _G.server_started = vim.wait(5000, function()
-        return _G.server and _G.server:is_running()
-      end, 50)
-    ]])
-    eq(child.lua_get("_G.server_started"), true)
+T["server"]["start without initialize"] = function()
+  child.lua("_G.server:start({ initialize = false })")
+  child.lua([[
+    _G.server_started = vim.wait(10000, function()
+      return _G.server and _G.server:is_running()
+    end, 100)
+  ]])
+  eq(child.lua_get("_G.server_started"), true)
+  sleep(1000)
+  eq(child.lua_get("_G.server.initialized"), false)
+end
 
-    child.lua_func(function()
-      _G.server:send_request(_G.method, {}, function(err, result)
-        _G.err = err
-        _G.result = result
-      end)
-    end)
-    sleep(1500)
-    eq(child.lua_get("_G.result"), test_case.want)
-  end
+T["server"]["start with inexistent path"] = function()
+  child.lua([[
+    Config = require("eca.config")
+    Config.setup({ server_path = "non-existing-path" } )
+    _G.server:start()
+  ]])
+  child.lua([[
+    _G.server_started = vim.wait(1000, function()
+      return _G.server and _G.server:is_running()
+    end, 100)
+  ]])
+  eq(string.find(child.lua_get("_G.notifications[1].message"), "non-existing-path", 1 , true) ~= nil, true)
+  eq(child.lua_get("_G.server_started"), false)
+  eq(child.lua_get("_G.server.initialized"), false)
 end
 
 return T
diff --git a/tests/test_server_path.lua b/tests/test_server_path.lua
