chore(types): merge MessagePart into OpencodeMessagePart

Author: sudo-tee

lua/opencode/api_client.lua

@@ -202,7 +202,7 @@ end
 --- @param id string Session ID (required)
 --- @param message_data {messageID?: string, model?: {providerID: string, modelID: string}, agent?: string, system?: string, tools?: table<string, boolean>, parts: Part[]} Message creation data
 --- @param directory string|nil Directory path
---- @return Promise<{info: MessageInfo, parts: MessagePart[]}>
+--- @return Promise<{info: MessageInfo, parts: OpencodeMessagePart[]}>
 function OpencodeApiClient:create_message(id, message_data, directory)
   return self:_call('/session/' .. id .. '/message', 'POST', message_data, { directory = directory })
 end

lua/opencode/event_manager.lua

@@ -18,7 +18,7 @@ local state = require('opencode.state')
 
 --- @class EventMessagePartUpdated
 --- @field type "message.part.updated"
---- @field properties {part: MessagePart}
+--- @field properties {part: OpencodeMessagePart}
 
 --- @class EventMessagePartRemoved
 --- @field type "message.part.removed"

lua/opencode/types.lua

@@ -142,7 +142,7 @@
 ---@field message string|nil Optional status or error message
 
 ---@class TaskToolMetadata: ToolMetadataBase
----@field summary MessagePart[]
+---@field summary OpencodeMessagePart[]
 
 ---@class WebFetchToolMetadata: ToolMetadataBase
 ---@field http_status number|nil HTTP response status code
@@ -203,20 +203,6 @@
 ---@field prompt string The subtask prompt
 ---@field description string Description of the subtask
 
----@class MessagePart
----@field type 'text'|'tool'|'step-start'|'patch' Type of the message part
----@field text string|nil Text content for text parts
----@field id string|nil Unique identifier for tool use parts
----@field tool string|nil Name of the tool being used
----@field state MessagePartState|nil State information for tool use parts
----@field snapshot string|nil Snapshot commit hash
----@field sessionID string|nil Session identifier
----@field messageID string|nil Message identifier
----@field callID string|nil Call identifier (used for tools)
----@field hash string|nil Hash identifier for patch parts
----@field files string[]|nil List of file paths for patch parts
----@field synthetic boolean|nil Whether the message was generated synthetically
-
 ---@class MessageTokenCount
 ---@field reasoning number
 ---@field input number
@@ -243,7 +229,7 @@
 
 ---@class OpencodeMessage
 ---@field info MessageInfo Metadata about the message
----@field parts MessagePart[] Parts that make up the message
+---@field parts OpencodeMessagePart[] Parts that make up the message
 
 ---@class MessageInfo
 ---@field id string Unique message identifier
@@ -337,14 +323,23 @@
 ---@field value string|nil
 
 ---@class OpencodeMessagePart
----@field type 'text'|'file'|'agent'|string
+---@field type 'text'|'file'|'agent'|'tool'|'step-start'|'patch'|string
+---@field id string|nil Unique identifier for tool use parts
 ---@field text string|nil
+---@field tool string|nil Name of the tool being used
+---@field state MessagePartState|nil State information for tool use parts
 ---@field filename string|nil
 ---@field mime string|nil
 ---@field url string|nil
 ---@field source OpencodeMessagePartSource|nil
 ---@field name string|nil
 ---@field synthetic boolean|nil
+---@field snapshot string|nil Snapshot commit hash
+---@field sessionID string|nil Session identifier
+---@field messageID string|nil Message identifier
+---@field callID string|nil Call identifier (used for tools)
+---@field hash string|nil Hash identifier for patch parts
+---@field files string[]|nil List of file paths for patch parts
 
 ---@class OpencodeModelModalities
 ---@field input ('text'|'image'|'audio'|'video')[] Supported input modalities

lua/opencode/ui/formatter.lua

@@ -52,7 +52,7 @@ function M._format_permission_request(output)
 end
 
 ---Calculate statistics for reverted messages and tool calls
