@bobfrankston/mailx-store 0.1.41 → 0.1.43

package/db.d.ts

@@ -334,15 +334,23 @@ export declare class MailxDB {
     findPendingSyncAction(accountId: string, action: string, uid: number, folderId: number, targetFolderId?: number): {
         id: number;
     } | null;
-    updateBodyPath(accountId: string, uid: number, bodyPath: string): void;
+    /** folderId REQUIRED — same UID-collision bug class as deleteMessage /
+     *  updateMessageFlags. The same numeric UID exists in many folders for
+     *  DIFFERENT messages; a (account, uid) UPDATE writes the body_path onto
+     *  EVERY folder's uid=N row, so 22 unrelated messages ended up sharing one
+     *  .eml and showed each other's bodies (Bob 2026-05-29 — subject/letter
+     *  mismatch). Never write body_path without folder_id. */
+    updateBodyPath(accountId: string, folderId: number, uid: number, bodyPath: string): void;
     /** Write the post-download metadata in one go: body file path, parsed
      *  attachment flag, preview text, and the parse timestamp. Called from
      *  prefetch after the body has been written to disk and parsed — without
      *  this, IMAP metadata-only sync leaves has_attachments=0 and preview=""
      *  forever (the paperclip 📎 never renders for non-Gmail accounts).
      *  Pass bodyPath = "" to update only the parsed fields (used by the
-     *  backfill worker re-parsing existing .eml files on disk). */
-    updateBodyMeta(accountId: string, uid: number, bodyPath: string, hasAttachments: boolean, preview: string): void;
+     *  backfill worker re-parsing existing .eml files on disk).
+     *  folderId REQUIRED — see updateBodyPath: the (account, uid) form
+     *  cross-wired body_path across every folder sharing the numeric UID. */
+    updateBodyMeta(accountId: string, folderId: number, uid: number, bodyPath: string, hasAttachments: boolean, preview: string): void;
     /** Find rows whose body is on disk but was never run through extractPreview
      *  (has_attachments/preview reflect "no body source at sync time", typical
      *  of the IMAP metadata-only path). Used by the backfill worker to walk
@@ -363,7 +371,7 @@ export declare class MailxDB {
      *  reply arrives. Idempotent — UPDATE on an already-1 row is a no-op. */
     markRepliedByMessageId(accountId: string, messageId: string): boolean;
     /** Get messages without cached bodies (for background prefetch) */
