heathrow 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af875b0f7d9ee70cf0f340207d21b5d367e6a8c98464361560c8b7649b2b6195
-  data.tar.gz: 30cc45fe89911cfe787a32a1e36e6d5d7a41a8e407779a2fb73cb0428b1b2e75
+  metadata.gz: cbe8be982ab3300b591a24bdba7bb67c9feff58167a7785fb288a4b62d558f46
+  data.tar.gz: 513f905dff1e8a9e74b87488a1fa5b007d3a76e26287d7643961ea2b1b0b2268
 SHA512:
-  metadata.gz: b2d822a3c2a09d17e13b8f579f4a91fe896145c303be3c51620dc059888ca710c733c302d705eaa7ecd0c709b79bb4524c831bc7f66aff937f39779b3c886c8a
-  data.tar.gz: 7ff0e102006c3bb8c33e527612890832120b67f9e3300840d20419bb04e67c0b50afd9b1896e951025c2abd913fe119b959ddf19554b1eb3a6947209a07341f8
+  metadata.gz: 29e42a3922e7dfb70188c3bc03345812ccb1a7a21c992384e1b50938a00418ecb6bdba009ba30d0020960b354f144b0ac1a9cc18910b2c2e775c0137a7f68c61
+  data.tar.gz: 3a7a0e541c490c8d783f679d6be4bcab6dabe703041ea2620d95b7756ec74cc53d9bfee851e15f3863685168f8c33f1c1b227ecf5e1aea784681d4b12cfb6f16

data/.gitignore

@@ -18,17 +18,26 @@
 /lib/bundler/man/
 .bundle/
 
-# Chitt specific
-~/.chitt/
+# Heathrow data
+~/.heathrow/
 *.db
 *.db-shm
 *.db-wal
 /logs/
 /attachments/
 
-# Environment
+# Secrets and credentials
 .env
 .env.local
+.env.*
+*.pem
+*.key
+*.p12
+*.pfx
+credentials.json
+token.json
+*_secret*
+*_token*
 
 # Editor directories
 .vscode/

data/lib/heathrow/message_composer.rb

@@ -27,7 +27,8 @@ module Heathrow
     # Compose a forward of a message
     def compose_forward
       template = build_forward_template
-      content = edit_in_editor(template)
+      # Cursor on "To: " line (line 2)
+      content = edit_in_editor(template, cursor_line: 2)
       return nil if content.nil? || content.strip.empty?
       parse_composed_message(content)
     end

data/lib/heathrow/sources/maildir.rb

@@ -170,9 +170,17 @@ module Heathrow
           changed_base_ids.each do |base_id|
             flags = self.class.parse_maildir_flags(disk_files[base_id])
             db_row = db_index[base_id]
-            if flags[:seen] != (db_row[:read] == 1) || flags[:flagged] != (db_row[:starred] == 1) || flags[:replied] != (db_row[:replied] == 1)
+            # For replied: DB is authoritative. If DB says replied but disk
+            # doesn't have R flag, add it to disk rather than clearing DB.
+            disk_replied = flags[:replied]
+            db_replied = db_row[:replied] == 1
+            if db_replied && !disk_replied
+              rename_with_flag(disk_files[base_id], 'R', add: true)
+              disk_replied = true
+            end
+            if flags[:seen] != (db_row[:read] == 1) || flags[:flagged] != (db_row[:starred] == 1) || disk_replied != db_replied
               db.execute("UPDATE messages SET read = ?, starred = ?, replied = ? WHERE id = ?",
-                         flags[:seen] ? 1 : 0, flags[:flagged] ? 1 : 0, flags[:replied] ? 1 : 0, db_row[:id])
+                         flags[:seen] ? 1 : 0, flags[:flagged] ? 1 : 0, disk_replied ? 1 : 0, db_row[:id])
             end
             # Update external_id and metadata if filename changed
             current_filename = File.basename(disk_files[base_id])

data/lib/heathrow/ui/application.rb

@@ -1979,28 +1979,28 @@ module Heathrow
         end
       else
         # Regular message display
-        header << "From: #{msg['sender']}".fg(39) if msg['sender']
+        header << "From: #{msg['sender']}".fg(2) if msg['sender']
         # Show recipients (To field)
         to = msg['recipients'] || msg['recipient']
         if to
           to_list = to.is_a?(String) ? (JSON.parse(to) rescue [to]) : to
           to_str = to_list.is_a?(Array) ? to_list.join(', ') : to_list.to_s
-          header << "To: #{to_str}".fg(45) unless to_str.empty?
+          header << "To: #{to_str}".fg(2) unless to_str.empty?
         end
         # Show CC recipients
         cc = msg['cc']
         if cc
           cc_list = cc.is_a?(String) ? (JSON.parse(cc) rescue [cc]) : cc
           cc_str = cc_list.is_a?(Array) ? cc_list.join(', ') : cc_list.to_s
