@bobfrankston/rmfmail 1.1.110 → 1.1.112

package/packages/mailx-store/db.ts

@@ -2704,6 +2704,13 @@ export class MailxDB {
         const tokens = query.split(/\s+/).filter(Boolean);
         const firstSubstr = `%${tokens[0]}%`;
         const firstPrefix = `${tokens[0]}%`;
+        // Word-prefix patterns: the token at the start of ANY name word, not
+        // just the whole name. Catches "Frankston, Bob" / "Frankston,Bob"
+        // when the user types "bob" — a first-name match on a Last,First
+        // contact (Bob 2026-05-21). The space variant also covers the normal
+        // "Bob Frankston" middle/last-word case.
+        const firstWordSpace = `% ${tokens[0]}%`;
+        const firstWordComma = `%,${tokens[0]}%`;
         const tokenWhere = tokens.map(() => "(name LIKE ? OR email LIKE ?)").join(" AND ");
         const tokenParams: string[] = [];
         for (const t of tokens) { tokenParams.push(`%${t}%`, `%${t}%`); }
@@ -2725,7 +2732,7 @@ export class MailxDB {
             rows = this.db.prepare(
                 `SELECT name, email, source, use_count, last_used,
                         (CASE
-                            WHEN lower(name) LIKE lower(?) THEN 300
+                            WHEN lower(name) LIKE lower(?) OR lower(name) LIKE lower(?) OR lower(name) LIKE lower(?) THEN 300
                             WHEN substr(email, 1, instr(email, '@') - 1) LIKE lower(?) THEN 200
                             WHEN email LIKE ? OR name LIKE ? THEN 100
                             ELSE 0
@@ -2739,7 +2746,7 @@ export class MailxDB {
                  WHERE ${tokenWhere}
                  ORDER BY match_rank DESC, use_count DESC, last_used DESC
                  LIMIT ?`
-            ).all(firstPrefix, firstPrefix, firstSubstr, firstSubstr, ...tokenParams, limit * 2) as any[];
+            ).all(firstPrefix, firstWordSpace, firstWordComma, firstPrefix, firstSubstr, firstSubstr, ...tokenParams, limit * 2) as any[];
         } catch (e: any) {
             console.error(`  [searchContacts] ranked query failed (${e?.message}) — falling back to simple LIKE`);
             rows = this.db.prepare(