----@param messages {info: MessageInfo, parts: MessagePart[]}[] All messages in the session
+---@param messages {info: MessageInfo, parts: OpencodeMessagePart[]}[] All messages in the session
 ---@param revert_index number Index of the message where revert occurred
 ---@param revert_info SessionRevertInfo Revert information
 ---@return {messages: number, tool_calls: number, files: table<string, {additions: number, deletions: number}>}
@@ -155,7 +155,7 @@ function M._format_revert_message(session_data, start_idx)
 end
 
 ---@param output Output Output object to write to
----@param part MessagePart
+---@param part OpencodeMessagePart
 function M._format_patch(output, part)
   local restore_points = snapshot.get_restore_points_by_parent(part.hash) or {}
   M._format_action(output, icons.get('snapshot') .. ' Created Snapshot', vim.trim(part.hash:sub(1, 8)))
@@ -351,7 +351,7 @@ function M._format_user_prompt(output, text, message)
 end
 
 ---@param output Output Output object to write to
----@param part MessagePart
+---@param part OpencodeMessagePart
 function M._format_selection_context(output, part)
   local json = context_module.decode_json_context(part.text, 'selection')
   if not json then
@@ -517,7 +517,7 @@ function M._format_list_tool(output, input, metadata, tool_output)
 end
 
 ---@param output Output Output object to write to
----@param part MessagePart
+---@param part OpencodeMessagePart
 function M._format_tool(output, part)
   local tool = part.tool
   if not tool or not part.state then
@@ -679,7 +679,7 @@ function M._add_vertical_border(output, start_line, end_line, hl_group, win_col)
 end
 
 ---Formats a single message part and returns the resulting output object
----@param part MessagePart The part to format
+---@param part OpencodeMessagePart The part to format
 ---@param message? OpencodeMessage Optional message object to extract role and mentions from
 ---@return Output
 function M.format_part(part, message)

lua/opencode/ui/render_state.lua

@@ -6,7 +6,7 @@ local state = require('opencode.state')
 ---@field line_end integer? Line where message header ends
 
 ---@class RenderedPart
----@field part MessagePart Direct reference to part in state.messages
+---@field part OpencodeMessagePart Direct reference to part in state.messages
 ---@field message_id string ID of parent message
 ---@field line_start integer? Line where part starts
 ---@field line_end integer? Line where part ends
@@ -75,7 +75,7 @@ end
 
 ---Get part ID by snapshot_id and message ID
 ---@param snapshot_id string Call ID
----@return MessagePart? part Part if found
+---@return OpencodeMessagePart? part Part if found
 function RenderState:get_part_by_snapshot_id(snapshot_id)
   for _, rendered_message in pairs(self._messages) do
     for _, part in ipairs(rendered_message.message.parts) do
@@ -175,7 +175,7 @@ function RenderState:set_message(message, line_start, line_end)
 end
 
 ---Set or update part render data
----@param part MessagePart Direct reference to part (must include id/messageID)
+---@param part OpencodeMessagePart Direct reference to part (must include id/messageID)
 ---@param line_start integer? Line where part starts
 ---@param line_end integer? Line where part ends
 function RenderState:set_part(part, line_start, line_end)
@@ -242,7 +242,7 @@ function RenderState:update_part_lines(part_id, new_line_start, new_line_end)
 end
 
 ---Update part data reference
----@param part_ref MessagePart New part reference (must include id)
+---@param part_ref OpencodeMessagePart New part reference (must include id)
 function RenderState:update_part_data(part_ref)
   if not part_ref or not part_ref.id then
     return

lua/opencode/ui/renderer.lua

@@ -415,7 +415,7 @@ end
 
 ---Event handler for message.part.updated events
 ---Inserts new parts or replaces existing parts in buffer
----@param properties {part: MessagePart} Event properties
+---@param properties {part: OpencodeMessagePart} Event properties
 ---@param revert_index? integer Revert index in session, if applicable
 function M.on_part_updated(properties, revert_index)
   if not properties or not properties.part then