feat(context): add sent_at/sent_at_mtime file context state tracking

Track when current_file is sent in context to improve status updates, highlights, and delta computation logic.
Refactor context read/write to access through get_context();

Author: sudo-tee

lua/opencode/context.lua

@@ -12,6 +12,11 @@ local M = {}
 M.ChatContext = ChatContext
 M.QuickChatContext = QuickChatContext
 
+-- Provide access to the context state
+function M.get_context()
+  return ChatContext.context
+end
+
 --- Formats context for main chat interface (new simplified API)
 ---@param prompt string The user's instruction/prompt
 ---@param context_config? OpencodeContextConfig Optional context config
@@ -78,8 +83,6 @@ function M.clear_selections()
 end
 
 function M.add_file(file)
-  ChatContext.context.mentioned_files = ChatContext.context.mentioned_files or {}
-
   local is_file = vim.fn.filereadable(file) == 1
   local is_dir = vim.fn.isdirectory(file) == 1
   if not is_file and not is_dir then
@@ -137,8 +140,6 @@ function M.delta_context(opts)
   return ChatContext.delta_context(opts)
 end
 
-M.context = ChatContext.context
-
 ---@param prompt string
 ---@param opts? OpencodeContextConfig|nil
 ---@return OpencodeMessagePart[]

lua/opencode/context/chat_context.lua

@@ -283,20 +283,67 @@ function M.get_mentioned_subagents()
   return M.context.mentioned_subagents or {}
 end
 
+---@param current_file table|nil
+---@return boolean, boolean -- should_update, is_different_file
+function M.should_update_current_file(current_file)
+  if not M.context.current_file then
+    return current_file ~= nil, false
+  end
+
+  if not current_file then
+    return false, false
+  end
+
+  -- Different file name means update needed
+  if M.context.current_file.name ~= current_file.name then
+    return true, true
+  end
+
+  local file_path = current_file.path
+  if not file_path or vim.fn.filereadable(file_path) ~= 1 then
+    return false, false
+  end
+
+  local stat = vim.uv.fs_stat(file_path)
+  if not (stat and stat.mtime and stat.mtime.sec) then
+    return false, false
+  end
+
+  local file_mtime_sec = stat.mtime.sec --[[@as number]]
+  local last_sent_mtime = M.context.current_file.sent_at_mtime or 0
+  return file_mtime_sec > last_sent_mtime, false
+end
+
 -- Load function that populates the global context state
 -- This is the core loading logic that was originally in the main context module
 function M.load()
   local buf, win = base_context.get_current_buf()
 
-  if buf then
-    local current_file = base_context.get_current_file(buf)
-    local cursor_data = base_context.get_current_cursor_data(buf, win)
+  if not buf or not win then
+    return
+  end
+
+  local current_file = base_context.get_current_file(buf)
+  local cursor_data = base_context.get_current_cursor_data(buf, win)
+
+  local should_update_file, is_different_file = M.should_update_current_file(current_file)
+
+  if should_update_file then
+    if is_different_file then
+      M.context.selections = {}
+    end
 
     M.context.current_file = current_file
-    M.context.cursor_data = cursor_data
-    M.context.linter_errors = base_context.get_diagnostics(buf, nil, nil)
+    if M.context.current_file then
+      M.context.current_file.sent_at = nil
+      M.context.current_file.sent_at_mtime = nil
+    end
   end
 
+  M.context.cursor_data = cursor_data
+  M.context.linter_errors = base_context.get_diagnostics(buf, nil, nil)
+
+  -- Handle current selection
   local current_selection = base_context.get_current_selection()
   if current_selection and M.context.current_file then
     local selection =
@@ -305,6 +352,18 @@ function M.load()
   end
 end
 
+---@param current_file table
+local function set_file_sent_timestamps(current_file)
+  if not current_file then
+    return
+  end
+  current_file.sent_at = vim.uv.now()
+  local stat = vim.uv.fs_stat(current_file.path)
+  if stat and stat.mtime and stat.mtime.sec then
+    current_file.sent_at_mtime = stat.mtime.sec
+  end
+end
+
 -- This function creates a context snapshot with delta logic against the last sent context
 function M.delta_context(opts)
   local config = require('opencode.config')
@@ -322,37 +381,31 @@ function M.delta_context(opts)
   end
 
   local buf, win = base_context.get_current_buf()
-  if not buf or not win then
+  if not buf then
     return {}
   end
 
-  local ctx = {
-    current_file = base_context.get_current_file(buf, opts),
-    cursor_data = base_context.get_current_cursor_data(buf, win, opts),
-    mentioned_files = M.context.mentioned_files or {},
-    selections = M.context.selections or {},
-    linter_errors = base_context.get_diagnostics(buf, opts, nil),
-    mentioned_subagents = M.context.mentioned_subagents or {},
-  }
+  local ctx = vim.deepcopy(M.context)
 
