wip: state-management refactor

Author: sudo-tee

lua/opencode/api.lua

@@ -41,7 +41,7 @@ end
 
 function M.close()
   if state.display_route then
-    state.display_route = nil
+    state.ui.clear_display_route()
     ui.clear_output()
     -- need to trigger a re-render here to re-display the session
     ui.render_output()
@@ -393,7 +393,7 @@ M.submit_input_prompt = Promise.async(function()
   if state.display_route then
     -- we're displaying /help or something similar, need to clear that and refresh
     -- the session data before sending the command
-    state.display_route = nil
+    state.ui.clear_display_route()
     ui.render_output(true)
   end
 
@@ -488,7 +488,7 @@ M.initialize = Promise.async(function()
     vim.notify('Invalid model format: ' .. tostring(state.current_model), vim.log.levels.ERROR)
     return
   end
-  state.active_session = new_session
+  state.session.set_active(new_session)
   M.open_input()
   state.api_client:init_session(state.active_session.id, {
     providerID = providerId,
@@ -536,7 +536,7 @@ end)
 
 function M.with_header(lines, show_welcome)
   show_welcome = show_welcome or show_welcome
-  state.display_route = '/header'
+  state.ui.set_display_route('/header')
 
   local msg = {
     '## Opencode.nvim',
@@ -561,7 +561,7 @@ function M.with_header(lines, show_welcome)
 end
 
 function M.help()
-  state.display_route = '/help'
+  state.ui.set_display_route('/help')
   M.open_input()
   local msg = M.with_header({
     '### Available Commands',
@@ -614,7 +614,7 @@ M.commands_list = Promise.async(function()
     return
   end
 
-  state.display_route = '/commands'
+  state.ui.set_display_route('/commands')
   M.open_input()
 
   local msg = M.with_header({
@@ -862,7 +862,7 @@ M.rename_session = Promise.async(function(current_session, new_title)
           local session_obj = session.get_by_id(current_session.id):await()
           if session_obj then
             session_obj.title = title
-            state.active_session = vim.deepcopy(session_obj)
+            state.session.set_active(vim.deepcopy(session_obj))
           end
         end
         promise:resolve(current_session)
@@ -1059,7 +1059,7 @@ M.review = Promise.async(function(args)
     vim.notify('Invalid model format: ' .. tostring(state.current_model), vim.log.levels.ERROR)
     return
   end
-  state.active_session = new_session
+  state.session.set_active(new_session)
   M.open_input():await()
   state.api_client
     :send_command(state.active_session.id, {
@@ -1184,7 +1184,7 @@ M.commands = {
               vim.notify('Failed to create new session', vim.log.levels.ERROR)
               return
             end
-            state.active_session = new_session
+            state.session.set_active(new_session)
             M.open_input()
           else
             M.open_input_new_session()

lua/opencode/api_client.lua

@@ -56,7 +56,7 @@ function OpencodeApiClient:_ensure_base_url()
 
   if not state.opencode_server then
     -- this is last resort - try to start the server and could be blocking
-    state.opencode_server = server_job.ensure_server():wait() --[[@as OpencodeServer]]
+    state.jobs.set_server(server_job.ensure_server():wait() --[[@as OpencodeServer]])
     -- shouldn't normally happen but prevents error in replay tester
     if not state.opencode_server then
       return false

lua/opencode/core.lua

@@ -38,12 +38,12 @@ end)
 M.switch_session = Promise.async(function(session_id)
   local selected_session = session.get_by_id(session_id):await()
 
-  state.current_model = nil
-  state.current_mode = nil
+  state.model.clear_model()
+  state.model.clear_mode()
   M.ensure_current_mode():await()
 
-  state.active_session = selected_session
-  state.restore_points = {}
+  state.session.set_active(selected_session)
+  state.session.reset_restore_points()
   if state.is_visible() then
     ui.focus_input()
   else
@@ -74,7 +74,7 @@ M.check_cwd = function()
       { current_cwd = state.current_cwd, new_cwd = vim.fn.getcwd() }
     )
     state.current_cwd = vim.fn.getcwd()
-    state.active_session = nil
+    state.session.clear_active()
     context.unload_attachments()
   end
 end
@@ -83,7 +83,7 @@ end
 M.open = Promise.async(function(opts)
   opts = opts or { focus = 'input', new_session = false }
 
-  state.is_opening = true
+  state.ui.set_opening(true)
 
   if not require('opencode.ui.ui').is_opencode_focused() then
     require('opencode.context').load()
@@ -95,8 +95,8 @@ M.open = Promise.async(function(opts)
 
   if are_windows_closed then
     if not ui.is_opencode_focused() then
-      state.last_code_win_before_opencode = vim.api.nvim_get_current_win()
-      state.current_code_buf = vim.api.nvim_get_current_buf()
+      state.ui.set_last_code_window(vim.api.nvim_get_current_win())
+      state.ui.set_current_code_buf(vim.api.nvim_get_current_buf())
     end
 
     M.is_prompting_allowed()
@@ -106,10 +106,10 @@ M.open = Promise.async(function(opts)
       if not restored then
         state.clear_hidden_window_state()
         restoring_hidden = false
-        state.windows = ui.create_windows()
+        state.ui.set_windows(ui.create_windows())
       end
     else
-      state.windows = ui.create_windows()
+      state.ui.set_windows(ui.create_windows())
     end
   end
 
@@ -122,29 +122,29 @@ M.open = Promise.async(function(opts)
   local server = server_job.ensure_server():await()
 
   if not server then
-    state.is_opening = false
+    state.ui.set_opening(false)
     return Promise.new():reject('Server failed to start')
   end
 
   M.check_cwd()
 
   local ok, err = pcall(function()
     if opts.new_session then
-      state.active_session = nil
+      state.session.clear_active()
       state.last_sent_context = nil
       context.unload_attachments()
 
       M.ensure_current_mode():await()
 
-      state.active_session = M.create_new_session():await()
+      state.session.set_active(M.create_new_session():await())
       log.debug('Created new session on open', { session = state.active_session.id })
     else
       M.ensure_current_mode():await()
 
       if not state.active_session then
-        state.active_session = session.get_last_workspace_session():await()
+        state.session.set_active(session.get_last_workspace_session():await())
         if not state.active_session then
-          state.active_session = M.create_new_session():await()
+          state.session.set_active(M.create_new_session():await())
         end
       else
         if not state.display_route and are_windows_closed and not restoring_hidden then
@@ -157,10 +157,10 @@ M.open = Promise.async(function(opts)
       end
     end
 
-    state.is_opencode_focused = true
+    state.ui.set_panel_focused(true)
   end)
 
-  state.is_opening = false
+  state.ui.set_opening(false)
 
   if not ok then
     vim.notify('Error opening panel: ' .. tostring(err), vim.log.levels.ERROR)
@@ -198,17 +198,17 @@ M.send_message = Promise.async(function(prompt, opts)
   if opts.model then
     local provider, model = opts.model:match('^(.-)/(.+)$')
     params.model = { providerID = provider, modelID = model }
-    state.current_model = opts.model
+    state.model.set_model(opts.model)
 
     if opts.variant then
       params.variant = opts.variant
-      state.current_variant = opts.variant
+      state.model.set_variant(opts.variant)
     end
   end
 
   if opts.agent then
     params.agent = opts.agent
-    state.current_mode = opts.agent
+    state.model.set_mode(opts.agent)
   end
 
   params.parts = context.format_message(prompt, opts.context):await()
@@ -293,12 +293,10 @@ function M.configure_provider()
       return
     end
     local model_str = string.format('%s/%s', selection.provider, selection.model)
-    state.current_model = model_str
+    state.model.set_model(model_str)
 
     if state.current_mode then
-      local mode_map = vim.deepcopy(state.user_mode_model_map)
-      mode_map[state.current_mode] = model_str
-      state.user_mode_model_map = mode_map
+      state.model.set_mode_model_override(state.current_mode, model_str)
     end
 
     if state.is_visible() then
@@ -318,7 +316,7 @@ function M.configure_variant()
       return
     end
 
-    state.current_variant = selection.name
+    state.model.set_variant(selection.name)
 
     if state.is_visible() then
       ui.focus_input()
@@ -378,7 +376,7 @@ M.cycle_variant = Promise.async(function()
     next_variant = variants[next_index]
   end
 
-  state.current_variant = next_variant
+  state.model.set_variant(next_variant)
 
   local model_state = require('opencode.model_state')
   model_state.set_variant(provider, model, next_variant)
@@ -412,11 +410,11 @@ M.cancel = Promise.async(function()
       end
 
       -- start a new one
-      state.opencode_server = nil
+      state.jobs.clear_server()
 
       -- NOTE: start a new server here to make sure we're subscribed
       -- to server events before a user sends a message
-      state.opencode_server = server_job.ensure_server():await() --[[@as OpencodeServer]]
+      state.jobs.set_server(server_job.ensure_server():await() --[[@as OpencodeServer]])
     end
   end
 
@@ -486,18 +484,18 @@ M.switch_to_mode = Promise.async(function(mode)
     return false
   end
 
-  state.current_mode = mode
+  state.model.set_mode(mode)
   local opencode_config = config_file.get_opencode_config():await() --[[@as OpencodeConfigFile]]
 
   local agent_config = opencode_config and opencode_config.agent or {}
   local mode_config = agent_config[mode] or {}
 
   if state.user_mode_model_map[mode] then
-    state.current_model = state.user_mode_model_map[mode]
+    state.model.set_model(state.user_mode_model_map[mode])
   elseif mode_config.model and mode_config.model ~= '' then
-    state.current_model = mode_config.model
+    state.model.set_model(mode_config.model)
   elseif opencode_config and opencode_config.model and opencode_config.model ~= '' then
-    state.current_model = opencode_config.model
+    state.model.set_model(opencode_config.model)
   end
   return true
 end)
@@ -518,10 +516,10 @@ M.ensure_current_mode = Promise.async(function()
 
     -- Try to use the configured default mode if it's available
     if default_mode and vim.tbl_contains(available_agents, default_mode) then
-      state.current_mode = default_mode
+      state.model.set_mode(default_mode)
     else
       -- Fallback to first available agent
-      state.current_mode = available_agents[1]
+      state.model.set_mode(available_agents[1])
     end
   end
   return true
@@ -537,7 +535,7 @@ M.initialize_current_model = Promise.async(function()
   local cfg = require('opencode.config_file').get_opencode_config():await()
 
   if cfg and cfg.model and cfg.model ~= '' then
-    state.current_model = cfg.model
+    state.model.set_model(cfg.model)
   end
 
   return state.current_model
@@ -583,11 +581,11 @@ M.handle_directory_change = Promise.async(function()
   log.debug('Working directory change %s', vim.inspect({ cwd = cwd }))
   vim.notify('Loading last session for new working dir [' .. cwd .. ']', vim.log.levels.INFO)
 
-  state.active_session = nil
+  state.session.clear_active()
   state.last_sent_context = nil
   context.unload_attachments()
 
-  state.active_session = session.get_last_workspace_session():await() or M.create_new_session():await()
+  state.session.set_active(session.get_last_workspace_session():await() or M.create_new_session():await())
 
   log.debug('Loaded session for new working dir ' .. vim.inspect({ session = state.active_session }))
 end)
@@ -598,7 +596,7 @@ function M.setup()
   state.subscribe('pending_permissions', M._on_current_permission_change)
   state.subscribe('current_model', function(key, new_val, old_val)
     if new_val ~= old_val then
-      state.current_variant = nil
+      state.model.clear_variant()
 
       -- Load saved variant for the new model
       if new_val then
@@ -607,7 +605,7 @@ function M.setup()
           local model_state = require('opencode.model_state')
           local saved_variant = model_state.get_variant(provider, model)
           if saved_variant then
-            state.current_variant = saved_variant
+            state.model.set_variant(saved_variant)
           end
         end
       end

lua/opencode/quick_chat.lua

@@ -375,7 +375,7 @@ M.quick_chat = Promise.async(function(message, options, range)
   end
 
   if config.debug.quick_chat and config.debug.quick_chat.set_active_session then
-    state.active_session = quick_chat_session
+    state.session.set_active(quick_chat_session)
   end
 
   running_sessions[quick_chat_session.id] = {

lua/opencode/server_job.lua

@@ -75,7 +75,7 @@ end
 function M.call_api(url, method, body)
   local call_promise = Promise.new()
 
-  state.job_count = state.job_count + 1
+  state.jobs.increment_count()
 
   local request_entry = { nil, call_promise }
   table.insert(M.requests, request_entry)
@@ -87,7 +87,7 @@ function M.call_api(url, method, body)
         break
       end
     end
-    state.job_count = #M.requests
+    state.jobs.set_count(#M.requests)
   end
 
   local opts = {
@@ -246,7 +246,7 @@ local function spawn_and_retry(base_url, custom_port, custom_url, promise, timeo
 
   retry_connect(base_url, timeout, 3, function(url)
     port_mapping.register(custom_port, vim.fn.getcwd(), true, 'custom', url, server_pid)
-    state.opencode_server = opencode_server.from_custom(url, custom_port, 'custom')
+    state.jobs.set_server(opencode_server.from_custom(url, custom_port, 'custom'))
     promise:resolve(state.opencode_server)
   end, function(_err)
     if config.server.port == 'auto' then
@@ -264,7 +264,7 @@ function M.try_connect_to_custom_server(base_url, timeout, promise, custom_port,
       local existing_started_by_nvim = port_mapping.started_by_nvim(custom_port)
       local mode = config.server.spawn_command and 'custom' or 'attach'
       port_mapping.register(custom_port, vim.fn.getcwd(), existing_started_by_nvim, mode, url, nil)
-      state.opencode_server = opencode_server.from_custom(url, custom_port, mode)
+      state.jobs.set_server(opencode_server.from_custom(url, custom_port, mode))
       log.notify(
         string.format('Connected to remote server at %s on port %d.', base_url, custom_port),
         vim.log.levels.INFO
@@ -285,7 +285,7 @@ end
 --- @param port? number|string Optional custom port
 --- @param hostname? string Optional custom hostname
 function M.spawn_local_server(promise, port, hostname)
-  state.opencode_server = opencode_server.new()
+  state.jobs.set_server(opencode_server.new())
 
   local spawn_opts = {
     on_ready = function(job, base_url)