Update lua/opencode/config.lua

Co-authored-by: Copilot <[email protected]>

Author: sudo-tee

lua/opencode/config.lua

@@ -260,7 +260,7 @@ M.defaults = {
     enabled = false,
     capture_streamed_events = false,
     show_ids = true,
-    highlight_changed_lines = true,
+    highlight_changed_lines = false,
     highlight_changed_lines_timeout_ms = 120,
     quick_chat = {
       keep_session = false,

lua/opencode/id.lua

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

lua/opencode/ui/dialog.lua

@@ -281,15 +281,22 @@ function Dialog:format_options(output, options)
       label = label .. ' - ' .. option.description
     end
 
-    local line_idx = output:get_line_count()
     local is_selected = self._selected_index == i
     local line_text = is_selected and string.format('    %d. %s ', i, label) or string.format('    %d. %s', i, label)
 
-    output:add_line(line_text)
+    -- Output uses 0-based indexing for extmarks. The correct target for
+    -- extmarks is the previous line count (0-based) because add_line will
+    -- append a new line and increase the 1-based line count. Capture the
+    -- current count first and then add the line so we can use that 0-based
+    -- index for extmarks.
+    -- add_line returns a 1-based line index; Output extmarks use 0-based
+    -- keys, so subtract 1 to get the correct extmark key.
+    local added_idx = output:add_line(line_text)
 
     if is_selected then
-      output:add_extmark(line_idx, { line_hl_group = 'OpencodeDialogOptionHover' } --[[@as OutputExtmark]])
-      output:add_extmark(line_idx, {
+      local extmark_idx = added_idx - 1
+      output:add_extmark(extmark_idx, { line_hl_group = 'OpencodeDialogOptionHover' } --[[@as OutputExtmark]])
+      output:add_extmark(extmark_idx, {
         start_col = 2,
         virt_text = { { '› ', 'OpencodeDialogOptionHover' } },
         virt_text_pos = 'overlay',
@@ -313,11 +320,16 @@ function Dialog:_setup_keymaps()
   if keymaps.up then
     for _, key in ipairs(keymaps.up) do
       if key and key ~= '' then
-        vim.keymap.set('n', key, function()
-          self:navigate(-1)
-        end, vim.tbl_extend('force', keymap_opts, {
-          desc = 'Dialog: navigate up',
-        }))
+        vim.keymap.set(
+          'n',
+          key,
+          function()
+            self:navigate(-1)
+          end,
+          vim.tbl_extend('force', keymap_opts, {
+            desc = 'Dialog: navigate up',
+          })
+        )
         table.insert(self._keymaps, key)
       end
     end
@@ -326,31 +338,46 @@ function Dialog:_setup_keymaps()
   if keymaps.down then
     for _, key in ipairs(keymaps.down) do
       if key and key ~= '' then
-        vim.keymap.set('n', key, function()
-          self:navigate(1)
-        end, vim.tbl_extend('force', keymap_opts, {
-          desc = 'Dialog: navigate down',
-        }))
+        vim.keymap.set(
+          'n',
+          key,
+          function()
+            self:navigate(1)
+          end,
+          vim.tbl_extend('force', keymap_opts, {
+            desc = 'Dialog: navigate down',
+          })
+        )
         table.insert(self._keymaps, key)
       end
     end
   end
 
   if keymaps.select and keymaps.select ~= '' then
-    vim.keymap.set('n', keymaps.select, function()
-      self:select()
-    end, vim.tbl_extend('force', keymap_opts, {
-      desc = 'Dialog: select option',
-    }))
+    vim.keymap.set(
+      'n',
+      keymaps.select,
+      function()
+        self:select()
+      end,
+      vim.tbl_extend('force', keymap_opts, {
+        desc = 'Dialog: select option',
+      })
+    )
     table.insert(self._keymaps, keymaps.select)
   end
 
   if keymaps.dismiss and keymaps.dismiss ~= '' then
-    vim.keymap.set('n', keymaps.dismiss, function()
-      self:dismiss()
-    end, vim.tbl_extend('force', keymap_opts, {
-      desc = 'Dialog: dismiss',
-    }))
+    vim.keymap.set(
+      'n',
+      keymaps.dismiss,
+      function()
+        self:dismiss()
+      end,
+      vim.tbl_extend('force', keymap_opts, {
+        desc = 'Dialog: dismiss',
+      })
+    )
     table.insert(self._keymaps, keymaps.dismiss)
   end
 
@@ -359,15 +386,20 @@ function Dialog:_setup_keymaps()
     local number_keymap_opts = vim.tbl_extend('force', keymap_opts, { nowait = true })
     for i = 1, math.min(option_count, 9) do
       local key = tostring(i)
-      vim.keymap.set('n', key, function()
-        if not self._active or not self._config.check_focused() then
-          return
-        end
-        self._selected_index = i
-        self._config.on_select(i)
-      end, vim.tbl_extend('force', number_keymap_opts, {
-        desc = 'Dialog: select option ' .. key,
-      }))
+      vim.keymap.set(
+        'n',
+        key,
+        function()
+          if not self._active or not self._config.check_focused() then
+            return
+          end
+          self._selected_index = i
+          self._config.on_select(i)
+        end,
+        vim.tbl_extend('force', number_keymap_opts, {
+          desc = 'Dialog: select option ' .. key,
+        })
+      )
       table.insert(self._keymaps, key)
     end
   end

lua/opencode/ui/formatter.lua

@@ -173,13 +173,13 @@ function M.format_message_header(message)
   local display_name
   if role == 'assistant' then
     local mode = message.info.mode
-      if mode and mode ~= '' then
-        display_name = mode:upper()
-      elseif state.current_mode and state.current_mode ~= '' then
-        display_name = state.current_mode:upper()
-      else
-        display_name = 'ASSISTANT'
-      end
+    if mode and mode ~= '' then
+      display_name = mode:upper()
+    elseif state.current_mode and state.current_mode ~= '' then
+      display_name = state.current_mode:upper()
+    else
+      display_name = 'ASSISTANT'
+    end
   else
     display_name = role:upper()
   end
@@ -307,7 +307,10 @@ function M._format_selection_context(output, part)
           local has_selection = context_module.decode_json_context(previous_part.text or '', 'selection') ~= nil
           local has_cursor = context_module.decode_json_context(previous_part.text or '', 'cursor-data') ~= nil
           local diagnostics = context_module.decode_json_context(previous_part.text or '', 'diagnostics')
-          local has_diagnostics = diagnostics and diagnostics.content and type(diagnostics.content) == 'table' and #diagnostics.content > 0
+          local has_diagnostics = diagnostics
+            and diagnostics.content
+            and type(diagnostics.content) == 'table'
+            and #diagnostics.content > 0
 
           if has_selection or has_cursor or has_diagnostics then
             start_line = output:get_line_count()
@@ -548,6 +551,7 @@ function M.add_vertical_border(output, start_line, end_line, hl_group, win_col,
     virt_text_repeat_linebreak = true,
     line_hl_group = text_hl_group or nil,
   }
+
   for line = start_line, end_line do
     output:add_extmark(line - 1, extmark_opts --[[@as OutputExtmark]])
   end

lua/opencode/ui/loading_animation.lua

@@ -85,6 +85,28 @@ local function subscribe_session_status_event(manager)
   M._animation.status_event_manager = manager
 end
 
+local function is_active_session_busy()
+  local active_session = state.active_session
+  local session_id = active_session and active_session.id
+  if session_id and ((state.user_message_count or {})[session_id] or 0) > 0 then
+    return true
+  end
+
+  local ok, question_window = pcall(require, 'opencode.ui.question_window')
+  if ok and question_window.has_question and question_window.belongs_to_active_session then
+    local current_question = question_window._current_question
+    if question_window.has_question() and question_window.belongs_to_active_session(current_question) then
+      return true
+    end
+  end
+
+  if M._animation.status_data and M._animation.status_data.type ~= 'idle' then
+    return true
+  end
+
+  return state.jobs.is_running()
+end
+
 function M.on_session_status(properties)
   if not properties or type(properties) ~= 'table' then
     return
@@ -104,6 +126,27 @@ local function on_active_session_change(_, new_session, old_session)
   local old_id = old_session and old_session.id
   if new_id ~= old_id then
     M._animation.status_data = nil
+    if is_active_session_busy() then
+      M.start(state.windows)
+    else
+      M.stop()
+    end
+  end
+end
+
+local function on_user_message_count_change()
+  if not state.windows then
+    return
+  end
+
+  if is_active_session_busy() then
+    if not M.is_running() then
+      M.start(state.windows)
+    else
+      M.render(state.windows)
+    end
+  else
+    M.stop()
   end
 end
 
@@ -138,7 +181,7 @@ M.render = vim.schedule_wrap(function(windows)
     return false
   end
 
-  if not state.jobs.is_running() then
+  if not is_active_session_busy() then
     M.stop()
     return false
   end
@@ -168,7 +211,7 @@ function M._start_animation_timer(windows)
     on_tick = function()
       M._animation.current_frame = M._next_frame()
       M.render(state.windows)
-      if state.jobs.is_running() then
+      if is_active_session_busy() then
         return true
       else
         M.stop()
@@ -214,22 +257,34 @@ local function on_running_change(_, new_value)
     return
   end
 
-  if not M.is_running() and new_value and new_value > 0 then
-    M.start(state.windows)
+  if (new_value and new_value > 0) or is_active_session_busy() then
+    if not M.is_running() then
+      M.start(state.windows)
+    else
+      M.render(state.windows)
+    end
   else
     M.stop()
   end
 end
 
 function M.setup()
   state.store.subscribe('job_count', on_running_change)
+  state.store.subscribe('user_message_count', on_user_message_count_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)
+
+  if is_active_session_busy() then
+    M.start(state.windows)
+  else
+    M.stop()
+  end
 end
 
 function M.teardown()
   state.store.unsubscribe('job_count', on_running_change)
+  state.store.unsubscribe('user_message_count', on_user_message_count_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)

lua/opencode/ui/output_window.lua

@@ -181,6 +181,7 @@ function M.setup(windows)
   )
   window_options.set_window_option('wrap', true, windows.output_win, { save_original = true })
   window_options.set_window_option('linebreak', true, windows.output_win, { save_original = true })
+  window_options.set_window_option('cursorline', false, windows.output_win, { save_original = true })
   window_options.set_window_option('number', false, windows.output_win, { save_original = true })
   window_options.set_window_option('relativenumber', false, windows.output_win, { save_original = true })
   window_options.set_buffer_option('modifiable', false, windows.output_buf)

lua/opencode/ui/permission_window.lua

@@ -174,6 +174,7 @@ function M.format_display(output)
     title = icons.get('warning') .. ' Permission Required' .. progress,
     title_hl = 'OpencodePermissionTitle',
     border_hl = 'OpencodePermissionBorder',
+    extend_border_to_trailing_blank = true,
     content = render_content and nil or content,
     render_content = render_content,
     options = options,