feat: add tool type check for formatters

Author: sudo-tee

lua/opencode/ui/formatter/tools/apply_patch.lua

@@ -20,6 +20,10 @@ end
 ---@param output Output
 ---@param part OpencodeMessagePart
 function M.format(output, part)
+  if part.tool ~= 'apply_patch' then
+    return
+  end
+
   local metadata = part.state and part.state.metadata or {}
   for _, file in ipairs(metadata.files or {}) do
     local utils = require('opencode.ui.formatter.utils')
@@ -48,7 +52,7 @@ function M.summary(_, _, metadata)
   local file = metadata.files and metadata.files[1]
   local others_count = metadata.files and #metadata.files - 1 or 0
   local suffix = others_count > 0 and string.format(' (+%d more)', others_count) or ''
-  return 'edit', 'apply patch', file and resolve_file_name(file.filePath) .. suffix or ''
+  return icons.get('edit'), 'apply patch', file and resolve_file_name(file.filePath) .. suffix or ''
 end
 
 return M

lua/opencode/ui/formatter/tools/bash.lua

@@ -1,3 +1,4 @@
+local icons = require('opencode.ui.icons')
 local M = {}
 
 ---@param output Output
@@ -34,7 +35,7 @@ end
 ---@param input BashToolInput
 ---@return string, string, string
 function M.summary(_, input)
-  return 'run', 'run', input.description or ''
+  return icons.get('run'), 'run', input.description or ''
 end
 
 return M

lua/opencode/ui/formatter/tools/file.lua

@@ -1,4 +1,5 @@
 local util = require('opencode.util')
+local icons = require('opencode.ui.icons')
 
 local M = {}
 
@@ -82,9 +83,9 @@ function M.summary(part, input)
   local tool = part.tool
   if tool == 'read' then
     local tool_output = part.state and part.state.output or nil
-    return 'read', 'read', resolve_display_file_name(input.filePath, tool_output)
+    return icons.get('read'), 'read', resolve_display_file_name(input.filePath, tool_output)
   end
-  return tool, tool, resolve_file_name(input.filePath)
+  return icons.get(tool), tool, resolve_file_name(input.filePath)
 end
 
 return M

lua/opencode/ui/formatter/tools/glob.lua

@@ -1,8 +1,13 @@
+local icons = require('opencode.ui.icons')
 local M = {}
 
 ---@param output Output
 ---@param part OpencodeMessagePart
 function M.format(output, part)
+  if part.tool ~= 'glob' then
+    return
+  end
+
   local input = part.state and part.state.input or {}
   local metadata = part.state and part.state.metadata or {}
 
@@ -23,7 +28,7 @@ end
 ---@param input GlobToolInput
 ---@return string, string, string
 function M.summary(_, input)
-  return 'search', 'glob', input.pattern or ''
+  return icons.get('search'), 'glob', input.pattern or ''
 end
 
 return M

lua/opencode/ui/formatter/tools/grep.lua

@@ -1,3 +1,4 @@
+local icons = require('opencode.ui.icons')
 local M = {}
 
 ---@param input GrepToolInput|nil
@@ -19,6 +20,10 @@ end
 ---@param output Output
 ---@param part OpencodeMessagePart
 function M.format(output, part)
+  if part.tool ~= 'grep' then
+    return
+  end
+
   local metadata = part.state and part.state.metadata or {}
   local input = part.state and part.state.input or nil
 
@@ -41,7 +46,7 @@ end
 ---@param input GrepToolInput
 ---@return string, string, string
 function M.summary(_, input)
-  return 'search', 'grep', resolve_grep_string(input)
+  return icons.get('search'), 'grep', resolve_grep_string(input)
 end
 
 return M

lua/opencode/ui/formatter/tools/list.lua

@@ -3,6 +3,9 @@ local M = {}
 ---@param output Output
 ---@param part OpencodeMessagePart
 function M.format(output, part)
