@bobfrankston/rmfmail 1.1.101 → 1.1.103

package/packages/mailx-store/db.ts

@@ -2693,7 +2693,7 @@ export class MailxDB {
      *  Multi-name-per-email is supported: the same email can carry distinct
      *  (source, name) rows — Bob's wife and Bob Smith both at bob@example.com
      *  surface as two rows, each typing-completable by their own name. */
-    searchContacts(query: string, limit = 10): { name: string; email: string; source: string; useCount: number }[] {
+    searchContacts(query: string, limit = 10): { name: string; email: string; source: string; sources: string[]; useCount: number }[] {
         query = (query || "").trim();
         if (!query) return [];
         // Split into whitespace-separated tokens. Each token must appear in
@@ -2753,21 +2753,33 @@ export class MailxDB {
         rows.sort((a, b) => score(b) - score(a));
         // Dedup by lowercased email — same address often appears as both
         // source='google' (synced from Google Contacts) and source='discovered'
-        // (auto-collected from sent mail). The user only wants to see the
-        // best entry; we keep the higher-ranked source (which the sort above
-        // has already put first), and silently drop the duplicate. Without
-        // this, the autocomplete dropdown showed two identical Kevin Healy
-        // rows just labeled GOOGLE and DISCOVERED.
-        const seenEmails = new Set<string>();
-        rows = rows.filter(r => {
+        // (auto-collected from sent mail). Keep the higher-ranked row (already
+        // sorted first) and FOLD subsequent rows' sources into a `sources` array
+        // on the survivor so the dropdown can display "google, discovered"
+        // instead of showing two duplicate lines.
+        const merged = new Map<string, any>();
+        for (const r of rows) {
             const k = (r.email || "").toLowerCase();
-            if (!k) return true;
-            if (seenEmails.has(k)) return false;
-            seenEmails.add(k);
-            return true;
-        });
-        rows = rows.slice(0, limit);
-        return rows.map(r => ({ name: r.name, email: r.email, source: r.source, useCount: r.use_count }));
+            if (!k) { merged.set(`__noemail_${merged.size}`, { ...r, _sources: new Set([r.source]) }); continue; }
+            const existing = merged.get(k);
+            if (!existing) {
+                merged.set(k, { ...r, _sources: new Set([r.source]) });
+            } else {
+                existing._sources.add(r.source);
+                // If this row has a non-empty name and the kept one didn't,
+                // promote the name — Google rows often have proper names while
+                // discovered rows are bare-email.
+                if (!existing.name && r.name) existing.name = r.name;
+            }
+        }
+        const out = Array.from(merged.values()).slice(0, limit);
+        return out.map(r => ({
+            name: r.name,
+            email: r.email,
+            source: r.source,
+            sources: Array.from(r._sources as Set<string>).filter(Boolean),
+            useCount: r.use_count,
+        }));
     }
 
     /** List all contacts (address-book view) with pagination + optional filter. */
@@ -2904,6 +2916,13 @@ export class MailxDB {
                 const v = folderMatch[1].replace(/"/g, "");
                 extraWhere.push("LOWER(f.name) LIKE ?");
                 extraParams.push(`%${v.toLowerCase()}%`);
+            } else if (/^(AND|OR|NOT)$/.test(part)) {
+                // FTS5 boolean operators — pass through verbatim (must be uppercase).
+                // Without this branch, `hoddie AND git` got wildcarded into
+                // `hoddie* AND* git*`, which FTS5 reads as three required terms
+                // (one of them being any word starting with "AND") — so a real
+                // match like "Peter Hoddie" + "github" returned zero hits.
+                ftsQuery += `${part} `;
             } else {
                 // Unqualified — search everything.
                 let term = part.replace(/^\/|\/$/g, "");

package/packages/mailx-store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-store",
-  "version": "0.1.31",
+  "version": "0.1.32",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",