-          header << "Cc: #{cc_str}".fg(45) unless cc_str.empty?
+          header << "Cc: #{cc_str}".fg(2) unless cc_str.empty?
         end
         # For weechat, show channel name from metadata instead of content preview
         meta = msg['metadata']
         meta = JSON.parse(meta) if meta.is_a?(String) rescue nil
         if meta.is_a?(Hash) && meta['channel_name']
-          header << "Subject: #{meta['channel_name']}".b.fg(226)
+          header << "Subject: #{meta['channel_name']}".b.fg(1)
         elsif msg['subject']
-          header << "Subject: #{msg['subject']}".b.fg(226)
+          header << "Subject: #{msg['subject']}".b.fg(1)
         end
       end
       
@@ -3702,6 +3702,7 @@ module Heathrow
     def show_folder_browser
       @in_folder_browser = true
       @folder_browser_index = 0
+      @panes[:top].bg = @topcolor
       @folder_collapsed ||= {}
       @folder_count_cache = {}  # Fresh counts each time
       @browser_favorites = nil  # Fresh favorites read
@@ -3969,6 +3970,7 @@ module Heathrow
       favorites = get_favorite_folders
       @in_folder_browser = true
       @folder_browser_index = 0
+      @panes[:top].bg = @topcolor
       @folder_count_cache = {}  # Fresh counts each time
 
       # Build display from favorites only (no DB queries — counts fetched on select)
@@ -4250,6 +4252,13 @@ module Heathrow
       msg['folder'] = dest
       msg['metadata'] = metadata
       msg['labels'] = labels
+
+      # Mark as read (we've seen it if we're filing it)
+      if msg['is_read'].to_i == 0
+        @db.mark_as_read(msg['id'])
+        msg['is_read'] = 1
+        sync_maildir_flag(msg, 'S', true)
+      end
     end
 
     # ── Save by browsing folders (sB) ──
@@ -4517,7 +4526,7 @@ module Heathrow
     def ai_assistant
       msg = current_message
       return unless msg && !msg['is_header'] && !msg['is_channel_header'] && !msg['is_thread_header']
-      ensure_full_message(msg)
+      msg = ensure_full_message(msg)
 
       # Build message context
       context = ai_message_context(msg)
@@ -4963,9 +4972,19 @@ module Heathrow
     end
 
     def ensure_full_message(msg)
-      if msg && msg['id'] && !msg.key?('content') && !msg['is_header']
+      if msg && msg['id'] && !msg['_full_loaded'] && !msg['is_header']
         full = @db.get_message(msg['id'])
-        msg.merge!(full) if full
+        if full
+          if msg.frozen?
+            # Replace frozen hash in filtered_messages with mutable copy
+            idx = @filtered_messages.index { |m| m.equal?(msg) }
+            msg = full.merge('_full_loaded' => true)
+            @filtered_messages[idx] = msg if idx
+          else
+            msg.merge!(full)
+            msg['_full_loaded'] = true
+          end
+        end
       end
       msg
     end
@@ -4975,7 +4994,7 @@ module Heathrow
     def reply_to_message(force_editor: false)
       msg = current_message
       return unless msg
-      ensure_full_message(msg)
+      msg = ensure_full_message(msg)
 
       # Don't allow replying to header messages
       if msg['is_header'] || msg['is_channel_header'] || msg['is_thread_header'] || msg['is_dm_header']
@@ -5004,15 +5023,15 @@ module Heathrow
         @panes[:bottom].refresh
 
         composed = composer.compose_reply(false)
+        setup_display
+        create_panes
+        render_all
         if composed
           finalize_compose(source, composed, "Reply cancelled")
         else
           set_feedback("Reply cancelled", 245, 1)
         end
       end
-
-      render_message_list
-      render_bottom_bar
     end
 
     def chat_reply_context(msg, source_type)
@@ -5088,7 +5107,7 @@ module Heathrow
     def reply_all_to_message
       msg = current_message
       return unless msg
-      ensure_full_message(msg)
+      msg = ensure_full_message(msg)
       source_id = msg['source_id']
       
       # Check if source supports replying
@@ -5106,20 +5125,21 @@ module Heathrow
       # Compose the reply
       composed = composer.compose_reply(true)
 
+      setup_display
+      create_panes
+      render_all
       if composed
         finalize_compose(source, composed, "Reply-all cancelled")
       else
         set_feedback("Reply-all cancelled", 245, 1)
       end
-
-      render_bottom_bar
     end
 
     def edit_message_content
       msg = current_message
       return unless msg
       return if msg['is_header'] || msg['is_channel_header'] || msg['is_thread_header']
-      ensure_full_message(msg)
+      msg = ensure_full_message(msg)
 
       source_id = msg['source_id']
       source = @db.get_source(source_id)
