feat(ui/renderer): decouple events from buffer ops

Author: sudo-tee

README.md

@@ -234,6 +234,7 @@ require('opencode').setup({
     },
     output = {
       filetype = 'opencode_output', -- Filetype assigned to the output buffer (default: 'opencode_output')
+      max_rendered_messages = nil, -- Maximum number of messages kept in the full-session render. Set to nil to show all messages, or a number to truncate older history.
       tools = {
         show_output = true, -- Show tools output [diffs, cmd output, etc.] (default: true)
         show_reasoning_output = true, -- Show reasoning/thinking steps output (default: true)

lua/opencode/config.lua

@@ -139,6 +139,7 @@ M.defaults = {
     },
     output = {
       filetype = 'opencode_output',
+      max_rendered_messages = nil,
       rendering = {
         markdown_debounce_ms = 250,
         on_data_rendered = nil,
@@ -150,6 +151,10 @@ M.defaults = {
         show_reasoning_output = true,
       },
       always_scroll_to_bottom = false,
+      viewport = {
+        enabled = true,
+        overscan = 8,
+      },
     },
     questions = {
       use_vim_ui_select = false, -- If true, render questions with vim.ui.select instead of in the output buffer

lua/opencode/event_manager.lua

@@ -380,7 +380,9 @@ function EventManager:_on_drained_events(events)
   if not config.ui.output.rendering.event_collapsing then
     for _, event in ipairs(normalized_events) do
       if event and event.type then
-        self:emit(event.type, event.properties)
+        if event.type ~= 'custom.emit_events.finished' then
+          self:emit(event.type, event.properties)
+        end
       else
         log.warn('Received event with missing type: %s', vim.inspect(event))
       end
@@ -432,7 +434,9 @@ function EventManager:_on_drained_events(events)
   for i = 1, #normalized_events do
     local event = collapsed_events[i]
     if event and event.type then
-      self:emit(event.type, event.properties)
+      if event.type ~= 'custom.emit_events.finished' then
+        self:emit(event.type, event.properties)
+      end
     elseif event then
       log.warn('Received collapsed event with missing type: %s', vim.inspect(event))
     end

lua/opencode/types.lua

@@ -180,6 +180,7 @@
 ---@field rendering OpencodeUIOutputRenderingConfig
 ---@field always_scroll_to_bottom boolean
 ---@field filetype string
+---@field max_rendered_messages? integer|nil
 
 ---@class OpencodeUIPickerConfig
 ---@field snacks_layout? snacks.picker.layout.Config

lua/opencode/ui/dialog.lua

@@ -260,11 +260,11 @@ function Dialog:format_dialog(output, config)
 
   local end_line = output:get_line_count()
 
+  output:add_line('')
+
   if config.border_hl then
     formatter.add_vertical_border(output, start_line + 1, end_line, config.border_hl, -2)
   end
-
-  output:add_line('')
 end
 
 ---Format options list with selection indicator

lua/opencode/ui/formatter.lua

@@ -17,9 +17,76 @@ M.separator = {
   '',
 }
 
+local function default_win_width()
+  local output_win = state.windows and state.windows.output_win
+  if output_win and vim.api.nvim_win_is_valid(output_win) then
+    return vim.api.nvim_win_get_width(output_win)
+  end
+
+  if type(config.ui.window_width) == 'number' and config.ui.window_width > 1 then
+    return config.ui.window_width
+  end
+
+  return 80
+end
+
+local function resolve_render_ctx(render_ctx)
+  render_ctx = render_ctx or {}
+
+  local current_messages = render_ctx.messages
+  if current_messages == nil then
+    current_messages = state.messages or {}
+  end
+
+  local permission_renderer = render_ctx.permission_renderer
+  if permission_renderer == nil then
+    permission_renderer = function(output)
+      permission_window.format_display(output)
+    end
+  end
+
+  local question_renderer = render_ctx.question_renderer
+  if question_renderer == nil then
+    question_renderer = function(output)
+      require('opencode.ui.question_window').format_display(output)
+    end
+  end
+
+  local show_reasoning_output = config.ui.output.tools.show_reasoning_output
+  if render_ctx.show_reasoning_output ~= nil then
+    show_reasoning_output = render_ctx.show_reasoning_output
+  end
+
+  local show_debug_ids = config.debug.show_ids
+  if render_ctx.show_debug_ids ~= nil then
+    show_debug_ids = render_ctx.show_debug_ids
+  end
+
+  local revert_info = state.active_session and state.active_session.revert or nil
+  if render_ctx.revert_info ~= nil then
+    revert_info = render_ctx.revert_info
+  end
+
+  return {
+    messages = current_messages,
+    current_mode = render_ctx.current_mode ~= nil and render_ctx.current_mode or state.current_mode,
+    show_reasoning_output = show_reasoning_output,
+    show_debug_ids = show_debug_ids,
+    win_width = render_ctx.win_width or default_win_width(),
+    get_child_parts = render_ctx.get_child_parts,
+    child_session_parts = render_ctx.child_session_parts,
+    permission_renderer = permission_renderer,
+    question_renderer = question_renderer,
+    revert_info = revert_info,
+    is_last_part = render_ctx.is_last_part == true,
+  }
+end
+
 ---@param output Output
 ---@param part OpencodeMessagePart
-function M._format_reasoning(output, part)
+---@param render_ctx? table
+function M._format_reasoning(output, part, render_ctx)
+  render_ctx = resolve_render_ctx(render_ctx)
   local text = vim.trim(part.text or '')
 
   local start_line = output:get_line_count() + 1
@@ -35,7 +102,7 @@ function M._format_reasoning(output, part)
 
   format_utils.format_action(output, icons.get('reasoning'), title, '')
 
-  if config.ui.output.tools.show_reasoning_output and text ~= '' then
+  if render_ctx.show_reasoning_output and text ~= '' then
     output:add_empty_line()
     output:add_lines(vim.split(text, '\n'))
     output:add_empty_line()
@@ -54,10 +121,12 @@ end
 ---Format the revert callout with statistics
 ---@param session_data OpencodeMessage[] All messages in the session
 ---@param start_idx number Index of the message where revert occurred
+---@param render_ctx? table
 ---@return Output output object representing the lines, extmarks, and actions
-function M._format_revert_message(session_data, start_idx)
+function M.render_revert_message(session_data, start_idx, render_ctx)
+  render_ctx = resolve_render_ctx(render_ctx)
   local output = Output.new()
-  local stats = format_utils.calculate_revert_stats(session_data, start_idx, state.active_session.revert)
+  local stats = format_utils.calculate_revert_stats(session_data, start_idx, render_ctx.revert_info)
   local message_text = stats.messages == 1 and 'message' or 'messages'
   local tool_text = stats.tool_calls == 1 and 'tool call' or 'tool calls'
 
@@ -98,6 +167,8 @@ function M._format_revert_message(session_data, start_idx)
   return output
 end
 
+M._format_revert_message = M.render_revert_message
+
 local function add_action(output, text, action_type, args, key, line)
   -- actions use api-indexing (e.g. 0 indexed)
   line = (line or output:get_line_count()) - 1
@@ -150,8 +221,10 @@ function M._format_error(output, message)
 end
 
 ---@param message OpencodeMessage
+---@param render_ctx? table
 ---@return Output
-function M.format_message_header(message)
+function M.render_message_header(message, render_ctx)
+  render_ctx = resolve_render_ctx(render_ctx)
   local output = Output.new()
 
   output:add_lines(M.separator)
@@ -162,19 +235,16 @@ function M.format_message_header(message)
   local role_hl = 'OpencodeMessageRole' .. role:sub(1, 1):upper() .. role:sub(2)
   local model_text = message.info.modelID and ' ' .. message.info.modelID or ''
 
-  local debug_text = config.debug.show_ids and ' [' .. message.info.id .. ']' or ''
+  local debug_text = render_ctx.show_debug_ids and ' [' .. message.info.id .. ']' or ''
 
   local display_name
   if role == 'assistant' then
     local mode = message.info.mode
     if mode and mode ~= '' then
       display_name = mode:upper()
     else
-      -- For the most recent assistant message, show current_mode if mode is missing
-      -- This handles new messages that haven't been stamped yet
-      local is_last_message = #state.messages == 0 or message.info.id == state.messages[#state.messages].info.id
-      if is_last_message and state.current_mode and state.current_mode ~= '' then
-        display_name = state.current_mode:upper()
+      if render_ctx.current_mode and render_ctx.current_mode ~= '' then
+        display_name = render_ctx.current_mode:upper()
       else
         display_name = 'ASSISTANT'
       end
@@ -222,16 +292,21 @@ function M.format_message_header(message)
   return output
 end
 
+---@param message OpencodeMessage
+---@return Output
+function M.format_message_header(message)
+  return M.render_message_header(message)
+end
+
 ---@param output Output Output object to write to
 ---@param callout string Callout type (e.g., 'ERROR', 'TODO')
 ---@param text string Callout text content
 ---@param title? string Optional title for the callout
-function M._format_callout(output, callout, text, title)
+---@param render_ctx? table
+function M._format_callout(output, callout, text, title, render_ctx)
+  render_ctx = resolve_render_ctx(render_ctx)
   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 = render_ctx.win_width
   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
@@ -259,17 +334,12 @@ function M._format_user_prompt(output, text, message)
 
   local end_line = output:get_line_count()
 
-  local end_line_extmark_offset = 0
-
   local mentions = {}
   if message and message.parts then
     -- message.parts will only be filled out on a re-render
     -- we need to collect the mentions here
     for _, part in ipairs(message.parts) do
       if part.type == 'file' then
-        -- we're rerendering this part and we have files, the space after the user prompt
-        -- also needs an extmark
-        end_line_extmark_offset = 1
         if part.source and part.source.text then
           table.insert(mentions, part.source.text)
         end
@@ -285,6 +355,25 @@ function M._format_user_prompt(output, text, message)
     mention.highlight_mentions_in_output(output, text, mentions, start_line)
   end
 
+  local end_line_extmark_offset = 0
+  if message and message.parts then
+    local has_file_parts = false
+    local last_content_idx = 0
+    local text_idx = 0
+    for i, part in ipairs(message.parts) do
+      if part.type == 'file' then
+        has_file_parts = true
+        last_content_idx = i
+      elseif part.type == 'text' and not part.synthetic then
+        text_idx = i
+        last_content_idx = i
+      end
+    end
+    if has_file_parts and text_idx > 0 and text_idx == last_content_idx then
+      end_line_extmark_offset = 1
+    end
+  end
+
   M.add_vertical_border(output, start_line, end_line + end_line_extmark_offset, 'OpencodeMessageRoleUser', -3)
 end
 
@@ -470,10 +559,10 @@ end
 ---Formats a single message part and returns the resulting output object
 ---@param part OpencodeMessagePart The part to format
 ---@param message? OpencodeMessage Optional message object to extract role and mentions from
----@param is_last_part? boolean Whether this is the last part in the message, used to show an error if there is one
----@param get_child_parts? fun(session_id: string): OpencodeMessagePart[]?
+---@param render_ctx? { is_last_part?: boolean, get_child_parts?: fun(session_id: string): OpencodeMessagePart[]?, child_session_parts?: OpencodeMessagePart[]?, show_reasoning_output?: boolean, permission_renderer?: fun(output: Output), question_renderer?: fun(output: Output), win_width?: integer, messages?: OpencodeMessage[], current_mode?: string, show_debug_ids?: boolean }
 ---@return Output
-function M.format_part(part, message, is_last_part, get_child_parts)
+function M.render_part(part, message, render_ctx)
+  render_ctx = resolve_render_ctx(render_ctx)
   local output = Output.new()
 
   if not message or not message.info or not message.info.role then
@@ -505,9 +594,24 @@ function M.format_part(part, message, is_last_part, get_child_parts)
       M._format_assistant_message(output, vim.trim(part.text), part.messageID)
       content_added = true
     elseif part.type == 'reasoning' then
-      M._format_reasoning(output, part)
+      M._format_reasoning(output, part, render_ctx)
       content_added = true
     elseif part.type == 'tool' then
+      local get_child_parts = render_ctx.get_child_parts
+      if render_ctx.child_session_parts ~= nil then
+        local child_session_parts = render_ctx.child_session_parts
+        local child_session_id = part.state and part.state.metadata and part.state.metadata.sessionId
+        get_child_parts = function(session_id)
+          if child_session_id and session_id == child_session_id then
+            return child_session_parts
+          end
+          if type(render_ctx.get_child_parts) == 'function' then
+            return render_ctx.get_child_parts(session_id)
+          end
+          return nil
+        end
+      end
+
       M.format_tool(output, part, get_child_parts)
       content_added = true
     elseif part.type == 'patch' and part.hash then
@@ -516,27 +620,39 @@ function M.format_part(part, message, is_last_part, get_child_parts)
     end
   elseif role == 'system' then
     if part.type == 'permissions-display' then
-      permission_window.format_display(output)
-      content_added = true
+      render_ctx.permission_renderer(output)
+      content_added = output:get_line_count() > 0
     elseif part.type == 'questions-display' then
-      local question_window = require('opencode.ui.question_window')
-      question_window.format_display(output)
-      content_added = true
+      render_ctx.question_renderer(output)
+      content_added = output:get_line_count() > 0
     end
   end
 
   if content_added then
     output:add_empty_line()
   end
 
-  if is_last_part and role == 'assistant' and message.info.error and message.info.error ~= '' then
+  if render_ctx.is_last_part and role == 'assistant' and message.info.error and message.info.error ~= '' then
     local error = message.info.error
     local error_message = error.data and error.data.message or vim.inspect(error)
-    M._format_callout(output, 'ERROR', error_message)
+    M._format_callout(output, 'ERROR', error_message, nil, render_ctx)
     output:add_empty_line()
   end
 
   return output
 end
 
+---Formats a single message part and returns the resulting output object
+---@param part OpencodeMessagePart The part to format
+---@param message? OpencodeMessage Optional message object to extract role and mentions from
+---@param is_last_part? boolean Whether this is the last part in the message, used to show an error if there is one
+---@param get_child_parts? fun(session_id: string): OpencodeMessagePart[]?
+---@return Output
+function M.format_part(part, message, is_last_part, get_child_parts)
+  return M.render_part(part, message, {
+    is_last_part = is_last_part,
+    get_child_parts = get_child_parts,
+  })
+end
+
 return M

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

@@ -79,8 +79,8 @@ function M.format(output, part, get_child_parts)
     type = 'select_child_session',
     args = {},
     key = 'S',
-    display_line = start_line - 1,
-    range = { from = start_line, to = end_line },
+    display_line = start_line,
+    range = { from = start_line + 1, to = end_line + 1 },
   })
 end
 

lua/opencode/ui/output.lua

@@ -102,6 +102,7 @@ function Output:add_extmark(idx, extmark)
   if not self.extmarks[idx] then
     self.extmarks[idx] = {}
   end
+
   table.insert(self.extmarks[idx], extmark)
 end