Merge branch 'upstream/main' into feat/extended

Resolved merge conflicts:
- api_client.lua: accept upstream version (cleaner error handling)
- config.lua: accept upstream version (removed unused get() function)
- context.lua: accept upstream version (direct config import)
- core.lua: accept upstream version (corrected state field names)
- autocmds.lua: accept HEAD version (better performance with cached requires)
- renderer.lua: accept HEAD version (improved synthetic part handling)
- ui.lua: accept HEAD version (retain scroll_to_bottom and autocmd cleanup)
- Deleted output_renderer.lua and session_formatter.lua (no longer referenced)

Author: Danilo Verde Ribeiro

README.md

@@ -205,6 +205,9 @@ require('opencode').setup({
     session_picker = {
       delete_session = { '<C-d>' }, -- Delete selected session in the session picker
     },
+    session_picker = {
+      delete_session = { '<C-d>' }, -- Delete selected session in the session picker
+    },
   },
   ui = {
     position = 'right', -- 'right' (default) or 'left'. Position of the UI split
@@ -217,7 +220,7 @@ require('opencode').setup({
     window_highlight = 'Normal:OpencodeBackground,FloatBorder:OpencodeBorder', -- Highlight group for the opencode window
     icons = {
       preset = 'nerdfonts', -- 'emoji' | 'nerdfonts' | 'text'. Choose UI icon style (default: 'nerdfonts')
-      overrides = {},   -- Optional per-key overrides, see section below
+      overrides = {}, -- Optional per-key overrides, see section below
     },
     output = {
       tools = {

lua/opencode/api.lua

@@ -77,7 +77,7 @@ end
 ---@param opts? SendMessageOpts
 function M.run_new_session(prompt, opts)
   opts = vim.tbl_deep_extend('force', { new_session = true, focus = 'output' }, opts or {})
-  core.send_message(prompt, { new_session = true, focus = 'output' })
+  core.send_message(prompt, opts)
 end
 
 ---@param parent_id? string

lua/opencode/api_client.lua

@@ -51,12 +51,6 @@ function OpencodeApiClient:_call(endpoint, method, body, query)
   if not self:_ensure_base_url() then
     return nil
   end
-  if not self.base_url then
-    error("OpenCode server URL is not available. Ensure the server is running.")
-  end
-  if not self.base_url then
-    error("OpenCode server URL is not available. Ensure the server is running.")
-  end
   local url = self.base_url .. endpoint
 
   if query then
@@ -388,14 +382,6 @@ end
 --- @param on_event fun(event: table) Event callback
 --- @return Job The streaming job handle
 function OpencodeApiClient:subscribe_to_events(directory, on_event)
-  if not self.base_url then
-    local state = require('opencode.state')
-    self.base_url = state.opencode_server_job.url:gsub('/$', '')
-  end
-  if not self.base_url then
-    error("API client base_url is nil. Call OpencodeApiClient.new() after server startup.")
-    return nil
-  end
   self:_ensure_base_url()
   local url = self.base_url .. '/event'
   if directory then

lua/opencode/config.lua

@@ -1,36 +1,11 @@
---- @field get fun(key: "preferred_completion"): 'blink' | 'nvim-cmp' | 'vim_complete' | nil
---- @field get fun(key: "default_mode"): 'build' | 'plan'
---- @field get fun(key: "default_global_keymaps"): boolean
---- @field get fun(key: "keymap"): OpencodeKeymap
---- @field get fun(key: "ui"): OpencodeUIConfig
---- @field get fun(key: "providers"): OpencodeProviders
---- @field get fun(key: "context"): OpencodeContextConfig
---- @field get fun(key: "debug"): OpencodeDebugConfig
-
-local M = {} ---@type OpencodeConfigModule
-
---- @class OpencodeConfigModule
---- @field defaults OpencodeConfig
---- @field values OpencodeConfig
---- @field setup fun(opts?: OpencodeConfig): nil
---- @field get fun(key: nil): OpencodeConfig
---- @field get fun(key: "preferred_picker"): 'mini.pick' | 'telescope' | 'fzf' | 'snacks' | nil
---- @field get fun(key: "preferred_completion"): 'blink' | 'nvim-cmp' | 'vim_complete' | nil
---- @field get fun(key: "default_mode"): 'build' | 'plan' |
---- @field get fun(key: "default_global_keymaps"): boolean
---- @field get fun(key: "keymap"): OpencodeKeymap
---- @field get fun(key: "ui"): OpencodeUIConfig
---- @field get fun(key: "providers"): OpencodeProviders
---- @field get fun(key: "context"): OpencodeContextConfig
---- @field get fun(key: "debug"): OpencodeDebugConfig
-
-local M = {} ---@type OpencodeConfigModule
+-- Default and user-provided settings for opencode.nvim
 
+---@type OpencodeConfigModule
+---@diagnostic disable-next-line: missing-fields
+local M = {}
 -- Default configuration
 ---@type OpencodeConfig
 M.defaults = {
-  providers = {},
-  custom_commands = {},
   preferred_picker = nil,
   preferred_completion = nil,
   default_global_keymaps = true,
@@ -128,12 +103,11 @@ M.defaults = {
     },
     input = {
       text = {
-        wrap = true,
+        wrap = false,
       },
     },
     completion = {
       file_sources = {
-        cache_timeout = 300, -- seconds
         enabled = true,
         preferred_cli_tool = 'server',
         ignore_patterns = {
@@ -169,27 +143,12 @@ M.defaults = {
   },
   context = {
     enabled = true,
-    -- Idle threshold in milliseconds for automatic context updates
-    -- Context will be updated after this period of user inactivity
-    idle_threshold = 10000, -- 10 seconds
-    -- Cache TTL in milliseconds for expensive context operations
-    -- Set to 0 to disable caching
-    cache_ttl = {
-      git_info = 5000, -- 5 seconds
-      plugin_versions = 60000, -- 60 seconds
-      highlights = 2000, -- 2 seconds
-      lsp_symbols = 10000, -- 10 seconds
-    },
-    plugin_versions = {
-      enabled = false,
-      limit = 20,
-    },
     cursor_data = {
-      enabled = true,
+      enabled = false,
     },
     diagnostics = {
       info = false,
-      warning = false,
+      warning = true,
       error = true,
     },
     current_file = {
@@ -203,86 +162,6 @@ M.defaults = {
     selection = {
       enabled = true,
     },
-    jumplist = {
-      enabled = true,
-      limit = 5,
-    },
-    recent_buffers = {
-      enabled = true,
-      limit = 3,
-      symbols_only = true,
-    },
-    undo_history = {
-      enabled = true,
-      limit = 3,
-    },
-    windows_tabs = {
-      enabled = true,
-    },
-    highlights = {
-      enabled = true,
-    },
-    session_info = {
-      enabled = false,
-    },
-    registers = {
-      enabled = true,
-      include = { '"', '/', 'q', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '%', '#', '.' },
-    },
-    command_history = {
-      enabled = true,
-      limit = 3,
-    },
-    search_history = {
-      enabled = true,
-      limit = 3,
-    },
-    debug_data = {
-      enabled = true,
-    },
-    lsp_context = {
-      enabled = false,
-      diagnostics_limit = 10,
-      code_actions = false,
-    },
-    git_info = {
-      enabled = true,
-      diff_limit = 10,
-      changes_limit = 5,
-    },
-    fold_info = {
-      enabled = true,
-    },
-    cursor_surrounding = {
-      enabled = true,
-      lines_above = 4,
-      lines_below = 4,
-    },
-    quickfix_loclist = {
-      enabled = true,
-      limit = 5,
-    },
-    macros = {
-      enabled = false,
-      register = 'q',
-    },
-    terminal_buffers = {
-      enabled = true,
-    },
-    session_duration = {
-      enabled = false,
-    },
-    -- Remove duplicate configurations above - keeping only the final instances
-    -- All configurations below this point are unique and should be kept as-is
-    vectorcode_snippets = {
-      enabled = false,
-      n = 3,
-      query_strategy = 'auto', -- 'auto', 'selection', 'line', 'filename'
-      timeout = 5000, -- Timeout for async queries in milliseconds
-      batch_mode = false, -- Enable batch querying for multiple snippets
-      cache_results = true, -- Cache VectorCode results for performance
-      background_refresh = true, -- Refresh snippets in background
-    },
   },
   debug = {
     enabled = false,
@@ -408,11 +287,6 @@ function M.normalize_keymap(legacy_config, filter_functions)
   return converted
 end
 
----@return OpencodeConfig
-function M.get()
-  return M.values
-end
-
 ---@export Config
 return setmetatable(M, {
   __index = function(_, key)