feat(context-bar): move prompt-guard icon to the context bar

Author: sudo-tee

lua/opencode/ui/context_bar.lua

@@ -3,6 +3,7 @@ local M = {}
 local context = require('opencode.context')
 local icons = require('opencode.ui.icons')
 local state = require('opencode.state')
+local prompt_guard_indicator = require('opencode.ui.prompt_guard_indicator')
 
 local function get_current_file_info(ctx)
   local current_file = ctx.current_file
@@ -139,7 +140,9 @@ local function format_winbar_text(segments)
     end
   end
 
-  return right_align .. table.concat(parts, '')
+  local show_guard_indicator = prompt_guard_indicator.is_denied()
+  local left = show_guard_indicator and prompt_guard_indicator.get_formatted() or ''
+  return left .. right_align .. table.concat(parts, '')
 end
 
 local function update_winbar_highlights(win_id)

lua/opencode/ui/icons.lua

@@ -28,7 +28,7 @@ local presets = {
     -- statuses
     status_on = ' ',
     status_off = ' ',
-    guard_on = '',
+    guard_on = ' ',
     -- borders and misc
     border = '▌',
     -- context bar

lua/opencode/ui/topbar.lua

@@ -4,7 +4,6 @@ local M = {}
 
 local state = require('opencode.state')
 local config_file = require('opencode.config_file')
-local prompt_guard_indicator = require('opencode.ui.prompt_guard_indicator')
 
 local LABELS = {
   NEW_SESSION_TITLE = 'New session',
@@ -43,14 +42,10 @@ local function get_mode_highlight()
   end
 end
 
-local function create_winbar_text(description, model_info, mode_info, show_guard_indicator, win_width)
+local function create_winbar_text(description, model_info, mode_info, win_width)
   local left_content = ''
   local right_content = ''
 
-  if show_guard_indicator then
-    left_content = left_content .. prompt_guard_indicator.get_formatted() .. ' '
-  end
-
   right_content = model_info .. ' ' .. get_mode_highlight() .. mode_info .. '%*'
 
   local desc_width = win_width - util.strdisplaywidth(left_content) - util.strdisplaywidth(right_content)
@@ -110,14 +105,8 @@ function M.render()
     -- topbar needs to at least have a value to make sure footer is positioned correctly
     vim.wo[win].winbar = ' '
 
-    local show_guard_indicator = prompt_guard_indicator.is_denied()
-    vim.wo[win].winbar = create_winbar_text(
-      get_session_desc(),
-      format_model_info(),
-      format_mode_info(),
-      show_guard_indicator,
-      vim.api.nvim_win_get_width(win)
-    )
+    vim.wo[win].winbar =
+      create_winbar_text(get_session_desc(), format_model_info(), format_mode_info(), vim.api.nvim_win_get_width(win))
 
     update_winbar_highlights(win)
   end)