+  if part.tool ~= 'list' then
+    return
+  end
   local input = part.state and part.state.input or {}
   local metadata = part.state and part.state.metadata or {}
   local tool_output = part.state and part.state.output or ''
@@ -39,7 +42,7 @@ end
 ---@param input ListToolInput
 ---@return string, string, string
 function M.summary(_, input)
-  return 'list', 'list', input.path or ''
+  return icons.get('list'), 'list', input.path or ''
 end
 
 return M

lua/opencode/ui/formatter/tools/question.lua

@@ -3,6 +3,10 @@ local M = {}
 ---@param output Output
 ---@param part OpencodeMessagePart
 function M.format(output, part)
+  if part.tool ~= 'question' then
+    return
+  end
+
   local input = part.state and part.state.input or {}
   local metadata = part.state and part.state.metadata or {}
 

lua/opencode/ui/formatter/tools/task.lua

@@ -12,19 +12,23 @@ function M.tool_action_line(part, status, utils)
   local metadata = part.state and part.state.metadata or {}
   local formatter = tool_formatters[tool] or tool_formatters.tool
   local summary = formatter.summary or tool_formatters.tool.summary
-  local icon_name, tool_label, tool_value = summary(part, input, metadata)
+  local icon, tool_label, tool_value = summary(part, input, metadata)
+
   if status ~= 'completed' then
-    icon_name = status
+    icon = icons.get(status)
   end
 
-  local icon = icons.get(icon_name)
   return utils.build_action_line(icon, tool_label or tool or 'tool', tool_value)
 end
 
 ---@param output Output
 ---@param part OpencodeMessagePart
 ---@param get_child_parts? fun(session_id: string): OpencodeMessagePart[]?
 function M.format(output, part, get_child_parts)
+  if part.tool ~= 'task' then
+    return
+  end
+
   local input = part.state and part.state.input or {}
   local metadata = part.state and part.state.metadata or {}
   local tool_output = part.state and part.state.output or ''
@@ -84,7 +88,7 @@ end
 ---@param input TaskToolInput
 ---@return string, string, string
 function M.summary(_, input)
-  return 'task', 'task', input.description or ''
+  return icons.get('task'), 'task', input.description or ''
 end
 
 return M

lua/opencode/ui/formatter/tools/todowrite.lua

@@ -1,13 +1,23 @@
+local icons = require('opencode.ui.icons')
 local M = {}
 
 ---@param output Output
 ---@param part OpencodeMessagePart
 function M.format(output, part)
+  if part.tool ~= 'todowrite' then
+    return
+  end
   local utils = require('opencode.ui.formatter.utils')
   local config = require('opencode.config')
 
   local icons = require('opencode.ui.icons')
-  utils.format_action(output, icons.get('plan'), 'plan', (part.state and part.state.title or ''), utils.get_duration_text(part))
+  utils.format_action(
+    output,
+    icons.get('plan'),
+    'plan',
+    (part.state and part.state.title or ''),
+    utils.get_duration_text(part)
+  )
   if not config.ui.output.tools.show_output then
     return
   end
@@ -22,7 +32,7 @@ end
 ---@param part OpencodeMessagePart
 ---@return string, string, string
 function M.summary(part)
-  return 'plan', 'plan', part.state and part.state.title or ''
+  return icons.get('plan'), 'plan', part.state and part.state.title or ''
 end
 
 return M

lua/opencode/ui/formatter/tools/tool.lua

@@ -1,5 +1,6 @@
-local M = {}
 local utils = require('opencode.ui.formatter.utils')
+local icons = require('opencode.ui.icons')
+local M = {}
 
 ---@param output Output
 ---@param part OpencodeMessagePart
@@ -12,7 +13,7 @@ end
 ---@param input table
 ---@return string, string, string
 function M.summary(_, input)
-  return 'tool', 'tool', input.description or ''
+  return icons.get('tool'), 'tool', input.description or ''
 end
 
 return M