@@ -5147,7 +5167,7 @@ module Heathrow
     def forward_message
       msg = current_message
       return unless msg
-      ensure_full_message(msg)
+      msg = ensure_full_message(msg)
       source_id = msg['source_id']
       
       # Check if source supports sending
@@ -5162,18 +5182,59 @@ module Heathrow
       @panes[:bottom].text = " Opening editor to forward message...".fg(226)
       @panes[:bottom].refresh
 
+      # Extract attachments BEFORE editor
+      orig_attachments = extract_original_attachments(msg)
+
       # Compose the forward
       composed = composer.compose_forward
 
+      # Rebuild panes after editor (vim clears the screen)
+      setup_display
+      create_panes
+      render_all
+
       if composed
+        # Include original attachments
+        composed[:attachments] = orig_attachments if orig_attachments && !orig_attachments.empty?
         finalize_compose(source, composed, "Forward cancelled")
       else
         set_feedback("Forward cancelled", 245, 1)
       end
-
-      render_bottom_bar
     end
     
+    # Extract original attachments from a message for forwarding
+    def extract_original_attachments(msg)
+      metadata = msg['metadata']
+      metadata = JSON.parse(metadata) if metadata.is_a?(String) rescue nil
+      return nil unless metadata.is_a?(Hash)
+
+      file_path = metadata['maildir_file']
+      return nil unless file_path && File.exist?(file_path)
+
+      require 'mail'
+      require 'tmpdir'
+      mail = Mail.read(file_path)
+      return nil if mail.attachments.empty?
+
+      tmp_dir = File.join(Dir.tmpdir, "heathrow-fwd-#{Process.pid}")
+      FileUtils.mkdir_p(tmp_dir)
+
+      paths = []
+      mail.attachments.each do |att|
+        next unless att.filename
+        out = File.join(tmp_dir, att.filename)
+        File.write(out, att.decoded)
+        paths << out
+      end
+      paths.empty? ? nil : paths
+    rescue => e
+      File.open('/tmp/heathrow-crash.log', 'a') { |f|
+        f.puts "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} extract_attachments: #{e.class}: #{e.message}"
+        f.puts "  #{e.backtrace&.first(3)&.join("\n  ")}"
+      }
+      nil
+    end
+
     def compose_new_message
       # Build list of sendable channels from all DB sources
       channels = []
@@ -5250,6 +5311,9 @@ module Heathrow
 
         composed = composer.compose_new
       end
+      setup_display
+      create_panes
+      render_all
       if composed
         finalize_compose(source, composed, "Message cancelled")
       else
@@ -5402,8 +5466,10 @@ module Heathrow
       setup_display
       create_panes
       render_all
+      pending_attachments = Array(composed[:attachments]).dup
       loop do
-        attachments = prompt_attachments(composed: composed)
+        attachments = prompt_attachments(pending_attachments, composed: composed)
+        pending_attachments = []  # Only seed on first iteration
         case attachments
         when :postpone
           postpone_message(source, composed)
@@ -5622,14 +5688,14 @@ module Heathrow
               msg += " (#{composed[:attachments].size} attachment(s))"
             end
             set_feedback(msg, 156, 3)
+            render_left_pane if orig_id
           else
             set_feedback(result[:message], 196, 4)
           end
         rescue => e
           set_feedback("Send error: #{e.message}", 196, 4)
-          if ENV['DEBUG']
-            File.open('/tmp/heathrow_debug.log', 'a') { |f| f.puts "send_composed_message error: #{e.message}\n#{e.backtrace.first(5).join("\n")}" }
-          end
+          File.open('/tmp/heathrow_debug.log', 'a') { |f| f.puts "#{Time.now} send_composed_message error: #{e.message}\n#{e.backtrace.first(5).join("\n")}" }
+
         end
       end
     end
@@ -7608,8 +7674,9 @@ Required: URL, optional CSS selector
     def colorize_email_content(content)
       quote_colors = [theme[:quote1] || 114, theme[:quote2] || 180,
                       theme[:quote3] || 139, theme[:quote4] || 109]
-      sig_color = theme[:sig] || 242
-      link_color = theme[:accent] || 33
+      sig_color = theme[:sig] || 5       # magenta (vim PreProc)
+      link_color = theme[:link] || 4     # blue (vim String)
+      email_color = theme[:email] || 5   # magenta (vim Special)
       in_signature = false
 
       content.lines.map do |line|
@@ -7719,7 +7786,7 @@ Required: URL, optional CSS selector
 
       msg = current_message
       return unless msg
-      ensure_full_message(msg)
+      msg = ensure_full_message(msg)
 
       http_urls = []
 

data/lib/heathrow/version.rb

@@ -1,3 +1,3 @@
 module Heathrow
-  VERSION = '0.7.0'
+  VERSION = '0.7.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heathrow
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Geir Isene
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-16 00:00:00.000000000 Z
+date: 2026-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcurses