feat: better permission actions

Author: sudo-tee

lua/opencode/api.lua

@@ -927,12 +927,11 @@ end
 
 ---@param answer? 'once'|'always'|'reject'
 ---@param permission? OpencodePermission
-function M.respond_to_permission(answer, permission_id)
+function M.respond_to_permission(answer, permission)
   answer = answer or 'once'
 
-  -- Try to get current permission from permission window first, fallback to state
   local permission_window = require('opencode.ui.permission_window')
-  local current_permission = permission_window.get_current_permission()
+  local current_permission = permission or permission_window.get_current_permission()
 
   if not current_permission then
     vim.notify('No permission request to accept', vim.log.levels.WARN)
@@ -1270,12 +1269,24 @@ M.commands = {
     completions = { 'accept', 'accept_all', 'deny' },
     fn = function(args)
       local subcmd = args[1]
+      local index = tonumber(args[2])
+      local permission = nil
+      if index then
+        local permission_window = require('opencode.ui.permission_window')
+        local permissions = permission_window.get_all_permissions()
+        if not permissions or not permissions[index] then
+          vim.notify('Invalid permission index: ' .. tostring(index), vim.log.levels.ERROR)
+          return
+        end
+        permission = permissions[index]
+      end
+
       if subcmd == 'accept' then
-        M.permission_accept()
+        M.permission_accept(permission)
       elseif subcmd == 'accept_all' then
-        M.permission_accept_all()
+        M.permission_accept_all(permission)
       elseif subcmd == 'deny' then
-        M.permission_deny()
+        M.permission_deny(permission)
       else
         local valid_subcmds = table.concat(M.commands.permission.completions or {}, ', ')
         vim.notify('Invalid permission subcommand. Use: ' .. valid_subcmds, vim.log.levels.ERROR)

lua/opencode/ui/permission_window.lua

@@ -161,37 +161,26 @@ function M.clear_keymaps()
 
   local action_order = { 'accept', 'deny', 'accept_all' }
 
+  local function safe_del(keymap, opts)
+    pcall(vim.keymap.del, 'n', keymap, opts)
+  end
+
   for i, permission in ipairs(M._permission_queue) do
     for _, action in ipairs(action_order) do
-      -- Clear OpenCode-focused keys (buffer-specific)
       local opencode_key = opencode_keys[action]
       if opencode_key then
-        local function safe_del(keymap, opts)
-          pcall(vim.keymap.del, 'n', keymap, opts)
-        end
-
         for _, buf in ipairs(buffers) do
           if buf then
-            if #M._permission_queue > 1 then
-              safe_del(opencode_key .. tostring(i), { buffer = buf })
-            else
-              safe_del(opencode_key, { buffer = buf })
-            end
+            safe_del(opencode_key .. tostring(i), { buffer = buf })
+            safe_del(opencode_key, { buffer = buf })
           end
         end
       end
 
       local editor_key = editor_keys[action]
       if editor_key then
-        local function safe_del_global(keymap)
-          pcall(vim.keymap.del, 'n', keymap)
-        end
-
-        if #M._permission_queue > 1 then
-          safe_del_global(editor_key .. tostring(i))
-        else
-          safe_del_global(editor_key)
-        end
+        safe_del(editor_key .. tostring(i))
+        safe_del(editor_key)
       end
     end
   end
@@ -200,6 +189,7 @@ end
 ---Setup keymaps for all permission actions
 function M.setup_keymaps()
   M.clear_keymaps()
+
   if #M._permission_queue == 0 then
     return
   end
@@ -227,7 +217,7 @@ function M.setup_keymaps()
       if api_func then
         local function execute_action()
           M._selected_index = i
-          api_func()
+          api_func(permission)
           M.remove_permission(permission.id)
         end
 

tests/data/permission-denied.expected.json

@@ -1 +1 @@
-{"actions":[],"extmarks":[[1,1,0,{"virt_text_pos":"win_col","virt_text_repeat_linebreak":false,"priority":10,"virt_text":[[" ","OpencodeMessageRoleAssistant"],[" "],["PLAN","OpencodeMessageRoleAssistant"],[" claude-sonnet-4.5","OpencodeHint"],[" (2025-10-16 04:27:36)","OpencodeHint"],[" [msg_9eb45fbe60020xE560OGH3Vdoo]","OpencodeHint"]],"right_gravity":true,"ns_id":3,"virt_text_win_col":-3,"virt_text_hide":false}],[2,5,0,{"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"priority":4096,"virt_text":[["▌","OpencodeToolBorder"]],"right_gravity":true,"ns_id":3,"virt_text_win_col":-1,"virt_text_hide":false}],[3,6,0,{"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"priority":4096,"virt_text":[["▌","OpencodeToolBorder"]],"right_gravity":true,"ns_id":3,"virt_text_win_col":-1,"virt_text_hide":false}],[4,7,0,{"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"priority":4096,"virt_text":[["▌","OpencodeToolBorder"]],"right_gravity":true,"ns_id":3,"virt_text_win_col":-1,"virt_text_hide":false}],[5,8,0,{"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"priority":4096,"virt_text":[["▌","OpencodeToolBorder"]],"right_gravity":true,"ns_id":3,"virt_text_win_col":-1,"virt_text_hide":false}],[6,9,0,{"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"priority":4096,"virt_text":[["▌","OpencodeToolBorder"]],"right_gravity":true,"ns_id":3,"virt_text_win_col":-1,"virt_text_hide":false}],[7,10,0,{"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"priority":4096,"virt_text":[["▌","OpencodeToolBorder"]],"right_gravity":true,"ns_id":3,"virt_text_win_col":-1,"virt_text_hide":false}],[8,11,0,{"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"priority":4096,"virt_text":[["▌","OpencodeToolBorder"]],"right_gravity":true,"ns_id":3,"virt_text_win_col":-1,"virt_text_hide":false}],[9,12,0,{"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"priority":4096,"virt_text":[["▌","OpencodeToolBorder"]],"right_gravity":true,"ns_id":3,"virt_text_win_col":-1,"virt_text_hide":false}],[10,13,0,{"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"priority":4096,"virt_text":[["▌","OpencodeToolBorder"]],"right_gravity":true,"ns_id":3,"virt_text_win_col":-1,"virt_text_hide":false}],[11,14,0,{"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"priority":4096,"virt_text":[["▌","OpencodeToolBorder"]],"right_gravity":true,"ns_id":3,"virt_text_win_col":-1,"virt_text_hide":false}],[12,15,0,{"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"priority":4096,"virt_text":[["▌","OpencodeToolBorder"]],"right_gravity":true,"ns_id":3,"virt_text_win_col":-1,"virt_text_hide":false}]],"timestamp":1766432126,"lines":["----","","","Perfect! Now I understand how it works. The message headers have extmarks with `virt_text` where the first element contains the icon (either `header_user` or `header_assistant`). Let me check the output_window module to understand the extmark namespace:","","**  run** `Find extmark namespace usage`","","`````bash","> rg \"nvim_buf_get_extmarks|ns_id\" /Users/cam/Dev/neovim-dev/opencode.nvim/lua/opencode/ui/output_window.lua -B 2 -A 2","","`````","","> [!WARNING] Permission required to run this tool.",">","> Accept `a`    Always `A`    Deny `d`","",""]}
+{"actions":[],"extmarks":[[1,1,0,{"virt_text_hide":false,"virt_text":[[" ","OpencodeMessageRoleAssistant"],[" "],["PLAN","OpencodeMessageRoleAssistant"],[" claude-sonnet-4.5","OpencodeHint"],[" (2025-10-16 04:27:36)","OpencodeHint"],[" [msg_9eb45fbe60020xE560OGH3Vdoo]","OpencodeHint"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":false,"priority":10,"virt_text_win_col":-3,"ns_id":3,"right_gravity":true}],[2,5,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"priority":4096,"virt_text_win_col":-1,"ns_id":3,"right_gravity":true}],[3,6,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"priority":4096,"virt_text_win_col":-1,"ns_id":3,"right_gravity":true}],[4,7,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"priority":4096,"virt_text_win_col":-1,"ns_id":3,"right_gravity":true}],[5,8,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"priority":4096,"virt_text_win_col":-1,"ns_id":3,"right_gravity":true}],[6,9,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"priority":4096,"virt_text_win_col":-1,"ns_id":3,"right_gravity":true}],[7,10,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":true,"priority":4096,"virt_text_win_col":-1,"ns_id":3,"right_gravity":true}],[8,13,0,{"virt_text_hide":false,"virt_text":[[" ","OpencodeMessageRoleSystem"],[" "],["SYSTEM","OpencodeMessageRoleSystem"],["","OpencodeHint"],["","OpencodeHint"],[" [permission-display-message]","OpencodeHint"]],"virt_text_pos":"win_col","virt_text_repeat_linebreak":false,"priority":10,"virt_text_win_col":-3,"ns_id":3,"right_gravity":true}]],"timestamp":1767982258,"lines":["----","","","Perfect! Now I understand how it works. The message headers have extmarks with `virt_text` where the first element contains the icon (either `header_user` or `header_assistant`). Let me check the output_window module to understand the extmark namespace:","","**  run** `Find extmark namespace usage`","","`````bash","> rg \"nvim_buf_get_extmarks|ns_id\" /Users/cam/Dev/neovim-dev/opencode.nvim/lua/opencode/ui/output_window.lua -B 2 -A 2","","`````","","----","","","> [!WARNING] Permission Required",">",">  `rg \"nvim_buf_get_extmarks|ns_id\" /Users/cam/Dev/neovim-dev/opencode.nvim/lua/opencode/ui/output_window.lua -B 2 -A 2`",">","> Accept `a`   Deny `d`   Always `A`","",""]}

tests/data/permission-denied.json

@@ -58,15 +58,7 @@ describe('opencode.keymap', function()
     package.loaded['opencode.state'] = mock_state
 
     -- Mock the config module
-    local mock_config = {
-      keymap = {
-        permission = {
-          accept = 'a',
-          accept_all = 'A',
-          deny = 'd',
-        },
-      },
-    }
+    local mock_config = {}
     package.loaded['opencode.config'] = mock_config
 
     -- Now require the keymap module