feat(formatter): display diagnostics sent in user prompt

Author: sudo-tee

lua/opencode/config.lua

@@ -305,4 +305,4 @@ return setmetatable(M, {
   __tostring = function(_)
     return vim.inspect(M.values)
   end,
-}) --[[@as OpencodeConfig]]
+}) --[[@as OpencodeConfig &  OpencodeConfigModule]]

lua/opencode/ui/formatter.lua

@@ -360,12 +360,12 @@ end
 ---@param output Output Output object to write to
 ---@param part OpencodeMessagePart
 function M._format_selection_context(output, part)
-  local json = context_module.decode_json_context(part.text, 'selection')
+  local json = context_module.decode_json_context(part.text or '', 'selection')
   if not json then
     return
   end
   local start_line = output:get_line_count()
-  output:add_lines(vim.split(json.content, '\n'))
+  output:add_lines(vim.split(json.content or '', '\n'))
   output:add_empty_line()
 
   local end_line = output:get_line_count()
@@ -376,7 +376,7 @@ end
 ---@param output Output Output object to write to
 ---@param part OpencodeMessagePart
 function M._format_cursor_data_context(output, part)
-  local json = context_module.decode_json_context(part.text, 'cursor-data')
+  local json = context_module.decode_json_context(part.text or '', 'cursor-data')
   if not json then
     return
   end
@@ -390,6 +390,44 @@ function M._format_cursor_data_context(output, part)
   M._add_vertical_border(output, start_line, end_line, 'OpencodeMessageRoleUser', -3)
 end
 
+---@param output Output Output object to write to
+---@param part OpencodeMessagePart
+function M._format_diagnostics_context(output, part)
+  local json = context_module.decode_json_context(part.text or '', 'diagnostics')
+  if not json then
+    return
+  end
+  local start_line = output:get_line_count()
+  local diagnostics = json.content --[[@as vim.Diagnostic[] ]]
+  if not diagnostics or type(diagnostics) ~= 'table' or #diagnostics == 0 then
+    return
+  end
+
+  local diagnostics_count = { error = 0, warn = 0, info = 0 }
+  local diagnostics_icons = {
+    error = icons.get('error'),
+    warn = icons.get('warning'),
+    info = icons.get('info'),
+  }
+
+  for _, diag in ipairs(diagnostics) do
+    local name = vim.diagnostic.severity[diag.severity]:lower()
+    diagnostics_count[name] = diagnostics_count[name] + 1
+  end
+
+  local diag_line = '**Diagnostics:**'
+  for name, count in pairs(diagnostics_count) do
+    if count > 0 then
+      diag_line = diag_line .. (string.format(' %s(%d)', diagnostics_icons[name], count))
+    end
+  end
+  output:add_line(diag_line)
+  output:add_empty_line()
+  local end_line = output:get_line_count()
+
+  M._add_vertical_border(output, start_line, end_line, 'OpencodeMessageRoleUser', -3)
+end
+
 ---Format and display the file path in the context
 ---@param output Output Output object to write to
 ---@param path string|nil File path
@@ -727,6 +765,7 @@ function M.format_part(part, message, is_last_part)
       if part.synthetic == true then
         M._format_selection_context(output, part)
         M._format_cursor_data_context(output, part)
+        M._format_diagnostics_context(output, part)
       else
         M._format_user_prompt(output, vim.trim(part.text), message)
         content_added = true

lua/opencode/ui/highlight.lua

@@ -49,7 +49,7 @@ function M.setup()
     vim.api.nvim_set_hl(0, 'OpencodeAgentBuild', { bg = '#616161', fg = '#FFFFFF', bold = true, default = true })
     vim.api.nvim_set_hl(0, 'OpencodeAgentCustom', { bg = '#3b4261', fg = '#FFFFFF', bold = true, default = true })
     vim.api.nvim_set_hl(0, 'OpencodeContextualActions', { bg = '#3b4261', fg = '#61AFEF', bold = true, default = true })
-    vim.api.nvim_set_hl(0, 'OpencodeInputLegend', { bg = '#616161', fg = '#CCCCCC', bold = false, default = true })
+    vim.api.nvim_set_hl(0, 'OpencodeInputLegend', { link = '@label', bold = false, default = true })
     vim.api.nvim_set_hl(0, 'OpencodeHint', { link = 'Comment', default = true })
     vim.api.nvim_set_hl(0, 'OpencodeGuardDenied', { fg = '#EF5350', bold = true, default = true })
     vim.api.nvim_set_hl(0, 'OpencodeContextBar', { fg = '#3b4261', default = true })