refactor(state): move UI/window APIs into state.ui

Move window state, cursor, visibility, and hidden-buffer helpers into a dedicated
state.ui table. Update callers across modules and tests to reference state.ui.*,
improving separation between core store logic and UI utilities.

Author: sudo-tee

lua/opencode/api.lua

@@ -61,7 +61,7 @@ end
 
 ---@return {status: 'closed'|'hidden'|'visible', position: string, windows: OpencodeWindowState|nil, cursor_positions: {input: integer[]|nil, output: integer[]|nil}}
 function M.get_window_state()
-  return state.get_window_state()
+  return state.ui.get_window_state()
 end
 
 ---@param hidden OpencodeHiddenBuffers|nil
@@ -82,7 +82,7 @@ end
 ---@return {focus: 'input'|'output', open_action: 'reuse_visible'|'restore_hidden'|'create_fresh'}
 local function build_toggle_open_context(restore_hidden)
   if restore_hidden then
-    local hidden = state.inspect_hidden_buffers()
+    local hidden = state.ui.inspect_hidden_buffers()
     return {
       focus = resolve_hidden_focus(hidden),
       open_action = 'restore_hidden',
@@ -329,7 +329,7 @@ function M.set_review_breakpoint()
 end
 
 function M.prev_history()
-  if not state.is_visible() then
+  if not state.ui.is_visible() then
     return
   end
   local prev_prompt = history.prev()
@@ -340,7 +340,7 @@ function M.prev_history()
 end
 
 function M.next_history()
-  if not state.is_visible() then
+  if not state.ui.is_visible() then
     return
   end
   local next_prompt = history.next()
@@ -575,7 +575,7 @@ function M.help()
     '|--------------|-------------|',
   }, false)
 
-  if not state.is_visible() or not state.windows.output_win then
+  if not state.ui.is_visible() or not state.windows.output_win then
     return
   end
 

lua/opencode/core.lua

