feat(apply-patch): add support for apply_patch tool (types, formatter, tests)

Author: sudo-tee

lua/opencode/types.lua

@@ -214,14 +214,33 @@
 ---@field quick_chat OpencodeQuickChatConfig
 
 ---@class MessagePartState
----@field input TaskToolInput|BashToolInput|FileToolInput|TodoToolInput|GlobToolInput|GrepToolInput|WebFetchToolInput|ListToolInput|QuestionToolInput Input data for the tool
+---@field input TaskToolInput|BashToolInput|FileToolInput|TodoToolInput|GlobToolInput|GrepToolInput|WebFetchToolInput|ListToolInput|QuestionToolInput|ApplyPatchToolInput Input data for the tool
 ---@field metadata TaskToolMetadata|ToolMetadataBase|WebFetchToolMetadata|BashToolMetadata|FileToolMetadata|GlobToolMetadata|GrepToolMetadata|ListToolMetadata|QuestionToolMetadata Metadata about the tool execution
 ---@field time { start: number, end: number } Timestamps for tool use
 ---@field status string Status of the tool use (e.g., 'running', 'completed', 'failed')
 ---@field title string Title of the tool use
 ---@field output string Output of the tool use, if applicable
 ---@field error? string Error message if the part failed
 
+---@class ApplyPatchToolInput
+---@field patchText string The patch content in unified diff format
+
+---@class ApplyPatchFileResult
+---@field filePath string Absolute path to the file
+---@field relativePath string Relative path to the file
+---@field before string File contents before the patch
+---@field after string File contents after the patch
+---@field additions number Number of lines added
+---@field deletions number Number of lines deleted
+---@field type 'add'|'edit'|'delete' Type of file operation
+---@field diff string Unified diff for this file
+
+---@class ApplyPatchToolMetadata: ToolMetadataBase
+---@field truncated boolean Whether the output was truncated
+---@field diagnostics table<string, any> Diagnostic information keyed by file path
+---@field files ApplyPatchFileResult[] Per-file results
+---@field diff string Combined unified diff for all files
+
 ---@class ToolMetadataBase
 ---@field error boolean|nil Whether the tool execution resulted in an error
 ---@field message string|nil Optional status or error message

lua/opencode/ui/formatter.lua

@@ -532,6 +532,18 @@ function M._format_file_tool(output, tool_type, input, metadata, duration_text)
   end
 end
 
+---@param output Output Output object to write to
+---@param metadata ApplyPatchToolMetadata Metadata for the tool use
+---@param duration_text? string
+function M._format_apply_patch_tool(output, metadata, duration_text)
+  for _, file in ipairs(metadata.files or {}) do
+    M.format_action(output, icons.get('edit') .. ' apply patch', file.relativePath or file.filePath, duration_text)
+    if config.ui.output.tools.show_output and file.diff then
+      M.format_diff(output, file.diff, '')
+    end
+  end
+end
+
 ---@param output Output Output object to write to
 ---@param title string
 ---@param input TodoToolInput
@@ -685,6 +697,8 @@ function M._format_tool(output, part)
     M._format_todo_tool(output, part.state.title, input --[[@as TodoToolInput]], duration_text)
   elseif tool == 'glob' then
     M._format_glob_tool(output, input --[[@as GlobToolInput]], metadata --[[@as GlobToolMetadata]], duration_text)
