Merge remote-tracking branch 'upstream'

Author: jugarpeupv

.gitignore

@@ -18,4 +18,7 @@ luac.out
 doc/tags
 
 # Test dependencies
-deps/
+deps/
+
+# Local Claude settings (keep out of repo)
+.claude/

README.md

@@ -168,16 +168,16 @@ require('opencode').setup({
     },
     input_window = {
       ['<S-cr>'] = { 'submit_input_prompt', mode = { 'n', 'i' } }, -- Submit prompt (normal mode and insert mode)
-      ['<esc>'] = { 'close' }, -- Close UI windows
-      ['<C-c>'] = { 'cancel' }, -- Cancel opencode request while it is running
+      ['<esc>'] = { 'close', defer_to_completion = true }, -- Close UI windows
+      ['<C-c>'] = { 'cancel', defer_to_completion = true }, -- Cancel opencode request while it is running
       ['~'] = { 'mention_file', mode = 'i' }, -- Pick a file and add to context. See File Mentions section
       ['@'] = { 'mention', mode = 'i' }, -- Insert mention (file/agent)
       ['/'] = { 'slash_commands', mode = 'i' }, -- Pick a command to run in the input window
       ['#'] = { 'context_items', mode = 'i' }, -- Manage context items (current file, selection, diagnostics, mentioned files)
       ['<M-v>'] = { 'paste_image', mode = 'i' }, -- Paste image from clipboard as attachment
-      ['<tab>'] = { 'toggle_pane', mode = { 'n', 'i' } }, -- Toggle between input and output panes
-      ['<up>'] = { 'prev_prompt_history', mode = { 'n', 'i' } }, -- Navigate to previous prompt in history
-      ['<down>'] = { 'next_prompt_history', mode = { 'n', 'i' } }, -- Navigate to next prompt in history
+      ['<tab>'] = { 'toggle_pane', mode = { 'n', 'i' }, defer_to_completion = true }, -- Toggle between input and output panes
+      ['<up>'] = { 'prev_prompt_history', mode = { 'n', 'i' }, defer_to_completion = true }, -- Navigate to previous prompt in history
+      ['<down>'] = { 'next_prompt_history', mode = { 'n', 'i' }, defer_to_completion = true }, -- Navigate to next prompt in history
       ['<M-m>'] = { 'switch_mode' }, -- Switch between modes (build/plan)
       ['<M-r>'] = { 'cycle_variant', mode = { 'n', 'i' } }, -- Cycle through available model variants
     },
@@ -234,6 +234,7 @@ require('opencode').setup({
     },
     output = {
       filetype = 'opencode_output', -- Filetype assigned to the output buffer (default: 'opencode_output')
+      compact_assistant_headers = false, -- Collapse consecutive assistant headers in the same mode to a right-aligned timestamp only
       tools = {
         show_output = true, -- Show tools output [diffs, cmd output, etc.] (default: true)
         show_reasoning_output = true, -- Show reasoning/thinking steps output (default: true)
@@ -368,6 +369,7 @@ Each keymap entry is a table consising of:
 - Or a custom function: `{ function() ... end }`
 - An optional mode: `{ 'toggle', mode = { 'n', 'i' } }`
 - An optional desc: `{'toggle', desc = 'Toggle Opencode' }`
+- An optional defer_to_completion: `{'toggle', defer_to_completion = true }` if true, when completion menu is open, it will defer to the completion keymaps instead of triggering the action
 
 #### Disabling Specific Keymaps
 
@@ -661,13 +663,14 @@ Example keymap for silent add:
 
 **add_visual_selection_inline** inserts the visually selected code directly into the input buffer as a Markdown code block, prefixed with the file path:
 
-```
+````
 **`path/to/file.lua`**
 
 ```lua
 <selected text>
-```
-```
+````
+
+````
 
 The cursor is left in normal mode in the input buffer so you can type your prompt around the inserted snippet.
 
@@ -692,7 +695,7 @@ Run a prompt in a new session using the Plan agent and disabling current file co
 ```vim
 :Opencode run new_session "Please help me plan a new feature" agent=plan context.current_file.enabled=false
 :Opencode run "Fix the bug in the current file" model=github-copilot/claude-sonnet-4
-```
+````
 
 ## 👮 Permissions
 

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()
@@ -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',
@@ -98,7 +98,7 @@ local function build_toggle_open_context(restore_hidden)
 end
 
 M.toggle = Promise.async(function(new_session)
-  local decision = state.resolve_toggle_decision(config.ui.persist_state, state.display_route ~= nil)
+  local decision = state.ui.resolve_toggle_decision(config.ui.persist_state, state.display_route ~= nil)
   local action = decision.action
   local is_new_session = new_session == true
 
@@ -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()
@@ -390,7 +390,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
 
@@ -485,7 +485,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,
@@ -533,7 +533,7 @@ end)
 
 function M.with_header(lines, show_welcome)
   show_welcome = show_welcome or false
-  state.display_route = '/header'
+  state.ui.set_display_route('/header')
 
   local msg = {
     '## Opencode.nvim',
@@ -558,7 +558,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',
@@ -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
 
@@ -611,7 +611,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({
@@ -859,7 +859,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)
@@ -1056,7 +1056,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, {
@@ -1204,7 +1204,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

@@ -34,7 +34,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
@@ -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/config.lua

@@ -74,26 +74,26 @@ M.defaults = {
       ['<leader>ods'] = { 'debug_session',                                     desc = 'Open raw session debug view' },
     },
     input_window = {
-      ['<cr>']   =      { 'submit_input_prompt',          mode = { 'n' },      desc = 'Submit prompt' },
-      ['<S-cr>'] =      { 'submit_input_prompt',          mode = { 'n', 'i' }, desc = 'Submit prompt' },
-      ['<esc>']  =      { 'close',                                             desc = 'Close Opencode windows' },
-      ['<C-c>']  =      { 'cancel',                                            desc = 'Cancel running request' },
-      ['~']      =      { 'mention_file',                 mode = 'i',          desc = 'Mention file in context' },
-      ['@']      =      { 'mention',                      mode = 'i',          desc = 'Open mention picker' },
-      ['/']      =      { 'slash_commands',               mode = 'i',          desc = 'Open slash commands picker' },
-      ['#']      =      { 'context_items',                mode = 'i',          desc = 'Open context items picker' },
-      ['<M-v>']  =      { 'paste_image',                  mode = 'i',          desc = 'Paste image from clipboard' },
-      ['<tab>']  =      { 'toggle_pane',                  mode = { 'n' },      desc = 'Toggle input/output panes' },
-      ['<up>']   =      { 'prev_prompt_history',          mode = { 'n', 'i' }, desc = 'Previous prompt history item' },
-      ['<down>'] =      { 'next_prompt_history',          mode = { 'n', 'i' }, desc = 'Next prompt history item' },
-      ['<M-m>']  =      { 'switch_mode',                  mode = { 'n', 'i' }, desc = 'Switch agent mode' },
-      ['<M-r>']  =      { 'cycle_variant',                mode = { 'n', 'i' }, desc = 'Cycle model variants' },
-      ['<M-i>']  =      { 'toggle_input',                 mode = { 'n', 'i' }, desc = 'Toggle input window' },
-      ['gr']     =      { 'references',                                        desc = 'Browse code references' },
-      ['<leader>oS'] =  { 'select_child_session',                              desc = 'Select child session' },
-      ['<leader>oD'] =  { 'debug_message',                                     desc = 'Open raw message debug view' },
-      ['<leader>oO'] =  { 'debug_output',                                      desc = 'Open raw output debug view' },
-      ['<leader>ods'] = { 'debug_session',                                     desc = 'Open raw session debug view' },
+      ['<cr>']   =      { 'submit_input_prompt',          mode = { 'n' },      desc = 'Submit prompt'                                            },
+      ['<S-cr>'] =      { 'submit_input_prompt',          mode = { 'n', 'i' }, desc = 'Submit prompt'                                            },
+      ['<esc>']  =      { 'close',                                             desc = 'Close Opencode windows',       defer_to_completion = true },
+      ['<C-c>']  =      { 'cancel',                                            desc = 'Cancel running request' ,      defer_to_completion = true },
+      ['~']      =      { 'mention_file',                 mode = 'i',          desc = 'Mention file in context'                                  },
+      ['@']      =      { 'mention',                      mode = 'i',          desc = 'Open mention picker'                                      },
+      ['/']      =      { 'slash_commands',               mode = 'i',          desc = 'Open slash commands picker'                               },
+      ['#']      =      { 'context_items',                mode = 'i',          desc = 'Open context items picker'                                },
+      ['<M-v>']  =      { 'paste_image',                  mode = 'i',          desc = 'Paste image from clipboard'                               },
+      ['<tab>']  =      { 'toggle_pane',                  mode = { 'n' },      desc = 'Toggle input/output panes',    defer_to_completion = true },
+      ['<up>']   =      { 'prev_prompt_history',          mode = { 'n', 'i' }, desc = 'Previous prompt history item', defer_to_completion = true },
+      ['<down>'] =      { 'next_prompt_history',          mode = { 'n', 'i' }, desc = 'Next prompt history item' ,    defer_to_completion = true },
+      ['<M-m>']  =      { 'switch_mode',                  mode = { 'n', 'i' }, desc = 'Switch agent mode'                                        },
+      ['<M-r>']  =      { 'cycle_variant',                mode = { 'n', 'i' }, desc = 'Cycle model variants'                                     },
+      ['<M-i>']  =      { 'toggle_input',                 mode = { 'n', 'i' }, desc = 'Toggle input window'                                      },
+      ['gr']     =      { 'references',                                        desc = 'Browse code references'                                   },
+      ['<leader>oS'] =  { 'select_child_session',                              desc = 'Select child session'                                     },
+      ['<leader>oD'] =  { 'debug_message',                                     desc = 'Open raw message debug view'                              },
+      ['<leader>oO'] =  { 'debug_output',                                      desc = 'Open raw output debug view'                               },
+      ['<leader>ods'] = { 'debug_session',                                     desc = 'Open raw session debug view'                              },
     },
     session_picker = {
       rename_session = { '<C-r>',                                              desc = 'Rename selected session' },
@@ -139,9 +139,15 @@ M.defaults = {
     },
     output = {
       filetype = 'opencode_output',
+      compact_assistant_headers = false,
       rendering = {
         markdown_debounce_ms = 250,
         on_data_rendered = nil,
+        markdown_on_idle = false,
+        -- If set to a number, markdown rendering will be deferred while
+        -- `state.user_message_count[session_id]` is greater than this value.
+        -- If `nil`, the existing behavior is used (defer while > 0).
+        markdown_on_idle_threshold = nil,
         event_throttle_ms = 40,
         event_collapsing = true,
       },
@@ -255,6 +261,8 @@ M.defaults = {
     enabled = false,
     capture_streamed_events = false,
     show_ids = true,
+    highlight_changed_lines = false,
+    highlight_changed_lines_timeout_ms = 120,
     quick_chat = {
       keep_session = false,
       set_active_session = false,

lua/opencode/context.lua

@@ -22,11 +22,10 @@ local toggleable_context_keys = {
 ---@param context_key OpencodeToggleableContextKey
 ---@return table
 local function ensure_context_state(context_key)
-  state.current_context_config = state.current_context_config or {}
-  local current = state.current_context_config[context_key]
   local defaults = vim.tbl_get(config, 'context', context_key) or {}
-  state.current_context_config[context_key] = vim.tbl_deep_extend('force', {}, defaults, current or {})
-  return state.current_context_config[context_key]
+  return state.context.update_current_context_config(function(current_config)
+    current_config[context_key] = vim.tbl_deep_extend('force', {}, defaults, current_config[context_key] or {})
+  end)[context_key]
 end
 
 M.ChatContext = ChatContext
@@ -117,12 +116,10 @@ end
 -- Delegate global state management to ChatContext
 function M.add_selection(selection)
   ChatContext.add_selection(selection)
-  state.context_updated_at = vim.uv.now()
 end
 
 function M.remove_selection(selection)
   ChatContext.remove_selection(selection)
-  state.context_updated_at = vim.uv.now()
 end
 
 function M.clear_selections()
@@ -197,12 +194,7 @@ function M.build_inline_selection_text(range)
   end
 
   local filetype = vim.bo[buf].filetype or ''
-  local text = string.format(
-    '**`%s`**\n\n```%s\n%s\n```',
-    file.path,
-    filetype,
-    current_selection.text
-  )
+  local text = string.format('**`%s`**\n\n```%s\n%s\n```', file.path, filetype, current_selection.text)
 
   return text
 end
@@ -222,13 +214,11 @@ function M.add_file(file)
 
   file = vim.fn.fnamemodify(file, ':p')
   ChatContext.add_file(file)
-  state.context_updated_at = vim.uv.now()
 end
 
 function M.remove_file(file)
   file = vim.fn.fnamemodify(file, ':p')
   ChatContext.remove_file(file)
-  state.context_updated_at = vim.uv.now()
 end
 
 function M.clear_files()
@@ -237,12 +227,10 @@ end
 
 function M.add_subagent(subagent)
   ChatContext.add_subagent(subagent)
-  state.context_updated_at = vim.uv.now()
 end
 
 function M.remove_subagent(subagent)
   ChatContext.remove_subagent(subagent)
-  state.context_updated_at = vim.uv.now()
 end
 
 function M.clear_subagents()
@@ -255,7 +243,6 @@ end
 
 function M.load()
   ChatContext.load()
-  state.context_updated_at = vim.uv.now()
 end
 
 -- Context creation with delta logic (delegates to ChatContext)
@@ -354,7 +341,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)