@@ -25,7 +25,7 @@ M.select_session = Promise.async(function(parent_id)
 
   ui.select_session(filtered_sessions, function(selected_session)
     if not selected_session then
-      if state.is_visible() then
+      if state.ui.is_visible() then
         ui.focus_input()
       end
       return
@@ -43,7 +43,7 @@ M.switch_session = Promise.async(function(session_id)
 
   state.session.set_active(selected_session)
   state.session.reset_restore_points()
-  if state.is_visible() then
+  if state.ui.is_visible() then
     ui.focus_input()
   else
     M.open()
@@ -52,7 +52,7 @@ end)
 
 ---@param opts? OpenOpts
 M.open_if_closed = Promise.async(function(opts)
-  if not state.is_visible() then
+  if not state.ui.is_visible() then
     M.open(opts):await()
   end
 end)
@@ -88,7 +88,7 @@ M.open = Promise.async(function(opts)
     require('opencode.context').load()
   end
 
-  local open_windows_action = opts.open_action or state.resolve_open_windows_action()
+  local open_windows_action = opts.open_action or state.ui.resolve_open_windows_action()
   local are_windows_closed = open_windows_action ~= 'reuse_visible'
   local restoring_hidden = open_windows_action == 'restore_hidden'
 
@@ -286,7 +286,7 @@ end
 function M.configure_provider()
   require('opencode.model_picker').select(function(selection)
     if not selection then
-      if state.is_visible() then
+      if state.ui.is_visible() then
         ui.focus_input()
       end
       return
@@ -298,7 +298,7 @@ function M.configure_provider()
       state.model.set_mode_model_override(state.current_mode, model_str)
     end
 
-    if state.is_visible() then
+    if state.ui.is_visible() then
       ui.focus_input()
     else
       vim.notify('Changed provider to ' .. model_str, vim.log.levels.INFO)
@@ -309,15 +309,15 @@ end
 function M.configure_variant()
   require('opencode.variant_picker').select(function(selection)
     if not selection then
-      if state.is_visible() then
+      if state.ui.is_visible() then
         ui.focus_input()
       end
       return
     end
 
     state.model.set_variant(selection.name)
 
-    if state.is_visible() then
+    if state.ui.is_visible() then
       ui.focus_input()
     else
       vim.notify('Changed variant to ' .. selection.name, vim.log.levels.INFO)
@@ -417,7 +417,7 @@ M.cancel = Promise.async(function()
     end
   end
 
-  if state.is_visible() then
+  if state.ui.is_visible() then
     require('opencode.ui.footer').clear()
     input_window.set_content('')
     require('opencode.history').index = nil

lua/opencode/state/init.lua

@@ -105,21 +105,6 @@
 ---@field subscribe fun(key:string|string[]|nil, cb:fun(key:string, new_val:any, old_val:any))
 ---@field unsubscribe fun(key:string|nil, cb:fun(key:string, new_val:any, old_val:any))
 ---@field is_running fun():boolean
----@field get_window_state fun(): {status: 'closed'|'hidden'|'visible', position: string, windows: OpencodeWindowState|nil, cursor_positions: {input: integer[]|nil, output: integer[]|nil}}
----@field is_window_in_current_tab fun(win_id: integer|nil): boolean
----@field are_windows_in_current_tab fun(): boolean
----@field get_window_cursor fun(win_id: integer|nil): integer[]|nil
----@field set_cursor_position fun(win_type: 'input'|'output', pos: integer[]|nil)
----@field get_cursor_position fun(win_type: 'input'|'output'): integer[]|nil
----@field stash_hidden_buffers fun(hidden: OpencodeHiddenBuffers|nil)
----@field inspect_hidden_buffers fun(): OpencodeHiddenBuffers|nil
----@field is_hidden_snapshot_in_current_tab fun(): boolean
----@field clear_hidden_window_state fun()
----@field has_hidden_buffers fun(): boolean
----@field consume_hidden_buffers fun(): OpencodeHiddenBuffers|nil
----@field resolve_toggle_decision fun(persist_state: boolean, has_display_route: boolean): OpencodeToggleDecision
----@field resolve_open_windows_action fun(): 'reuse_visible'|'restore_hidden'|'create_fresh'
----@field get_window_cursor fun(win_id: integer|nil): integer[]|nil
 ---@field session OpencodeSessionStateMutations
 ---@field jobs OpencodeJobStateMutations
 ---@field ui OpencodeUiStateMutations
@@ -139,21 +124,6 @@ local M = {
   ui = ui,
   model = model,
   test_helpers = test_helpers,
-  is_window_in_current_tab = ui.is_window_in_current_tab,
-  are_windows_in_current_tab = ui.are_windows_in_current_tab,
-  is_visible = ui.is_visible,
-  get_window_state = ui.get_window_state,
-  get_window_cursor = ui.get_window_cursor,
-  set_cursor_position = ui.set_cursor_position,
-  get_cursor_position = ui.get_cursor_position,
-  stash_hidden_buffers = ui.stash_hidden_buffers,
-  inspect_hidden_buffers = ui.inspect_hidden_buffers,
-  is_hidden_snapshot_in_current_tab = ui.is_hidden_snapshot_in_current_tab,
-  clear_hidden_window_state = ui.clear_hidden_window_state,
-  has_hidden_buffers = ui.has_hidden_buffers,
-  consume_hidden_buffers = ui.consume_hidden_buffers,
-  resolve_toggle_decision = ui.resolve_toggle_decision,
-  resolve_open_windows_action = ui.resolve_open_windows_action,
   subscribe = store.subscribe,
   unsubscribe = store.unsubscribe,
   notify = store.notify,

lua/opencode/ui/input_window.lua

@@ -559,9 +559,9 @@ function M._hide()
   M._hidden = true
   M._toggling = true
 
-  local pos = state.get_window_cursor(windows.input_win)
+  local pos = state.ui.get_window_cursor(windows.input_win)
   if pos then
-    state.set_cursor_position('input', pos)
+    state.ui.set_cursor_position('input', pos)
   end
 
   pcall(vim.api.nvim_win_close, windows.input_win, false)

lua/opencode/ui/output_window.lua

@@ -318,9 +318,9 @@ function M.setup_autocmds(windows, group)
 
           if visible_bottom < line_count then
             pcall(vim.api.nvim_win_set_cursor, windows.output_win, { visible_bottom, 0 })
-            local pos = state.get_window_cursor(windows.output_win)
+            local pos = state.ui.get_window_cursor(windows.output_win)
             if pos then
-              state.set_cursor_position('output', pos)
+              state.ui.set_cursor_position('output', pos)
             end
           end
         end

lua/opencode/ui/ui.lua

@@ -13,8 +13,8 @@ local M = {}
 ---@return {input: integer[]|nil, output: integer[]|nil}
 local function capture_cursors_position(windows)
   return {
-    input = state.get_window_cursor(windows.input_win),
-    output = state.get_window_cursor(windows.output_win),
+    input = state.ui.get_window_cursor(windows.input_win),
+    output = state.ui.get_window_cursor(windows.output_win),
   }
 end
 
@@ -76,7 +76,7 @@ local function capture_hidden_snapshot(windows)
     output_view = ok and type(view) == 'table' and view or nil,
     focused_window = focused,
     position = config.ui.position,
-    owner_tab = state.are_windows_in_current_tab() and vim.api.nvim_get_current_tabpage() or nil,
+    owner_tab = state.ui.are_windows_in_current_tab() and vim.api.nvim_get_current_tabpage() or nil,
   }
 end
 
@@ -160,7 +160,7 @@ function M.hide_visible_windows(windows)
       state.input_content = lines
     end
   end
-  state.stash_hidden_buffers(snapshot)
+  state.ui.stash_hidden_buffers(snapshot)
   if state.windows == windows then
     state.windows.input_win = nil
     state.windows.output_win = nil
@@ -192,7 +192,7 @@ end
 function M.drop_hidden_snapshot()
   renderer.teardown()
 
-  local hidden = state.inspect_hidden_buffers()
+  local hidden = state.ui.inspect_hidden_buffers()
   if hidden then
     for _, buf in ipairs({ hidden.input_buf, hidden.output_buf, hidden.footer_buf }) do
       if buf and vim.api.nvim_buf_is_valid(buf) then
@@ -208,7 +208,7 @@ end
 ---Restore windows using preserved buffers
 ---@return boolean success
 function M.restore_hidden_windows()
-  local hidden = state.inspect_hidden_buffers()
+  local hidden = state.ui.inspect_hidden_buffers()
   if not hidden then
     return false
   end
@@ -263,7 +263,7 @@ function M.restore_hidden_windows()
     if hidden.output_was_at_bottom then
       renderer.scroll_to_bottom(true)
     else
-      restore_window_cursor(w.output_win, w.output_buf, state.get_cursor_position('output'))
+      restore_window_cursor(w.output_win, w.output_buf, state.ui.get_cursor_position('output'))
       if type(hidden.output_view) == 'table' then
         pcall(vim.api.nvim_win_call, w.output_win, function()
           vim.fn.winrestview(hidden.output_view)
@@ -272,7 +272,7 @@ function M.restore_hidden_windows()
     end
 
     if not hidden.input_hidden then
-      restore_window_cursor(w.input_win, w.input_buf, state.get_cursor_position('input'))
+      restore_window_cursor(w.input_win, w.input_buf, state.ui.get_cursor_position('input'))
     end
   end)
 

tests/unit/cursor_tracking_spec.lua

@@ -4,8 +4,8 @@ local ui = require('opencode.ui.ui')
 
 describe('cursor persistence (state)', function()
   before_each(function()
-    state.set_cursor_position('input', nil)
-    state.set_cursor_position('output', nil)
+    state.ui.set_cursor_position('input', nil)
+    state.ui.set_cursor_position('output', nil)
   end)
 
   describe('renderer.scroll_to_bottom', function()
@@ -93,73 +93,73 @@ describe('cursor persistence (state)', function()
 
   describe('set/get round-trip', function()
     it('stores and retrieves input cursor', function()
-      state.set_cursor_position('input', { 5, 3 })
-      assert.same({ 5, 3 }, state.get_cursor_position('input'))
+      state.ui.set_cursor_position('input', { 5, 3 })
+      assert.same({ 5, 3 }, state.ui.get_cursor_position('input'))
     end)
 
     it('stores and retrieves output cursor', function()
-      state.set_cursor_position('output', { 10, 0 })
-      assert.same({ 10, 0 }, state.get_cursor_position('output'))
+      state.ui.set_cursor_position('output', { 10, 0 })
+      assert.same({ 10, 0 }, state.ui.get_cursor_position('output'))
     end)
 
     it('input and output are independent', function()
-      state.set_cursor_position('input', { 1, 0 })
-      state.set_cursor_position('output', { 99, 5 })
-      assert.same({ 1, 0 }, state.get_cursor_position('input'))
-      assert.same({ 99, 5 }, state.get_cursor_position('output'))
+      state.ui.set_cursor_position('input', { 1, 0 })
+      state.ui.set_cursor_position('output', { 99, 5 })
+      assert.same({ 1, 0 }, state.ui.get_cursor_position('input'))
+      assert.same({ 99, 5 }, state.ui.get_cursor_position('output'))
     end)
 
     it('returns nil for unknown win_type', function()
-      assert.is_nil(state.get_cursor_position('footer'))
+      assert.is_nil(state.ui.get_cursor_position('footer'))
     end)
   end)
 
   describe('normalize_cursor edge cases', function()
     it('clamps negative line to 1', function()
-      state.set_cursor_position('input', { -5, 3 })
-      local pos = state.get_cursor_position('input')
+      state.ui.set_cursor_position('input', { -5, 3 })
+      local pos = state.ui.get_cursor_position('input')
       assert.equals(1, pos[1])
     end)
 
     it('clamps negative col to 0', function()
-      state.set_cursor_position('input', { 1, -1 })
-      local pos = state.get_cursor_position('input')
+      state.ui.set_cursor_position('input', { 1, -1 })
+      local pos = state.ui.get_cursor_position('input')
       assert.equals(0, pos[2])
     end)
 
     it('floors fractional values', function()
-      state.set_cursor_position('input', { 3.7, 2.9 })
-      local pos = state.get_cursor_position('input')
+      state.ui.set_cursor_position('input', { 3.7, 2.9 })
+      local pos = state.ui.get_cursor_position('input')
       assert.equals(3, pos[1])
       assert.equals(2, pos[2])
     end)
 
     it('rejects non-table input', function()
-      state.set_cursor_position('input', 'bad')
-      assert.is_nil(state.get_cursor_position('input'))
+      state.ui.set_cursor_position('input', 'bad')
+      assert.is_nil(state.ui.get_cursor_position('input'))
     end)
 
     it('rejects table with fewer than 2 elements', function()
-      state.set_cursor_position('input', { 1 })
-      assert.is_nil(state.get_cursor_position('input'))
+      state.ui.set_cursor_position('input', { 1 })
+      assert.is_nil(state.ui.get_cursor_position('input'))
     end)
 
     it('rejects non-numeric elements', function()
-      state.set_cursor_position('input', { 'a', 'b' })
-      assert.is_nil(state.get_cursor_position('input'))
+      state.ui.set_cursor_position('input', { 'a', 'b' })
+      assert.is_nil(state.ui.get_cursor_position('input'))
     end)
 
     it('clears position when set to nil', function()
-      state.set_cursor_position('input', { 5, 3 })
-      state.set_cursor_position('input', nil)
-      assert.is_nil(state.get_cursor_position('input'))
+      state.ui.set_cursor_position('input', { 5, 3 })
+      state.ui.set_cursor_position('input', nil)
+      assert.is_nil(state.ui.get_cursor_position('input'))
     end)
   end)
 
   describe('get_window_cursor', function()
     it('returns nil for invalid window', function()
-      assert.is_nil(state.get_window_cursor(nil))
-      assert.is_nil(state.get_window_cursor(999999))
+      assert.is_nil(state.ui.get_window_cursor(nil))
+      assert.is_nil(state.ui.get_window_cursor(999999))
     end)
 
     it('gets cursor from a real window', function()
@@ -174,12 +174,12 @@ describe('cursor persistence (state)', function()
       })
       vim.api.nvim_win_set_cursor(win, { 2, 3 })
 
-      local pos = state.get_window_cursor(win)
+      local pos = state.ui.get_window_cursor(win)
       assert.same({ 2, 3 }, pos)
 
       -- Manually save to verify persistence path
-      state.set_cursor_position('output', pos)
-      assert.same({ 2, 3 }, state.get_cursor_position('output'))
+      state.ui.set_cursor_position('output', pos)
+      assert.same({ 2, 3 }, state.ui.get_cursor_position('output'))
 
       pcall(vim.api.nvim_win_close, win, true)
       pcall(vim.api.nvim_buf_delete, buf, { force = true })