feat(permission_window): render description/command from part updates

Update permission window rendering to prefer message.part.updated description and command, wire renderer correlation for part-to-permission updates, and add regression coverage including replay expectations and collapsing-order handling.

Author: disrupted

lua/opencode/event_manager.lua

@@ -273,14 +273,27 @@ function EventManager:_on_drained_events(events)
     if event.type == 'message.part.updated' and event.properties.part then
       local part_id = event.properties.part.id
       if part_update_indices[part_id] then
-        -- vim.notify('collapsing: ' .. part_id .. ' text: ' .. vim.inspect(event.properties.part.text))
-        -- put this event in the earlier slot
-
-        -- move this newer part to the position of the original part
-        collapsed_events[part_update_indices[part_id]] = event
-
-        -- clear out this parts now unneeded position
-        collapsed_events[i] = nil
+        local previous_index = part_update_indices[part_id]
+
+        -- Preserve ordering dependencies for permission events.
+        -- Moving a later part update earlier can break correlation when
+        -- permission.updated/permission.asked sits between the two updates.
+        local has_intervening_permission_event = false
+        for j = previous_index + 1, i - 1 do
+          if events[j] and (events[j].type == 'permission.updated' or events[j].type == 'permission.asked') then
+            has_intervening_permission_event = true
+            break
+          end
+        end
+
+        if has_intervening_permission_event then
+          collapsed_events[previous_index] = nil
+          collapsed_events[i] = event
+          part_update_indices[part_id] = i
+        else
+          collapsed_events[previous_index] = event
+          collapsed_events[i] = nil
+        end
       else
         part_update_indices[part_id] = i
         collapsed_events[i] = event

lua/opencode/ui/permission_window.lua

@@ -3,7 +3,6 @@ local Dialog = require('opencode.ui.dialog')
 
 local M = {}
 
--- Simple state
 M._permission_queue = {}
 M._dialog = nil
 M._processing = false
@@ -15,17 +14,66 @@ function M.add_permission(permission)
     return
   end
 
-  -- Update if exists, otherwise add
+  if permission.tool then
+    permission._message_id = permission.tool.messageID
+    permission._call_id = permission.tool.callID
+  end
+
   for i, existing in ipairs(M._permission_queue) do
     if existing.id == permission.id then
       M._permission_queue[i] = permission
-      M._setup_dialog() -- Refresh dialog when permission is updated
+      M._setup_dialog()
       return
     end
   end
 
   table.insert(M._permission_queue, permission)
-  M._setup_dialog() -- Setup dialog when first permission is added
+  M._setup_dialog()
+end
+
+---Update permission from message part data
+---@param permission_id string
+---@param part table
+---@return boolean
+function M.update_permission_from_part(permission_id, part)
+  if not permission_id or not part then
+    return false
+  end
+
+  local permission = nil
+  for i, existing in ipairs(M._permission_queue) do
+    if existing.id == permission_id then
+      permission = existing
+      break
+    end
+  end
+
+  if not permission then
+    return false
+  end
+
+  if part.state and part.state.input then
+    local input = part.state.input
+    local updated = false
+
+    if input.description and input.description ~= '' then
+      permission._description = input.description
+      updated = true
+    end
+
+    if input.command and input.command ~= '' then
+      permission._command = input.command
+      updated = true
+    end
+
+    if updated and M._dialog then
+      M._setup_dialog()
+    end
+
+    return true
+  end
+
+  return false
 end
 
 ---Remove permission from queue
@@ -41,7 +89,7 @@ function M.remove_permission(permission_id)
   if #M._permission_queue == 0 then
     M._clear_dialog()
   else
-    M._setup_dialog() -- Setup dialog for next permission
+    M._setup_dialog()
   end
 end
 
