fix(context): keep context state and send behavior in sync (#306)

Author: disrupted

README.md

@@ -728,6 +728,13 @@ You can quiclkly see the current context items in the context bar at the top of
   <img src="https://i.imgur.com/vGgu6br.png" alt="Opencode.nvim context bar" width="90%" />
 </div>
 
+For `Current file`, the color indicates whether it will be sent with the next prompt:
+
+- Regular highlight: file is pending and will be included.
+- Dimmed/gray highlight: file was already sent and has not changed, so it will be skipped (delta behavior).
+
+If the file content changes, it becomes pending again and will be sent on the next prompt.
+
 ### Context Items Completion
 
 You can quickly reference available context items by typing `#` in the input window. This will show a completion menu with all available context items:

lua/opencode/context.lua

@@ -208,8 +208,7 @@ function M.clear_subagents()
 end
 
 function M.unload_attachments()
-  ChatContext.clear_files()
-  ChatContext.clear_selections()
+  ChatContext.unload_attachments()
 end
 
 function M.load()

lua/opencode/context/chat_context.lua

@@ -195,6 +195,7 @@ end
 
 function M.clear_selections()
   M.context.selections = {}
+  state.context_updated_at = vim.uv.now()
 end
 
 function M.add_file(file)
@@ -230,6 +231,7 @@ end
 
 function M.clear_files()
   M.context.mentioned_files = {}
+  state.context_updated_at = vim.uv.now()
 end
 
 function M.add_subagent(subagent)
@@ -261,11 +263,13 @@ end
 
 function M.clear_subagents()
   M.context.mentioned_subagents = {}
+  state.context_updated_at = vim.uv.now()
 end
 
 function M.unload_attachments()
   M.context.mentioned_files = {}
   M.context.selections = {}
+  state.context_updated_at = vim.uv.now()
 end
 
 function M.get_mentioned_files()
@@ -336,7 +340,7 @@ function M.should_update_current_file(current_file)
   end
 
   if not current_file then
-    return false, false
+    return true, false
   end
 
   -- Different file name means update needed
@@ -373,6 +377,10 @@ function M.load()
     return
   end
 
+  local prev_current_file = vim.deepcopy(M.context.current_file)
+  local prev_cursor_data = vim.deepcopy(M.context.cursor_data)
+  local prev_linter_errors = vim.deepcopy(M.context.linter_errors)
+
   local current_file = base_context.get_current_file(buf)
   local cursor_data = base_context.get_current_cursor_data(buf, win)
 
@@ -389,6 +397,14 @@ function M.load()
   M.context.cursor_data = cursor_data
   M.context.linter_errors = M.get_diagnostics(buf, nil, nil)
 
+  if
+    not vim.deep_equal(prev_current_file, M.context.current_file)
+    or not vim.deep_equal(prev_cursor_data, M.context.cursor_data)
+    or not vim.deep_equal(prev_linter_errors, M.context.linter_errors)
+  then
+    state.context_updated_at = vim.uv.now()
+  end
+
   -- Handle current selection
   if base_context.is_context_enabled('selection') then
     local current_selection = base_context.get_current_selection()
@@ -484,7 +500,11 @@ M.format_message = Promise.async(function(prompt, opts)
     return { parts = parts }
   end
 
-  if M.context.current_file and not M.context.current_file.sent_at then
+  if
+    base_context.is_context_enabled('current_file', context_config)
+    and 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

lua/opencode/ui/context_bar.lua

@@ -171,7 +171,7 @@ end
 
 function M.setup()
   state.subscribe(
-    { 'current_context_config', 'current_code_buf', 'opencode_focused', 'context_updated_at', 'user_message_count' },
+    { 'current_context_config', 'current_code_buf', 'is_opencode_focused', 'context_updated_at', 'user_message_count' },
     function()
       M.render()
     end

tests/unit/context_bar_spec.lua

@@ -299,7 +299,8 @@ describe('opencode.ui.context_bar', function()
       assert.is_true(subscription_called)
       assert.is_table(captured_keys)
 
-      local expected_keys = { 'current_context_config', 'current_code_buf', 'opencode_focused', 'context_updated_at' }
+      local expected_keys =
+        { 'current_context_config', 'current_code_buf', 'is_opencode_focused', 'context_updated_at' }
       for _, expected_key in ipairs(expected_keys) do
         local found = false
         for _, key in ipairs(captured_keys) do

tests/unit/context_spec.lua

@@ -154,6 +154,92 @@ describe('format_message', function()
     BaseContext.get_current_selection = original_get_current_selection
     BaseContext.get_current_file_for_selection = original_get_current_file_for_selection
   end)
+
+  it('does not include current_file when disabled even if stale current_file exists', function()
+    local ChatContext = require('opencode.context.chat_context')
+    local BaseContext = require('opencode.context.base_context')
+
+    local original_get_current_buf = BaseContext.get_current_buf
+    local original_get_diagnostics = BaseContext.get_diagnostics
+
+    ChatContext.context.current_file = {
+      path = '/tmp/foo.lua',
+      name = 'foo.lua',
+      extension = 'lua',
+      sent_at = nil,
+      sent_at_mtime = nil,
+    }
+
+    BaseContext.get_current_buf = function()
+      return 1, 1
+    end
+    BaseContext.get_diagnostics = function()
+      return {}
+    end
+
+    local parts = context
+      .format_message('follow-up prompt', {
+        current_file = { enabled = false },
+        selection = { enabled = false },
+        diagnostics = { enabled = false },
+        cursor_data = { enabled = false },
+        buffer = { enabled = false },
+        git_diff = { enabled = false },
+      })
+      :wait()
+
+    local has_file_part = false
+    for _, part in ipairs(parts) do
+      if part.type == 'file' then
+        has_file_part = true
+        break
+      end
+    end
+
+    assert.is_false(has_file_part)
+    assert.is_nil(ChatContext.context.current_file.sent_at)
+
+    BaseContext.get_current_buf = original_get_current_buf
+    BaseContext.get_diagnostics = original_get_diagnostics
+  end)
+end)
+
+describe('context update notifications', function()
+  local ChatContext
+  local original_now
+
+  before_each(function()
+    ChatContext = require('opencode.context.chat_context')
+    ChatContext.context.mentioned_files = { '/tmp/a.lua' }
+    ChatContext.context.selections = { { file = { path = '/tmp/a.lua' }, lines = '1, 1', content = 'x' } }
+    ChatContext.context.mentioned_subagents = { 'agent1' }
+
+    state.context_updated_at = 0
+    local tick = 0
+    original_now = vim.uv.now
+    vim.uv.now = function()
+      tick = tick + 1
+      return tick
+    end
+  end)
+
+  after_each(function()
+    vim.uv.now = original_now
+  end)
+
+  it('updates context_updated_at for clear operations and unload_attachments', function()
+    ChatContext.clear_files()
+    assert.equal(1, state.context_updated_at)
+
+    ChatContext.clear_selections()
+    assert.equal(2, state.context_updated_at)
+
+    ChatContext.clear_subagents()
+    assert.equal(3, state.context_updated_at)
+
+    context.unload_attachments()
+    assert.equal(4, state.context_updated_at)
+  end)
 end)
 
 describe('delta_context', function()
@@ -812,6 +898,53 @@ describe('ChatContext.load() preserves selections on file switch', function()
     BaseContext.new_selection = original_new_selection
     ChatContext.get_diagnostics = original_get_diagnostics
   end)
+
+  it('should clear stale current_file when current_file context is disabled', function()
+    ChatContext.context.current_file = {
+      path = '/tmp/stale.lua',
+      name = 'stale.lua',
+      extension = 'lua',
+      sent_at = nil,
+      sent_at_mtime = nil,
+    }
+
+    local original_get_current_buf = BaseContext.get_current_buf
+    local original_get_current_file = BaseContext.get_current_file
+    local original_get_current_cursor_data = BaseContext.get_current_cursor_data
+    local original_is_context_enabled = BaseContext.is_context_enabled
+    local original_get_current_selection = BaseContext.get_current_selection
+    local original_get_diagnostics = ChatContext.get_diagnostics
+
+    BaseContext.get_current_buf = function()
+      return 1, 1
+    end
+    BaseContext.get_current_file = function()
+      return nil
+    end
+    BaseContext.get_current_cursor_data = function()
+      return nil
+    end
+    BaseContext.is_context_enabled = function()
+      return false
+    end
+    BaseContext.get_current_selection = function()
+      return nil
+    end
+    ChatContext.get_diagnostics = function()
+      return {}
+    end
+
+    ChatContext.load()
+
+    assert.is_nil(ChatContext.context.current_file)
+
+    BaseContext.get_current_buf = original_get_current_buf
+    BaseContext.get_current_file = original_get_current_file
+    BaseContext.get_current_cursor_data = original_get_current_cursor_data
+    BaseContext.is_context_enabled = original_is_context_enabled
+    BaseContext.get_current_selection = original_get_current_selection
+    ChatContext.get_diagnostics = original_get_diagnostics
+  end)
 end)
 
 describe('add_visual_selection API', function()