refactor: streaming_renderer, session_formatter

Renamed them:

streaming_renderer -> renderer
session_formatter -> formatter

Author: cameronr

lua/opencode/api.lua

@@ -583,7 +583,7 @@ function M.undo()
       state.active_session.revert = response.revert
       vim.schedule(function()
         vim.notify('Last message undone successfully', vim.log.levels.INFO)
-        require('opencode.ui.streaming_renderer').reset_and_render()
+        require('opencode.ui.renderer').reset_and_render()
       end)
     end)
     :catch(function(err)
@@ -606,7 +606,7 @@ function M.redo()
       state.active_session.revert = response.revert
       vim.schedule(function()
         vim.notify('Last message rerterted successfully', vim.log.levels.INFO)
-        require('opencode.ui.streaming_renderer').reset_and_render()
+        require('opencode.ui.renderer').reset_and_render()
       end)
     end)
     :catch(function(err)

lua/opencode/ui/contextual_actions.lua

@@ -26,7 +26,7 @@ function M.setup_contextual_actions()
     callback = function()
       vim.schedule(function()
         local line_num = vim.api.nvim_win_get_cursor(0)[1]
-        local actions = require('opencode.ui.session_formatter').output:get_actions_for_line(line_num)
+        local actions = require('opencode.ui.formatter').output:get_actions_for_line(line_num)
         last_line_num = line_num
 
         vim.api.nvim_buf_clear_namespace(state.windows.output_buf, ns_id, 0, -1)

lua/opencode/ui/debug_helper.lua

@@ -21,12 +21,12 @@ function M.open_json_file(data)
 end
 
 function M.debug_output()
-  local session_formatter = require('opencode.ui.session_formatter')
+  local session_formatter = require('opencode.ui.formatter')
   M.open_json_file(session_formatter:get_lines())
 end
 
 function M.debug_message()
-  local session_formatter = require('opencode.ui.session_formatter')
+  local session_formatter = require('opencode.ui.formatter')
   local current_line = vim.api.nvim_win_get_cursor(state.windows.output_win)[1]
   local metadata = session_formatter.get_message_at_line(current_line) or {}
   M.open_json_file(metadata.message)

lua/opencode/ui/session_formatter.lua lua/opencode/ui/formatter.lualua/opencode/ui/session_formatter.lua renamed to lua/opencode/ui/formatter.lua

@@ -1,7 +1,7 @@
 local M = {}
 
 local state = require('opencode.state')
-local session_formatter = require('opencode.ui.session_formatter')
+local formatter = require('opencode.ui.formatter')
 
 local function re_focus()
   vim.cmd('normal! zt')
@@ -12,11 +12,11 @@ function M.goto_next_message()
   local windows = state.windows
   local win = windows.output_win
   local buf = windows.output_buf
-  local all_metadata = session_formatter.output:get_all_metadata()
+  local all_metadata = formatter.output:get_all_metadata()
 
   local current_line = vim.api.nvim_win_get_cursor(win)[1]
   local line_count = vim.api.nvim_buf_line_count(buf)
-  local current = session_formatter.get_message_at_line(current_line)
+  local current = formatter.get_message_at_line(current_line)
   local current_idx = current and current.msg_idx or 0
 
   for i = current_line, line_count do
@@ -33,10 +33,10 @@ function M.goto_prev_message()
   require('opencode.ui.ui').focus_output()
   local windows = state.windows
   local win = windows.output_win
-  local all_metadata = session_formatter.output:get_all_metadata()
+  local all_metadata = formatter.output:get_all_metadata()
 
   local current_line = vim.api.nvim_win_get_cursor(win)[1]
-  local current = session_formatter.get_message_at_line(current_line)
+  local current = formatter.get_message_at_line(current_line)
   local current_idx = current and current.msg_idx or 0
 
   for i = current_line - 1, 1, -1 do

lua/opencode/ui/navigation.lua

@@ -1,7 +1,7 @@
 local M = {}
 
 local state = require('opencode.state')
-local formatter = require('opencode.ui.session_formatter')
+local formatter = require('opencode.ui.formatter')
 local loading_animation = require('opencode.ui.loading_animation')
 local output_window = require('opencode.ui.output_window')
 local util = require('opencode.util')
@@ -11,6 +11,8 @@ M._subscriptions = {}
 M._ns_id = vim.api.nvim_create_namespace('opencode_output')
 M._debounce_ms = 50
 
+-- FIXME: this file should eventually be removed
+
 function M.render_markdown()
   if vim.fn.exists(':RenderMarkdown') > 0 then
     vim.cmd(':RenderMarkdown')

lua/opencode/ui/output_renderer.lua

@@ -12,10 +12,6 @@ function M.reset()
   M._part_cache = {}
   M._prev_line_count = 0
 
-  -- FIXME: this prolly isn't the right place for state.messages to be
-  -- cleared. It would probably be better to have streaming_renderer
-  -- subscribe to state changes and if state.messages is cleared, it
-  -- should clear it's state too
   state.messages = {}
   state.last_user_message = nil
 end
@@ -203,7 +199,7 @@ end
 ---@param msg_idx integer Message index
 ---@return {line_start: integer, line_end: integer}? Range where header was written
 function M._write_message_header(message, msg_idx)
-  local formatter = require('opencode.ui.session_formatter')
+  local formatter = require('opencode.ui.formatter')
   local header_data = formatter.format_message_header_isolated(message, msg_idx)
   local line_range = M._write_formatted_data(header_data)
   return line_range
@@ -400,7 +396,7 @@ function M.on_part_updated(event)
     }
   end
 
-  local formatter = require('opencode.ui.session_formatter')
+  local formatter = require('opencode.ui.formatter')
   local ok, formatted = pcall(formatter.format_part_isolated, part, {
     msg_idx = msg_idx,
     part_idx = part_idx,
@@ -503,6 +499,8 @@ end
 function M.on_session_compacted(event)
   vim.notify('on_session_compacted')
   -- TODO: render a note that the session was compacted
+  -- FIXME: did we need unset state.last_sent_context because the
+  -- session was compacted?
 end
 
 ---Reset and re-render the whole session via output_renderer
@@ -523,7 +521,7 @@ function M.on_session_error(event)
   local error_data = event.properties.error
   local error_message = error_data.data and error_data.data.message or vim.inspect(error_data)
 
-  local formatter = require('opencode.ui.session_formatter')
+  local formatter = require('opencode.ui.formatter')
   local formatted = formatter.format_error_callout(error_message)
 
   M._write_formatted_data(formatted)
@@ -628,7 +626,7 @@ function M._rerender_part(part_id)
     return
   end
 
-  local formatter = require('opencode.ui.session_formatter')
+  local formatter = require('opencode.ui.formatter')
   local message_with_parts = vim.tbl_extend('force', msg_wrapper.info, { parts = msg_wrapper.parts })
   local ok, formatted = pcall(formatter.format_part_isolated, part, {
     msg_idx = msg_idx,

lua/opencode/ui/streaming_renderer.lua lua/opencode/ui/renderer.lualua/opencode/ui/streaming_renderer.lua renamed to lua/opencode/ui/renderer.lua

@@ -2,7 +2,7 @@ local M = {}
 local config = require('opencode.config')
 local state = require('opencode.state')
 local output_renderer = require('opencode.ui.output_renderer')
-local streaming_renderer = require('opencode.ui.streaming_renderer')
+local renderer = require('opencode.ui.renderer')
 local output_window = require('opencode.ui.output_window')
 local input_window = require('opencode.ui.input_window')
 local footer = require('opencode.ui.footer')
@@ -37,7 +37,7 @@ function M.close_windows(windows)
 
   topbar.close()
   output_renderer.teardown()
-  streaming_renderer.teardown()
+  renderer.teardown()
 
   pcall(vim.api.nvim_del_augroup_by_name, 'OpencodeResize')
   pcall(vim.api.nvim_del_augroup_by_name, 'OpencodeWindows')
@@ -119,7 +119,7 @@ function M.create_windows()
   topbar.setup()
 
   output_renderer.setup_subscriptions(windows)
-  streaming_renderer.setup_subscriptions(windows)
+  renderer.setup_subscriptions(windows)
 
   autocmds.setup_autocmds(windows)
   autocmds.setup_resize_handler(windows)
@@ -189,7 +189,7 @@ end
 
 function M.clear_output()
   output_renderer.stop()
-  streaming_renderer.reset()
+  renderer.reset()
   output_window.clear()
   footer.clear()
   topbar.render()

lua/opencode/ui/ui.lua

@@ -113,7 +113,7 @@ function M.load_test_data(filename)
 end
 
 function M.get_session_from_events(events)
-  -- streaming_renderer needs a valid session id
+  -- renderer needs a valid session id
   for _, event in ipairs(events) do
     -- find the session id in a message or part event
     local properties = event.properties
@@ -128,21 +128,21 @@ function M.get_session_from_events(events)
 end
 
 function M.replay_event(event)
-  local streaming_renderer = require('opencode.ui.streaming_renderer')
+  local renderer = require('opencode.ui.renderer')
   if event.type == 'message.updated' then
-    streaming_renderer.on_message_updated(event)
+    renderer.on_message_updated(event)
   elseif event.type == 'message.part.updated' then
-    streaming_renderer.on_part_updated(event)
+    renderer.on_part_updated(event)
   elseif event.type == 'message.removed' then
-    streaming_renderer.on_message_removed(event)
+    renderer.on_message_removed(event)
   elseif event.type == 'message.part.removed' then
-    streaming_renderer.on_part_removed(event)
+    renderer.on_part_removed(event)
   elseif event.type == 'session.compacted' then
-    streaming_renderer.on_session_compacted()
+    renderer.on_session_compacted()
   elseif event.type == 'permission.updated' then
-    streaming_renderer.on_permission_updated(event)
+    renderer.on_permission_updated(event)
   elseif event.type == 'permission.replied' then
-    streaming_renderer.on_permission_replied(event)
+    renderer.on_permission_replied(event)
   end
 end
 

tests/helpers.lua

@@ -15,7 +15,7 @@ Replay captured event data to visually test the streaming renderer.
 Or manually:
 
 ```bash
-nvim -u tests/manual/init_replay.lua -c "lua require('tests.manual.streaming_renderer_replay').start()"
+nvim -u tests/manual/init_replay.lua -c "lua require('tests.manual.renderer_replay').start()"
 ```
 
 ### Available Commands