refactor: move full session loading to renderer

also:

- move settings lines / extmarks into output_window
- loading_animation subscribes for states now

Author: cameronr

lua/opencode/api.lua

@@ -574,16 +574,17 @@ function M.undo()
     return
   end
 
-  ui.render_output(true)
+  -- ui.render_output(true)
   state.api_client
     :revert_message(state.active_session.id, {
       messageID = last_user_message.id,
     })
     :and_then(function(response)
       state.active_session.revert = response.revert
       vim.schedule(function()
+        -- FIXME: shouldn't require a full re-render
         vim.notify('Last message undone successfully', vim.log.levels.INFO)
-        require('opencode.ui.renderer').reset_and_render()
+        require('opencode.ui.renderer').render_full_session()
       end)
     end)
     :catch(function(err)
@@ -605,8 +606,9 @@ function M.redo()
     :and_then(function(response)
       state.active_session.revert = response.revert
       vim.schedule(function()
-        vim.notify('Last message rerterted successfully', vim.log.levels.INFO)
-        require('opencode.ui.renderer').reset_and_render()
+        -- FIXME: shouldn't require a full re-render
+        vim.notify('Last message reverted successfully', vim.log.levels.INFO)
+        require('opencode.ui.renderer').render_full_session()
       end)
     end)
     :catch(function(err)

lua/opencode/core.lua

@@ -54,6 +54,9 @@ function M.open(opts)
     state.active_session = nil
     state.last_sent_context = nil
     state.active_session = M.create_new_session()
+
+    -- FIXME: shouldn't need to clear_output here, setting the session should
+    -- do that
     ui.clear_output()
   else
     if not state.active_session then

lua/opencode/ui/footer.lua

@@ -5,6 +5,7 @@ local icons = require('opencode.ui.icons')
 local output_window = require('opencode.ui.output_window')
 local snapshot = require('opencode.snapshot')
 local config_file = require('opencode.config_file')
+local loading_animation = require('opencode.ui.loading_animation')
 
 local M = {}
 
@@ -89,6 +90,8 @@ function M.setup(windows)
   -- to show C-c message
   state.subscribe('job_count', on_job_count_changed)
   state.subscribe('restore_points', on_change)
+
+  loading_animation.setup()
 end
 
 function M.close()
@@ -100,6 +103,8 @@ function M.close()
   state.unsubscribe('current_model', on_change)
   state.unsubscribe('job_count', on_job_count_changed)
   state.unsubscribe('restore_points', on_change)
+
+  loading_animation.teardown()
 end
 
 function M.mounted(windows)

lua/opencode/ui/formatter.lua

@@ -28,17 +28,15 @@ function M.format_session(session)
   state.last_user_message = nil
   return require('opencode.session').get_messages(session):and_then(function(msgs)
     vim.notify('formatting session', vim.log.levels.WARN)
-    return M._format_messages(session, msgs)
+    state.messages = msgs
+    return M._format_messages(session)
   end)
 end
 
-function M._format_messages(session, messages)
-  state.messages = messages
-
+function M._format_messages(session)
   M.output:clear()
 
-  -- M.output:add_line('')
-  -- M.output:add_line('')
+  M.output:add_line('')
 
   for i, msg in ipairs(state.messages) do
     M.output:add_lines(M.separator)
@@ -77,8 +75,7 @@ function M._format_messages(session, messages)
     end
   end
 
-  -- M.output:add_empty_line()
-  return M.output:get_lines()
+  return M.output
 end
 
 function M._handle_permission_request(part)

lua/opencode/ui/loading_animation.lua

@@ -117,7 +117,7 @@ local function on_running_change(_, new_value)
   end
 end
 
-function M.setup_subscription()
+function M.setup()
   state.subscribe('job_count', on_running_change)
 end
 

lua/opencode/ui/output_renderer.lua

@@ -57,28 +57,32 @@ M.render = vim.schedule_wrap(function(windows, force)
 end)
 
 function M.setup_subscriptions(windows)
-  M._cleanup_subscriptions()
-  loading_animation.setup_subscription()
-
-  local on_change = util.debounce(function(old, new)
-    M.render(windows, true)
-  end, M._debounce_ms)
 
-  M._subscriptions.active_session = function(_, new, old)
-    if not old then
-      return
-    end
-    on_change(old, new)
-  end
-  state.subscribe('active_session', M._subscriptions.active_session)
+  -- NOTE: output_renderer no longer renders automatically
+  -- only leaving this code for now, in case we want to use
+  -- this old pathway. will be removed in the near future
+
+  -- M._cleanup_subscriptions()
+
+  -- local on_change = util.debounce(function(old, new)
+  --   M.render(windows, true)
+  -- end, M._debounce_ms)
+  --
+  -- M._subscriptions.active_session = function(_, new, old)
+  --   if not old then
+  --     return
+  --   end
+  --   on_change(old, new)
+  -- end
+  -- state.subscribe('active_session', M._subscriptions.active_session)
 end
 
 function M._cleanup_subscriptions()
-  for key, cb in pairs(M._subscriptions) do
-    state.unsubscribe(key, cb)
-  end
-  M._subscriptions = {}
-  loading_animation.teardown()
+  -- for key, cb in pairs(M._subscriptions) do
+  --   state.unsubscribe(key, cb)
+  -- end
+  -- M._subscriptions = {}
+  -- loading_animation.teardown()
 end
 
 function M.teardown()
@@ -87,9 +91,9 @@ function M.teardown()
 end
 
 function M.stop()
-  -- FIXME: the footer should probably own this... and it may
-  -- not even be necessary
-  loading_animation.stop()
+  -- -- FIXME: the footer should probably own this... and it may
+  -- -- not even be necessary
+  -- loading_animation.stop()
 end
 
 function M.write_output(windows, output_lines)

lua/opencode/ui/output_window.lua

@@ -2,6 +2,7 @@ local state = require('opencode.state')
 local config = require('opencode.config')
 
 local M = {}
+M.namespace = vim.api.nvim_create_namespace('opencode_output')
 
 function M.create_buf()
   local output_buf = vim.api.nvim_create_buf(false, true)
@@ -51,8 +52,9 @@ function M.setup(windows)
   M.update_dimensions(windows)
   M.setup_keymaps(windows)
   state.subscribe('restore_points', function(_, new_val, old_val)
-    local outout_renderer = require('opencode.ui.output_renderer')
-    outout_renderer.render(state.windows, true)
+    -- FIXME: restore points
+    -- local outout_renderer = require('opencode.ui.output_renderer')
+    -- outout_renderer.render(state.windows, true)
   end)
 end
 
@@ -63,21 +65,74 @@ function M.update_dimensions(windows)
   vim.api.nvim_win_set_config(windows.output_win, { width = width })
 end
 
-function M.set_content(lines)
+function M.get_buf_line_count()
+  if not M.mounted() then
+    return 0
+  end
+
+  return vim.api.nvim_buf_line_count(state.windows.output_buf)
+end
+
+---Set the output buffer contents
+---@param lines string[] The lines to set
+---@param start_line? integer The starting line to set, defaults to 0
+---@param end_line? integer The last line to set, defaults to -1
+function M.set_lines(lines, start_line, end_line)
   if not M.mounted() then
     return
   end
 
+  start_line = start_line or 0
+  end_line = end_line or -1
+
   local windows = state.windows
   if not windows or not windows.output_buf then
     return
   end
+
   vim.api.nvim_set_option_value('modifiable', true, { buf = windows.output_buf })
-  local padded = vim.tbl_extend('force', {}, lines)
-  vim.api.nvim_buf_set_lines(windows.output_buf, 0, -1, false, padded)
+  vim.api.nvim_buf_set_lines(windows.output_buf, start_line, end_line, false, lines)
   vim.api.nvim_set_option_value('modifiable', false, { buf = windows.output_buf })
 end
 
+---Clear output buf extmarks
+---@param start_line? integer Line to start clearing, defaults 0
+---@param end_line? integer Line to to clear until, defaults to -1
+function M.clear_extmarks(start_line, end_line)
+  if not M.mounted() or not state.windows.output_buf then
+    return
+  end
+
+  start_line = start_line or 0
+  end_line = end_line or -1
+
+  vim.api.nvim_buf_clear_namespace(state.windows.output_buf, M.namespace, start_line, end_line)
+end
+
+---Apply extmarks to the output buffer
+---@param extmarks table<number, OutputExtmark> Extmarks indexed by line
+---@param line_offset? integer Line offset to apply to extmarks, defaults to 0
+function M.set_extmarks(extmarks, line_offset)
+  if not M.mounted() or not extmarks or type(extmarks) ~= 'table' then
+    return
+  end
+
+  line_offset = line_offset or 0
+
+  local output_buf = state.windows.output_buf
+
+  for line_idx, marks in pairs(extmarks) do
+    for _, mark in ipairs(marks) do
+      local actual_mark = type(mark) == 'function' and mark() or mark
+      local target_line = line_offset + line_idx - 1
+      if actual_mark.end_row then
+        actual_mark.end_row = actual_mark.end_row + line_offset
+      end
+      pcall(vim.api.nvim_buf_set_extmark, output_buf, M.namespace, target_line, 0, actual_mark)
+    end
+  end
+end
+
 function M.focus_output(should_stop_insert)
   if should_stop_insert then
     vim.cmd('stopinsert')
@@ -121,11 +176,8 @@ function M.setup_autocmds(windows, group)
 end
 
 function M.clear()
-  if not M.mounted() then
-    return
-  end
-  vim.api.nvim_buf_clear_namespace(state.windows.output_buf, -1, 0, -1)
-  M.set_content({})
+  M.set_lines({})
+  M.clear_extmarks()
 end
 
 return M