move contexts to state

Author: joaopluigi

lua/eca/api.lua

@@ -81,23 +81,20 @@ function M.add_file_context(file_path)
   -- Create context object
   local context = {
     type = "file",
-    path = file_path,
-    content = content,
+    data = {
+      path = file_path,
+    }
   }
 
-  -- Get current sidebar and add context
-  local sidebar = eca.get()
-  if not sidebar then
-    Logger.info("Opening ECA sidebar to add context...")
-    M.chat()
-    sidebar = eca.get()
-  end
+  local chat = eca.get()
 
-  if sidebar then
-    sidebar:add_context(context)
-  else
-    Logger.notify("Failed to create ECA sidebar", vim.log.levels.ERROR)
+  if not chat or not chat.mediator then
+    Logger.notify("No active ECA Chat to add context", vim.log.levels.WARN)
+    return
   end
+
+  chat.mediator:add_context(context)
+  Logger.info("File context added: " .. vim.inspect(context))
 end
 
 ---@param directory_path string
@@ -113,12 +110,20 @@ function M.add_directory_context(directory_path)
   -- Create context object for directory
   local context = {
     type = "directory",
-    path = directory_path,
+    data = {
+      path = directory_path,
+    },
   }
 
-  -- For now, store it for next message
-  -- TODO: Implement context management
-  Logger.debug("Directory context added: " .. directory_path)
+  local chat = eca.get()
+
+  if not chat or not chat.mediator then
+    Logger.notify("No active ECA Chat to add context", vim.log.levels.WARN)
+    return
+  end
+
+  chat.mediator:add_context(context)
+  Logger.info("Directory context added: " .. vim.inspect(context))
 end
 
 function M.add_current_file_context()
@@ -131,6 +136,9 @@ function M.add_current_file_context()
 end
 
 function M.add_selection_context()
+  Logger.info("Adding selection context ...")
+  local eca = require("eca")
+
   -- Get visual selection marks (should be set by the command before calling this)
   local start_pos = vim.fn.getpos("'<")
   local end_pos = vim.fn.getpos("'>")
@@ -145,97 +153,82 @@ function M.add_selection_context()
   local end_line = math.max(start_pos[2], end_pos[2])
 
   local lines = vim.api.nvim_buf_get_lines(0, start_line - 1, end_line, false)
