feat(context): display cursor_data with the user prompt

Author: sudo-tee

lua/opencode/context.lua

@@ -259,7 +259,7 @@ function M.get_current_cursor_data(buf, win)
 
   local cursor_pos = vim.fn.getcurpos(win)
   local cursor_content = vim.trim(vim.api.nvim_buf_get_lines(buf, cursor_pos[2] - 1, cursor_pos[2], false)[1] or '')
-  return { line = cursor_pos[2], col = cursor_pos[3], line_content = cursor_content }
+  return { line = cursor_pos[2], column = cursor_pos[3], line_content = cursor_content }
 end
 
 function M.get_current_selection()
@@ -345,13 +345,15 @@ local function format_diagnostics_part(diagnostics)
 end
 
 local function format_cursor_data_part(cursor_data)
+  local buf = (M.get_current_buf() or 0) --[[@as integer]]
+  local lang = util.get_markdown_filetype(vim.api.nvim_buf_get_name(buf)) or ''
   return {
     type = 'text',
     text = vim.json.encode({
       context_type = 'cursor-data',
       line = cursor_data.line,
       column = cursor_data.column,
-      line_content = cursor_data.line_content,
+      line_content = string.format('`````%s\n%s\n`````', lang, cursor_data.line_content),
     }),
     synthetic = true,
   }

lua/opencode/core.lua

@@ -95,9 +95,7 @@ end
 --- @param prompt string The message prompt to send.
 --- @param opts? SendMessageOpts
 function M.send_message(prompt, opts)
-  -- Check if prompt is allowed
-  local context_module = require('opencode.context')
-  local mentioned_files = context_module.context.mentioned_files or {}
+  local mentioned_files = context.context.mentioned_files or {}
   local allowed, err_msg = util.check_prompt_allowed(config.prompt_guard, mentioned_files)
 
   if not allowed then
@@ -123,8 +121,9 @@ function M.send_message(prompt, opts)
     state.current_mode = opts.agent
   end
 
-  params.parts = context.format_message(prompt, opts.context)
   state.current_context_config = opts.context
+  context.load()
+  params.parts = context.format_message(prompt, opts.context)
 
   M.before_run(opts)
 

lua/opencode/ui/formatter.lua

@@ -373,6 +373,23 @@ function M._format_selection_context(output, part)
   M._add_vertical_border(output, start_line, end_line, 'OpencodeMessageRoleUser', -3)
 end
 
+---@param output Output Output object to write to
+---@param part OpencodeMessagePart
+function M._format_cursor_data_context(output, part)
+  local json = context_module.decode_json_context(part.text, 'cursor-data')
+  if not json then
+    return
+  end
+  local start_line = output:get_line_count()
+  output:add_line('Line ' .. json.line .. ':')
+  output:add_lines(vim.split(json.line_content or '', '\n'))
+  output:add_empty_line()
+
+  local end_line = output:get_line_count()
+
+  M._add_vertical_border(output, start_line, end_line, 'OpencodeMessageRoleUser', -3)
+end
+
 ---Format and display the file path in the context
 ---@param output Output Output object to write to
 ---@param path string|nil File path
@@ -709,6 +726,7 @@ function M.format_part(part, message, is_last_part)
     if part.type == 'text' and part.text then
       if part.synthetic == true then
         M._format_selection_context(output, part)
+        M._format_cursor_data_context(output, part)
       else
         M._format_user_prompt(output, vim.trim(part.text), message)
         content_added = true

tests/data/cursor_data.expected.json

@@ -0,0 +1 @@
+{"extmarks":[[1,2,0,{"virt_text_hide":false,"ns_id":3,"right_gravity":true,"priority":10,"virt_text":[["▌󰭻 ","OpencodeMessageRoleUser"],[" "],["USER","OpencodeMessageRoleUser"],["","OpencodeHint"],[" (2025-10-30 17:42:54)","OpencodeHint"],[" [msg_a3637244a001FDRDfoBYVPEGpd]","OpencodeHint"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":false,"virt_text_win_col":-3}],[2,3,0,{"virt_text_hide":false,"ns_id":3,"right_gravity":true,"priority":4096,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"virt_text_win_col":-3}],[3,4,0,{"virt_text_hide":false,"ns_id":3,"right_gravity":true,"priority":4096,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"virt_text_win_col":-3}],[4,5,0,{"virt_text_hide":false,"ns_id":3,"right_gravity":true,"priority":4096,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"virt_text_win_col":-3}],[5,6,0,{"virt_text_hide":false,"ns_id":3,"right_gravity":true,"priority":4096,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"virt_text_win_col":-3}],[6,7,0,{"virt_text_hide":false,"ns_id":3,"right_gravity":true,"priority":4096,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"virt_text_win_col":-3}],[7,8,0,{"virt_text_hide":false,"ns_id":3,"right_gravity":true,"priority":4096,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"virt_text_win_col":-3}],[8,9,0,{"virt_text_hide":false,"ns_id":3,"right_gravity":true,"priority":4096,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"virt_text_win_col":-3}],[9,10,0,{"virt_text_hide":false,"ns_id":3,"right_gravity":true,"priority":4096,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"virt_text_win_col":-3}],[10,11,0,{"virt_text_hide":false,"ns_id":3,"right_gravity":true,"priority":4096,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"virt_text_win_col":-3}],[11,12,0,{"virt_text_hide":false,"ns_id":3,"right_gravity":true,"priority":4096,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"virt_text_win_col":-3}],[12,14,0,{"virt_text_hide":false,"ns_id":3,"right_gravity":true,"priority":10,"virt_text":[[" ","OpencodeMessageRoleAssistant"],[" "],["BUILD","OpencodeMessageRoleAssistant"],[" gpt-5-mini","OpencodeHint"],[" (2025-10-30 17:42:56)","OpencodeHint"],[" [msg_a36372b9a001M1lQEix4SK5QE5]","OpencodeHint"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":false,"virt_text_win_col":-3}]],"actions":[],"lines":["","----","","","what is this doing","","[lua/opencode/context.lua](lua/opencode/context.lua)","","Line 59:","`````lua","local is_enabled = vim.tbl_get(config, 'context', context_key, 'enabled')","`````","","----","","","**Explanation**","","- The line `local is_enabled = vim.tbl_get(config, 'context', context_key, 'enabled')` (in `lua/opencode/context.lua:58`) uses `vim.tbl_get` to safely read a nested field from a table.","- Concretely it attempts to read `config.context[context_key].enabled` but without throwing an error if `config.context` or `config.context[context_key]` is nil. If any intermediate key is missing it returns `nil`.","- In the surrounding function `M.is_context_enabled`, that value is the default config value for the given context key. The function then checks the state override:","  - If `state.current_context_config[context_key].enabled` is not `nil`, that state value (true/false) is returned.","  - Otherwise the `is_enabled` value (from `config`) is returned.","- Example: if `config.context.selection.enabled == true` but `state.current_context_config.selection.enabled == false`, the function returns `false` (state overrides config). If the state value is `nil`, the config value is used.","- Why this matters: `vim.tbl_get` provides safe nested access; using it avoids runtime errors when some parts of the nested config are absent.",""],"timestamp":1761846231}