fix: issues with backmerge

Author: sudo-tee

lua/opencode/api.lua

@@ -299,6 +299,13 @@ function M.mention()
   require('opencode.ui.completion').trigger_completion(char)()
 end
 
+function M.context_items()
+  local config = require('opencode.config')
+  local char = config.get_key_for_function('input_window', 'context_items')
+  ui.focus_input({ restore_position = true, start_insert = true })
+  require('opencode.ui.completion').trigger_completion(char)()
+end
+
 function M.slash_commands()
   local config = require('opencode.config')
   local char = config.get_key_for_function('input_window', 'slash_commands')

lua/opencode/config.lua

@@ -56,6 +56,7 @@ M.defaults = {
       ['~'] = { 'mention_file', mode = 'i' },
       ['@'] = { 'mention', mode = 'i' },
       ['/'] = { 'slash_commands', mode = 'i' },
+      ['#'] = { 'context_items', mode = 'i' },
       ['<tab>'] = { 'toggle_pane', mode = { 'n', 'i' } },
       ['<up>'] = { 'prev_prompt_history', mode = { 'n', 'i' } },
       ['<down>'] = { 'next_prompt_history', mode = { 'n', 'i' } },

lua/opencode/init.lua

@@ -13,6 +13,7 @@ function M.setup(opts)
   require('opencode.keymap').setup(config.keymap)
   require('opencode.ui.completion').setup()
   require('opencode.event_manager').setup()
+  require('opencode.ui.context_bar').setup()
 end
 
 return M

lua/opencode/types.lua

@@ -53,7 +53,8 @@
 ---@field share? SessionShareInfo
 
 ---@class OpencodeKeymapEntry
----@field [1] string # Function name
+---@field [1] string # Function nam
+
 ---@field mode? string|string[] # Mode(s) for the keymap
 ---@field desc? string # Keymap description
 
@@ -66,28 +67,6 @@
 ---@field accept_all string
 ---@field deny string
 
-<<<<<<< HEAD
-=======
----@class OpencodeKeymapWindow
----@field submit string
----@field submit_insert string
----@field close string
----@field stop string
----@field next_message string
----@field prev_message string
----@field mention_file string # mention files with a file picker
----@field mention string # mention subagents or files with a completion popup
----@field slash_commands string
----@field context_items string # select context items with a completion popup
----@field toggle_pane string
----@field prev_prompt_history string
----@field next_prompt_history string
----@field focus_input string
----@field debug_message string
----@field debug_output string
----@field switch_mode string
----@field select_child_session string
->>>>>>> 31b9b62 (wip: context bar)
 ---@class OpencodeKeymap
 ---@field editor OpencodeKeymapEditor
 ---@field input_window OpencodeKeymapInputWindow
@@ -140,13 +119,8 @@
 ---@class OpencodeContextConfig
 ---@field enabled boolean
 ---@field cursor_data { enabled: boolean }
-<<<<<<< HEAD
----@field diagnostics { info: boolean, warning: boolean, error: boolean }
----@field current_file { enabled: boolean, show_full_path: boolean }
-=======
 ---@field diagnostics { enabled:boolean, info: boolean, warning: boolean, error: boolean }
 ---@field current_file { enabled: boolean }
->>>>>>> 31b9b62 (wip: context bar)
 ---@field selection { enabled: boolean }
 ---@field subagents { enabled: boolean }
 

lua/opencode/ui/completion/context.lua

@@ -1,4 +1,4 @@
-local config = require('opencode.config').get()
+local config = require('opencode.config')
 local context = require('opencode.context')
 local state = require('opencode.state')
 local icons = require('opencode.ui.icons')
@@ -89,7 +89,8 @@ local context_source = {
   complete = function(completion_context)
     local input = completion_context.input or ''
 
-    if completion_context.trigger_char ~= '#' then
+    local expected_trigger = config.get_key_for_function('input_window', 'context_items')
+    if completion_context.trigger_char ~= expected_trigger then
       return {}
     end
 

lua/opencode/ui/completion/engines/blink_cmp.lua

@@ -12,13 +12,17 @@ function Source:get_trigger_characters()
   local config = require('opencode.config')
   local mention_key = config.get_key_for_function('input_window', 'mention')
   local slash_key = config.get_key_for_function('input_window', 'slash_commands')
+  local context_key = config.get_key_for_function('input_window', 'context_items')
   local triggers = {}
   if mention_key then
     table.insert(triggers, mention_key)
   end
   if slash_key then
     table.insert(triggers, slash_key)
   end
+  if context_key then
+    table.insert(triggers, context_key)
+  end
   return triggers
 end