Merge branch 'style-assistant-name-is-agent-name'

Author: Danilo Verde Ribeiro

lua/opencode/types.lua

@@ -293,8 +293,7 @@
 ---@field providerID string Provider identifier
 ---@field role 'user'|'assistant'|'system' Role of the message sender
 ---@field system_role string|nil Role defined in system messages
----@field mode string|nil Agent/mode used to create this message (from CLI)
----@field assistant_mode string|nil Assistant mode active when message was created (deprecated)
+---@field mode string|nil Agent or mode identifier
 ---@field error table
 
 ---@class RestorePoint

lua/opencode/ui/session_formatter.lua

@@ -116,7 +116,7 @@ end
 ---@param messages Message[] 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}>}
+---@return {messages: number, tool_calls: number, files: {additions: number, deletions: number}}
 function M._calculate_revert_stats(messages, revert_index, revert_info)
   local stats = {
     messages = 0,
@@ -192,10 +192,10 @@ function M._format_revert_message(stats)
       end
       if #file_diff > 0 then
         local line_str = string.format(icons.get('file') .. '%s: %s', file, table.concat(file_diff, ' '))
-        local line_idx = M.output:add_line(line_str) ---@type number
-        local col = #('  ' .. file .. ': ') ---@type number
+        local line_idx = M.output:add_line(line_str)
+        local col = #('  ' .. file .. ': ')
         for _, diff in ipairs(file_diff) do
-           local hl_group = diff:sub(1, 1) == '+' and 'OpencodeDiffAddText' or 'OpencodeDiffDeleteText' ---@type string
+          local hl_group = diff:sub(1, 1) == '+' and 'OpencodeDiffAddText' or 'OpencodeDiffDeleteText'
           M.output:add_extmark(line_idx, {
             virt_text = { { diff, hl_group } },
             virt_text_pos = 'inline',
@@ -251,7 +251,7 @@ function M._format_patch(part)
           util.time_ago(restore_point.created_at)
         )
       )
-      local restore_line = M.output:get_line_count() ---@type number
+      local restore_line = M.output:get_line_count()
       M.output:add_action({
         text = 'Restore [A]ll',
         type = 'diff_restore_snapshot_all',
@@ -293,10 +293,9 @@ function M._format_message_header(message, msg_idx)
   M.output:add_empty_line()
   M.output:add_metadata({ msg_idx = msg_idx, part_idx = 1, role = role, type = 'header' })
 
-  -- Use the mode field from the message (stable label from CLI)
   local display_name
   if role == 'assistant' then
-    local mode = message.mode or message.assistant_mode
+    local mode = message.mode
     if mode and mode ~= '' then
       display_name = mode:upper()
     else
@@ -334,7 +333,10 @@ end
 ---@param title? string Optional title for the callout
 function M._format_callout(callout, text, title)
   title = title and title .. ' ' or ''
-  local win_width = (state.windows and state.windows.output_win and vim.api.nvim_win_is_valid(state.windows.output_win)) and vim.api.nvim_win_get_width(state.windows.output_win) or config.ui.window_width or 80
+  local win_width = (state.windows and state.windows.output_win and vim.api.nvim_win_is_valid(state.windows.output_win))
+      and vim.api.nvim_win_get_width(state.windows.output_win)
+    or config.ui.window_width
+    or 80
   if #text > win_width - 4 then
     local ok, substituted = pcall(vim.fn.substitute, text, '\v(.{' .. (win_width - 8) .. '})', '\1\n', 'g')
     text = ok and substituted or text
@@ -360,7 +362,7 @@ function M._format_user_message(text, message)
     context = context_module.extract_from_opencode_message(message)
   end
 
-   local start_line = M.output:get_line_count() - 1 ---@type number
+  local start_line = M.output:get_line_count() - 1
 
   M.output:add_empty_line()
   M.output:add_lines(vim.split(context.prompt, '\n'))
@@ -378,7 +380,7 @@ function M._format_user_message(text, message)
     M.output:add_line(string.format('[%s](%s)', path, context.current_file))
   end
 
-     local end_line = M.output:get_line_count() ---@type number
+  local end_line = M.output:get_line_count()
 
   M._add_vertical_border(start_line, end_line, 'OpencodeMessageRoleUser', -3)
 end
@@ -519,12 +521,9 @@ function M._format_tool(part)
   end
 
   local start_line = M.output:get_line_count() + 1
-   ---@type TaskToolInput|BashToolInput|FileToolInput|TodoToolInput|GlobToolInput|GrepToolInput|WebFetchToolInput|ListToolInput
-   local input = (part.state and part.state.input) or {}
-   ---@type ToolMetadataBase|TaskToolMetadata|WebFetchToolMetadata|BashToolMetadata|FileToolMetadata|GlobToolMetadata|GrepToolMetadata|ListToolMetadata
-   local metadata = (part.state and part.state.metadata) or {}
-   ---@type string
-   local output = (part.state and part.state.output) or ''
+  local input = (part.state and part.state.input) or {}
+  local metadata = (part.state and part.state.metadata) or {}
+  local output = (part.state and part.state.output) or ''
 
   if tool == 'bash' then
     M._format_bash_tool(input --[[@as BashToolInput]], metadata --[[@as BashToolMetadata]])
@@ -552,7 +551,7 @@ function M._format_tool(part)
 
   M.output:add_empty_line()
 
-     local end_line = M.output:get_line_count() ---@type number
+  local end_line = M.output:get_line_count()
   if end_line - start_line > 1 then
     M._add_vertical_border(start_line, end_line - 1, 'OpencodeToolBorder', -1)
   end
@@ -581,7 +580,7 @@ function M._format_task_tool(input, metadata, output)
     end
   end
 
-     local end_line = M.output:get_line_count() ---@type number
+  local end_line = M.output:get_line_count()
   M.output:add_action({
     text = '[S]elect Child Session',
     type = 'select_child_session',