fix(topbar/footer): subscriptions + lifecycle

Author: cameronr

lua/opencode/api.lua

@@ -352,14 +352,10 @@ end
 
 function M.agent_plan()
   state.current_mode = 'plan'
-  -- TODO: topbar subscribe to current_mode
-  require('opencode.ui.topbar').render()
 end
 
 function M.agent_build()
   state.current_mode = 'build'
-  -- TODO: topbar subscribe to current_mode
-  require('opencode.ui.topbar').render()
 end
 
 function M.select_agent()
@@ -371,9 +367,7 @@ function M.select_agent()
       return
     end
 
-    -- TODO: topbar subscribe to current_mode
     state.current_mode = selection
-    require('opencode.ui.topbar').render()
   end)
 end
 
@@ -390,8 +384,6 @@ function M.switch_mode()
   local next_index = (current_index % #modes) + 1
 
   state.current_mode = modes[next_index]
-  -- TODO: topbar subscribe to current_mode
-  require('opencode.ui.topbar').render()
 end
 
 function M.with_header(lines, show_welcome)

lua/opencode/ui/footer.lua

@@ -5,9 +5,11 @@ 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 M = {}
 
-function M.render(windows)
+function M.render()
+  local windows = state.windows
   if not output_window.mounted(windows) or not M.mounted(windows) then
     return
   end
@@ -43,6 +45,7 @@ function M.render(windows)
     append_to_footer(restore_point_text)
   end
 
+  ---@diagnostic disable-next-line: need-check-nil
   local win_width = vim.api.nvim_win_get_width(windows.output_win)
   local footer_text = table.concat(segments, ' | ') .. ' '
   footer_text = string.rep(' ', win_width - #footer_text) .. footer_text
@@ -67,24 +70,36 @@ function M._build_footer_win_config(windows)
   }
 end
 
+local function on_change(_, _, _)
+  M.render()
+end
+
+local function on_job_count_changed(_, new, old)
+  if new == 0 or old == 0 then
+    M.render()
+  end
+end
+
 function M.setup(windows)
   windows.footer_win = vim.api.nvim_open_win(windows.footer_buf, false, M._build_footer_win_config(windows))
   vim.api.nvim_set_option_value('winhl', 'Normal:OpenCodeHint', { win = windows.footer_win })
 
   -- for stats changes
-  state.subscribe('current_model', function(_, _, _)
-    M.render(windows)
-  end)
+  state.subscribe('current_model', on_change)
+  -- to show C-c message
+  state.subscribe('job_count', on_job_count_changed)
+  state.subscribe('restore_points', on_change)
+end
 
-  state.subscribe('job_count', function(_, new, old)
-    if new == 0 or old == 0 then
-      M.render(windows)
-    end
-  end)
+function M.close()
+  if state.windows then
+    pcall(vim.api.nvim_win_close, state.windows.footer_win, true)
+    pcall(vim.api.nvim_buf_delete, state.windows.footer_buf, { force = true })
+  end
 
-  state.subscribe('restore_points', function(_, _, _)
-    M.render(windows)
-  end)
+  state.unsubscribe('current_model', on_change)
+  state.unsubscribe('job_count', on_job_count_changed)
+  state.unsubscribe('restore_points', on_change)
 end
 
 function M.mounted(windows)
@@ -101,7 +116,7 @@ function M.update_window(windows)
   end
 
   vim.api.nvim_win_set_config(windows.footer_win, M._build_footer_win_config(windows))
-  M.render(windows)
+  M.render()
 end
 
 ---@return integer
@@ -137,13 +152,4 @@ function M.set_content(lines)
   vim.api.nvim_set_option_value('modifiable', false, { buf = windows.footer_buf })
 end
 
-function M.close()
-  if not state.windows then
-    return
-  end
-
-  pcall(vim.api.nvim_win_close, state.windows.footer_win, true)
-  pcall(vim.api.nvim_buf_delete, state.windows.footer_buf, { force = true })
-end
-
 return M

lua/opencode/ui/loading_animation.lua

@@ -30,12 +30,8 @@ M.render = vim.schedule_wrap(function(windows)
   if not windows or not windows.output_buf or not windows.footer_buf then
     return false
   end
-  if not vim.api.nvim_buf_is_valid(windows.output_buf) or not vim.api.nvim_buf_is_valid(windows.footer_buf) then
-    return false
-  end
 
-  local buffer_line_count = vim.api.nvim_buf_line_count(windows.output_buf)
-  if buffer_line_count <= 0 then
+  if not vim.api.nvim_buf_is_valid(windows.output_buf) or not vim.api.nvim_buf_is_valid(windows.footer_buf) then
     return false
   end
 

lua/opencode/ui/output_renderer.lua

@@ -43,14 +43,12 @@ M.render = vim.schedule_wrap(function(windows, force)
     vim.schedule(function()
       -- M.render_markdown()
       M.handle_auto_scroll(windows)
-      require('opencode.ui.topbar').render()
     end)
 
     pcall(function()
       vim.schedule(function()
         require('opencode.ui.mention').highlight_all_mentions(windows.output_buf)
         require('opencode.ui.contextual_actions').setup_contextual_actions()
-        require('opencode.ui.footer').render(windows)
       end)
     end)
   end)

lua/opencode/ui/topbar.lua

@@ -103,8 +103,15 @@ function M.render()
   end)
 end
 
+local function on_mode_changed(_, _, _)
+  M.render()
+end
+
 function M.setup()
+  state.subscribe('current_mode', on_mode_changed)
   M.render()
 end
 
+function M.close() end
+state.unsubscribe('current_mode', on_mode_changed)
 return M

lua/opencode/ui/ui.lua

@@ -35,6 +35,7 @@ function M.close_windows(windows)
     M.return_to_last_code_win()
   end
 
+  topbar.close()
   output_renderer.teardown()
   streaming_renderer.teardown()