@bobfrankston/mailx-store 0.1.38 → 0.1.40

package/db.d.ts

@@ -294,7 +294,14 @@ export declare class MailxDB {
      *  is stable. Use this as the identity in any long-lived reference
      *  (compose in-reply-to, dally, undo stacks). */
     getMessageByUuid(uuid: string): MessageEnvelope;
-    getMessageBodyPath(accountId: string, uid: number): string;
+    /** Look up a message's body_path. folderId is REQUIRED when available
+     *  because (account, uid) is not a unique key — the same numeric UID
+     *  refers to different messages in INBOX vs Outbox vs Sent etc. Passing
+     *  no folderId returns the first matching row, which may be the wrong
+     *  message's body — same class of bug as the parsedCache UID collision.
+     *  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;
     updateMessageFolder(accountId: string, uid: number, targetFolderId: number): void;
     /** Local-first move of a message between folders. Updates BOTH the
@@ -392,9 +399,23 @@ export declare class MailxDB {
      *  appended at a different real UID). Idempotent: if no row matches
      *  (already rebound by an earlier sync), it's a no-op. */
     updateMessageUid(accountId: string, folderId: number, oldUid: number, newUid: number): void;
-    /** Delete a message by account + UID. Reason is propagated into the
-     *  audit_log so the DB carries an authoritative trail of every removal. */
-    deleteMessage(accountId: string, uid: number, reason?: string, source?: string): void;
+    /** Delete a message by account + folder + UID. folderId is REQUIRED:
+     *  IMAP UIDs are per-folder, so the same numeric UID refers to different
+     *  messages in INBOX vs Sent vs any other folder. The pre-2026-05-27
+     *  implementation accepted (accountId, uid) only and ran
+     *  `DELETE FROM messages WHERE account_id=? AND uid=?` — which on a
+     *  QRESYNC VANISHED for INBOX uid=N would also delete the row for the
+     *  SAME numeric uid=N living in Sent, Drafts, every label folder, etc.
+     *  That's what wiped 70k bobma rows on 2026-05-27 when QRESYNC reported
+     *  a handful of vanished UIDs. Never again — folderId required.
+     *
+     *  folderId === null is allowed as an explicit "I want every folder's
+     *  copy of this UID gone" (used by cross-account move where the source
+     *  is being abandoned entirely). All other callers MUST pass a folderId.
+     *
+     *  Reason is propagated into the audit_log so the DB carries an
+     *  authoritative trail of every removal. */
+    deleteMessage(accountId: string, folderId: number | null, uid: number, reason?: string, source?: string): void;
     /** Recalculate folder total/unread counts from actual messages */
     recalcFolderCounts(folderId: number): void;
     /** Bulk insert within a transaction for sync performance */

package/db.js

@@ -1802,8 +1802,17 @@ export class MailxDB {
             return null;
         return this.rowToEnvelope(r);
     }
-    getMessageBodyPath(accountId, uid) {
-        const r = this.db.prepare("SELECT body_path FROM messages WHERE account_id = ? AND uid = ?").get(accountId, uid);
+    /** Look up a message's body_path. folderId is REQUIRED when available
+     *  because (account, uid) is not a unique key — the same numeric UID
+     *  refers to different messages in INBOX vs Outbox vs Sent etc. Passing
+     *  no folderId returns the first matching row, which may be the wrong
+     *  message's body — same class of bug as the parsedCache UID collision.
+     *  Existing callers without folderId are tolerated (legacy) but should
+     *  be migrated. */
+    getMessageBodyPath(accountId, uid, folderId) {
+        const r = folderId != null
+            ? this.db.prepare("SELECT body_path FROM messages WHERE account_id = ? AND folder_id = ? AND uid = ?").get(accountId, folderId, uid)
+            : this.db.prepare("SELECT body_path FROM messages WHERE account_id = ? AND uid = ?").get(accountId, uid);
         return r?.body_path || "";
     }
     updateMessageFlags(accountId, uid, flags) {
@@ -2012,13 +2021,31 @@ export class MailxDB {
             }
         }
     }
-    /** Delete a message by account + UID. Reason is propagated into the
-     *  audit_log so the DB carries an authoritative trail of every removal. */
-    deleteMessage(accountId, uid, reason, source) {
-        // Get folderId + message_id + subject before deleting so the audit
-        // row carries enough context to identify what was removed.
-        const msg = this.db.prepare("SELECT folder_id, message_id, subject FROM messages WHERE account_id = ? AND uid = ?").get(accountId, uid);
-        const r = this.db.prepare("DELETE FROM messages WHERE account_id = ? AND uid = ?").run(accountId, uid);
+    /** Delete a message by account + folder + UID. folderId is REQUIRED:
+     *  IMAP UIDs are per-folder, so the same numeric UID refers to different
+     *  messages in INBOX vs Sent vs any other folder. The pre-2026-05-27
+     *  implementation accepted (accountId, uid) only and ran
+     *  `DELETE FROM messages WHERE account_id=? AND uid=?` — which on a
+     *  QRESYNC VANISHED for INBOX uid=N would also delete the row for the
+     *  SAME numeric uid=N living in Sent, Drafts, every label folder, etc.
+     *  That's what wiped 70k bobma rows on 2026-05-27 when QRESYNC reported
+     *  a handful of vanished UIDs. Never again — folderId required.
+     *
+     *  folderId === null is allowed as an explicit "I want every folder's
+     *  copy of this UID gone" (used by cross-account move where the source
+     *  is being abandoned entirely). All other callers MUST pass a folderId.
+     *
+     *  Reason is propagated into the audit_log so the DB carries an
+     *  authoritative trail of every removal. */
+    deleteMessage(accountId, folderId, uid, reason, source) {
+        // Get message_id + subject before deleting so the audit row carries
+        // enough context to identify what was removed.
+        const msg = folderId != null
+            ? this.db.prepare("SELECT folder_id, message_id, subject FROM messages WHERE account_id = ? AND folder_id = ? AND uid = ?").get(accountId, folderId, uid)
+            : this.db.prepare("SELECT folder_id, message_id, subject FROM messages WHERE account_id = ? AND uid = ?").get(accountId, uid);
+        const r = folderId != null
+            ? this.db.prepare("DELETE FROM messages WHERE account_id = ? AND folder_id = ? AND uid = ?").run(accountId, folderId, uid)
+            : this.db.prepare("DELETE FROM messages WHERE account_id = ? AND uid = ?").run(accountId, uid);
         if (r.changes && msg) {
             this.audit({
                 kind: "delete-msg",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-store",
-  "version": "0.1.38",
+  "version": "0.1.40",
   "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.24",
+    "@bobfrankston/mailx-settings": "^0.1.25",
     "@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.24",
+      "@bobfrankston/mailx-settings": "^0.1.25",
       "@bobfrankston/mailx-bus": "^0.1.2",
       "mailparser": "^3.7.2"
     }

package/store.js

@@ -224,7 +224,7 @@ export class Store {
         // the historical lookup. Either may be empty (body never fetched).
         let storedPath = envelope.bodyPath || "";
         if (!storedPath)
-            storedPath = this.db.getMessageBodyPath(accountId, uid) || "";
+            storedPath = this.db.getMessageBodyPath(accountId, uid, folderId) || "";
         const empty = {
             ...envelope,
             bodyHtml: "", bodyText: "",
@@ -531,7 +531,7 @@ export class Store {
             });
             return "moved-to-trash";
         }
-        this.db.deleteMessage(accountId, uid, "user-initiated trash (already in trash → expunge)", "Store.trashMessage");
+        this.db.deleteMessage(accountId, folderId, uid, "user-initiated trash (already in trash → expunge)", "Store.trashMessage");
         this.db.recalcFolderCounts(folderId);
         if (msgUuid) {
             this.bus.publish({