-  -- Delta logic against last sent context
+  if ctx.current_file and M.context.current_file then
+    set_file_sent_timestamps(M.context.current_file)
+    set_file_sent_timestamps(ctx.current_file)
+  end
+
+  -- no need to send subagents again
   local last_context = state.last_sent_context
   if last_context then
-    -- no need to send file context again
-    if ctx.current_file and last_context.current_file and ctx.current_file.name == last_context.current_file.name then
-      ctx.current_file = nil
-    end
-
-    -- no need to send subagents again
     if
       ctx.mentioned_subagents
       and last_context.mentioned_subagents
       and vim.deep_equal(ctx.mentioned_subagents, last_context.mentioned_subagents)
     then
       ctx.mentioned_subagents = nil
+      M.context.mentioned_subagents = nil
     end
   end
 
+  state.context_updated_at = vim.uv.now()
   return ctx
 end
 
@@ -368,40 +421,42 @@ M.format_message = Promise.async(function(prompt, opts)
   local range = opts.range
   local parts = {}
 
-  -- Add mentioned files from global state (always process, even without buffer)
   for _, file_path in ipairs(M.context.mentioned_files or {}) do
     table.insert(parts, format_file_part(file_path, prompt))
   end
 
-  -- Add mentioned subagents from global state (always process, even without buffer)
   for _, agent in ipairs(M.context.mentioned_subagents or {}) do
     table.insert(parts, format_subagents_part(agent, prompt))
   end
 
-  if not buf or not win then
-    -- Add the main prompt
+  if not buf then
     table.insert(parts, { type = 'text', text = prompt })
     return { parts = parts }
   end
 
-  -- Add selections (both from range and global state)
+  if M.context.current_file and not M.context.current_file.sent_at then
+    table.insert(parts, format_file_part(M.context.current_file.path))
+    set_file_sent_timestamps(M.context.current_file)
+  end
+
   if base_context.is_context_enabled('selection', context_config) then
     local selections = {}
 
-    -- Add range selection if specified
     if range and range.start and range.stop then
       local file = base_context.get_current_file(buf, context_config)
       if file then
         local selection = base_context.new_selection(
           file,
-          table.concat(vim.api.nvim_buf_get_lines(buf, range.start - 1, range.stop, false), '\n'),
-          string.format('%d-%d', range.start, range.stop)
+          table.concat(
+            vim.api.nvim_buf_get_lines(buf, math.floor(range.start) - 1, math.floor(range.stop), false),
+            '\n'
+          ),
+          string.format('%d-%d', math.floor(range.start), math.floor(range.stop))
         )
         table.insert(selections, selection)
       end
     end
 
-    -- Add current visual selection if available
     local current_selection = base_context.get_current_selection(context_config)
     if current_selection then
       local file = base_context.get_current_file(buf, context_config)
@@ -411,7 +466,6 @@ M.format_message = Promise.async(function(prompt, opts)
       end
     end
 
-    -- Add selections from global state
     for _, sel in ipairs(M.context.selections or {}) do
       table.insert(selections, sel)
     end
@@ -421,28 +475,19 @@ M.format_message = Promise.async(function(prompt, opts)
     end
   end
 
-  -- Add current file if enabled and not already mentioned
-  local current_file = base_context.get_current_file(buf, context_config)
-  if current_file and not vim.tbl_contains(M.context.mentioned_files or {}, current_file.path) then
-    table.insert(parts, format_file_part(current_file.path))
-  end
-
-  -- Add buffer content if enabled
   if base_context.is_context_enabled('buffer', context_config) then
     table.insert(parts, format_buffer_part(buf))
   end
 
-  -- Add diagnostics
   local diag_range = nil
   if range then
-    diag_range = { start_line = range.start - 1, end_line = range.stop - 1 }
+    diag_range = { start_line = math.floor(range.start) - 1, end_line = math.floor(range.stop) - 1 }
   end
   local diagnostics = base_context.get_diagnostics(buf, context_config, diag_range)
   if diagnostics and #diagnostics > 0 then
-    table.insert(parts, format_diagnostics_part(diagnostics, nil)) -- No need to filter again
+    table.insert(parts, format_diagnostics_part(diagnostics, diag_range))
   end
 
-  -- Add cursor data
   if base_context.is_context_enabled('cursor_data', context_config) then
     local cursor_data = base_context.get_current_cursor_data(buf, win, context_config)
     if cursor_data then
@@ -455,15 +500,13 @@ M.format_message = Promise.async(function(prompt, opts)
     end
   end
 
-  -- Add git diff
   if base_context.is_context_enabled('git_diff', context_config) then
     local diff_text = base_context.get_git_diff(context_config):await()
     if diff_text and diff_text ~= '' then
       table.insert(parts, format_git_diff_part(diff_text))
     end
   end
 
-  -- Add the main prompt
   table.insert(parts, { type = 'text', text = prompt })
 
   return { parts = parts }

lua/opencode/core.lua

@@ -69,7 +69,7 @@ M.open = Promise.async(function(opts)
   local are_windows_closed = state.windows == nil
   if are_windows_closed then
     -- Check if whether prompting will be allowed
-    local mentioned_files = context.context.mentioned_files or {}
+    local mentioned_files = context.get_context().mentioned_files or {}
     local allowed, err_msg = util.check_prompt_allowed(config.prompt_guard, mentioned_files)
     if not allowed then
       vim.notify(err_msg or 'Prompts will be denied by prompt_guard', vim.log.levels.WARN)
@@ -138,7 +138,7 @@ M.send_message = Promise.async(function(prompt, opts)
     return false
   end
 
-  local mentioned_files = context.context.mentioned_files or {}
+  local mentioned_files = context.get_context().mentioned_files or {}
   local allowed, err_msg = util.check_prompt_allowed(config.prompt_guard, mentioned_files)
 
   if not allowed then
@@ -222,7 +222,8 @@ end)
 ---@param prompt string
 function M.after_run(prompt)
   context.unload_attachments()
-  state.last_sent_context = vim.deepcopy(context.context)
+  state.last_sent_context = vim.deepcopy(context.get_context())
+  context.delta_context()
   require('opencode.history').write(prompt)
   M._abort_count = 0
 end

lua/opencode/quick_chat.lua

@@ -289,7 +289,7 @@ local function generate_raw_code_instructions(context_config)
   return {
     'I want you to act as a senior ' .. filetype .. ' developer. ' .. context_info,
     'I will ask you specific questions.',
-    'I want you to ALWAYS return valid raw code ONLY ',
+    'I want you to ALWAYS return valid RAW code ONLY ',
     'CRITICAL: NEVER add (codeblocks, explanations or any additional text). ',
     'Respect the current indentation and formatting of the existing code. ',
     "If you can't respond with code, respond with nothing.",

lua/opencode/types.lua

@@ -389,6 +389,7 @@
 ---@field path string
 ---@field name string
 ---@field extension string
+---@field sent_at? number
 
 ---@class OpencodeMessagePartSourceText
 ---@field start number

lua/opencode/ui/completion/context.lua

@@ -44,27 +44,26 @@ local function format_diagnostics(diagnostics)
     return 'No diagnostics available.'
   end
 
-  local counts = {}
+  local by_severity = { Error = {}, Warning = {}, Info = {}, Hint = {} }
   for _, diag in ipairs(diagnostics) do
-    counts[diag.severity] = (counts[diag.severity] or 0) + 1
-  end
-  local parts = {}
-  if counts[vim.diagnostic.severity.ERROR] then
-    table.insert(parts, string.format('%d Error%s', counts[1], counts[1] > 1 and 's' or ''))
-  end
-  if counts[vim.diagnostic.severity.WARN] then
-    table.insert(parts, string.format('%d Warning%s', counts[2], counts[2] > 1 and 's' or ''))
-  end
-  if counts[vim.diagnostic.severity.INFO] then
-    table.insert(parts, string.format('%d Info%s', counts[3], counts[3] > 1 and 's' or ''))
+    local severity = diag.severity
+    local key = severity == 1 and 'Error' or severity == 2 and 'Warning' or severity == 3 and 'Info' or 'Hint'
+    table.insert(by_severity[key], diag)
   end
 
-  return table.concat(parts, ', ')
+  local summary = {}
+  for key, items in pairs(by_severity) do
+    if #items > 0 then
+      table.insert(summary, string.format('%d %s%s', #items, key, #items > 1 and 's' or ''))
+    end
+  end
+  return table.concat(summary, ', ')
 end
 
 local function format_selection(selection)
-  local lang = selection.file and selection.file.extension or ''
-  return string.format('```%s\n%s\n```', lang, selection.content)
+  local lang = (selection.file and selection.file.extension) or ''
+  local content = selection.content or ''
+  return string.format('```%s\n%s\n```', lang, content)
 end
 
 ---@param cursor_data? OpencodeContextCursorData
@@ -77,14 +76,15 @@ local function format_cursor_data(cursor_data)
     return 'No cursor data available.'
   end
 
-  local filetype = context.context.current_file and context.context.current_file.extension
-  local parts = {
-    'Line: ' .. (cursor_data.line or 'N/A'),
-    (cursor_data.column or ''),
-    string.format('```%s \n%s\n```', filetype, cursor_data.line_content or 'N/A'),
-  }
-
-  return table.concat(parts, '\n')
+  local filetype = context.get_context().current_file and context.get_context().current_file.extension or ''
+  local content = cursor_data.line_content or ''
+  return string.format(
+    'Line: %s\nColumn: %s\n```%s\n%s\n```',
+    tostring(cursor_data.line or 'N/A'),
+    tostring(cursor_data.column or 'N/A'),
+    filetype,
+    content
+  )
 end
 
 ---@param ctx OpencodeContext
@@ -238,7 +238,7 @@ local context_source = {
       return {}
     end
 
-    local ctx = context.delta_context()
+    local ctx = context.get_context()
 
     local items = {
       add_current_file_item(ctx),