decouple UI from server

Add a mediator that sits between the sidebar and the server that handles
sending messages

Author: tomgeorge

lua/eca/init.lua

@@ -168,7 +168,7 @@ function M._init(id)
   local sidebar = M.sidebars[id]
 
   if not sidebar then
-    sidebar = Sidebar.new(id)
+    sidebar = Sidebar.new(id, M.mediator)
     M.sidebars[id] = sidebar
   end
   M.current = { sidebar = sidebar }
@@ -241,11 +241,9 @@ function M.setup(opts)
   H.keymaps()
   H.signs()
 
-  -- Initialize status bar
-
   -- Initialize the ECA server with callbacks
   M.server = Server.new()
-
+  M.mediator = require("eca.mediator").new(M.server)
   -- Start server automatically in background
   vim.defer_fn(function()
     M.server:start()

lua/eca/mediator.lua

@@ -0,0 +1,24 @@
+---@class eca.Mediator
+---@field server eca.Server
+local mediator = {}
+
+---@param server eca.Server
+---@return eca.Mediator
+function mediator.new(server)
+  return setmetatable({
+    server = server,
+  }, { __index = mediator })
+end
+
+---@param method string
+---@param params eca.MessageParams
+---@param callback fun(err: string, result: table)
+function mediator:send(method, params, callback)
+  if not self.server:is_running() then
+    callback("Server is not running, please start the server", nil)
+    return
+  end
+  self.server:send_request(method, params, callback)
+end
+
+return mediator

lua/eca/sidebar.lua

@@ -8,6 +8,7 @@ local Split = require("nui.split")
 ---@class eca.Sidebar
 ---@field public id integer The tab ID
 ---@field public containers table<string, NuiSplit> The nui containers
+---@field mediator eca.Mediator mediator to send server requests to
 ---@field private _initialized boolean Whether the sidebar has been initialized
 ---@field private _current_response_buffer string Buffer for accumulating streaming response
 ---@field private _is_streaming boolean Whether we're currently receiving a streaming response
@@ -34,10 +35,12 @@ local UI_ELEMENTS_HEIGHT = 2 -- Reserve space for statusline and tabline
 local SAFETY_MARGIN = 2 -- Extra margin to prevent "Not enough room" errors
 
 ---@param id integer Tab ID
+---@param mediator eca.Mediator
 ---@return eca.Sidebar
-function M.new(id)
+function M.new(id, mediator)
   local instance = setmetatable({}, M)
   instance.id = id
+  instance.mediator = mediator
   instance.containers = {}
   instance._initialized = false
   instance._current_response_buffer = ""
@@ -1158,30 +1161,24 @@ function M:_send_message(message)
   -- Store the last user message to avoid duplication
   self._last_user_message = message
 
-  -- Send message to ECA server
-  local eca = require("eca")
-  if eca.server and eca.server:is_running() then
-    -- Include active contexts in the message
-    local contexts = self:get_contexts()
-    eca.server:send_request("chat/prompt", {
-      chatId = self.id,
-      requestId = tostring(os.time()),
-      message = message,
-      contexts = contexts or {},
-    }, function(err, result)
-      if err then
-        Logger.error("Failed to send message to ECA server: " .. tostring(err))
-        self:_add_message("assistant", "❌ **Error**: Failed to send message to ECA server")
-      end
-      -- Response will come through server notification handler
-      self:_add_input_line()
-
-      self:handle_chat_content_received(result.params)
-    end)
-  else
-    self:_add_message("assistant", "❌ **Error**: ECA server is not running. Please check server status.")
+  local contexts = self:get_contexts()
+  self.mediator:send("chat/prompt", {
+    chatId = self.id,
+    requestId = tostring(os.time()),
+    message = message,
+    contexts = contexts or {},
+  }, function(err, result)
+    if err then
+      print("err is " .. err)
+      Logger.error("Failed to send message to ECA server: " .. err)
+      self:_add_message("assistant", "❌ **Error**: Failed to send message to ECA server: " .. err)
+      return
+    end
+    -- Response will come through server notification handler
     self:_add_input_line()
-  end
+
+    self:handle_chat_content_received(result.params)
+  end)
 end
 
 function M:handle_chat_content(message)

lua/eca/types.lua

@@ -22,6 +22,10 @@
 
 ---@alias eca.ToolCallDetails eca.FileChangedDetails
 
+---TODO: flesh these out
+---@alias eca.MessageParams table
+---@alias eca.Message table
+
 ---@class eca.FileChangedDetails
 ---@field type 'fileChange'
 ---@field path string the file path of this file change