mailmate 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79154ae28a8d2c2aaf816e6719da7ee549f59db9a9425c19fd14971fa17c2752
-  data.tar.gz: 3ebd8963699820c5a10a777ea1d0013108301f268bd4a59939e5a9cf54649747
+  metadata.gz: 52941d76f7875e2944527026ed3d8584eb15e718dded7c7db5b75cad880be7d2
+  data.tar.gz: bb5f9463d23b07f6b6755c1c1c54326a060b9bd5680554399ff97f23137f7b6c
 SHA512:
-  metadata.gz: 0f709dfccd86d6abb7e82ec1da45fc7f84745a6967f7e9fdaa90b1b90ae015671271102016f03aea80262ce8ff6ca109d7d8b5365d012c95ab4cc57c102e43ed
-  data.tar.gz: 1da1debaba2cb1260b8b033efb742ec45bca0b37c5b041f87492367bbf0f9efda29cf117723cd1bf027d7b84ccfd4947f8dc84d545759b36ad8f346b0eb4121c
+  metadata.gz: ac99eb6fee19f727a953228a599f5ec29d741339776388547ff514403a838c990635c586881dfee5750c3a0c6a72f6c66bdcc513f3dba4ed85eb0e980b588357
+  data.tar.gz: 6a293bf66d563b80d9f9a0e2f0808fa32db6ba4bd40bea65fbb364a73e0fbef3d0aa715b284ad07f464a7cbb695825da4d2f614903699f1d3e527101e7135edc

data/README.md

