@bobfrankston/mailx-imap 0.1.27 → 0.1.28

package/index.js

@@ -1949,24 +1949,40 @@ export class ImapManager extends EventEmitter {
     static RECONCILE_DELETE_GRACE_MS = 30 * 60_000;
     scheduleDeferredReconcileDelete(accountId, folderId, uid, folderPath) {
         const key = `${accountId}:${folderId}:${uid}`;
-        // If already pending, don't reset — the 60s clock should run from
-        // the FIRST detection so a flapping server can't keep deferring.
+        // If already pending, don't reset — the grace clock runs from the
+        // FIRST detection so a flapping server can't keep deferring.
         if (this.deferredDeletes.has(key))
             return;
         const t = setTimeout(() => {
             this.deferredDeletes.delete(key);
-            // Verify the row still exists at the original (folder, uid).
-            // If move-detect rebound it during the grace window, this
-            // lookup returns null — skip the delete.
-            const env = this.db.getMessageByUid(accountId, uid, folderId);
-            if (!env || env.folderId !== folderId) {
-                console.log(`  [reconcile-skip] ${accountId}/${folderPath} uid=${uid}: row moved during grace window (rebound to folder ${env?.folderId ?? "deleted"})`);
-                return;
+            // NEW SEMANTICS (post-message_folders refactor): we drop the
+            // FOLDER MEMBERSHIP, not the messages row. The message itself
+            // may exist in other folders (Gmail labels, server-side moves
+            // already reconciled by the dest folder's sync); deleting the
+            // messages row would clobber those.
+            //
+            // 1. Delete from message_folders for THIS (folder, uid).
+            // 2. Look up if the messages row has any other memberships.
+            //    If yes — message lives elsewhere; just drop our row's
+            //    body-cache reference if it was tied to this location.
+            //    If no — message is truly orphaned; delete the messages
+            //    row + unlink body file.
+            const ds = this.db.dropFolderMembership?.(accountId, folderId, uid, folderPath);
+            // Fall back to the legacy path if the new method isn't there
+            // for some reason (defensive — shouldn't happen, but the same
+            // call site is hit by Gmail-API reconcile too which I haven't
+            // converted yet).
+            if (!ds) {
+                const env = this.db.getMessageByUid(accountId, uid, folderId);
+                if (!env || env.folderId !== folderId) {
+                    console.log(`  [reconcile-skip] ${accountId}/${folderPath} uid=${uid}: row moved during grace window`);
+                    return;
+                }
+                const tag = env.messageId ? `msgid=${env.messageId} subj="${(env.subject || "").slice(0, 60)}"` : "no-msgid";
+                console.log(`  [reconcile-delete] ${accountId}/${folderPath} uid=${uid} ${tag} (legacy path)`);
+                this.unlinkBodyFile(accountId, uid, folderId).catch(() => { });
+                this.db.deleteMessage(accountId, uid, "reconcile: server missing this UID after grace (legacy)", `mailx-imap deferred reconcile (${folderPath})`);
             }
-            const tag = env.messageId ? `msgid=${env.messageId} subj="${(env.subject || "").slice(0, 60)}"` : "no-msgid";
-            console.log(`  [reconcile-delete] ${accountId}/${folderPath} uid=${uid} ${tag} (after 60s grace, no rebind)`);
-            this.unlinkBodyFile(accountId, uid, folderId).catch(() => { });
-            this.db.deleteMessage(accountId, uid, "reconcile: server missing this UID 60s after detection (no move-detect rebind)", `mailx-imap syncFolder deferred reconcile (${folderPath})`);
             this.db.recalcFolderCounts(folderId);
             this.emit("folderCountsChanged", accountId, {});
         }, ImapManager.RECONCILE_DELETE_GRACE_MS);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.27",
+  "version": "0.1.28",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -11,7 +11,7 @@
   "dependencies": {
     "@bobfrankston/mailx-types": "^0.1.10",
     "@bobfrankston/mailx-settings": "^0.1.13",
-    "@bobfrankston/mailx-store": "^0.1.12",
+    "@bobfrankston/mailx-store": "^0.1.13",
     "@bobfrankston/iflow-direct": "^0.1.35",
     "@bobfrankston/tcp-transport": "^0.1.5",
     "@bobfrankston/smtp-direct": "^0.1.5",
@@ -39,7 +39,7 @@
     "dependencies": {
       "@bobfrankston/mailx-types": "^0.1.10",
       "@bobfrankston/mailx-settings": "^0.1.13",
-      "@bobfrankston/mailx-store": "^0.1.12",
+      "@bobfrankston/mailx-store": "^0.1.13",
       "@bobfrankston/iflow-direct": "^0.1.35",
       "@bobfrankston/tcp-transport": "^0.1.5",
       "@bobfrankston/smtp-direct": "^0.1.5",