Merge branch 'sudo-tee:main' into refactor/command-boundary-a-clean

Author: jensenojs

README.md

@@ -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)

lua/opencode/config.lua

@@ -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/core.lua

@@ -23,6 +23,14 @@ M.select_session = Promise.async(function(parent_id)
     return s.title ~= '' and s ~= nil and s.parentID == parent_id
   end, all_sessions)
 
+  if #filtered_sessions == 0 then
+    vim.notify(parent_id and 'No child sessions found' or 'No sessions found', vim.log.levels.INFO)
+    if state.ui.is_visible() then
+      ui.focus_input()
+    end
+    return
+  end
+
   ui.select_session(filtered_sessions, function(selected_session)
     if not selected_session then
       if state.ui.is_visible() then
@@ -520,15 +528,30 @@ M.ensure_current_mode = Promise.async(function()
   return true
 end)
 
----Initialize current model if it's not already set.
----@return string|nil The current model (or the default model, if configured)
+---Initialize current model from messages or config.
+---@return string|nil The current model
 M.initialize_current_model = Promise.async(function()
+  if state.messages then
+    for i = #state.messages, 1, -1 do
+      local msg = state.messages[i]
+      if msg and msg.info and msg.info.modelID and msg.info.providerID then
+        local model_str = msg.info.providerID .. '/' .. msg.info.modelID
+        if state.current_model ~= model_str then
+          state.model.set_model(model_str)
+        end
+        if msg.info.mode and state.current_mode ~= msg.info.mode then
+          state.model.set_mode(msg.info.mode)
+        end
+        return state.current_model
+      end
+    end
+  end
+
   if state.current_model then
     return state.current_model
   end
 
   local cfg = require('opencode.config_file').get_opencode_config():await()
-
   if cfg and cfg.model and cfg.model ~= '' then
     state.model.set_model(cfg.model)
   end
@@ -537,6 +560,8 @@ M.initialize_current_model = Promise.async(function()
 end)
 
 M._on_user_message_count_change = Promise.async(function(_, new, old)
+  require('opencode.ui.renderer.flush').flush_pending_on_data_rendered()
+
   if config.hooks and config.hooks.on_done_thinking then
     local all_sessions = session.get_all_workspace_sessions():await()
     local done_sessions = vim.tbl_filter(function(s)

lua/opencode/event_manager.lua

@@ -183,6 +183,7 @@ local log = require('opencode.log')
 --- @field state_cwd_listener function|nil Listener for state.current_cwd updates
 --- @field is_started boolean Whether the event manager is started
 --- @field captured_events table[] List of captured events for debugging
+--- @field ignored_events string[] List of event types to ignore when capturing
 --- @field throttling_emitter ThrottlingEmitter Throttle instance for batching events
 local EventManager = {}
 EventManager.__index = EventManager
@@ -197,6 +198,7 @@ function EventManager.new()
     state_cwd_listener = nil,
     is_started = false,
     captured_events = {},
+    ignored_events = { 'server.heartbeat' },
     _parts_by_id = {},
   }, EventManager)
 
@@ -553,6 +555,14 @@ function EventManager:_subscribe_to_server_events(server)
   local api_client = state.api_client
 
   local emitter = function(event)
+    if not event or not event.type then
+      log.warn('Received malformed event from server: %s', vim.inspect(event))
+      return
+    end
+    if self.ignored_events and vim.tbl_contains(self.ignored_events, event.type) then
+      log.debug('Ignoring event of type %s', event.type)
+      return
+    end
     self.throttling_emitter:enqueue(event)
   end
 

lua/opencode/id.lua

@@ -142,4 +142,3 @@ function M.get_prefixes()
 end
 
 return M
-

lua/opencode/throttling_emitter.lua

@@ -46,7 +46,9 @@ function ThrottlingEmitter:_drain()
   local items_to_process = self.queue
   self.queue = {}
 
-  self.process_fn(items_to_process)
+  if #items_to_process > 0 then
+    self.process_fn(items_to_process)
+  end
 
   -- double check that items weren't added while processing
   if #self.queue > 0 and not self.drain_scheduled then

lua/opencode/types.lua

@@ -231,6 +231,7 @@
 ---@class OpencodeUIOutputRenderingConfig
 ---@field markdown_debounce_ms number
 ---@field on_data_rendered (fun(buf: integer, win: integer)|boolean)|nil
+---@field markdown_on_idle boolean
 ---@field event_throttle_ms number
 ---@field event_collapsing boolean
 
@@ -239,6 +240,7 @@
 ---@field rendering OpencodeUIOutputRenderingConfig
 ---@field always_scroll_to_bottom boolean
 ---@field filetype string
+---@field compact_assistant_headers boolean
 
 ---@class OpencodeUIPickerConfig
 ---@field snacks_layout? snacks.picker.layout.Config
@@ -266,6 +268,8 @@
 ---@field enabled boolean
 ---@field capture_streamed_events boolean
 ---@field show_ids boolean
+---@field highlight_changed_lines boolean
+---@field highlight_changed_lines_timeout_ms number
 ---@field quick_chat {keep_session: boolean, set_active_session: boolean}
 
 ---@alias OpencodeCommandLifecycleStage 'before'|'after'|'error'|'finally'

lua/opencode/ui/base_picker.lua

@@ -19,6 +19,7 @@ local Promise = require('opencode.promise')
 ---@field multi_selection? table<string, boolean> Actions that support multi-selection
 ---@field preview? "file"|"none"|false Preview mode: "file" for file preview, "none" or false to disable
 ---@field layout_opts? OpencodeUIPickerConfig
+---@field close? fun() Close the picker programmatically (set by the backend)
 
 ---@class TelescopeEntry
 ---@field value any
@@ -84,6 +85,8 @@ local function telescope_ui(opts)
   local entry_display = require('telescope.pickers.entry_display')
 
   -- Create displayer dynamically based on number of parts
+  ---@param picker_item PickerItem
+  ---@return table
   local function create_displayer(picker_item)
     local items = {}
     for _ in ipairs(picker_item.parts) do
@@ -128,6 +131,7 @@ local function telescope_ui(opts)
     return entry
   end
 
+  ---@return unknown
   local function refresh_picker()
     return current_picker
       and current_picker:refresh(
@@ -147,6 +151,11 @@ local function telescope_ui(opts)
         width = opts.width + 7, -- extra space for telescope UI
       } or nil,
     attach_mappings = function(prompt_bufnr, map)
+      opts.close = function()
+        selection_made = true
+        actions.close(prompt_bufnr)
+      end
+
       actions.select_default:replace(function()
         selection_made = true
         local selection = action_state.get_selected_entry()
@@ -197,8 +206,12 @@ local function telescope_ui(opts)
               local new_items = action.fn(items_to_process, opts)
               Promise.wrap(new_items):and_then(function(resolved_items)
                 if action.reload and resolved_items then
-                  opts.items = resolved_items
-                  refresh_picker()
+                  if #resolved_items == 0 and opts.close then
+                    opts.close()
+                  else
+                    opts.items = resolved_items
+                    refresh_picker()
+                  end
                 end
               end)
             end
@@ -222,6 +235,7 @@ end
 local function fzf_ui(opts)
   local fzf_lua = require('fzf-lua')
 
+  ---@return table
   local function create_fzf_config()
     local has_multi_action = util.some(opts.actions, function(action)
       return action.multi_selection
@@ -251,6 +265,7 @@ local function fzf_ui(opts)
     }
   end
 
+  ---@return fun(fzf_cb: fun(line?: string))
   local function create_finder()
     return function(fzf_cb)
       for idx, item in ipairs(opts.items) do
@@ -289,15 +304,40 @@ local function fzf_ui(opts)
     end
   end
 
+  ---Reopen fzf-lua to reflect updated picker items.
   local function refresh_fzf()
     vim.schedule(function()
       fzf_ui(opts)
     end)
   end
 
+  local closed = false
+
+  opts.close = function()
+    if closed then
+      return
+    end
+    closed = true
+    vim.schedule(function()
+      local ok, fzf_win = pcall(require, 'fzf-lua.win')
+      if ok and fzf_win.__SELF then
+        local win = fzf_win.__SELF()
+        if win then
+          win:close()
+        end
+      end
+      if opts.callback then
+        opts.callback(nil)
+      end
+    end)
+  end
+
   ---@type FzfLuaActions
   local actions_config = {
     ['default'] = function(selected, fzf_opts)
+      if closed then
+        return
+      end
       if not selected or #selected == 0 then
         if opts.callback then
           opts.callback(nil)
@@ -310,6 +350,9 @@ local function fzf_ui(opts)
       end
     end,
     ['esc'] = function()
+      if closed then
+        return
+      end
       if opts.callback then
         opts.callback(nil)
       end
@@ -346,8 +389,12 @@ local function fzf_ui(opts)
             Promise.wrap(new_items):and_then(function(resolved_items)
               if action.reload and resolved_items then
                 ---@cast resolved_items any[]
-                opts.items = resolved_items
-                refresh_fzf()
+                if #resolved_items == 0 and opts.close then
+                  opts.close()
+                else
+                  opts.items = resolved_items
+                  refresh_fzf()
+                end
               end
             end)
           end
@@ -376,6 +423,10 @@ local function mini_pick_ui(opts)
 
   local mappings = {}
 
+  opts.close = function()
+    mini_pick.stop()
+  end
+
   for action_name, action in pairs(opts.actions) do
     if action.key and action.key[1] then
       mappings[action_name] = {
@@ -387,8 +438,12 @@ local function mini_pick_ui(opts)
             local new_items = action.fn(current.item, opts)
             Promise.wrap(new_items):and_then(function(resolved_items)
               if action.reload and resolved_items then
-                opts.items = resolved_items
-                mini_pick_ui(opts)
+                if #resolved_items == 0 and opts.close then
+                  opts.close()
+                else
+                  opts.items = resolved_items
+                  mini_pick_ui(opts)
+                end
               end
             end)
           end
@@ -522,6 +577,13 @@ local function snacks_picker_ui(opts)
       snack_opts.win.input.keys[action.key[1]] = { action_name, mode = action.key.mode or 'i' }
 
       snack_opts.actions[action_name] = function(_picker, item)
+        if not opts.close then
+          opts.close = function()
+            selection_made = true
+            _picker:close()
+          end
+        end
+
         if item then
           local items_to_process
           if action.multi_selection then
@@ -540,9 +602,13 @@ local function snacks_picker_ui(opts)
             local new_items = action.fn(items_to_process, opts)
             Promise.wrap(new_items):and_then(function(resolved_items)
               if action.reload and resolved_items then
-                opts.items = resolved_items
-                _picker:refresh()
-                _picker:find()
+                if #resolved_items == 0 and opts.close then
+                  opts.close()
+                else
+                  opts.items = resolved_items
+                  _picker:refresh()
+                  _picker:find()
+                end
               end
             end)
           end)
@@ -584,6 +650,7 @@ function M.create_picker_item(parts)
     parts = parts,
   }
 
+  ---@return string
   function item:to_string()
     local texts = {}
     for _, part in ipairs(self.parts) do
@@ -592,6 +659,7 @@ function M.create_picker_item(parts)
     return table.concat(texts, ' ')
   end
 
+  ---@return table
   function item:to_formatted_text()
     local formatted = {}
     for _, part in ipairs(self.parts) do

lua/opencode/ui/completion/files.lua

@@ -85,7 +85,9 @@ local function create_file_item(file, suffix, priority)
   local dir = vim.fn.fnamemodify(file, ':h')
   local file_path = dir == '.' and filename or dir .. '/' .. filename
   local detail = dir == '.' and filename or dir .. '/' .. filename
-  local full_path = vim.fn.fnamemodify(file, ':p')
+  -- Build absolute path without resolving symlinks so that files inside
+  -- symlinked directories within cwd pass the is_path_in_cwd check.
+  local full_path = file:sub(1, 1) == '/' and file or (vim.fn.getcwd() .. '/' .. file)
   local display_label = file_path
 
   local file_config = config.ui.completion.file_sources