feat: support arguments for commands after completion

Author: sudo-tee

lua/opencode/api.lua

@@ -380,10 +380,16 @@ function M.run_user_command(name, args)
   M.open_input()
 
   ui.render_output(true)
-  state.api_client:send_command(state.active_session.id, {
-    command = name,
-    arguments = table.concat(args or {}, ' '),
-  })
+  state.api_client
+    :send_command(state.active_session.id, {
+      command = name,
+      arguments = table.concat(args or {}, ' '),
+    })
+    :and_then(function()
+      vim.schedule(function()
+        require('opencode.history').write('/' .. name .. ' ' .. table.concat(args or {}, ' '))
+      end)
+    end)
 end
 
 --- Compacts the current session by removing unnecessary data.
@@ -986,10 +992,11 @@ function M.get_slash_commands()
 
   local user_commands = require('opencode.config_file').get_user_commands()
   if user_commands then
-    for name, _ in pairs(user_commands) do
+    for name, cfg in pairs(user_commands) do
       table.insert(commands, {
         slash_cmd = '/' .. name,
         desc = 'Run user command: ' .. name,
+        args = cfg.template and cfg.template:match('$ARGUMENTS') ~= nil,
         fn = function(args)
           M.run_user_command(name, args)
         end,

lua/opencode/types.lua

@@ -479,4 +479,5 @@
 ---@class OpencodeSlashCommand
 ---@field slash_cmd string The command trigger (e.g., "/help")
 ---@field desc string|nil Description of the command
----@field fn fun(...:string):nil Function to execute the command
+---@field fn fun(args:string[]):nil Function to execute the command
+---@field args boolean Whether the command accepts arguments

lua/opencode/ui/completion/commands.lua

@@ -11,6 +11,7 @@ local function get_available_commands()
       description = cmd_info.desc,
       documentation = 'Opencode command: ' .. cmd_info.slash_cmd,
       command_key = key,
+      args = cmd_info.args,
       fn = cmd_info.fn,
     })
   end
@@ -44,15 +45,16 @@ local command_source = {
 
       if context.input == '' or name_lower:find(input_lower, 1, true) or desc_lower:find(input_lower, 1, true) then
         local item = {
-          label = command.name,
+          label = command.name .. (command.args and ' *' or ''),
           kind = 'command',
           detail = command.description,
-          documentation = command.documentation,
+          documentation = command.documentation .. (command.args and '\n\n* This command takes arguments.' or ''),
           insert_text = command.name,
           source_name = 'commands',
           data = {
             name = command.name,
             fn = command.fn,
+            args = command.args,
           },
         }
 
@@ -68,6 +70,11 @@ local command_source = {
   on_complete = function(item)
     if item.kind == 'command' then
       if item.data.fn then
+        if item.data.args then
+          require('opencode.ui.input_window').set_content(item.insert_text .. ' ')
+          vim.api.nvim_win_set_cursor(0, { 1, #item.insert_text + 1 })
+          return
+        end
         item.data.fn()
         require('opencode.ui.input_window').set_content('')
       else

lua/opencode/ui/input_window.lua

@@ -58,9 +58,34 @@ function M.handle_submit()
     modeline = false,
   })
 
+  if input_content == '' then
+    return
+  end
+
+  if input_content:match('^/') then
+    M._execute_slash_command(input_content)
+    return
+  end
+
   require('opencode.core').send_message(input_content)
 end
 
+M._execute_slash_command = function(command)
+  local slash_commands = require('opencode.config_file').get_user_commands()
+  local cmd = command:sub(2):match('^%s*(.-)%s*$')
+  if cmd == '' then
+    return
+  end
+  local parts = vim.split(cmd, ' ')
+  local command_cfg = slash_commands[parts[1]]
+
+  if command_cfg then
+    require('opencode.api').run_user_command(parts[1], vim.list_slice(parts, 2))
+  else
+    vim.notify('Unknown command: ' .. cmd, vim.log.levels.WARN)
+  end
+end
+
 function M.setup(windows)
   vim.api.nvim_set_option_value('winhighlight', config.ui.window_highlight, { win = windows.input_win })
   vim.api.nvim_set_option_value('wrap', config.ui.input.text.wrap, { win = windows.input_win })