@bobfrankston/mailx-store 0.1.40 → 0.1.42

package/db.d.ts

@@ -302,7 +302,15 @@ export declare class MailxDB {
      *  Existing callers without folderId are tolerated (legacy) but should
      *  be migrated. */
     getMessageBodyPath(accountId: string, uid: number, folderId?: number): string;
-    updateMessageFlags(accountId: string, uid: number, flags: string[]): void;
+    /** Update flags for a message. folderId is REQUIRED — same UID-collision
+     *  bug class as the deleteMessage one we fixed 2026-05-27. The
+     *  WHERE-account-AND-uid query previously updated EVERY folder's row
+     *  that shared the numeric UID, causing the "stars on letters I never
+     *  starred" symptom (Bob 2026-05-27: flagging one INBOX message lit
+     *  up stars on a same-numeric-UID row in Drafts/Sent/sub-folders).
+     *  folderId === null is allowed as an explicit "every folder" override
+     *  for code paths that mean it; everyone else must pass folderId. */
+    updateMessageFlags(accountId: string, folderId: number | null, uid: number, flags: string[]): void;
     updateMessageFolder(accountId: string, uid: number, targetFolderId: number): void;
     /** Local-first move of a message between folders. Updates BOTH the
      *  legacy `messages.folder_id` column AND the `message_folders`
@@ -326,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

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.
@@ -1815,8 +1849,21 @@ export class MailxDB {
             : this.db.prepare("SELECT body_path FROM messages WHERE account_id = ? AND uid = ?").get(accountId, uid);
         return r?.body_path || "";
     }
-    updateMessageFlags(accountId, uid, flags) {
-        this.db.prepare("UPDATE messages SET flags_json = ? WHERE account_id = ? AND uid = ?").run(JSON.stringify(flags), accountId, uid);
+    /** Update flags for a message. folderId is REQUIRED — same UID-collision
+     *  bug class as the deleteMessage one we fixed 2026-05-27. The
+     *  WHERE-account-AND-uid query previously updated EVERY folder's row
+     *  that shared the numeric UID, causing the "stars on letters I never
+     *  starred" symptom (Bob 2026-05-27: flagging one INBOX message lit
+     *  up stars on a same-numeric-UID row in Drafts/Sent/sub-folders).
+     *  folderId === null is allowed as an explicit "every folder" override
+     *  for code paths that mean it; everyone else must pass folderId. */
+    updateMessageFlags(accountId, folderId, uid, flags) {
+        if (folderId != null) {
+            this.db.prepare("UPDATE messages SET flags_json = ? WHERE account_id = ? AND folder_id = ? AND uid = ?").run(JSON.stringify(flags), accountId, folderId, uid);
+        }
+        else {
+            this.db.prepare("UPDATE messages SET flags_json = ? WHERE account_id = ? AND uid = ?").run(JSON.stringify(flags), accountId, uid);
+        }
     }
     updateMessageFolder(accountId, uid, targetFolderId) {
         // Idempotency: if a row already exists at (account, target_folder, uid)
@@ -1900,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
@@ -1909,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

package/package.json

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

package/store.js

@@ -450,7 +450,7 @@ export class Store {
      *    `folder:<id>`    (auto fan-out)
      */
     updateFlags(accountId, uid, folderId, flags) {
-        this.db.updateMessageFlags(accountId, uid, flags);
+        this.db.updateMessageFlags(accountId, folderId, uid, flags);
         const env = this.db.getMessageByUid(accountId, uid, folderId);
         const msgUuid = env?.uuid;
         if (msgUuid) {