@bobfrankston/rmfmail 1.2.306 → 1.2.307

package/packages/mailx-store/db.ts

@@ -3445,6 +3445,58 @@ export class MailxDB {
         this.notifyContactsChanged();
     }
 
+    /** Apply one email entry of a Google People contact.
+     *  (Claude Code 2026-09-06, at Bob's direction)
+     *
+     *  The `google` row for this address is the one Google owns: its name and
+     *  card follow Google on every sync, so a contact renamed in Google
+     *  Contacts is renamed here. Discovered rows for the same address are left
+     *  alone — they hold the name the correspondent's own mail carried, and
+     *  searchContacts folds the two into one line with the google row on top.
+     *
+     *  Replaces the pre-2026-09-06 sequence recordSentAddress + a bare
+     *  `UPDATE ... WHERE email = ?` in the People sync, which had two defects,
+     *  both visible on one contact in Bob's DB: (1) it never wrote `name`, so
+     *  a google row kept whatever name it was first created with — Tyler's
+     *  Gmail address stayed "T Nichols" after the contact became "tyler K
+     *  Nichols" in Google, and typing "Tyler Nichols" in compose found only
+     *  his protonmail row; (2) the WHERE-by-email update also tried to turn
+     *  the discovered duplicate into a second google row with the same
+     *  (source, email, name) and hit the UNIQUE constraint — 4,505
+     *  "[contacts] field update failed" lines in one day's log, and none of
+     *  those contacts ever received a card update either.
+     *
+     *  Returns true when the google row was created. */
+    upsertGoogleContact(googleId: string, name: string, email: string, card: Partial<ContactFields>): boolean {
+        const lower = (email || "").toLowerCase();
+        if (!lower || !/^[^\s<>@]+@[^\s<>@]+\.[^\s<>@]+$/.test(lower)) return false;
+        name = cleanContactName(name);
+        const now = Date.now();
+        const rows = this.db.prepare(
+            "SELECT id FROM contacts WHERE source = 'google' AND lower(email) = ? ORDER BY use_count DESC, id ASC"
+        ).all(lower) as { id: number }[];
+        // Older syncs could leave two google rows for one address (the
+        // WHERE-by-email update converted discovered rows). Keep the
+        // most-used one; the rest would collide with the rename below.
+        for (const extra of rows.slice(1)) this.db.prepare("DELETE FROM contacts WHERE id = ?").run(extra.id);
+        const cardVals = CONTACT_FIELD_COLUMNS.map(c => card?.[c] ?? "");
+        if (rows.length) {
+            this.db.prepare(
+                `UPDATE contacts SET name = CASE WHEN ? != '' THEN ? ELSE name END, google_id = ?,
+                    ${CONTACT_FIELD_COLUMNS.map(c => `${c} = ?`).join(", ")}, updated_at = ?
+                 WHERE id = ?`
+            ).run(name, name, googleId, ...cardVals, now, rows[0].id);
+            this.notifyContactsChanged();
+            return false;
+        }
+        this.db.prepare(
+            `INSERT INTO contacts (source, google_id, name, email, ${CONTACT_FIELD_COLUMNS.join(", ")}, last_used, use_count, updated_at)
+             VALUES ('google', ?, ?, ?, ${CONTACT_FIELD_COLUMNS.map(() => "?").join(", ")}, 0, 0, ?)`
+        ).run(googleId, name, lower, ...cardVals, now);
+        this.notifyContactsChanged();
+        return true;
+    }
+
     /** True if `email` (lowercased) appears in the active denylist. Cached
      *  in-memory; refreshed on contacts.jsonc reload via setContactsDenylist. */
     private _denylist: Set<string> = new Set();

package/packages/mailx-store/package.json

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