@@ -108,12 +108,8 @@ Pre-1.0 (0.x). Breaking changes allowed without version bumps. See [`docs/roadma
 
 ## Install
 
-For development (no `gem install` needed):
-
 ```bash
-git clone <this repo> ~/code/claude/mailmate
-echo 'export PATH="$HOME/code/claude/mailmate/exe:$PATH"' >> ~/.zshrc
-source ~/.zshrc
+gem install mailmate
 ```
 
 Then bootstrap your config:
@@ -124,6 +120,18 @@ mmdiscover
 
 `mmdiscover` reads MailMate's `Sources.plist` and `Identities.plist`, shows you the accounts and addresses it found, and offers to write `~/.config/mailmate/config.yml` from them. It also writes `~/.config/mailmate/bundle_loader.rb` for MailMate bundles.
 
+### From source (development)
+
+If you're hacking on the gem itself, skip `gem install` and put the repo's `exe/` on your `PATH`:
+
+```bash
+git clone <this repo> ~/code/claude/mailmate
+echo 'export PATH="$HOME/code/claude/mailmate/exe:$PATH"' >> ~/.zshrc
+source ~/.zshrc
+```
+
+Then `mmdiscover` as above.
+
 ## Commands
 
 | Command | What it does |

data/lib/mailmate/cli/search.rb

@@ -25,7 +25,8 @@ module Mailmate
       HEADER_FIELDS = %i[from recipients cc subject address_any any].freeze
 
       VALID_FIELDS = %w[id path mailbox from to cc bcc reply-to subject date time
-                        message-id direction party flags read archive].freeze
+                        message-id references in-reply-to
+                        direction party flags read archive tags keywords].freeze
 
       HEADER_LABELS = {
         "direction" => "dir",
@@ -39,8 +40,11 @@ module Mailmate
         "read" => :index,
         "archive" => :index,
         "flags" => :index,
+        "tags" => :index,
+        "keywords" => :index,
         "from" => :header, "to" => :header, "cc" => :header, "bcc" => :header,
         "reply-to" => :header, "subject" => :header, "message-id" => :header,
+        "references" => :header, "in-reply-to" => :header,
         "direction" => :header, "party" => :header,
       }.freeze
 
@@ -57,8 +61,10 @@ module Mailmate
         parser.parse!(argv)
 
         search_string = argv[0] || DEFAULT_SEARCH
-        fields_arg    = (opts[:fields] || argv[1] || DEFAULT_FIELDS).to_s
-        extra_fields  = fields_arg.strip.split(/\s+/).reject(&:empty?)
+        fields_arg    = (opts[:fields] || argv[1] || DEFAULT_FIELDS).to_s.strip
+        # `+...` means "defaults plus these"; bare list replaces defaults.
+        fields_arg    = "#{DEFAULT_FIELDS} #{fields_arg[1..]}" if fields_arg.start_with?("+")
+        extra_fields  = fields_arg.split(/\s+/).reject(&:empty?)
         fields = (["id"] + extra_fields).uniq
 
         imap_root = Mailmate.config.imap_root
@@ -105,7 +111,7 @@ module Mailmate
             :index
           elsif specs.any? { |field, _, _| (field == :body || field == :message_or_body) && !opts[:headers_only] }
             :full
-          elsif specs.all? { |field, _, _| field == :date }
+          elsif specs.all? { |field, _, _| %i[date tag keyword].include?(field) }
             :index
           else
             :header
@@ -156,8 +162,9 @@ module Mailmate
           o.separator ""
           o.separator "POSITIONAL ARGS"
           o.separator "  search-string  Quicksearch expression. Default: 'd 1d'. Pass '' to disable."
-          o.separator "  fields         Space-separated columns to add (id is always first)."
+          o.separator "  fields         Space-separated columns to show (id is always first)."
           o.separator "                 Default: 'flags date time direction party subject'."
+          o.separator "                 Prefix with '+' to add to the defaults: '+tags' = defaults + tags."
           o.separator ""
           o.separator "OPTIONS"
           o.on("--mailbox X", "Mailbox to search (default: all)") { |v| opts[:mailbox] = v }
@@ -188,6 +195,29 @@ module Mailmate
           o.separator "    mmsearch 'f medium d 7d'           from Medium in last 7 days"
           o.separator "    mmsearch 's \"rent due\" !draft'     subject has rent due, no 'draft'"
           o.separator "    mmsearch 'd 2026-05'               received in May 2026"
+          o.separator ""
+          o.separator "FIELDS (for the fields argument / --fields)"
+          o.separator "  id          eml-id (always included as first column)"
+          o.separator "  path        full path to the .eml file"
+          o.separator "  mailbox     account/mailbox path (no /Messages/<id>.eml suffix)"
+          o.separator "  from        From header"
+          o.separator "  to          To header"
+          o.separator "  cc          Cc header"
+          o.separator "  bcc         Bcc header"
+          o.separator "  reply-to    Reply-To header"
+          o.separator "  subject       Subject header"
+          o.separator "  message-id    RFC Message-ID header"
+          o.separator "  references    RFC References header (space-joined when multiple)"
+          o.separator "  in-reply-to   RFC In-Reply-To header"
+          o.separator "  date        received date, YYYY-MM-DD (local time)"
+          o.separator "  time        received time, HH:MM (local time)"
+          o.separator "  direction   '→' outbound, '←' inbound (column header: 'dir')"
+          o.separator "  party       counterparty (recipients if outbound, sender if inbound)"
+          o.separator "  flags       archive + read combined, e.g. 'AR', 'PU'"
+          o.separator "  read        'R' read or 'U' unread (column header: 'r')"
+          o.separator "  archive     'A' archived or 'P' present elsewhere (column header: 'a')"
+          o.separator "  tags        user tags (IMAP keywords), comma-joined; system flags (\\… , $…) excluded"
+          o.separator "  keywords    raw IMAP keyword list (incl. \\Seen, \\Draft, \\Flagged, \$Forwarded, user tags)"
         end
       end
 
@@ -359,11 +389,19 @@ module Mailmate
         when :address_any
           [mail[:from], mail[:to], mail[:cc], mail[:reply_to], mail[:sender]]
             .compact.map { |h| h.value.to_s }.join(" ").downcase
-        when :tag, :keyword
-          [mail["x-keywords"]&.value, mail["keywords"]&.value].compact.join(" ").downcase
         end
       end
 
+      # MailMate stores user tags as IMAP keywords in the `#flags` index — not
+      # as `X-Keywords`/`Keywords` headers in the .eml — so tag matching has to
+      # go through the index, not the parsed mail. Strips `\…` (RFC) and `$…`
+      # (Thunderbird/Apple) system flags so substring matches only hit user tags.
+      def tag_value(eml_id)
+        return "" unless eml_id
+        flags = (Mailmate::IndexReader.for("#flags").flags_for(eml_id.to_i) rescue [])
+        flags.reject { |f| f.start_with?("\\", "$") }.join(" ").downcase
+      end
+
       def text_body(mail)
         (mail.text_part&.decoded || mail.body.decoded).to_s.force_encoding("UTF-8").scrub.downcase
       rescue StandardError
@@ -374,8 +412,10 @@ module Mailmate
         specs.all? do |field, term, negate|
           hit =
             case field
-            when :from, :recipients, :cc, :subject, :address_any, :tag, :keyword
+            when :from, :recipients, :cc, :subject, :address_any
               field_value(mail, field).include?(term)
+            when :tag, :keyword
+              tag_value(eml_id).include?(term)
             when :body
               headers_only ? false : text_body(mail).include?(term)
             when :message_or_body
@@ -485,14 +525,21 @@ module Mailmate
           archive = path.include?("/Archive.mailbox/") ? "A" : "P"
           seen    = (Mailmate::IndexReader.for("#flags").flags_for(eml_id.to_i) rescue []).include?("\\Seen")
           "#{archive}#{seen ? 'R' : 'U'}"
+        when "tags"
+          flags = (Mailmate::IndexReader.for("#flags").flags_for(eml_id.to_i) rescue [])
+          flags.reject { |f| f.start_with?("\\", "$") }.join(",")
+        when "keywords"
+          (Mailmate::IndexReader.for("#flags").flags_for(eml_id.to_i) rescue []).join(",")
         when "from"       then mail ? Array(mail.from).join("; ") : nil
         when "to"         then mail ? Array(mail.to).join("; ") : nil
         when "cc"         then mail ? Array(mail.cc).join("; ") : nil
         when "bcc"        then mail ? Array(mail.bcc).join("; ") : nil
         when "reply-to"   then mail ? Array(mail.reply_to).join("; ") : nil
-        when "subject"    then mail&.subject.to_s
-        when "message-id" then mail&.message_id.to_s
-        when "direction"  then mail ? (outbound?(path, mail) ? "→" : "←") : nil
+        when "subject"     then mail&.subject.to_s
+        when "message-id"  then mail&.message_id.to_s
+        when "references"  then mail ? Array(mail.references).join(" ") : nil
+        when "in-reply-to" then mail ? Array(mail.in_reply_to).join(" ") : nil
+        when "direction"   then mail ? (outbound?(path, mail) ? "→" : "←") : nil
         when "party"      then mail ? party_for(mail, outbound?(path, mail)) : nil
         end.to_s
       end

data/lib/mailmate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mailmate
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailmate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Brian Murphy-Dye