heathrow 0.7.8 → 0.8.0

data/lib/heathrow/ui/application.rb

@@ -736,6 +736,8 @@ module Heathrow
         jump_to_date
       when 'x'
         open_message_external
+      when 'X'
+        open_in_brrowser
       when 'HOME'
         go_first
       when 'END'
@@ -1035,10 +1037,10 @@ module Heathrow
       idx = 0
 
       render_pick = -> {
-        lines = [title.b.fg(226), ""]
+        lines = [title.bd.fg(226), ""]
         names.each_with_index do |name, i|
           if i == idx
-            lines << "→ #{name}".b.fg(226)
+            lines << "→ #{name}".bd.fg(226)
           else
             lines << "  #{name}".fg(252)
           end
@@ -1390,7 +1392,7 @@ module Heathrow
       
       # Build colored components
       title_part = " Heathrow - ".fg(248)
-      view_part = view_name.b.fg(255)
+      view_part = view_name.bd.fg(255)
 
       # Add sort order info (only for message views, not Sources)
       sort_part = ""
@@ -1501,9 +1503,9 @@ module Heathrow
       end
 
       @panes[:left].text = new_text
-      @panes[:left].refresh
+      @panes[:left].full_refresh
     end
-    
+
     def format_message_line(msg, selected)
       # Extract message details
       timestamp = (parse_timestamp(msg['timestamp']) || "").ljust(6)
@@ -1595,7 +1597,7 @@ module Heathrow
 
       if selected
         content = "#{name} #{poll_col} #{count_col}"
-        health + " " + content.b.u.fg(src_color) + padding
+        health + " " + content.bd.ul.fg(src_color) + padding
       elsif msg['enabled'].to_i == 0
         health + " " + line.fg(240)
       else
@@ -1742,7 +1744,7 @@ module Heathrow
       
       # Show edit options in right pane
       options = []
-      options << "EDIT SOURCE: #{source['name']}".b.fg(226)
+      options << "EDIT SOURCE: #{source['name']}".bd.fg(226)
       options << "=" * 40
       options << ""
       options << "What would you like to edit?"
@@ -1945,6 +1947,9 @@ module Heathrow
         return
       end
 
+      # Auto-mark as read when content is rendered in the right pane
+      mark_current_message_as_read
+
       msg = current_msg
 
       # Lazily load full content if this was a light query result
@@ -1969,7 +1974,7 @@ module Heathrow
       
       # Special handling for RSS/HN messages
       if msg['source_type'] == 'rss' || msg['source_type'] == 'hacker_news'
-        header << "📰 #{msg['subject']}".b.fg(226) if msg['subject']
+        header << "📰 #{msg['subject']}".bd.fg(226) if msg['subject']
         
         # Extract metadata from raw_data if available
         if msg['raw_data']
@@ -2015,9 +2020,9 @@ module Heathrow
         # For weechat, show channel name from metadata instead of content preview
         meta = msg['metadata']
         if meta.is_a?(Hash) && meta['channel_name']
-          header << "Subject: #{meta['channel_name']}".b.fg(1)
+          header << "Subject: #{meta['channel_name']}".bd.fg(1)
         elsif msg['subject']
-          header << "Subject: #{msg['subject']}".b.fg(1)
+          header << "Subject: #{msg['subject']}".bd.fg(1)
         end
       end
       
@@ -2063,7 +2068,7 @@ module Heathrow
       # For RSS/HN, add extra formatting and info
       if msg['source_type'] == 'rss' || msg['source_type'] == 'hacker_news'
         content_parts = []
-        content_parts << "📄 Article Summary:".b.fg(226)
+        content_parts << "📄 Article Summary:".bd.fg(226)
         content_parts << ""
         
         # Word wrap the content for better readability
@@ -2102,7 +2107,7 @@ module Heathrow
         # Add helpful instructions
         content_parts << ""
         content_parts << "─" * 40
-        content_parts << "💡 Keyboard Shortcuts:".b.fg(156)
+        content_parts << "💡 Keyboard Shortcuts:".bd.fg(156)
         content_parts << ""
         content_parts << "  x     - Open full article in browser".fg(250)
         content_parts << "  SPACE - Toggle read/unread status".fg(250)
@@ -2172,7 +2177,7 @@ module Heathrow
 
       # Title
       title = header_msg['subject'] || header_msg['channel_name'] || 'Group'
-      lines << title.b.fg(226)
+      lines << title.bd.fg(226)
       lines << ""
 
       # Message count
@@ -2253,8 +2258,14 @@ module Heathrow
     end
     
     def render_bottom_bar
-      # Check if there's an active feedback message
-      if @feedback_expires_at && Time.now < @feedback_expires_at
+      # Check if there's an active feedback message (timed or sticky)
+      if @feedback_sticky && @feedback_message
+        if @panes[:bottom]
+          @panes[:bottom].text = " #{@feedback_message}".fg(@feedback_color || 156)
+          @panes[:bottom].refresh
+        end
+        return
+      elsif @feedback_expires_at && Time.now < @feedback_expires_at
         if @panes[:bottom]
           @panes[:bottom].text = " #{@feedback_message}".fg(@feedback_color || 156)
           @panes[:bottom].refresh
@@ -3173,6 +3184,47 @@ module Heathrow
       end
     end
     
+    def open_in_brrowser
+      unless system("which brrowser > /dev/null 2>&1")
+        set_feedback("brrowser not installed. See https://github.com/isene/brrowser", 196, 4)
+        return
+      end
+
+      msg = current_message
+      return unless msg
+      return if header_message?(msg)
+      msg = ensure_full_message(msg)
+
+      # Build URL from message (same logic as open_message_external)
+      url = nil
+      if message_has_html?(msg)
+        html = msg['html_content']
+        html = msg['content'] if !html || html.to_s.strip.empty?
+        tmpfile = "/tmp/heathrow-view-#{msg['id']}.html"
+        File.write(tmpfile, html)
+        url = "file://#{tmpfile}"
+      else
+        meta = msg['metadata']
+        if meta
+          parsed = meta.is_a?(Hash) ? meta : (JSON.parse(meta) rescue {})
+          url = parsed['link'] || parsed['url']
+        end
+        url ||= msg['url'] || msg['link'] || msg['permalink']
+        url ||= msg['external_id'] if msg['external_id']&.start_with?('http')
+      end
+
+      unless url
+        set_feedback("No URL or HTML content to open", 226, 3)
+        return
+      end
+
+      Rcurses.clear_screen
+      system("brrowser '#{url}'")
+      setup_display
+      create_panes
+      render_all
+    end
+
     def view_attachments
       msg = current_message
       return unless msg
@@ -3250,14 +3302,14 @@ module Heathrow
     end
 
     def render_attachment_list(attachments, idx, tagged)
-      lines = ["Attachments:".b.fg(226), ""]
+      lines = ["Attachments:".bd.fg(226), ""]
       attachments.each_with_index do |att, i|
         name = att['name'] || att['filename'] || 'unnamed'
         size = att['size'] ? " (#{human_size(att['size'])})" : ''
         ctype = att['content_type']&.split(';')&.first || ''
         tag = tagged.include?(i) ? "* ".fg(226) : "  "
         if i == idx
-          lines << "→ ".fg(226) + tag + "#{name}#{size}  #{ctype}".b.fg(255)
+          lines << "→ ".fg(226) + tag + "#{name}#{size}  #{ctype}".bd.fg(255)
         else
           lines << "  " + tag + "#{name}#{size}  #{ctype}".fg(250)
         end
@@ -3378,7 +3430,8 @@ module Heathrow
         success = @db.mark_as_read(msg['id'])
         if success
           msg['is_read'] = 1
-          
+          sync_maildir_flag(msg, 'S', true)
+
           # Re-sort if sorting by unread
           if @sort_order == 'unread'
             sort_messages
@@ -3829,7 +3882,7 @@ module Heathrow
         star = @browser_favorites.include?(folder[:full_name]) ? "* ".fg(226) : "  "
 
         if i == @folder_browser_index
-          line = "→ ".fg(226) + indent + arrow.fg(226) + star + folder[:name].b.u.fg(255)
+          line = "→ ".fg(226) + indent + arrow.fg(226) + star + folder[:name].bd.ul.fg(255)
         else
           line = "  " + indent + arrow.fg(245) + star + folder[:name].fg(245)
         end
@@ -3861,7 +3914,7 @@ module Heathrow
         @folder_count_cache ||= {}
         counts = @folder_count_cache[folder[:full_name]] ||= folder_message_count(folder[:full_name])
         info = []
-        info << "FOLDER: #{folder[:full_name]}".b.fg(226)
+        info << "FOLDER: #{folder[:full_name]}".bd.fg(226)
         info << ""
         info << "Messages: #{counts[:total]}".fg(39)
         info << "Unread: #{counts[:unread]}".fg(counts[:unread] > 0 ? 208 : 245)
@@ -3876,7 +3929,7 @@ module Heathrow
       # Update top bar (preserve Favorites title if in favorites mode)
       browser_title = @in_favorites_browser ? "Favorites" : "Folder Browser"
       browser_color = @in_favorites_browser ? 226 : 201
-      @panes[:top].text = " Heathrow - ".b.fg(255) + browser_title.b.fg(browser_color) + " [#{@folder_display.size} folders]".fg(246)
+      @panes[:top].text = " Heathrow - ".bd.fg(255) + browser_title.bd.fg(browser_color) + " [#{@folder_display.size} folders]".fg(246)
       @panes[:top].refresh
 
       # Update bottom bar
@@ -3893,7 +3946,7 @@ module Heathrow
         arrow = folder[:has_children] ? (folder[:collapsed] ? "▸ " : "▾ ") : "  "
         star = @browser_favorites.include?(folder[:full_name]) ? "* ".fg(226) : "  "
         if i == @folder_browser_index
-          line = "→ ".fg(226) + indent + arrow.fg(226) + star + folder[:name].b.u.fg(255)
+          line = "→ ".fg(226) + indent + arrow.fg(226) + star + folder[:name].bd.ul.fg(255)
         else
           line = "  " + indent + arrow.fg(245) + star + folder[:name].fg(245)
         end
@@ -4082,7 +4135,7 @@ module Heathrow
       end
 
       render_folder_browser
-      @panes[:top].text = " Heathrow - ".b.fg(255) + "Favorites".b.fg(226) + " [#{favorites.size} folders]".fg(246)
+      @panes[:top].text = " Heathrow - ".bd.fg(255) + "Favorites".bd.fg(226) + " [#{favorites.size} folders]".fg(246)
       @panes[:top].refresh
       @panes[:bottom].text = " j/k:Navigate | Enter:Open | C-Up/C-Down:Reorder | B:All folders | +:Remove fav | ESC:Back".fg(245)
       @panes[:bottom].refresh
@@ -4121,7 +4174,7 @@ module Heathrow
               @folder_browser_index = 0 if @folder_browser_index < 0
               set_feedback("Removed #{folder[:full_name]} from favorites", 226, 2)
               render_folder_browser
-              @panes[:top].text = " Heathrow - ".b.fg(255) + "Favorites".b.fg(226) + " [#{@folder_display.size} folders]".fg(246)
+              @panes[:top].text = " Heathrow - ".bd.fg(255) + "Favorites".bd.fg(226) + " [#{@folder_display.size} folders]".fg(246)
               @panes[:top].refresh
             end
           end
@@ -4181,7 +4234,7 @@ module Heathrow
       shortcuts = get_folder_shortcuts
       # Show shortcuts in right pane
       info = []
-      info << "FOLDER SHORTCUTS".b.fg(226)
+      info << "FOLDER SHORTCUTS".bd.fg(226)
       info << "Press a key to jump to folder:".fg(245)
       info << ""
       shortcuts.sort_by { |k, _| k }.each do |key, folder|
@@ -4297,13 +4350,19 @@ module Heathrow
       return if msgs.empty?
 
       count = 0
+      failed = 0
+      filed_ids = Set.new
       msgs.each do |msg|
-        file_single_message(msg, dest)
-        count += 1
+        begin
+          file_single_message(msg, dest)
+          filed_ids << msg['id'] if msg['id']
+          count += 1
+        rescue => e
+          failed += 1
+        end
       end
 
       # Remove filed messages from current view (by id, works in both flat and threaded mode)
-      filed_ids = msgs.map { |m| m['id'] }.compact.to_set
       @filtered_messages.reject! { |m| m['id'] && filed_ids.include?(m['id']) }
       if @show_threaded
         @display_messages&.reject! { |m| m['id'] && filed_ids.include?(m['id']) }
@@ -4314,7 +4373,9 @@ module Heathrow
       @index = [@index, (@filtered_messages.size - 1)].min
       @index = 0 if @index < 0 || @filtered_messages.empty?
 
-      set_feedback("Moved #{count} message#{count > 1 ? 's' : ''} to #{dest}", 156, 2)
+      msg_text = "Moved #{count} message#{count > 1 ? 's' : ''} to #{dest}"
+      msg_text += " (#{failed} failed)" if failed > 0
+      set_feedback(msg_text, failed > 0 ? 208 : 156, 2)
       render_all
     end
 
@@ -4457,7 +4518,7 @@ module Heathrow
         indent = "  " * folder[:depth]
         arrow = folder[:has_children] ? (folder[:collapsed] ? "▸ " : "▾ ") : "  "
         if i == idx
-          "→ ".fg(226) + indent + arrow.fg(226) + folder[:name].b.u.fg(255)
+          "→ ".fg(226) + indent + arrow.fg(226) + folder[:name].bd.ul.fg(255)
         else
           "  " + indent + arrow.fg(245) + folder[:name].fg(245)
         end
@@ -4480,7 +4541,7 @@ module Heathrow
       end
       @panes[:left].refresh
 
-      @panes[:top].text = " Heathrow - ".b.fg(255) + title.b.fg(226)
+      @panes[:top].text = " Heathrow - ".bd.fg(255) + title.bd.fg(226)
       @panes[:top].refresh
       @panes[:bottom].text = " j/k:Navigate | Enter:Save here | h/l:Collapse/Expand | ESC:Cancel".fg(245)
       @panes[:bottom].refresh
@@ -4494,7 +4555,7 @@ module Heathrow
       loop do
         # Display current shortcuts in right pane
         info = []
-        info << "SAVE FOLDER SHORTCUTS".b.fg(226)
+        info << "SAVE FOLDER SHORTCUTS".bd.fg(226)
         info << ""
         if shortcuts.empty?
           info << "No shortcuts configured".fg(245)
@@ -4609,7 +4670,7 @@ module Heathrow
         return
       end
 
-      lines = ["LABELS IN USE".b.fg(226), ""]
+      lines = ["LABELS IN USE".bd.fg(226), ""]
       label_counts.sort_by { |_, c| -c }.each do |label, count|
         lines << "  #{label}".fg(51) + " (#{count})".fg(245)
       end
@@ -4721,7 +4782,7 @@ module Heathrow
 
     def ai_show_response(title, response)
       lines = []
-      lines << title.b.fg(226)
+      lines << title.bd.fg(226)
       lines << ""
       lines << response
       @panes[:right].ix = 0
@@ -4838,7 +4899,7 @@ module Heathrow
 
       # Show diff-like view
       lines = []
-      lines << "GRAMMAR/SPELLING FIX".b.fg(226)
+      lines << "GRAMMAR/SPELLING FIX".bd.fg(226)
       lines << ""
       lines << "Original:".fg(245)
       lines << msg['content'].to_s
@@ -5398,7 +5459,7 @@ module Heathrow
       idx = 0
       loop do
         ch = channels[idx]
-        @panes[:bottom].text = " New message via: #{ch[:name].b}  (TAB to cycle, ENTER to confirm, ESC to cancel)".fg(226)
+        @panes[:bottom].text = " New message via: #{ch[:name].bd}  (TAB to cycle, ENTER to confirm, ESC to cancel)".fg(226)
         @panes[:bottom].refresh
 
         key = getchr
@@ -5536,6 +5597,9 @@ module Heathrow
       end
 
       loop do
+        # Ensure terminal is in raw mode with cursor hidden (safety after external tools)
+        Cursor.hide
+
         # Show attachments and recipients in right pane
         right_lines = []
         if composed
@@ -5549,7 +5613,7 @@ module Heathrow
         else
           total_size = attachments.sum { |f| File.size(f) rescue 0 }
           size_str = total_size < 1_000_000 ? "#{(total_size / 1024.0).round(1)}KB" : "#{(total_size / 1_000_000.0).round(1)}MB"
-          right_lines << "Attachments (#{attachments.size}, #{size_str}):".b
+          right_lines << "Attachments (#{attachments.size}, #{size_str}):".bd
           attachments.each_with_index do |f, i|
             fsize = File.size(f) rescue 0
             fs = fsize < 1_000_000 ? "#{(fsize / 1024.0).round(1)}KB" : "#{(fsize / 1_000_000.0).round(1)}MB"
@@ -5559,10 +5623,15 @@ module Heathrow
         @panes[:right].text = right_lines.join("\n")
         @panes[:right].refresh
 
+        # Build prompt with compose plugin keys
+        plugins = compose_plugins
+        plugin_hint = plugins.map { |p| "#{p[:label]} (#{p[:key]})" }.join(" | ")
+        plugin_hint = " | #{plugin_hint}" unless plugin_hint.empty?
+
         if attachments.empty?
-          prompt = " Send (ENTER) | Edit (e) | Attach (a) | Postpone (p) | Cancel (ESC)"
+          prompt = " Send (ENTER) | Edit (e) | Attach (a)#{plugin_hint} | Postpone (p) | Cancel (ESC)"
         else
-          prompt = " Send (ENTER) | Edit (e) | More (a) | Clear (x) | Postpone (p) | ESC"
+          prompt = " Send (ENTER) | Edit (e) | More (a)#{plugin_hint} | Remove (x) | Postpone (p) | ESC"
         end
 
         @panes[:bottom].text = prompt.fg(226)
@@ -5577,12 +5646,31 @@ module Heathrow
         when 'p'
           return :postpone
         when 'e'
+          composed[:attachments] = attachments.dup unless attachments.empty?
           return :edit
         when 'a', 'A'
           new_files = run_rtfm_picker
           attachments.concat(new_files) if new_files && !new_files.empty?
         when 'x', 'X'
-          attachments.clear
+          if attachments.size == 1
+            attachments.clear
+          elsif attachments.size > 1
+            @panes[:bottom].text = " Remove which? (1-#{attachments.size}, or 'a' for all): ".fg(226)
+            @panes[:bottom].refresh
+            ans = getchr
+            if ans == 'a' || ans == 'A'
+              attachments.clear
+            elsif ans =~ /^\d$/ && (idx = ans.to_i) >= 1 && idx <= attachments.size
+              attachments.delete_at(idx - 1)
+            end
+          end
+        else
+          # Check compose plugins
+          plugin = plugins.find { |p| p[:key] == chr }
+          if plugin
+            new_files = run_compose_plugin(plugin)
+            attachments.concat(new_files) if new_files && !new_files.empty?
+          end
         end
       end
     end
@@ -5592,7 +5680,8 @@ module Heathrow
       pick_file = "/tmp/rtfm_pick_#{Process.pid}.txt"
       File.delete(pick_file) if File.exist?(pick_file)
 
-      # Restore terminal for RTFM
+      # Flush input, restore terminal for RTFM
+      $stdin.getc while $stdin.wait_readable(0)
       system("stty sane 2>/dev/null")
       Cursor.show
 
@@ -5616,6 +5705,58 @@ module Heathrow
       end
     end
 
+
+    # Compose plugins: loaded from ~/.heathrow/plugins/compose/*.rb
+    # Each plugin file should define a hash with :key, :label, :command
+    # Example: { key: 'i', label: 'Insight', command: 'cd ~/myapp && ./picker --pick=%{pick_file}' }
+    def compose_plugins
+      @_compose_plugins ||= begin
+        plugins = []
+        dir = File.join(Dir.home, '.heathrow', 'plugins', 'compose')
+        if Dir.exist?(dir)
+          Dir.glob(File.join(dir, '*.rb')).each do |f|
+            begin
+              plugin = eval(File.read(f))
+              plugins << plugin if plugin.is_a?(Hash) && plugin[:key] && plugin[:command]
+            rescue => e
+              File.open('/tmp/heathrow_debug.log', 'a') { |log| log.puts "Compose plugin error (#{f}): #{e.message}" }
+            end
+          end
+        end
+        plugins
+      end
+    end
+
+    def run_compose_plugin(plugin)
+      pick_file = "/tmp/heathrow_plugin_pick_#{Process.pid}.txt"
+      File.delete(pick_file) if File.exist?(pick_file)
+
+      # Flush any queued input, restore terminal, clear screen
+      $stdin.getc while $stdin.wait_readable(0)
+      system("stty sane 2>/dev/null")
+      Cursor.show
+      print "\e[2J\e[H"  # Clear screen + home cursor
+
+      cmd = plugin[:command].gsub('%{pick_file}', Shellwords.escape(pick_file))
+      system(cmd)
+
+      $stdin.raw!
+      $stdin.echo = false
+      Cursor.hide
+      Rcurses.clear_screen
+      setup_display
+      create_panes
+      render_all
+
+      if File.exist?(pick_file)
+        files = File.read(pick_file).lines.map(&:strip).reject(&:empty?)
+        File.delete(pick_file) rescue nil
+        files.select { |f| File.exist?(f) && File.file?(f) }
+      else
+        []
+      end
+    end
+
     # Unified send prompt loop: handles send, edit, postpone, cancel
     def finalize_compose(source, composed, cancel_label = "cancelled")
       require_relative '../message_composer'
@@ -5626,12 +5767,13 @@ module Heathrow
       pending_attachments = Array(composed[:attachments]).dup
       loop do
         attachments = prompt_attachments(pending_attachments, composed: composed)
-        pending_attachments = []  # Only seed on first iteration
         case attachments
         when :postpone
           postpone_message(source, composed)
           return
         when :edit
+          # Preserve attachments across edit
+          pending_attachments = Array(composed[:attachments]).dup
           # Re-open editor with current composed data
           composer = MessageComposer.new(nil, identity: current_identity, address_book: @address_book, editor_args: @editor_args)
           re_composed = composer.compose_draft(composed.transform_keys(&:to_s))
@@ -5640,10 +5782,9 @@ module Heathrow
           render_all
           if re_composed
             composed = re_composed
-          else
-            set_feedback("Edit cancelled", 245, 1)
-            return
+            composed[:attachments] = pending_attachments unless pending_attachments.empty?
           end
+          # If unchanged (re_composed nil), just return to send prompt
         when nil
           set_feedback(cancel_label, 245, 1)
           return
@@ -5698,7 +5839,7 @@ module Heathrow
 
       build = -> {
         popup.full_refresh
-        lines = ["", "  " + "Postponed Messages".b.fg(theme[:accent])]
+        lines = ["", "  " + "Postponed Messages".bd.fg(theme[:accent])]
         lines << "  " + "\u2500" * [pw - 6, 1].max
         drafts.each_with_index do |d, i|
           data = JSON.parse(d['data']) rescue {}
@@ -5918,7 +6059,7 @@ module Heathrow
         inner_w = pw - 4
         lines = []
         lines << ""
-        lines << "  " + "Settings".b.fg(theme[:accent])
+        lines << "  " + "Settings".bd.fg(theme[:accent])
         lines << "  " + "\u2500" * [inner_w - 3, 1].max
 
         settings_rows.each_with_index do |key, i|
@@ -6140,7 +6281,7 @@ module Heathrow
         lines = []
         title = theme_name ? "Edit: #{theme_name}" : "Theme Editor (#{@color_theme})"
         lines << ""
-        lines << "  " + title.b.fg(editing[:accent] || 10)
+        lines << "  " + title.bd.fg(editing[:accent] || 10)
         lines << "  " + "\u2500" * [inner_w - 3, 1].max
 
         # Ensure scroll follows selection
@@ -6612,13 +6753,13 @@ module Heathrow
           content = $2.chomp
           case level
           when 1
-            colored += content.b.fg(226) + "\n"  # Bright yellow bold for H1
+            colored += content.bd.fg(226) + "\n"  # Bright yellow bold for H1
           when 2
-            colored += content.b.fg(14) + "\n"   # Cyan bold for H2
+            colored += content.bd.fg(14) + "\n"   # Cyan bold for H2
           when 3
-            colored += content.b.fg(10) + "\n"   # Green bold for H3
+            colored += content.bd.fg(10) + "\n"   # Green bold for H3
           else
-            colored += content.b.fg(11) + "\n"   # Yellow bold for H4-H6
+            colored += content.bd.fg(11) + "\n"   # Yellow bold for H4-H6
           end
         when /^\s*[-*+]\s+(.+)$/  # Bullet points
           indent = line[/^\s*/]
@@ -6648,8 +6789,8 @@ module Heathrow
           processed = line.dup
           
           # Bold text **text** or __text__
-          processed.gsub!(/\*\*(.+?)\*\*/, '\1'.b)
-          processed.gsub!(/__(.+?)__/, '\1'.b)
+          processed.gsub!(/\*\*(.+?)\*\*/, '\1'.bd)
+          processed.gsub!(/__(.+?)__/, '\1'.bd)
           
           # Italic text *text* or _text_
           processed.gsub!(/\*([^*]+)\*/, '\1'.fg(252))
@@ -6672,14 +6813,14 @@ module Heathrow
     
     def get_extended_help_text
       <<~HELP
-#{"HEATHROW - COMPREHENSIVE DOCUMENTATION".b.fg(226)}
+#{"HEATHROW - COMPREHENSIVE DOCUMENTATION".bd.fg(226)}
 #{"=" * 60}
 
 Heathrow is a unified terminal interface for all your communication sources.
 It aggregates messages from email, WhatsApp, Telegram, Discord, Reddit, 
 RSS feeds, and more into a single, keyboard-driven interface.
 
-#{"KEYBOARD SHORTCUTS".b.fg(theme[:accent])}
+#{"KEYBOARD SHORTCUTS".bd.fg(theme[:accent])}
 
 #{"Navigation".fg(11)}
       j/↓        Move down in message list
@@ -6740,7 +6881,7 @@ RSS feeds, and more into a single, keyboard-driven interface.
                    t = Translate message
                    a = Ask anything about the message
 
-#{"FILTER SYNTAX".b.fg(theme[:accent])}
+#{"FILTER SYNTAX".bd.fg(theme[:accent])}
       
       Filters support powerful pattern matching:
       - Comma (,) = AND condition - all must match
@@ -6752,7 +6893,7 @@ RSS feeds, and more into a single, keyboard-driven interface.
       - "critical,production" = matches critical AND production
       - "error|warning,production" = (error OR warning) AND production
       
-#{"SOURCE TYPES".b.fg(theme[:accent])}
+#{"SOURCE TYPES".bd.fg(theme[:accent])}
       
 #{"Email (IMAP)".fg(39)}
 Connect to any IMAP email server. Supports Gmail, Outlook, Yahoo, etc.
@@ -6782,7 +6923,7 @@ Required: Client ID, client secret
 Monitor web pages for changes.
 Required: URL, optional CSS selector
       
-#{"CONFIGURATION".b.fg(theme[:accent])}
+#{"CONFIGURATION".bd.fg(theme[:accent])}
       
       Config file: ~/.heathrow/config.yml
       Database: ~/.heathrow/heathrow.db
@@ -6793,7 +6934,7 @@ Required: URL, optional CSS selector
       - Notification settings
       - Custom key bindings
       
-#{"TIPS & TRICKS".b.fg(theme[:accent])}
+#{"TIPS & TRICKS".bd.fg(theme[:accent])}
       
       1. Use numbered views (0-9) to organize messages by topic
       2. Combine source filters with content patterns for precision
@@ -6807,16 +6948,16 @@ Required: URL, optional CSS selector
     
     def get_help_text
       <<~HELP
- #{"HEATHROW - Communication Hub In The Terminal".b.fg(226)}
+ #{"HEATHROW - Communication Hub In The Terminal".bd.fg(226)}
  
- #{"BASIC KEYS".b.fg(theme[:accent])}
+ #{"BASIC KEYS".bd.fg(theme[:accent])}
    #{"?".fg(10)}       = Show this help text (press again for extended help)
    #{"q".fg(10)}       = Quit Heathrow
    #{"Q".fg(10)}       = QUIT (force quit without saving state)
    #{"Ctrl-r".fg(10)}   = Refresh current view (sync + reload)
    #{"Ctrl-l".fg(10)}   = Redraw panes (no fetch)
    
- #{"NAVIGATION".b.fg(theme[:accent])}
+ #{"NAVIGATION".bd.fg(theme[:accent])}
    #{"j/↓".fg(10)}     = Move down in message list (rounds to top)
    #{"k/↑".fg(10)}     = Move up in message list (rounds to bottom)
    #{"h/←".fg(10)}     = Go back / parent view
@@ -6827,7 +6968,7 @@ Required: URL, optional CSS selector
    #{"End".fg(10)}     = Go to last message
    #{"J".fg(10)}       = Jump to date (yyyy-mm-dd)
    
- #{"RIGHT PANE SCROLLING".b.fg(theme[:accent])}
+ #{"RIGHT PANE SCROLLING".bd.fg(theme[:accent])}
    #{"S-↓".fg(10)}     = Scroll content down one line
    #{"S-↑".fg(10)}     = Scroll content up one line
    #{"S-PgDn".fg(10)}  = Scroll content down one page
@@ -6836,7 +6977,7 @@ Required: URL, optional CSS selector
    #{"S-LEFT".fg(10)}  = Scroll content up one page
    #{"TAB".fg(10)}     = Scroll content down one page
  
- #{"VIEWS & FILTERS".b.fg(theme[:accent])}
+ #{"VIEWS & FILTERS".bd.fg(theme[:accent])}
    #{"A".fg(10)}       = Show all messages
    #{"N".fg(10)}       = Show new (unread) messages only
    #{"S".fg(10)}       = Sources configuration and management
@@ -6845,7 +6986,7 @@ Required: URL, optional CSS selector
    #{"Ctrl-f".fg(10)}  = Edit/create filter for current view (0-9, F1-F12)
    #{"K".fg(10)}       = Kill/delete a view (with confirmation)
  
- #{"MESSAGE ACTIONS".b.fg(theme[:accent])}
+ #{"MESSAGE ACTIONS".bd.fg(theme[:accent])}
    #{"R".fg(10)}       = Toggle read/unread status
    #{"M".fg(10)}       = Mark all messages in view as read
    #{"Space".fg(10)}   = Collapse/expand thread (threaded view)
@@ -6868,14 +7009,14 @@ Required: URL, optional CSS selector
    #{"m".fg(10)}       = Mail/compose new message
    #{"y".fg(10)}       = Copy message ID to clipboard (for CC sessions)
    
- #{"SOURCE MANAGEMENT".b.fg(theme[:accent])} (in Sources view with 'S')
+ #{"SOURCE MANAGEMENT".bd.fg(theme[:accent])} (in Sources view with 'S')
    #{"a".fg(10)}       = Add new source
    #{"e".fg(10)}       = Edit selected source
    #{"d".fg(10)}       = Delete selected source
    #{"Enter".fg(10)}   = Show all messages from selected source
    #{"Space".fg(10)}   = Enable/disable source
  
- #{"FOLDER NAVIGATION".b.fg(theme[:accent])}
+ #{"FOLDER NAVIGATION".bd.fg(theme[:accent])}
    #{"B".fg(10)}       = Browse all folders (folder tree)
    #{"F".fg(10)}       = Browse favorite folders
    #{"+".fg(10)}       = Add/remove current folder from favorites
@@ -6888,7 +7029,7 @@ Required: URL, optional CSS selector
    #{"l".fg(10)}       = Add/remove labels (+label / -label / ? to list)
    #{"/".fg(10)}       = Full-text search (notmuch)
 
- #{"AI ASSISTANT".b.fg(theme[:accent])}
+ #{"AI ASSISTANT".bd.fg(theme[:accent])}
    #{"I".fg(10)}       = AI assistant (Claude Code integration)
    #{"  d".fg(10)}     = Draft a reply
    #{"  f".fg(10)}     = Fix grammar/spelling
@@ -6896,7 +7037,7 @@ Required: URL, optional CSS selector
    #{"  t".fg(10)}     = Translate message
    #{"  a".fg(10)}     = Ask anything about the message
 
- #{"UI CONTROLS".b.fg(theme[:accent])}
+ #{"UI CONTROLS".bd.fg(theme[:accent])}
    #{"w".fg(10)}       = Change left pane width (20% → 60%)
    #{"Ctrl-b".fg(10)}  = Cycle border style (none/single/double)
    #{"D".fg(10)}       = Cycle date/time format
@@ -6915,7 +7056,7 @@ Required: URL, optional CSS selector
       bindings = @config.custom_bindings
       return "" if bindings.empty?
 
-      lines = ["\n #{" CUSTOM BINDINGS".b.fg(theme[:accent])}"]
+      lines = ["\n #{" CUSTOM BINDINGS".bd.fg(theme[:accent])}"]
       bindings.each do |key, b|
         desc = b[:description] || b[:shell] || b[:action].to_s
         lines << "   #{key.fg(10).ljust(16)}= #{desc}"
@@ -6925,7 +7066,7 @@ Required: URL, optional CSS selector
 
     def render_sources_info
       source_text = []
-      source_text << "SOURCE MANAGEMENT".b.fg(226)
+      source_text << "SOURCE MANAGEMENT".bd.fg(226)
       source_text << "=" * 40
       source_text << ""
       
@@ -6934,7 +7075,7 @@ Required: URL, optional CSS selector
         source_text << ""
         source_text << "Press 'a' to add a new source"
         source_text << ""
-        source_text << "Available source types:".b.fg(39)
+        source_text << "Available source types:".bd.fg(39)
         types = @source_manager.get_source_types
         types.each do |key, info|
           source_text << "• #{info[:icon]} #{info[:name]}".fg(226)
@@ -6945,7 +7086,7 @@ Required: URL, optional CSS selector
         if selected
           source = @source_manager.sources[selected['id']]
           if source
-            source_text << "Selected: #{source['name']}".b.fg(39)
+            source_text << "Selected: #{source['name']}".bd.fg(39)
             source_text << "Type: #{source['plugin_type'] || source['type']}".fg(245)
             source_text << "Status: #{source['enabled'] ? 'Enabled' : 'Disabled'}".fg(source['enabled'] ? 40 : 196)
             interval = (source['poll_interval'] || 900).to_i
@@ -6981,7 +7122,7 @@ Required: URL, optional CSS selector
               item_name = stype == 'rss' ? 'feed' : 'page'
               items = config[stype == 'rss' ? 'feeds' : 'pages'] || []
               unless items.empty?
-                source_text << "#{items.size} #{item_name}s:".b.fg(245)
+                source_text << "#{items.size} #{item_name}s:".bd.fg(245)
                 items.each_with_index do |item, i|
                   name = item['title'] || item['url'] || item['name'] || "Item #{i}"
                   status = item['last_status']
@@ -7001,14 +7142,14 @@ Required: URL, optional CSS selector
               end
 
               # Context-sensitive actions
-              source_text << "ACTIONS".b.fg(226)
+              source_text << "ACTIONS".bd.fg(226)
               source_text << "-" * 40
               source_text << "a - Add #{item_name}"
               source_text << "d - Remove #{item_name}"
               source_text << "e - Edit source settings"
             else
               # Show config (hide secrets)
-              source_text << "Configuration:".b.fg(39)
+              source_text << "Configuration:".bd.fg(39)
               config.each do |key, value|
                 next if key.to_s =~ /password|secret|token/
                 source_text << "  #{key}: #{value}".fg(245)
@@ -7016,7 +7157,7 @@ Required: URL, optional CSS selector
               source_text << ""
 
               # Context-sensitive actions
-              source_text << "ACTIONS".b.fg(226)
+              source_text << "ACTIONS".bd.fg(226)
               source_text << "-" * 40
               source_text << "a - Add new source"
               source_text << "e - Edit this source"
@@ -7043,7 +7184,7 @@ Required: URL, optional CSS selector
 
       # Build a 256-color grid in the right pane
       lines = []
-      lines << "COLOR PICKER for #{source['name']}".b.fg(226)
+      lines << "COLOR PICKER for #{source['name']}".bd.fg(226)
       lines << "=" * 40
       lines << ""
       lines << "Enter color number (0-255) or RGB hex (e.g. ff8800):"
@@ -7265,7 +7406,7 @@ Required: URL, optional CSS selector
       end
 
       lines = []
-      lines << "POLL INTERVAL for #{source['name']}".b.fg(226)
+      lines << "POLL INTERVAL for #{source['name']}".bd.fg(226)
       lines << "=" * 40
       lines << ""
       lines << "Current: #{current_str}".fg(245)
@@ -7337,14 +7478,14 @@ Required: URL, optional CSS selector
 
     def show_filter_details(view_num, view_config)
       filter_text = []
-      filter_text << "VIEW #{view_num} CONFIGURATION".b.fg(226)
+      filter_text << "VIEW #{view_num} CONFIGURATION".bd.fg(226)
       filter_text << "=" * 40
       filter_text << ""
       
       if view_config[:filters] && !view_config[:filters].empty?
-        filter_text << "Name:".b.fg(39) + " #{view_config[:name] || 'View ' + view_num.to_s}"
+        filter_text << "Name:".bd.fg(39) + " #{view_config[:name] || 'View ' + view_num.to_s}"
         filter_text << ""
-        filter_text << "Active Filters:".b.fg(39)
+        filter_text << "Active Filters:".bd.fg(39)
         filter_text << "-" * 20
         
         filters = view_config[:filters]
@@ -7395,14 +7536,14 @@ Required: URL, optional CSS selector
         filter_text << ""
         filter_text << "-" * 40
         filter_text << ""
-        filter_text << "Matching Messages:".b.fg(39) + " #{@filtered_messages.size}"
+        filter_text << "Matching Messages:".bd.fg(39) + " #{@filtered_messages.size}"
       else
         filter_text << "No filters configured".fg(245)
         filter_text << ""
         filter_text << "This view will show an empty list until"
         filter_text << "you configure filters."
         filter_text << ""
-        filter_text << "Available filter options:".b.fg(39)
+        filter_text << "Available filter options:".bd.fg(39)
         filter_text << "• Source types (email, whatsapp, etc.)"
         filter_text << "• Sender pattern (pipe | for OR)"
         filter_text << "• Subject pattern (pipe | for OR)"
@@ -7410,7 +7551,7 @@ Required: URL, optional CSS selector
         filter_text << "• Label (use 'l' to add labels, filter here)"
         filter_text << "• Read/unread status"
         filter_text << ""
-        filter_text << "Pattern Examples:".b.fg(39)
+        filter_text << "Pattern Examples:".bd.fg(39)
         filter_text << "Sender: Mom|Dad|Sister (any of them)"
         filter_text << "Content: error|warning,critical"
         filter_text << "  → (error OR warning) AND critical"
@@ -7629,7 +7770,7 @@ Required: URL, optional CSS selector
 
       welcome = []
       welcome << ""
-      welcome << "  " + "Welcome to Heathrow!".b.fg(226)
+      welcome << "  " + "Welcome to Heathrow!".bd.fg(226)
       welcome << "  " + "Where all your messages connect.".fg(245)
       welcome << ""
       welcome << "  " + "\u2500" * [pw - 6, 1].max
@@ -7637,7 +7778,7 @@ Required: URL, optional CSS selector
       welcome << "  No message sources configured yet."
       welcome << "  Let's get you started with your first source."
       welcome << ""
-      welcome << "  Available source types:".b.fg(39)
+      welcome << "  Available source types:".bd.fg(39)
       welcome << ""
       welcome << "  " + "1".fg(226) + " - Maildir (local email, works with offlineimap/mbsync/fetchmail)"
       welcome << "  " + "2".fg(226) + " - RSS/Atom feeds"
@@ -7831,19 +7972,72 @@ Required: URL, optional CSS selector
       if view && view[:filters] && view[:filters]['rules'].is_a?(Array)
         rule = view[:filters]['rules'].find { |r| r['field'] == 'source_type' && r['op'] == '=' }
         source_type = rule['value'] if rule
+        # Also check source_id rules to determine source type
+        if !source_type
+          sid_rule = view[:filters]['rules'].find { |r| r['field'] == 'source_id' && r['op'] == '=' }
+          if sid_rule
+            src = @db.get_source_by_id(sid_rule['value'].to_i)
+            source_type = src['plugin_type'] if src
+          end
+        end
       end
       folder = current_view_folder
 
       set_feedback("Syncing #{source_type || 'view'}...", 226, 30)
       @needs_redraw = true
 
+      # Extract thread info BEFORE spawning thread (current_message depends on UI state)
+      cur_msg = current_message
+      cur_meta = cur_msg && cur_msg['metadata']
+      cur_meta = JSON.parse(cur_meta) if cur_meta.is_a?(String) rescue nil
+      cur_thread_id = cur_meta['thread_id'] if cur_meta.is_a?(Hash)
+      # For thread headers, look for thread_id in section messages
+      if !cur_thread_id && cur_msg && cur_msg['section_messages']
+        first_msg = cur_msg['section_messages'].first
+        if first_msg
+          fm = first_msg['metadata']
+          fm = JSON.parse(fm) if fm.is_a?(String) rescue nil
+          cur_thread_id = fm['thread_id'] if fm.is_a?(Hash)
+        end
+      end
+      cur_thread_name = cur_msg['subject'] if cur_msg
+      File.open('/tmp/heathrow_sync_debug.log', 'w') { |f|
+        f.puts "source_type=#{source_type}"
+        f.puts "cur_msg_id=#{cur_msg&.[]('id')}"
+        f.puts "cur_msg_keys=#{cur_msg&.keys}"
+        f.puts "cur_meta_class=#{cur_meta.class}"
+        f.puts "cur_meta=#{cur_meta.inspect}"
+        f.puts "cur_thread_id=#{cur_thread_id}"
+        f.puts "cur_thread_name=#{cur_thread_name}"
+        f.puts "is_header=#{cur_msg&.[]('is_header')}"
+        f.puts "section_messages=#{cur_msg&.[]('section_messages')&.length}"
+      }
+
       Thread.new do
         thread_db = Heathrow::Database.new
+
         case source_type
         when 'maildir'   then sync_maildir(folder: folder, db: thread_db)
         when 'rss'       then sync_rss(db: thread_db)
         when 'web'       then sync_webwatch(db: thread_db)
-        when 'messenger' then sync_messenger(db: thread_db)
+        when 'messenger'
+          if cur_thread_id && cur_thread_name
+            require_relative '../sources/messenger'
+            src = thread_db.get_sources.find { |s| s['plugin_type'] == 'messenger' }
+            if src
+              config = src['config']
+              config = JSON.parse(config) if config.is_a?(String)
+              instance = Heathrow::Sources::Messenger.new(src['name'], config || {}, thread_db)
+              count = instance.sync_thread(src['id'], cur_thread_id.to_s, cur_thread_name)
+              if instance.sync_error
+                @last_sync_errors = (@last_sync_errors || []) << instance.sync_error
+              else
+                @_thread_sync_count = count
+              end
+            end
+          else
+            sync_messenger(db: thread_db)
+          end
         when 'instagram' then sync_instagram(db: thread_db)
         when 'weechat'   then sync_weechat(db: thread_db)
         else
@@ -7856,7 +8050,15 @@ Required: URL, optional CSS selector
         end
         thread_db.close rescue nil
         @pending_view_refresh = true
-        set_feedback("Synced", 46, 2)
+        if @last_sync_errors && !@last_sync_errors.empty?
+          set_feedback("Sync errors: #{@last_sync_errors.join('; ')}", 208, 0)
+          @last_sync_errors = nil
+        elsif @_thread_sync_count
+          set_feedback("Fetched #{@_thread_sync_count} messages from #{cur_thread_name}", @_thread_sync_count > 0 ? 156 : 208, 0)
+          @_thread_sync_count = nil
+        else
+          set_feedback("Synced", 46, 2)
+        end
       rescue => e
         set_feedback("Refresh error: #{e.message}", 196, 3)
       end
@@ -8241,7 +8443,7 @@ Required: URL, optional CSS selector
 
         # Format the event for display
         lines = []
-        lines << "Calendar Event".b.fg(226)
+        lines << "Calendar Event".bd.fg(226)
         lines << ""
         lines << "WHAT:  #{event[:summary]}".fg(156) if event[:summary]
         if event[:dates]
@@ -8365,7 +8567,7 @@ Required: URL, optional CSS selector
     def format_attachments(attachments)
       return nil unless attachments.is_a?(Array) && !attachments.empty?
       lines = []
-      lines << "Attachments:".b.fg(208)
+      lines << "Attachments:".bd.fg(208)
       attachments.each_with_index do |att, i|
         name = att['name'] || att['filename'] || 'unnamed'
         size = att['size'] ? " (#{human_size(att['size'])})" : ''
@@ -8403,7 +8605,7 @@ Required: URL, optional CSS selector
       result = ""
       parts.each_with_index do |part, i|
         result += base_color ? part.fg(base_color) : part
-        result += urls[i].u.fg(link_color) if urls[i]
+        result += urls[i].ul.fg(link_color) if urls[i]
       end
       result
     end
@@ -8535,14 +8737,18 @@ Required: URL, optional CSS selector
 
       require_relative '../sources/messenger'
       total = 0
+      errors = []
       sources.each do |source|
         config = source['config']
         config = JSON.parse(config) if config.is_a?(String)
         instance = Heathrow::Sources::Messenger.new(source['name'], config, db)
         total += (instance.sync(source['id']) || 0)
+        errors << instance.sync_error if instance.sync_error
       end
+      @last_sync_errors = (@last_sync_errors || []) + errors if errors.any?
       total > 0
     rescue => e
+      @last_sync_errors = (@last_sync_errors || []) << "Messenger: #{e.message}"
       File.open('/tmp/heathrow_debug.log', 'a') { |f| f.puts "Messenger sync error: #{e.message}\n#{e.backtrace.first(3).join("\n")}" }
       false
     end