-  if #lines > 0 then
-    local selection_text = table.concat(lines, "\n")
-    local current_file = vim.api.nvim_buf_get_name(0)
-    local context_path = current_file .. ":" .. start_line .. "-" .. end_line
-
-    -- Create context object
-    local context = {
-      type = "file",
+
+  if #lines <= 0 then
+    Logger.notify("No lines found in the selection", vim.log.levels.WARN)
+    return
+  end
+
+  local current_file = vim.api.nvim_buf_get_name(0)
+
+  -- Create context object
+  local context = {
+    type = "file",
+    data = {
       path = current_file,
-      linesRange = {
-        start = start_line,
-        ["end"] = end_line, -- end is a reserved word in Lua
+      lines_range = {
+        line_start = start_line,
+        line_end = end_line,
       },
     }
+  }
 
-    -- Get current sidebar and add context
-    local eca = require("eca")
-    local sidebar = eca.get()
-    if not sidebar then
-      Logger.info("Opening ECA sidebar to add context...")
-      M.chat()
-      sidebar = eca.get()
-    end
-
-    if sidebar then
-      sidebar:add_context(context)
-
-      -- Also set as selected code for visual display
-      local selected_code = {
-        filepath = current_file,
-        content = selection_text,
-        start_line = start_line,
-        end_line = end_line,
-        filetype = vim.api.nvim_get_option_value("filetype", { buf = 0 }),
-      }
-      sidebar:set_selected_code(selected_code)
+  local chat = eca.get()
 
-      Logger.info("Added selection context (" .. #lines .. " lines from lines " .. start_line .. "-" .. end_line .. ")")
-    else
-      Logger.notify("Failed to create ECA sidebar", vim.log.levels.ERROR)
-    end
-  else
-    Logger.notify("No lines found in selection", vim.log.levels.WARN)
+  if not chat or not chat.mediator then
+    Logger.notify("No active ECA Chat to add context", vim.log.levels.WARN)
+    return
   end
+
+  chat.mediator:add_context(context)
+  Logger.info("Added selection context: " .. vim.inspect(context))
 end
 
 function M.list_contexts()
   local eca = require("eca")
-  local sidebar = eca.get()
-  if not sidebar then
+  local chat = eca.get()
+
+  if not chat or not chat.mediator then
     Logger.notify("No active ECA sidebar", vim.log.levels.WARN)
     return
   end
 
-  local contexts = sidebar:get_contexts()
+  local contexts = chat.mediator:contexts()
   if #contexts == 0 then
     Logger.notify("No active contexts", vim.log.levels.INFO)
     return
   end
 
   Logger.info("Active contexts (" .. #contexts .. "):")
   for i, context in ipairs(contexts) do
-    local size_info = ""
-    if context.content then
-      local lines = vim.split(context.content, "\n")
-      size_info = " (" .. #lines .. " lines)"
-    end
-    Logger.info(i .. ". " .. context.type .. ": " .. context.path .. size_info)
+    Logger.info(i .. ". " .. context.type .. ": " .. vim.inspect(context.data))
   end
 end
 
 function M.clear_contexts()
   local eca = require("eca")
-  local sidebar = eca.get()
-  if not sidebar then
-    Logger.notify("No active ECA sidebar", vim.log.levels.WARN)
+  local chat = eca.get()
+
+  if not chat or not chat.mediator then
+    Logger.notify("No active ECA Chat", vim.log.levels.WARN)
     return
   end
 
-  sidebar:clear_contexts()
+  chat.mediator:clear_contexts()
+  Logger.info("Cleared all contexts")
 end
 
 function M.remove_context(path)
   local eca = require("eca")
-  local sidebar = eca.get()
-  if not sidebar then
-    Logger.notify("No active ECA sidebar", vim.log.levels.WARN)
+  local chat = eca.get()
+
+  if not chat or not chat.mediator then
+    Logger.notify("No active ECA Chat", vim.log.levels.WARN)
     return
   end
 
-  sidebar:remove_context(path)
+  chat.mediator:remove_context(path)
+  Logger.info("Context removed: " .. path)
 end
 
 function M.add_repo_map_context()

lua/eca/commands.lua

@@ -351,7 +351,7 @@ function M.setup()
       return
     end
 
-    local chat = eca.current.sidebar
+    local chat = eca.get()
     local models = chat.mediator:models()
 
     vim.ui.select(models, {
@@ -373,7 +373,7 @@ function M.setup()
       return
     end
 
-    local chat = eca.current.sidebar
+    local chat = eca.get()
     local behaviors = chat.mediator:behaviors()
 
     vim.ui.select(behaviors, {

lua/eca/mediator.lua

@@ -13,6 +13,93 @@ function mediator.new(server, state)
   }, { __index = mediator })
 end
 
+local function context_adapter(context)
+  if not context or not context.type or not context.data then
+    return nil
+  end
+
+  local function is_pos(p)
+    return type(p) == "table" and type(p.line) == "number" and type(p.character) == "number"
+  end
+
+  local adapters = {
+    cursor = function(ctx)
+      local d = ctx.data
+
+      if type(d.path) ~= "string" or type(d.position) ~= "table" then
+        return nil
+      end
+
+      local start_src = d.position.position_start
+      local end_src = d.position.position_end
+
+      if not (is_pos(start_src) and is_pos(end_src)) then
+        return nil
+      end
+
+      return {
+        type = ctx.type,
+        path = d.path,
+        position = {
+          start = {
+            line = start_src.line,
+            character = start_src.character,
+          },
+          ["end"] = {
+            line = end_src.line,
+            character = end_src.character,
+          },
+        },
+      }
+    end,
+    directory = function(ctx)
+      if type(ctx.data.path) ~= "string" then
+        return nil
+      end
+      return {
+        type = ctx.type,
+        path = ctx.data.path,
+      }
+    end,
+    file = function(ctx)
+      local d = ctx.data
+      if type(d.path) ~= "string" then
+        return nil
+      end
+      local linesRange = nil
+      if type(d.lines_range) == "table" and type(d.lines_range.line_start) == "number" and type(d.lines_range.line_end) == "number" then
+        linesRange = {
+          start = d.lines_range.line_start,
+          ["end"] = d.lines_range.line_end,
+        }
+      end
+
+      return {
+        type = ctx.type,
+        path = d.path,
+        linesRange = linesRange,
+      }
+    end,
+    web = function(ctx)
+      if type(ctx.data.path) ~= "string" then
+        return nil
+      end
+      return {
+        type = ctx.type,
+        url = ctx.data.path,
+      }
+    end,
+  }
+
+  local adapter = adapters[context.type]
+
+  if not adapter then
+    return nil
+  end
+
+  return adapter(context)
+end
+
 ---@param method string
 ---@param params eca.MessageParams
 ---@param callback? fun(err?: string, result?: table)
@@ -23,6 +110,18 @@ function mediator:send(method, params, callback)
     end
     require("eca.logger").notify("Server is not rnning, please start the server", vim.log.levels.WARN)
   end
+
+  local contexts = {}
+
+  for _, context in pairs(params.contexts) do
+    local adapted = context_adapter(context)
+    if adapted then
+      table.insert(contexts, adapted)
+    end
+  end
+
+  params.contexts = contexts
+
   self.server:send_request(method, params, callback)
 end
 
@@ -90,4 +189,32 @@ function mediator:id()
   return self.state and self.state.id
 end
 
+function mediator:contexts()
+  return self.state and self.state.contexts
+end
+
+function mediator:add_context(context)
+  if not self.state then
+    return
+  end
+
+  self.state:add_context(context)
+end
+
+function mediator:remove_context(name)
+  if not self.state then
+    return
+  end
+
+  self.state:remove_context(name)
+end
+
+function mediator:clear_contexts()
+  if not self.state then
+    return
+  end
+
+  self.state:clear_contexts()
+end
+
 return mediator

lua/eca/sidebar.lua

@@ -1277,7 +1277,7 @@ function M:_send_message(message)
   -- Add user message to chat
   self:_add_message("user", message)
 
-  local contexts = self:get_contexts()
+  local contexts = self.mediator:contexts()
   self.mediator:send("chat/prompt", {
     chatId = self.mediator:id(),
     requestId = tostring(os.time()),