Skip to content

Commit 16636ee

Browse files
committed
refactor(permisson-window): behave like the question-window
- Refactor permission_window to use the same dialog as question-window
1 parent 2867629 commit 16636ee

13 files changed

+550
-371
lines changed

README.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,12 @@ require('opencode').setup({
142142
['<leader>orr'] = { 'diff_restore_snapshot_file' }, -- Restore a file to a restore point
143143
['<leader>orR'] = { 'diff_restore_snapshot_all' }, -- Restore all files to a restore point
144144
['<leader>ox'] = { 'swap_position' }, -- Swap Opencode pane left/right
145-
['<leader>opa'] = { 'permission_accept' }, -- Accept permission request once
146-
['<leader>opA'] = { 'permission_accept_all' }, -- Accept all (for current tool)
147-
['<leader>opd'] = { 'permission_deny' }, -- Deny permission request once
148145
['<leader>ott'] = { 'toggle_tool_output' }, -- Toggle tools output (diffs, cmd output, etc.)
149146
['<leader>otr'] = { 'toggle_reasoning_output' }, -- Toggle reasoning output (thinking steps)
150147
['<leader>o/'] = { 'quick_chat', mode = { 'n', 'x' } }, -- Open quick chat input with selection context in visual mode or current line context in normal mode
151148
},
152149
input_window = {
153-
['<cr>'] = { 'submit_input_prompt', mode = { 'n', 'i' } }, -- Submit prompt (normal mode and insert mode)
150+
['<S-cr>'] = { 'submit_input_prompt', mode = { 'n', 'i' } }, -- Submit prompt (normal mode and insert mode)
154151
['<esc>'] = { 'close' }, -- Close UI windows
155152
['<C-c>'] = { 'cancel' }, -- Cancel opencode request while it is running
156153
['~'] = { 'mention_file', mode = 'i' }, -- Pick a file and add to context. See File Mentions section
@@ -178,15 +175,10 @@ require('opencode').setup({
178175
['<leader>oO'] = { 'debug_output' }, -- Open raw output in new buffer for debugging
179176
['<leader>ods'] = { 'debug_session' }, -- Open raw session in new buffer for debugging
180177
},
181-
permission = {
182-
accept = 'a', -- Accept permission request once (only available when there is a pending permission request)
183-
accept_all = 'A', -- Accept all (for current tool) permission request once (only available when there is a pending permission request)
184-
deny = 'd', -- Deny permission request once (only available when there is a pending permission request)
185-
},
186178
session_picker = {
187179
rename_session = { '<C-r>' }, -- Rename selected session in the session picker
188180
delete_session = { '<C-d>' }, -- Delete selected session in the session picker
189-
new_session = { '<C-n>' }, -- Create and switch to a new session in the session picker
181+
new_session = { '<C-s>' }, -- Create and switch to a new session in the session picker
190182
},
191183
timeline_picker = {
192184
undo = { '<C-u>', mode = { 'i', 'n' } }, -- Undo to selected message in timeline picker

lua/opencode/config.lua

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ M.defaults = {
4141
['<leader>orr'] = { 'diff_restore_snapshot_file', desc = 'Restore file snapshot' },
4242
['<leader>orR'] = { 'diff_restore_snapshot_all', desc = 'Restore all snapshots' },
4343
['<leader>ox'] = { 'swap_position', desc = 'Swap window position' },
44-
['<leader>oPa'] = { 'permission_accept', desc = 'Accept permission' },
45-
['<leader>oPA'] = { 'permission_accept_all', desc = 'Accept all permissions' },
46-
['<leader>oPd'] = { 'permission_deny', desc = 'Deny permission' },
4744
['<leader>otr'] = { 'toggle_reasoning_output', desc = 'Toggle reasoning output' },
4845
['<leader>ott'] = { 'toggle_tool_output', desc = 'Toggle tool output' },
4946
['<leader>o/'] = { 'quick_chat', desc = 'Quick chat with current context', mode = { 'n', 'x' } },
@@ -85,11 +82,6 @@ M.defaults = {
8582
['<leader>oO'] = { 'debug_output' },
8683
['<leader>ods'] = { 'debug_session' },
8784
},
88-
permission = {
89-
accept = 'a',
90-
accept_all = 'A',
91-
deny = 'd',
92-
},
9385
session_picker = {
9486
rename_session = { '<C-r>' },
9587
delete_session = { '<C-d>' },

lua/opencode/types.lua

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,10 @@
7373
---@class OpencodeKeymapInputWindow : table<string, OpencodeKeymapEntry>
7474
---@class OpencodeKeymapOutputWindow : table<string, OpencodeKeymapEntry>
7575

76-
---@class OpencodeKeymapPermission
77-
---@field accept string
78-
---@field accept_all string
79-
---@field deny string
80-
8176
---@class OpencodeKeymap
8277
---@field editor OpencodeKeymapEditor
8378
---@field input_window OpencodeKeymapInputWindow
8479
---@field output_window OpencodeKeymapOutputWindow
85-
---@field permission OpencodeKeymapPermission
8680
---@field session_picker OpencodeSessionPickerKeymap
8781
---@field timeline_picker OpencodeTimelinePickerKeymap
8882
---@field history_picker OpencodeHistoryPickerKeymap

0 commit comments

Comments
 (0)