refactor(state): centralize observable API under state.store

Replace top-level observable helpers (state.subscribe, state.unsubscribe, state.append, state.emit)

Author: sudo-tee

lua/opencode/api_client.lua

@@ -532,7 +532,7 @@ local function create_client(base_url)
     end
   end
 
-  state.subscribe('opencode_server', on_server_change)
+  state.store.subscribe('opencode_server', on_server_change)
 
   return api_client
 end

lua/opencode/context.lua

@@ -315,7 +315,7 @@ function M.setup()
     M.load()
   end, 200)
 
-  state.subscribe({ 'current_code_buf', 'current_context_config', 'is_opencode_focused' }, function()
+  state.store.subscribe({ 'current_code_buf', 'current_context_config', 'is_opencode_focused' }, function()
     debounced_load()
   end)
 

lua/opencode/core.lua

@@ -381,7 +381,7 @@ M.cycle_variant = Promise.async(function()
 end)
 
 M.cancel = Promise.async(function()
-  if state.active_session and state.is_running() then
+  if state.active_session and state.jobs.is_running() then
     M._abort_count = M._abort_count + 1
 
     local permissions = state.pending_permissions or {}
@@ -588,10 +588,10 @@ M.handle_directory_change = Promise.async(function()
 end)
 
 function M.setup()
-  state.subscribe('opencode_server', on_opencode_server)
-  state.subscribe('user_message_count', M._on_user_message_count_change)
-  state.subscribe('pending_permissions', M._on_current_permission_change)
-  state.subscribe('current_model', function(key, new_val, old_val)
+  state.store.subscribe('opencode_server', on_opencode_server)
+  state.store.subscribe('user_message_count', M._on_user_message_count_change)
+  state.store.subscribe('pending_permissions', M._on_current_permission_change)
+  state.store.subscribe('current_model', function(key, new_val, old_val)
     if new_val ~= old_val then
       state.model.clear_variant()
 

lua/opencode/event_manager.lua

@@ -480,7 +480,7 @@ function EventManager:start()
   self.is_started = true
 
   if self.state_server_listener then
-    state.unsubscribe('opencode_server', self.state_server_listener)
+    state.store.unsubscribe('opencode_server', self.state_server_listener)
   end
 
   self.state_server_listener = function(key, current, prev)
@@ -504,10 +504,10 @@ function EventManager:start()
     end
   end
 
-  state.subscribe('opencode_server', self.state_server_listener)
+  state.store.subscribe('opencode_server', self.state_server_listener)
 
   if self.state_cwd_listener then
-    state.unsubscribe('current_cwd', self.state_cwd_listener)
+    state.store.unsubscribe('current_cwd', self.state_cwd_listener)
   end
 
   self.state_cwd_listener = function(key, new_cwd, old_cwd)
@@ -517,7 +517,7 @@ function EventManager:start()
     end
   end
 
-  state.subscribe('current_cwd', self.state_cwd_listener)
+  state.store.subscribe('current_cwd', self.state_cwd_listener)
 end
 
 function EventManager:stop()
@@ -527,11 +527,11 @@ function EventManager:stop()
 
   self.is_started = false
   if self.state_server_listener then
-    state.unsubscribe('opencode_server', self.state_server_listener)
+    state.store.unsubscribe('opencode_server', self.state_server_listener)
     self.state_server_listener = nil
   end
   if self.state_cwd_listener then
-    state.unsubscribe('current_cwd', self.state_cwd_listener)
+    state.store.unsubscribe('current_cwd', self.state_cwd_listener)
     self.state_cwd_listener = nil
   end
   self:_cleanup_server_subscription()

lua/opencode/state/init.lua

@@ -14,7 +14,6 @@ local context = require('opencode.state.context')
 ---@field model OpencodeModelStateMutations
 ---@field renderer OpencodeRendererStateMutations
 ---@field context OpencodeContextStateMutations
----@field is_running fun():boolean
 
 ---@alias OpencodeState OpencodeStateModule & OpencodeStateData
 ---@type OpencodeState
@@ -26,17 +25,8 @@ local M = {
   model = model,
   renderer = renderer,
   context = context,
-  subscribe = store.subscribe,
-  unsubscribe = store.unsubscribe,
-  emit = store.emit,
-  append = store.append,
-  remove = store.remove,
 }
 
-function M.is_running()
-  return M.job_count > 0
-end
-
 return setmetatable(M, {
   __index = function(_, key)
     return store.get(key)

lua/opencode/state/jobs.lua

@@ -9,6 +9,7 @@ local store = require('opencode.state.store')
 ---@field set_api_client fun(client: OpencodeApiClient|nil)
 ---@field set_event_manager fun(manager: EventManager|nil)
 ---@field set_opencode_cli_version fun(version: string|nil)
+---@field is_running fun():boolean
 
 local M = {}
 
@@ -55,4 +56,8 @@ function M.set_opencode_cli_version(version)
   return store.set('opencode_cli_version', version)
 end
 
+function M.is_running()
+  return (store.get('job_count') or 0) > 0
+end
+
 return M

lua/opencode/ui/context_bar.lua

@@ -170,7 +170,7 @@ local function update_winbar_highlights(win_id)
 end
 
 function M.setup()
-  state.subscribe(
+  state.store.subscribe(
     { 'current_context_config', 'current_code_buf', 'is_opencode_focused', 'context_updated_at', 'user_message_count' },
     function()
       M.render()

lua/opencode/ui/footer.lua

@@ -35,14 +35,14 @@ end
 local function build_right_segments()
   local segments = {}
 
-  if state.is_running() and not state.is_opening then
+  if state.jobs.is_running() and not state.is_opening then
     local cancel_keymap = config.get_key_for_function('input_window', 'cancel') or '<C-c>'
     table.insert(segments, { string.format('%s ', cancel_keymap), 'OpencodeInputLegend' })
     table.insert(segments, { 'to cancel', 'OpencodeHint' })
     table.insert(segments, { ' ' })
   end
 
-  if not state.is_running() and state.current_model and config.ui.display_model then
+  if not state.jobs.is_running() and state.current_model and config.ui.display_model then
     table.insert(segments, { state.current_model, 'OpencodeHint' })
     if state.current_variant then
       table.insert(segments, { '·', 'OpencodeHint' })
@@ -151,13 +151,13 @@ function M.setup(windows)
   vim.api.nvim_set_option_value('winhl', 'Normal:OpencodeHint', { win = windows.footer_win })
 
   -- for model changes
-  state.subscribe('current_model', on_change)
-  state.subscribe('current_mode', on_change)
-  state.subscribe('current_variant', on_change)
-  state.subscribe('active_session', on_change)
+  state.store.subscribe('current_model', on_change)
+  state.store.subscribe('current_mode', on_change)
+  state.store.subscribe('current_variant', on_change)
+  state.store.subscribe('active_session', on_change)
   -- to show C-c message
-  state.subscribe('job_count', on_job_count_changed)
-  state.subscribe('restore_points', on_change)
+  state.store.subscribe('job_count', on_job_count_changed)
+  state.store.subscribe('restore_points', on_change)
 
   vim.api.nvim_create_autocmd({ 'VimResized', 'WinResized' }, {
     group = vim.api.nvim_create_augroup('OpencodeFooterResize', { clear = true }),
@@ -180,12 +180,12 @@ function M.close(preserve_buffer)
     end
   end
 
-  state.unsubscribe('current_model', on_change)
-  state.unsubscribe('current_mode', on_change)
-  state.unsubscribe('current_variant', on_change)
-  state.unsubscribe('active_session', on_change)
-  state.unsubscribe('job_count', on_job_count_changed)
-  state.unsubscribe('restore_points', on_change)
+  state.store.unsubscribe('current_model', on_change)
+  state.store.unsubscribe('current_mode', on_change)
+  state.store.unsubscribe('current_variant', on_change)
+  state.store.unsubscribe('active_session', on_change)
+  state.store.unsubscribe('job_count', on_job_count_changed)
+  state.store.unsubscribe('restore_points', on_change)
 
   loading_animation.teardown()
 end

lua/opencode/ui/formatter.lua

@@ -375,9 +375,10 @@ end
 
 ---@param output Output Output object to write to
 ---@param text string
-function M._format_assistant_message(output, text)
+---@param message_id string|nil Optional message ID for reference parsing
+function M._format_assistant_message(output, text, message_id)
   local reference_picker = require('opencode.ui.reference_picker')
-  local references = reference_picker.parse_references(text, '')
+  local references = reference_picker.parse_references(text, message_id)
 
   -- If no references, just add the text as-is
   if #references == 0 then
@@ -501,7 +502,7 @@ function M.format_part(part, message, is_last_part, get_child_parts)
     end
   elseif role == 'assistant' then
     if part.type == 'text' and part.text then
-      M._format_assistant_message(output, vim.trim(part.text))
+      M._format_assistant_message(output, vim.trim(part.text), part.messageID)
       content_added = true
     elseif part.type == 'reasoning' then
       M._format_reasoning(output, part)

lua/opencode/ui/loading_animation.lua

@@ -138,7 +138,7 @@ M.render = vim.schedule_wrap(function(windows)
     return false
   end
 
-  if not state.is_running() then
+  if not state.jobs.is_running() then
     M.stop()
     return false
   end
@@ -168,7 +168,7 @@ function M._start_animation_timer(windows)
     on_tick = function()
       M._animation.current_frame = M._next_frame()
       M.render(state.windows)
-      if state.is_running() then
+      if state.jobs.is_running() then
         return true
       else
         M.stop()
@@ -222,16 +222,16 @@ local function on_running_change(_, new_value)
 end
 
 function M.setup()
-  state.subscribe('job_count', on_running_change)
-  state.subscribe('active_session', on_active_session_change)
-  state.subscribe('event_manager', on_event_manager_change)
+  state.store.subscribe('job_count', on_running_change)
+  state.store.subscribe('active_session', on_active_session_change)
+  state.store.subscribe('event_manager', on_event_manager_change)
   subscribe_session_status_event(state.event_manager)
 end
 
 function M.teardown()
-  state.unsubscribe('job_count', on_running_change)
-  state.unsubscribe('active_session', on_active_session_change)
-  state.unsubscribe('event_manager', on_event_manager_change)
+  state.store.unsubscribe('job_count', on_running_change)
+  state.store.unsubscribe('active_session', on_active_session_change)
+  state.store.unsubscribe('event_manager', on_event_manager_change)
   unsubscribe_session_status_event(M._animation.status_event_manager)
   M._animation.status_data = nil
 end