+  elseif tool == 'apply_patch' then
+    M._format_apply_patch_tool(output, metadata --[[@as ApplyPatchToolMetadata]], duration_text)
   elseif tool == 'list' then
     M._format_list_tool(
       output,

tests/data/apply-patch.expected.json

@@ -0,0 +1 @@
+{"timestamp":1772481560,"lines":["----","","","----","","","**  apply patch** `src/app/features/auth/__tests__/LoginForm.test.tsx` 4s","","`````"," import React from 'react'"," // minimal diff for testing","","`````","",""],"actions":[],"extmarks":[[1,1,0,{"virt_text_hide":false,"right_gravity":true,"virt_text_repeat_linebreak":false,"priority":10,"ns_id":3,"virt_text_pos":"win_col","virt_text_win_col":-3,"virt_text":[["▌󰭻 ","OpencodeMessageRoleUser"],[" "],["USER","OpencodeMessageRoleUser"],["","OpencodeHint"],[" [msg_user001]","OpencodeHint"]]}],[2,4,0,{"virt_text_hide":false,"right_gravity":true,"virt_text_repeat_linebreak":false,"priority":10,"ns_id":3,"virt_text_pos":"win_col","virt_text_win_col":-3,"virt_text":[[" ","OpencodeMessageRoleAssistant"],[" "],["BUILD","OpencodeMessageRoleAssistant"],["","OpencodeHint"],[" [msg_asst001]","OpencodeHint"]]}],[3,6,0,{"virt_text_hide":false,"right_gravity":true,"virt_text_repeat_linebreak":true,"priority":4096,"ns_id":3,"virt_text_pos":"win_col","virt_text_win_col":-1,"virt_text":[["▌","OpencodeToolBorder"]]}],[4,7,0,{"virt_text_hide":false,"right_gravity":true,"virt_text_repeat_linebreak":true,"priority":4096,"ns_id":3,"virt_text_pos":"win_col","virt_text_win_col":-1,"virt_text":[["▌","OpencodeToolBorder"]]}],[5,8,0,{"virt_text_hide":false,"right_gravity":true,"virt_text_repeat_linebreak":true,"priority":4096,"ns_id":3,"virt_text_pos":"win_col","virt_text_win_col":-1,"virt_text":[["▌","OpencodeToolBorder"]]}],[6,9,0,{"virt_text_pos":"overlay","right_gravity":true,"priority":5000,"ns_id":3,"end_row":10,"hl_eol":true,"end_right_gravity":false,"virt_text_hide":false,"end_col":0,"virt_text_repeat_linebreak":false,"hl_group":"OpencodeDiffAdd","virt_text":[["+","OpencodeDiffAdd"]]}],[7,9,0,{"virt_text_hide":false,"right_gravity":true,"virt_text_repeat_linebreak":true,"priority":4096,"ns_id":3,"virt_text_pos":"win_col","virt_text_win_col":-1,"virt_text":[["▌","OpencodeToolBorder"]]}],[8,10,0,{"virt_text_pos":"overlay","right_gravity":true,"priority":5000,"ns_id":3,"end_row":11,"hl_eol":true,"end_right_gravity":false,"virt_text_hide":false,"end_col":0,"virt_text_repeat_linebreak":false,"hl_group":"OpencodeDiffAdd","virt_text":[["+","OpencodeDiffAdd"]]}],[9,10,0,{"virt_text_hide":false,"right_gravity":true,"virt_text_repeat_linebreak":true,"priority":4096,"ns_id":3,"virt_text_pos":"win_col","virt_text_win_col":-1,"virt_text":[["▌","OpencodeToolBorder"]]}],[10,11,0,{"virt_text_hide":false,"right_gravity":true,"virt_text_repeat_linebreak":true,"priority":4096,"ns_id":3,"virt_text_pos":"win_col","virt_text_win_col":-1,"virt_text":[["▌","OpencodeToolBorder"]]}],[11,12,0,{"virt_text_hide":false,"right_gravity":true,"virt_text_repeat_linebreak":true,"priority":4096,"ns_id":3,"virt_text_pos":"win_col","virt_text_win_col":-1,"virt_text":[["▌","OpencodeToolBorder"]]}]]}

tests/data/apply-patch.json

@@ -0,0 +1,10 @@
+[
+  {"properties":{},"type":"server.connected"},
+  {"properties":{"info":{"id":"ses_abc123","title":"Create user authentication tests","version":"1.2.10","directory":"/home/user/Projects/my-app"}},"type":"session.created"},
+  {"properties":{"info":{"id":"msg_user001","sessionID":"ses_abc123","role":"user","agent":"build"}},"type":"message.updated"},
+  {"properties":{"info":{"id":"msg_asst001","sessionID":"ses_abc123","role":"assistant","parentID":"msg_user001","agent":"build"}},"type":"message.updated"},
+  {"properties":{"part":{"id":"prt_tool001","callID":"call_abc123","state":{"status":"running","input":{"patchText":"*** Begin Patch\n*** Add File: src/app/features/auth/__tests__/LoginForm.test.tsx\n+import React from 'react'\n+// ... test content\n*** End Patch"},"time":{"start":1772468525525}},"sessionID":"ses_abc123","type":"tool","messageID":"msg_asst001","tool":"apply_patch"}},"type":"message.part.updated"},
+  {"properties":{"part":{"id":"prt_tool001","callID":"call_abc123","state":{"status":"completed","output":"Success. Updated the following files:\nA src/app/features/auth/__tests__/LoginForm.test.tsx","metadata":{"truncated":false,"diagnostics":{},"files":[{"filePath":"/home/user/Projects/my-app/src/app/features/auth/__tests__/LoginForm.test.tsx","relativePath":"src/app/features/auth/__tests__/LoginForm.test.tsx","before":"","after":"import React from 'react'\n","additions":42,"deletions":0,"type":"add","diff":"Index: /home/user/Projects/my-app/src/app/features/auth/__tests__/LoginForm.test.tsx\n===================================================================\n--- /home/user/Projects/my-app/src/app/features/auth/__tests__/LoginForm.test.tsx\n+++ /home/user/Projects/my-app/src/app/features/auth/__tests__/LoginForm.test.tsx\n@@ -0,0 +1,3 @@\n+import React from 'react'\n+// minimal diff for testing\n"}],"diff":"Index: /home/user/Projects/my-app/src/app/features/auth/__tests__/LoginForm.test.tsx\n===================================================================\n--- /home/user/Projects/my-app/src/app/features/auth/__tests__/LoginForm.test.tsx\n+++ /home/user/Projects/my-app/src/app/features/auth/__tests__/LoginForm.test.tsx\n@@ -0,0 +1,3 @@\n+import React from 'react'\n+// minimal diff for testing\n"},"input":{"patchText":"*** Begin Patch\n*** Add File: src/app/features/auth/__tests__/LoginForm.test.tsx\n+import React from 'react'\n*** End Patch"},"time":{"start":1772468525525,"end":1772468529137},"title":"Success. Updated the following files:\nA src/app/features/auth/__tests__/LoginForm.test.tsx"},"sessionID":"ses_abc123","type":"tool","messageID":"msg_asst001","tool":"apply_patch"}},"type":"message.part.updated"},
+  {"properties":{"sessionID":"ses_abc123","status":{"type":"idle"}},"type":"session.status"},
+  {"properties":{"sessionID":"ses_abc123"},"type":"session.idle"}
+]