@bobfrankston/mailx-store 0.1.18 → 0.1.20

package/db.d.ts

@@ -82,6 +82,7 @@ export declare class MailxDB {
         dirty?: boolean;
         recurringEventId?: string;
         htmlLink?: string;
+        isHoliday?: boolean;
     }): string;
     getCalendarEvents(accountId: string, fromMs: number, toMs: number): any[];
     /** Lookup by uuid only — used by patch/delete paths that don't have an
@@ -223,6 +224,12 @@ export declare class MailxDB {
         bodyPath: string;
         providerId?: string;
     }): number;
+    /** Backfill the FTS5 `body_text` column for a message after its body
+     *  has been parsed. Capped at ~64 KB of text per row — FTS5 stores the
+     *  raw text and indexes tokens; we don't need every byte of a 1 MB
+     *  marketing email to find a word in the first paragraph. Called from
+     *  LocalStore.getMessage right after simpleParser succeeds. */
+    updateFtsBodyByUid(accountId: string, folderId: number, uid: number, bodyText: string): void;
     /** List view: messages currently in (account, folder).
      *  Joins through `message_folders` so the UID + folder location come
      *  from membership rows, not from the legacy messages.folder_id /

package/db.js

@@ -406,6 +406,11 @@ export class MailxDB {
         // Filters like "hide recurring events" check this column.
         this.addColumnIfMissing("calendar_events", "recurring_event_id", "TEXT");
         this.addColumnIfMissing("calendar_events", "html_link", "TEXT");
+        // Holidays come from a separate Google calendar
+        // (en.usa#holiday@group.v.calendar.google.com) but share the
+        // calendar_events table; the flag distinguishes them so the UI can
+        // style them differently and the alarm scheduler can skip them.
+        this.addColumnIfMissing("calendar_events", "is_holiday", "INTEGER NOT NULL DEFAULT 0");
         // Backfill UUIDs for any pre-existing rows that were inserted before
         // this column landed. One UPDATE + an id roundtrip per row — cheap
         // at our row counts, runs once per DB upgrade.
@@ -732,8 +737,8 @@ export class MailxDB {
             INSERT INTO calendar_events
                 (uuid, account_id, provider_id, calendar_id, title, start_ms, end_ms,
                  all_day, location, notes, etag, last_synced, dirty, deleted, updated_at,
-                 recurring_event_id, html_link)
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?, ?, ?)
+                 recurring_event_id, html_link, is_holiday)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?, ?, ?, ?)
             ON CONFLICT(uuid) DO UPDATE SET
                 account_id=excluded.account_id, provider_id=excluded.provider_id,
                 calendar_id=excluded.calendar_id, title=excluded.title,
@@ -743,8 +748,9 @@ export class MailxDB {
                 last_synced=excluded.last_synced, dirty=excluded.dirty,
                 updated_at=excluded.updated_at,
                 recurring_event_id=excluded.recurring_event_id,
-                html_link=excluded.html_link
-        `).run(uuid, ev.accountId, ev.providerId || null, ev.calendarId || "primary", ev.title, ev.startMs, ev.endMs, ev.allDay ? 1 : 0, ev.location || "", ev.notes || "", ev.etag || null, ev.dirty ? 0 : Date.now(), ev.dirty ? 1 : 0, Date.now(), ev.recurringEventId || null, ev.htmlLink || null);
+                html_link=excluded.html_link,
+                is_holiday=excluded.is_holiday
+        `).run(uuid, ev.accountId, ev.providerId || null, ev.calendarId || "primary", ev.title, ev.startMs, ev.endMs, ev.allDay ? 1 : 0, ev.location || "", ev.notes || "", ev.etag || null, ev.dirty ? 0 : Date.now(), ev.dirty ? 1 : 0, Date.now(), ev.recurringEventId || null, ev.htmlLink || null, ev.isHoliday ? 1 : 0);
         return uuid;
     }
     getCalendarEvents(accountId, fromMs, toMs) {
@@ -779,6 +785,7 @@ export class MailxDB {
             etag: r.etag, lastSynced: r.last_synced, dirty: !!r.dirty, deleted: !!r.deleted,
             recurringEventId: r.recurring_event_id || null,
             htmlLink: r.html_link || null,
+            isHoliday: !!r.is_holiday,
         };
     }
     /** Find a calendar event by its Google Calendar event id (provider_id).
@@ -1045,10 +1052,31 @@ export class MailxDB {
         }
     }
     deleteFolder(folderId) {
-        // Drop memberships in this folder first, then GC any messages
-        // rows that are now orphaned (no remaining memberships). A
-        // multi-folder message (e.g. Gmail label = INBOX + Important)
-        // keeps its body intact when only one of its folders is deleted.
+        // Repoint the legacy `messages.folder_id` for any message that
+        // lives in this folder AND at least one other. Without this the
+        // final `DELETE FROM folders` fails with a FOREIGN KEY constraint:
+        // the message survives the GC (still belongs to its other folder)
+        // but its primary folder_id still points at the row we're about
+        // to delete. Pick the smallest remaining membership as the new
+        // primary; arbitrary but stable.
+        this.db.prepare(`
+            UPDATE messages
+               SET folder_id = (
+                   SELECT MIN(folder_id) FROM message_folders
+                    WHERE message_row_id = messages.id
+                      AND folder_id != ?
+               )
+             WHERE folder_id = ?
+               AND EXISTS (
+                   SELECT 1 FROM message_folders
+                    WHERE message_row_id = messages.id
+                      AND folder_id != ?
+               )
+        `).run(folderId, folderId, folderId);
+        // Drop memberships in this folder, then GC any messages rows that
+        // are now orphaned (no remaining memberships). A multi-folder
+        // message (e.g. Gmail label = INBOX + Important) keeps its body
+        // intact when only one of its folders is deleted.
         const orphans = this.gcMembershipsAndCollectOrphans(folderId);
         if (orphans.count > 0)
             this.audit({ kind: "delete-bulk", folderId, count: orphans.count, reason: "folder deleted", source: "deleteFolder" });
@@ -1234,6 +1262,23 @@ export class MailxDB {
             if (msg.providerId && !existing.provider_id) {
                 this.db.prepare("UPDATE messages SET provider_id = ? WHERE id = ?").run(msg.providerId, existing.id);
             }
+            // Local-first flag preservation: a row whose flags the user
+            // changed (mark read, flag/star, etc.) gets a pending
+            // `sync_action` queued. Until that action drains to the server,
+            // the server's snapshot is STALE for flags — pulling its
+            // "unread" answer back and overwriting the local "\Seen" would
+            // bounce the read row back to unread, which is what Bob 2026-05-12
+            // reported: "you keep reverting messages to show up as unread
+            // even after it is marked read." Keep the local flags whenever a
+            // pending flag-push exists; the regular processSyncActions cycle
+            // will reconcile in the user's direction.
+            const pendingFlags = this.db.prepare(`SELECT 1 FROM sync_actions
+                  WHERE account_id = ? AND folder_id = ? AND uid = ?
+                    AND action = 'flags'
+                  LIMIT 1`).get(msg.accountId, msg.folderId, msg.uid);
+            const flagsToWrite = pendingFlags
+                ? (this.db.prepare("SELECT flags_json FROM messages WHERE id = ?").get(existing.id)?.flags_json ?? JSON.stringify(msg.flags))
+                : JSON.stringify(msg.flags);
             // Only overwrite body_path / preview when the caller actually has a
             // body. Metadata-only syncs (Gmail API storeApiMessages, IMAP
             // header-only fetches) pass bodyPath: "" and would otherwise wipe
@@ -1243,13 +1288,13 @@ export class MailxDB {
                 this.db.prepare(`
                     UPDATE messages SET flags_json = ?, preview = ?, body_path = ?, cached_at = ?
                     WHERE id = ?
-                `).run(JSON.stringify(msg.flags), msg.preview, msg.bodyPath, Date.now(), existing.id);
+                `).run(flagsToWrite, msg.preview, msg.bodyPath, Date.now(), existing.id);
             }
             else {
                 this.db.prepare(`
                     UPDATE messages SET flags_json = ?, cached_at = ?
                     WHERE id = ?
-                `).run(JSON.stringify(msg.flags), Date.now(), existing.id);
+                `).run(flagsToWrite, Date.now(), existing.id);
             }
             // Refresh membership last_seen_at — server confirmed this UID
             // is still in this folder. No-op if migration already populated
@@ -1327,13 +1372,35 @@ export class MailxDB {
         // sync during the additive migration but reads will move to JOIN
         // with message_folders.
         this.upsertMessageFolder(rowId, msg.folderId, msg.uid);
-        // Index for full-text search
+        // Index for full-text search. body_text seeded from `msg.preview`
+        // here — the full parsed body isn't available at upsert time (we
+        // store .eml on disk; parsing is on-demand). LocalStore.getMessage
+        // calls `updateFtsBodyByUid` after simpleParser runs to swap the
+        // preview-only seed for the full body text, so subsequent searches
+        // hit body content too. Without that backfill, words that only
+        // appear deep in the body (Bob 2026-05-12: "I searched for ksink
+        // which is in <...>.eml but it was not found") never match.
         try {
             this.db.prepare("INSERT INTO messages_fts (rowid, subject, from_name, from_address, to_text, cc_text, body_text) VALUES (?, ?, ?, ?, ?, ?, ?)").run(rowId, msg.subject, msg.from.name, msg.from.address, toText, ccText, msg.preview);
         }
         catch { /* FTS insert may fail on rebuild, non-fatal */ }
         return rowId;
     }
