adjust

Author: jensenojs

lua/opencode/ui/renderer.lua

@@ -9,8 +9,6 @@ local RenderState = require('opencode.ui.render_state')
 local M = {
   _prev_line_count = 0,
   _render_state = RenderState.new(),
-  _full_render_in_flight = nil,
-  _full_render_pending_opts = nil,
   _last_part_formatted = {
     part_id = nil,
     formatted_data = nil --[[@as Output|nil]],
@@ -41,7 +39,6 @@ end, config.ui.output.rendering.markdown_debounce_ms or 250)
 function M.reset()
   M._prev_line_count = 0
   M._render_state:reset()
-  M._full_render_pending_opts = nil
   M._last_part_formatted = { part_id = nil, formatted_data = nil }
 
   output_window.clear()
@@ -125,50 +122,17 @@ local function fetch_session()
   return require('opencode.session').get_messages(session)
 end
 
----@param opts? {force_scroll?: boolean}
+---Request all of the session data from the opencode server and render it
 ---@return Promise<OpencodeMessage[]>
-function M.render_full_session(opts)
-  opts = opts or {}
-
+function M.render_full_session()
   if not output_window.mounted() or not state.api_client then
     return Promise.new():resolve(nil)
   end
 
-  if M._full_render_in_flight then
-    M._full_render_pending_opts = M._full_render_pending_opts or {}
-    M._full_render_pending_opts.force_scroll = M._full_render_pending_opts.force_scroll
-      or (opts.force_scroll == true)
-    return M._full_render_in_flight
-  end
-
-  local render_promise = fetch_session():and_then(function(session_data)
-    return M._render_full_session_data(session_data, opts)
-  end)
-
-  M._full_render_in_flight = render_promise
-
-  render_promise:finally(function()
-    M._full_render_in_flight = nil
-
-    local pending_opts = M._full_render_pending_opts
-    if pending_opts then
-      M._full_render_pending_opts = nil
-      vim.schedule(function()
-        if output_window.mounted() and state.api_client then
-          M.render_full_session(pending_opts)
-        end
-      end)
-    end
-  end)
-
-  return render_promise
+  return fetch_session():and_then(M._render_full_session_data)
 end
 
----@param session_data table
----@param opts? {force_scroll?: boolean}
-function M._render_full_session_data(session_data, opts)
-  opts = opts or {}
-  session_data = session_data or {}
+function M._render_full_session_data(session_data, prev_revert, revert)
   M.reset()
 
   if not state.active_session or not state.messages then
@@ -200,7 +164,7 @@ function M._render_full_session_data(session_data, opts)
   if set_mode_from_messages then
     M._set_model_and_mode_from_messages()
   end
-  M.scroll_to_bottom(opts.force_scroll == true)
+  M.scroll_to_bottom(true)
 
   if config.hooks and config.hooks.on_session_loaded then
     pcall(config.hooks.on_session_loaded, state.active_session)

tests/unit/cursor_tracking_spec.lua

@@ -31,7 +31,11 @@ describe('cursor persistence (state)', function()
       })
 
       win = vim.api.nvim_open_win(buf, true, {
-        relative = 'editor', width = 80, height = 10, row = 0, col = 0,
+        relative = 'editor',
+        width = 80,
+        height = 10,
+        row = 0,
+        col = 0,
       })
 
       state.windows = { output_win = win, output_buf = buf }
@@ -162,7 +166,11 @@ describe('cursor persistence (state)', function()
       local buf = vim.api.nvim_create_buf(false, true)
       vim.api.nvim_buf_set_lines(buf, 0, -1, false, { 'line1', 'line2', 'line3' })
       local win = vim.api.nvim_open_win(buf, true, {
-        relative = 'editor', width = 40, height = 10, row = 0, col = 0,
+        relative = 'editor',
+        width = 40,
+        height = 10,
+        row = 0,
+        col = 0,
       })
       vim.api.nvim_win_set_cursor(win, { 2, 3 })
 
@@ -190,7 +198,11 @@ describe('output_window.is_at_bottom', function()
     vim.api.nvim_buf_set_lines(buf, 0, -1, false, lines)
 
     win = vim.api.nvim_open_win(buf, true, {
-      relative = 'editor', width = 80, height = 10, row = 0, col = 0,
+      relative = 'editor',
+      width = 80,
+      height = 10,
+      row = 0,
+      col = 0,
     })
 
     state.windows = { output_win = win, output_buf = buf }
@@ -241,7 +253,11 @@ describe('output_window.is_at_bottom', function()
   it('returns true for empty buffer', function()
     local empty_buf = vim.api.nvim_create_buf(false, true)
     local empty_win = vim.api.nvim_open_win(empty_buf, true, {
-      relative = 'editor', width = 40, height = 5, row = 0, col = 0,
+      relative = 'editor',
+      width = 40,
+      height = 5,
+      row = 0,
+      col = 0,
     })
     state.windows = { output_win = empty_win, output_buf = empty_buf }
 
@@ -255,10 +271,13 @@ describe('output_window.is_at_bottom', function()
     vim.api.nvim_win_set_cursor(win, { 50, 0 })
     assert.is_true(output_window.is_at_bottom(win))
 
+    -- Scroll viewport up via winrestview, cursor stays at line 50
     pcall(vim.api.nvim_win_call, win, function()
       vim.fn.winrestview({ topline = 1 })
     end)
 
+    -- Cursor is still at 50, so is_at_bottom should still be true
+    -- This is the key behavioral difference from viewport-based check
     assert.is_true(output_window.is_at_bottom(win))
   end)
 end)
@@ -278,7 +297,11 @@ describe('renderer.scroll_to_bottom', function()
     vim.api.nvim_buf_set_lines(buf, 0, -1, false, lines)
 
     win = vim.api.nvim_open_win(buf, true, {
-      relative = 'editor', width = 80, height = 10, row = 0, col = 0,
+      relative = 'editor',
+      width = 80,
+      height = 10,
+      row = 0,
+      col = 0,
     })
 
     state.windows = { output_win = win, output_buf = buf }
@@ -327,10 +350,18 @@ describe('ui.focus_input', function()
     vim.api.nvim_buf_set_lines(output_buf, 0, -1, false, { 'output' })
 
     output_win = vim.api.nvim_open_win(output_buf, true, {
-      relative = 'editor', width = 40, height = 5, row = 0, col = 0,
+      relative = 'editor',
+      width = 40,
+      height = 5,
+      row = 0,
+      col = 0,
     })
     input_win = vim.api.nvim_open_win(input_buf, true, {
-      relative = 'editor', width = 40, height = 5, row = 6, col = 0,
+      relative = 'editor',
+      width = 40,
+      height = 5,
+      row = 6,
+      col = 0,
     })
 
     state.windows = {
@@ -373,7 +404,11 @@ describe('renderer._add_message_to_buffer scrolling', function()
     vim.api.nvim_buf_set_lines(buf, 0, -1, false, { 'existing line' })
 
     win = vim.api.nvim_open_win(buf, true, {
-      relative = 'editor', width = 80, height = 10, row = 0, col = 0,
+      relative = 'editor',
+      width = 80,
+      height = 10,
+      row = 0,
+      col = 0,
     })
 
     state.windows = { output_win = win, output_buf = buf }