Merge pull request #29 from tomgeorge/feat/diff

Display the diff in the chat window

Author: ericdallo

lua/eca/init.lua

@@ -171,7 +171,7 @@ function M._init(id)
   local sidebar = M.sidebars[id]
 
   if not sidebar then
-    sidebar = Sidebar:new(id)
+    sidebar = Sidebar.new(id)
     M.sidebars[id] = sidebar
   end
   M.current = { sidebar = sidebar }
@@ -235,9 +235,7 @@ function M.setup(opts)
     return
   end
 
-  -- Initialize logger with configuration
   require("eca.logger").setup(Config.options.log)
-
   require("eca.highlights").setup()
   require("eca.commands").setup()
 

lua/eca/sidebar.lua

@@ -41,7 +41,7 @@ local SAFETY_MARGIN = 2              -- Extra margin to prevent "Not enough room
 
 ---@param id integer Tab ID
 ---@return eca.Sidebar
-function M:new(id)
+function M.new(id)
   local instance = setmetatable({}, M)
   instance.id = id
   instance.containers = {}
@@ -1223,13 +1223,16 @@ function M:_handle_server_content(params)
     -- IMPORTANT: Return immediately - do NOT display anything for toolCallPrepare
     return
   elseif content.type == "toolCalled" then
-    
-    
+    -- Add diff to current tool call if present in toolCalled content
+    if self._current_tool_call and content.details then
+      self._current_tool_call.details = content.details
+    end
+
     -- Show the final accumulated tool call if we have one
     if self._is_tool_call_streaming and self._current_tool_call then
       self:_display_tool_call()
     end
-    
+
     -- Show the tool result
     local tool_text = string.format("✅ **Tool Result**: %s", content.name or "unknown")
     if content.outputs and #content.outputs > 0 then
@@ -1528,6 +1531,10 @@ function M:_handle_tool_call_prepare(content)
   if content.argumentsText then
     self._current_tool_call.arguments = (self._current_tool_call.arguments or "") .. content.argumentsText
   end
+
+  if content.details then
+    self._current_tool_call.details = content.details
+  end
 end
 
 function M:_display_tool_call()
@@ -1539,6 +1546,11 @@ function M:_display_tool_call()
     tool_text = tool_text .. "\n```json\n" .. self._current_tool_call.arguments .. "\n```"
   end
 
+
+  if self._current_tool_call.details and self._current_tool_call.details.diff then
+    tool_text = tool_text .. "\n\n**Diff**:\n```diff\n" .. self._current_tool_call.details.diff .. "\n```"
+  end
+
   self:_add_message("assistant", tool_text)
 end
 
@@ -1547,4 +1559,4 @@ function M:_finalize_tool_call()
   self._is_tool_call_streaming = false
 end
 
-return M
+return M

lua/eca/types.lua

@@ -1,19 +1,50 @@
 ---@meta
+
 ---@class eca.ChatContext
 ---@field type string
 ---@field path? string
----@field lines_range? {start: integer, end: integer}
+---@field linesRange? {start: integer, end: integer}
 ---@field url? string
 ---@field uri? string
 ---@field name? string
 ---@field description? string
----@field mime_type? string
+---@field mimeType? string
 ---@field server string
----
----
+
 ---@class eca.ChatCommand
 ---@field name string
 ---@field description string
 ---@field help string
 ---@field type "mcp-prompt"|"native"
 ---@field arguments {name: string, description?: string, required: boolean}[]
+
+---@alias eca.ToolCallOrigin "mcp"|"native"
+
+---@alias eca.ToolCallDetails eca.FileChangedDetails
+
+---@class eca.FileChangedDetails
+---@field type 'fileChange'
+---@field path string the file path of this file change
+---@field diff string the content diff of this file change
+---@field linesAdded integer the count of lines added in this change
+---@field linesRemoved integer the count of lines removed in this change
+
+---@class eca.ToolCallRun
+---@field type 'toolCallRun'
+---@field origin eca.ToolCallOrigin
+---@field id string the id of the tool call
+---@field name string name of the tool
+---@field arguments {[string]: string} arguments of the tool call
+---@field manualApproval boolean whether the call requires manual approval from the user
+---@field summary string  summary text to present about this tool call
+---@field details eca.ToolCallDetails extra details for the call. clients may use this to present a different UX for this tool call.
+
+---@class eca.ToolCalled
+---@field type 'toolCalled'
+---@field id string the id of the tool call
+---@field name string name of the tool
+---@field arguments {[string]: string} arguments of the tool call
+---@field errors boolean was there an error calling the tool
+---@field outputs {type: 'text', text: string}[] the result of the tool call
+---@field summary? string summary text to present about the tool call
+---@field details? eca.ToolCallDetails extra details about the call

lua/eca/utils.lua

@@ -44,7 +44,7 @@ end
 ---@return string[]
 function M.split_lines(text)
   local lines = {}
-  for line in text:gmatch("[^\r\n]*") do
+  for line in text:gmatch("[^\r\n]+") do
     table.insert(lines, line)
   end
   return lines