+    /** Backfill the FTS5 `body_text` column for a message after its body
+     *  has been parsed. Capped at ~64 KB of text per row — FTS5 stores the
+     *  raw text and indexes tokens; we don't need every byte of a 1 MB
+     *  marketing email to find a word in the first paragraph. Called from
+     *  LocalStore.getMessage right after simpleParser succeeds. */
+    updateFtsBodyByUid(accountId, folderId, uid, bodyText) {
+        try {
+            const row = this.db.prepare("SELECT id FROM messages WHERE account_id = ? AND folder_id = ? AND uid = ?").get(accountId, folderId, uid);
+            if (!row)
+                return;
+            const capped = bodyText.length > 64_000 ? bodyText.slice(0, 64_000) : bodyText;
+            this.db.prepare("UPDATE messages_fts SET body_text = ? WHERE rowid = ?").run(capped, row.id);
+        }
+        catch { /* FTS update is best-effort */ }
+    }
     /** List view: messages currently in (account, folder).
      *  Joins through `message_folders` so the UID + folder location come
      *  from membership rows, not from the legacy messages.folder_id /

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-store",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,8 +9,8 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@bobfrankston/mailx-types": "^0.1.10",
-    "@bobfrankston/mailx-settings": "^0.1.14"
+    "@bobfrankston/mailx-types": "^0.1.11",
+    "@bobfrankston/mailx-settings": "^0.1.16"
   },
   "repository": {
     "type": "git",
@@ -25,8 +25,8 @@
   },
   ".transformedSnapshot": {
     "dependencies": {
-      "@bobfrankston/mailx-types": "^0.1.10",
-      "@bobfrankston/mailx-settings": "^0.1.14"
+      "@bobfrankston/mailx-types": "^0.1.11",
+      "@bobfrankston/mailx-settings": "^0.1.16"
     }
   }
 }