@@ -71,12 +119,24 @@ function M.format_display(output)
     progress = string.format(' (%d/%d)', 1, #M._permission_queue)
   end
 
-  local title = permission.title
-    or table.concat(permission.patterns or {}, '`, `'):gsub('\r', '\\r'):gsub('\n', '\\n')
-    or 'Unknown Permission'
   local perm_type = permission.permission or permission.type or 'unknown'
 
-  local content = { (icons.get(perm_type) or '') .. ' *' .. (perm_type or '') .. '*' .. ' `' .. title .. '`' }
+  local display_text
+  if permission._description and permission._description ~= '' then
+    display_text = (icons.get(perm_type) or '') .. ' *' .. (perm_type or '') .. '* ' .. permission._description
+  elseif permission.title then
+    display_text = (icons.get(perm_type) or '') .. ' *' .. (perm_type or '') .. '* `' .. permission.title .. '`'
+  else
+    local patterns = table.concat(permission.patterns or {}, '`, `'):gsub('\r', '\\r'):gsub('\n', '\\n')
+    display_text = (icons.get(perm_type) or '') .. ' *' .. (perm_type or '') .. '* `' .. (patterns ~= '' and patterns or 'Unknown Permission') .. '`'
+  end
+
+  local content = { display_text }
+
+  if permission._command and permission._command ~= '' then
+    local escaped_command = permission._command:gsub('\r', '\\r'):gsub('\n', '\\n')
+    table.insert(content, '> `' .. escaped_command .. '`')
+  end
 
   local options = {
     { label = 'Allow once' },
@@ -88,6 +148,9 @@ function M.format_display(output)
   if perm_type == 'edit' and permission.metadata and permission.metadata.diff then
     render_content = function(out)
       out:add_line(content[1])
+      if content[2] then
+        out:add_line(content[2])
+      end
       out:add_line('')
 
       local file_type = permission.metadata.filepath and vim.fn.fnamemodify(permission.metadata.filepath, ':e') or ''
@@ -112,6 +175,11 @@ function M._setup_dialog()
     return
   end
 
+  local saved_selection = nil
+  if M._dialog then
+    saved_selection = M._dialog:get_selection()
+  end
+
   M._clear_dialog()
 
   if not state.windows or not state.windows.output_buf then
@@ -160,7 +228,7 @@ function M._setup_dialog()
   end
 
   local function get_option_count()
-    return #M._permission_queue > 0 and 3 or 0 -- accept, deny, accept_all
+    return #M._permission_queue > 0 and 3 or 0
   end
 
   M._dialog = Dialog.new({
@@ -171,11 +239,15 @@ function M._setup_dialog()
     check_focused = check_focused,
     namespace_prefix = 'opencode_permission',
     keymaps = {
-      dismiss = '', -- Disable dismiss keymap and legend
+      dismiss = '',
     },
   })
 
   M._dialog:setup()
+
+  if saved_selection then
+    M._dialog:set_selection(saved_selection)
+  end
 end
 
 function M._clear_dialog()

lua/opencode/ui/renderer.lua

@@ -727,6 +727,19 @@ function M.on_part_updated(properties, revert_index)
 
   local formatted = formatter.format_part(part, message, is_last_part)
 
+  if part.callID and state.pending_permissions then
+    for _, permission in ipairs(state.pending_permissions) do
+      local tool = permission.tool
+      local perm_callID = tool and tool.callID or permission.callID
+      local perm_messageID = tool and tool.messageID or permission.messageID
+
+      if perm_callID == part.callID and perm_messageID == part.messageID then
+        require('opencode.ui.permission_window').update_permission_from_part(permission.id, part)
+        break
+      end
+    end
+  end
+
   if revert_index and is_new_part then
     return
   end

tests/data/permission-prompt.expected.json

@@ -1 +1 @@
-{"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","","`````","","----","","","  Permission Required","","  *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`","","    1. Allow once ","    2. Reject","    3. Allow always","","Navigate: `j`/`k` or `↑`/`↓`  Select: `<CR>` or `1-3`","",""],"extmarks":[[1,1,0,{"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","ns_id":3,"right_gravity":true,"virt_text_hide":false,"priority":10,"virt_text_repeat_linebreak":false,"virt_text_win_col":-3}],[2,5,0,{"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col","ns_id":3,"right_gravity":true,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text_win_col":-1}],[3,6,0,{"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col","ns_id":3,"right_gravity":true,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text_win_col":-1}],[4,7,0,{"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col","ns_id":3,"right_gravity":true,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text_win_col":-1}],[5,8,0,{"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col","ns_id":3,"right_gravity":true,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text_win_col":-1}],[6,9,0,{"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col","ns_id":3,"right_gravity":true,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text_win_col":-1}],[7,10,0,{"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col","ns_id":3,"right_gravity":true,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text_win_col":-1}],[8,13,0,{"virt_text":[[" ","OpencodeMessageRoleSystem"],[" "],["SYSTEM","OpencodeMessageRoleSystem"],["","OpencodeHint"],["","OpencodeHint"],[" [permission-display-message]","OpencodeHint"]],"virt_text_pos":"win_col","ns_id":3,"right_gravity":true,"virt_text_hide":false,"priority":10,"virt_text_repeat_linebreak":false,"virt_text_win_col":-3}],[9,15,0,{"priority":4096,"line_hl_group":"OpencodePermissionTitle","ns_id":3,"right_gravity":true}],[10,15,0,{"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_pos":"win_col","ns_id":3,"right_gravity":true,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text_win_col":-2}],[11,16,0,{"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_pos":"win_col","ns_id":3,"right_gravity":true,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text_win_col":-2}],[12,17,0,{"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_pos":"win_col","ns_id":3,"right_gravity":true,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text_win_col":-2}],[13,18,0,{"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_pos":"win_col","ns_id":3,"right_gravity":true,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text_win_col":-2}],[14,19,0,{"priority":4096,"line_hl_group":"OpencodeDialogOptionHover","ns_id":3,"right_gravity":true}],[15,19,0,{"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_pos":"win_col","ns_id":3,"right_gravity":true,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text_win_col":-2}],[16,19,2,{"virt_text":[["› ","OpencodeDialogOptionHover"]],"virt_text_pos":"overlay","ns_id":3,"right_gravity":true,"virt_text_hide":false,"virt_text_repeat_linebreak":false,"priority":4096}],[17,20,0,{"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_pos":"win_col","ns_id":3,"right_gravity":true,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text_win_col":-2}],[18,21,0,{"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_pos":"win_col","ns_id":3,"right_gravity":true,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text_win_col":-2}],[19,22,0,{"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_pos":"win_col","ns_id":3,"right_gravity":true,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text_win_col":-2}],[20,23,0,{"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_pos":"win_col","ns_id":3,"right_gravity":true,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text_win_col":-2}]],"timestamp":1769449859,"actions":[]}
+{"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","","`````","","----","","","  Permission Required","","  *bash* Find extmark namespace usage","> `rg \"nvim_buf_get_extmarks|ns_id\" /Users/cam/Dev/neovim-dev/opencode.nvim/lua/opencode/ui/output_window.lua -B 2 -A 2`","","    1. Allow once ","    2. Reject","    3. Allow always","","Navigate: `j`/`k` or `↑`/`↓`  Select: `<CR>` or `1-3`","",""],"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_repeat_linebreak":false,"ns_id":3,"virt_text_win_col":-3,"priority":10,"virt_text_pos":"win_col","right_gravity":true}],[2,5,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-1,"priority":4096,"virt_text_pos":"win_col","right_gravity":true}],[3,6,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-1,"priority":4096,"virt_text_pos":"win_col","right_gravity":true}],[4,7,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-1,"priority":4096,"virt_text_pos":"win_col","right_gravity":true}],[5,8,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-1,"priority":4096,"virt_text_pos":"win_col","right_gravity":true}],[6,9,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-1,"priority":4096,"virt_text_pos":"win_col","right_gravity":true}],[7,10,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-1,"priority":4096,"virt_text_pos":"win_col","right_gravity":true}],[8,13,0,{"virt_text_hide":false,"virt_text":[[" ","OpencodeMessageRoleSystem"],[" "],["SYSTEM","OpencodeMessageRoleSystem"],["","OpencodeHint"],["","OpencodeHint"],[" [permission-display-message]","OpencodeHint"]],"virt_text_repeat_linebreak":false,"ns_id":3,"virt_text_win_col":-3,"priority":10,"virt_text_pos":"win_col","right_gravity":true}],[9,15,0,{"ns_id":3,"priority":4096,"right_gravity":true,"line_hl_group":"OpencodePermissionTitle"}],[10,15,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-2,"priority":4096,"virt_text_pos":"win_col","right_gravity":true}],[11,16,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-2,"priority":4096,"virt_text_pos":"win_col","right_gravity":true}],[12,17,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-2,"priority":4096,"virt_text_pos":"win_col","right_gravity":true}],[13,18,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-2,"priority":4096,"virt_text_pos":"win_col","right_gravity":true}],[14,19,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-2,"priority":4096,"virt_text_pos":"win_col","right_gravity":true}],[15,20,0,{"ns_id":3,"priority":4096,"right_gravity":true,"line_hl_group":"OpencodeDialogOptionHover"}],[16,20,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-2,"priority":4096,"virt_text_pos":"win_col","right_gravity":true}],[17,20,2,{"virt_text_hide":false,"virt_text":[["› ","OpencodeDialogOptionHover"]],"virt_text_repeat_linebreak":false,"ns_id":3,"priority":4096,"virt_text_pos":"overlay","right_gravity":true}],[18,21,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-2,"priority":4096,"virt_text_pos":"win_col","right_gravity":true}],[19,22,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-2,"priority":4096,"virt_text_pos":"win_col","right_gravity":true}],[20,23,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-2,"priority":4096,"virt_text_pos":"win_col","right_gravity":true}],[21,24,0,{"virt_text_hide":false,"virt_text":[["▌","OpencodePermissionBorder"]],"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-2,"priority":4096,"virt_text_pos":"win_col","right_gravity":true}]],"actions":[]}