@bobfrankston/mailx-store 0.1.39 → 0.1.40

package/db.d.ts

@@ -399,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

@@ -2021,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.39",
+  "version": "0.1.40",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",

package/store.js

@@ -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({