@bobfrankston/rmfmail 1.2.186 → 1.2.188

package/packages/mailx-store/db.ts

@@ -1759,8 +1759,12 @@ export class MailxDB {
      *  During the additive migration we ALSO have to handle the legacy
      *  case where the row's folder_id matches but no message_folders row
      *  was migrated for it (race during initial population, etc.) — we
-     *  fall back to the messages.folder_id check to clean up consistently. */
-    dropFolderMembership(accountId: string, folderId: number, uid: number, folderPath?: string): boolean {
+     *  fall back to the messages.folder_id check to clean up consistently.
+     *
+     *  `reason`/`source` override the audit text — deleteMessage routes user
+     *  deletes through here, and "reconcile: server missing this UID" would
+     *  be a lie in that audit trail. */
+    dropFolderMembership(accountId: string, folderId: number, uid: number, folderPath?: string, reason?: string, source?: string): boolean {
         // First find the messages row this membership pointed at.
         const mf = this.db.prepare(
             "SELECT message_row_id FROM message_folders WHERE folder_id = ? AND uid = ?"
@@ -1809,8 +1813,8 @@ export class MailxDB {
             this.audit({
                 kind: "delete-membership",
                 accountId, folderId, uid,
-                reason: `reconcile dropped folder membership; ${remaining.cnt} other location(s) remain`,
-                source: `dropFolderMembership (${folderPath || ""})`,
+                reason: reason || `reconcile dropped folder membership; ${remaining.cnt} other location(s) remain`,
+                source: source || `dropFolderMembership (${folderPath || ""})`,
             });
             return true;
         }
@@ -1827,8 +1831,8 @@ export class MailxDB {
                 accountId, folderId, uid,
                 messageId: env.message_id || undefined,
                 subject: env.subject || undefined,
-                reason: "reconcile: server missing this UID after grace, no other folder memberships",
-                source: `dropFolderMembership (${folderPath || ""})`,
+                reason: reason || "reconcile: server missing this UID after grace, no other folder memberships",
+                source: source || `dropFolderMembership (${folderPath || ""})`,
             });
             console.log(`  [reconcile-delete] ${accountId} ${folderPath || folderId}/${uid} msgid=${env.message_id || "?"} (no other memberships) — body ${env.body_path || "(none)"}`);
         }
@@ -2505,13 +2509,19 @@ export class MailxDB {
      *  hitting the message in `_Spam` (correct) and hitting nothing
      *  because the legacy messages.folder_id still points at INBOX. */
     getMessageByUid(accountId: string, uid: number, folderId?: number): MessageEnvelope {
+        // Alias mf.folder_id over m.folder_id too — the envelope must carry
+        // the identity of the membership that MATCHED, not the legacy primary
+        // location, or a caller doing delete/move/flag with the returned
+        // folderId operates on a different folder than the one it looked up
+        // (the two drift: local moves keep the original uid, re-binds update
+        // one table but not the other).
         const sql = folderId != null
-            ? `SELECT m.*, mf.uid AS uid
+            ? `SELECT m.*, mf.uid AS uid, mf.folder_id AS folder_id
                FROM messages m
                JOIN message_folders mf ON mf.message_row_id = m.id
                WHERE m.account_id = ? AND mf.uid = ? AND mf.folder_id = ?
                LIMIT 1`
-            : `SELECT m.*, mf.uid AS uid
+            : `SELECT m.*, mf.uid AS uid, mf.folder_id AS folder_id
                FROM messages m
                JOIN message_folders mf ON mf.message_row_id = m.id
                WHERE m.account_id = ? AND mf.uid = ?
@@ -3114,22 +3124,39 @@ export class MailxDB {
      *  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 {
-        // 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) as any
-            : this.db.prepare(
-                "SELECT folder_id, message_id, subject FROM messages WHERE account_id = ? AND uid = ?"
-              ).get(accountId, uid) as any;
-        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 (folderId != null) {
+            // Resolve through message_folders — the SAME identity that
+            // getMessageByUid and every list query use. The legacy
+            // messages.folder_id/uid columns can drift from the membership
+            // rows (local moves keep the original uid, server re-binds update
+            // one table but not the other), and a delete keyed only on the
+            // legacy columns silently matches ZERO rows on a drifted message:
+            // the membership keeps it visible in the UI and it becomes
+            // undeletable forever (Eleanor 2026-07-29: ElkinWs uid 125482 in
+            // Trash "refuses to delete" — every attempt no-op'd here while
+            // the sync action reported success). dropFolderMembership drops
+            // the membership, orphan-cleans the messages row, and falls back
+            // to the legacy columns for pre-migration rows.
+            const cleaned = this.dropFolderMembership(
+                accountId, folderId, uid, undefined,
+                reason || "deleteMessage (no reason)",
+                source || "db.deleteMessage",
+            );
+            if (!cleaned) {
+                // A delete that deletes nothing is the "refuses to delete"
+                // symptom — never let it pass silently.
+                console.error(`  [delete-miss] ${accountId} folder=${folderId} uid=${uid}: no membership or legacy row matched — nothing deleted (source=${source || "db.deleteMessage"})`);
+            }
+            this.recalcFolderCounts(folderId);
+            return;
+        }
+        // No folderId (legacy callers): fall back to the messages-table key.
+        const msg = this.db.prepare(
+            "SELECT id, folder_id, message_id, subject FROM messages WHERE account_id = ? AND uid = ?"
+        ).get(accountId, uid) as any;
+        const r = this.db.prepare(
+            "DELETE FROM messages WHERE account_id = ? AND uid = ?"
+        ).run(accountId, uid);
         if ((r as any).changes && msg) {
             this.audit({
                 kind: "delete-msg",
@@ -3141,6 +3168,8 @@ export class MailxDB {
                 reason: reason || "deleteMessage (no reason)",
                 source: source || "db.deleteMessage",
             });
+        } else if (!(r as any).changes) {
+            console.error(`  [delete-miss] ${accountId} uid=${uid} (no folderId): no messages row matched — nothing deleted (source=${source || "db.deleteMessage"})`);
         }
         // Refresh folder counts
         if (msg) this.recalcFolderCounts(msg.folder_id);

package/packages/mailx-store/package.json

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