-    getMessagesWithoutBody(accountId: string, limit?: number): {
+    getMessagesWithoutBody(accountId: string, limit?: number, excludeFolderIds?: number[]): {
         uid: number;
         folderId: number;
     }[];

package/db.js

@@ -501,6 +501,40 @@ export class MailxDB {
         catch (e) {
             console.error(`  [migration] synthetic-UID cleanup failed: ${e?.message || e}`);
         }
+        // Heal body_path cross-wiring caused by the pre-fix updateBodyMeta /
+        // updateBodyPath (which wrote body_path WHERE (account, uid) with no
+        // folder_id, so 22+ unrelated messages sharing a numeric UID across
+        // folders ended up pointing at ONE .eml and rendered each other's
+        // bodies — Bob 2026-05-29 "subject and summary unrelated"). Any
+        // body_path referenced by more than one row is, by construction,
+        // cross-wired (each (folder,uid) gets its own .eml via putMessage).
+        // Clear those rows' body_path + body_parsed_at so the prefetch /
+        // on-demand fetch re-downloads the CORRECT body per (folder, uid) with
+        // the now-folder-scoped writers. This is a cache re-download, not a
+        // data backfill — safe. KV-flagged so it runs once.
+        try {
+            const healedFlag = this.getKv("schema", "fix_crosswired_bodypath_v1");
+            if (!healedFlag) {
+                const r = this.db.prepare(`
+                    UPDATE messages SET body_path = '', body_parsed_at = NULL
+                    WHERE body_path IS NOT NULL AND body_path != ''
+                      AND body_path IN (
+                          SELECT body_path FROM messages
+                          WHERE body_path IS NOT NULL AND body_path != ''
+                          GROUP BY body_path HAVING COUNT(*) > 1
+                      )
+                `).run();
+                const count = r.changes || 0;
+                if (count > 0) {
+                    console.log(`  [migration] cleared ${count} cross-wired body_path rows — will re-fetch correct bodies`);
+                    this.audit({ kind: "migration", count, reason: "fix_crosswired_bodypath_v1 — clear body_path shared across multiple (folder,uid) rows", source: "MailxDB constructor" });
+                }
+                this.setKv("schema", "fix_crosswired_bodypath_v1", "1");
+            }
+        }
+        catch (e) {
+            console.error(`  [migration] body_path cross-wire cleanup failed: ${e?.message || e}`);
+        }
         // One-shot: backfill message_folders from existing messages rows.
         // After this runs, every existing (account, folder, uid) row in
         // messages has a corresponding membership row in message_folders.
@@ -1913,8 +1947,14 @@ export class MailxDB {
         const r = this.db.prepare(sql).get(...params);
         return r || null;
     }
-    updateBodyPath(accountId, uid, bodyPath) {
-        this.db.prepare("UPDATE messages SET body_path = ? WHERE account_id = ? AND uid = ?").run(bodyPath, accountId, uid);
+    /** folderId REQUIRED — same UID-collision bug class as deleteMessage /
+     *  updateMessageFlags. The same numeric UID exists in many folders for
+     *  DIFFERENT messages; a (account, uid) UPDATE writes the body_path onto
+     *  EVERY folder's uid=N row, so 22 unrelated messages ended up sharing one
+     *  .eml and showed each other's bodies (Bob 2026-05-29 — subject/letter
+     *  mismatch). Never write body_path without folder_id. */
+    updateBodyPath(accountId, folderId, uid, bodyPath) {
+        this.db.prepare("UPDATE messages SET body_path = ? WHERE account_id = ? AND folder_id = ? AND uid = ?").run(bodyPath, accountId, folderId, uid);
     }
     /** Write the post-download metadata in one go: body file path, parsed
      *  attachment flag, preview text, and the parse timestamp. Called from
@@ -1922,13 +1962,15 @@ export class MailxDB {
      *  this, IMAP metadata-only sync leaves has_attachments=0 and preview=""
      *  forever (the paperclip 📎 never renders for non-Gmail accounts).
      *  Pass bodyPath = "" to update only the parsed fields (used by the
-     *  backfill worker re-parsing existing .eml files on disk). */
-    updateBodyMeta(accountId, uid, bodyPath, hasAttachments, preview) {
+     *  backfill worker re-parsing existing .eml files on disk).
+     *  folderId REQUIRED — see updateBodyPath: the (account, uid) form
+     *  cross-wired body_path across every folder sharing the numeric UID. */
+    updateBodyMeta(accountId, folderId, uid, bodyPath, hasAttachments, preview) {
         if (bodyPath) {
-            this.db.prepare("UPDATE messages SET body_path = ?, has_attachments = ?, preview = ?, body_parsed_at = ? WHERE account_id = ? AND uid = ?").run(bodyPath, hasAttachments ? 1 : 0, preview, Date.now(), accountId, uid);
+            this.db.prepare("UPDATE messages SET body_path = ?, has_attachments = ?, preview = ?, body_parsed_at = ? WHERE account_id = ? AND folder_id = ? AND uid = ?").run(bodyPath, hasAttachments ? 1 : 0, preview, Date.now(), accountId, folderId, uid);
         }
         else {
-            this.db.prepare("UPDATE messages SET has_attachments = ?, preview = ?, body_parsed_at = ? WHERE account_id = ? AND uid = ?").run(hasAttachments ? 1 : 0, preview, Date.now(), accountId, uid);
+            this.db.prepare("UPDATE messages SET has_attachments = ?, preview = ?, body_parsed_at = ? WHERE account_id = ? AND folder_id = ? AND uid = ?").run(hasAttachments ? 1 : 0, preview, Date.now(), accountId, folderId, uid);
         }
     }
     /** Find rows whose body is on disk but was never run through extractPreview
@@ -1956,14 +1998,24 @@ export class MailxDB {
         return r.changes > 0;
     }
     /** Get messages without cached bodies (for background prefetch) */
-    getMessagesWithoutBody(accountId, limit = 50) {
+    getMessagesWithoutBody(accountId, limit = 50, excludeFolderIds = []) {
         // Prefetch order: smallest first, NULLs last, recent within tiebreak.
         // Reasoning: on slow / metered Android networks, the user feels the
         // cache "fill up" much faster when the queue is dominated by short
         // notification mails (a handful of KB each) instead of a single
         // multi-megabyte attachment that monopolizes bandwidth for minutes.
         // Size 0 / NULL fall to the end so they don't masquerade as small.
-        return this.db.prepare("SELECT uid, folder_id as folderId FROM messages WHERE account_id = ? AND (body_path IS NULL OR body_path = '') ORDER BY (size IS NULL OR size = 0), size ASC, date DESC LIMIT ?").all(accountId, limit);
+        //
+        // excludeFolderIds: folders the caller has put in error-cooldown. We
+        // exclude them HERE (at the query) rather than after slicing, because a
+        // single bloated/failing folder (e.g. a server-side Outbox stuffed with
+        // hundreds of stuck messages) would otherwise fill the entire size-asc
+        // result and starve every healthy folder of its prefetch turn — the
+        // "so much unfetched, nothing draining" symptom (Bob 2026-06-01).
+        const exclusion = excludeFolderIds.length
+            ? ` AND folder_id NOT IN (${excludeFolderIds.map(() => "?").join(",")})`
+            : "";
+        return this.db.prepare(`SELECT uid, folder_id as folderId FROM messages WHERE account_id = ? AND (body_path IS NULL OR body_path = '')${exclusion} ORDER BY (size IS NULL OR size = 0), size ASC, date DESC LIMIT ?`).all(accountId, ...excludeFolderIds, limit);
     }
     /** Highest server UID we've seen in this folder. After the
      *  message_folders refactor, this reads from the membership table

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-store",
-  "version": "0.1.41",
+  "version": "0.1.43",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -10,7 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "@bobfrankston/mailx-types": "^0.1.18",
-    "@bobfrankston/mailx-settings": "^0.1.25",
+    "@bobfrankston/mailx-settings": "^0.1.26",
     "@bobfrankston/mailx-bus": "^0.1.2",
     "mailparser": "^3.7.2"
   },
@@ -30,7 +30,7 @@
   ".transformedSnapshot": {
     "dependencies": {
       "@bobfrankston/mailx-types": "^0.1.18",
-      "@bobfrankston/mailx-settings": "^0.1.25",
+      "@bobfrankston/mailx-settings": "^0.1.26",
       "@bobfrankston/mailx-bus": "^0.1.2",
       "mailparser": "^3.7.2"
     }