@bobfrankston/rmfmail 1.2.29 → 1.2.31

package/packages/mailx-imap/index.ts

@@ -1520,6 +1520,15 @@ export class ImapManager extends EventEmitter {
                         this.db.updateFolderSync(folderId, qr.exists ? prevUidValidity : prevUidValidity, String(qr.newHighestModSeq));
                     }
 
+                    // QRESYNC confirmed UIDVALIDITY is unchanged (it falls back to
+                    // full sync otherwise), so serverUidNext is trustworthy — sweep
+                    // phantom (uid >= UIDNEXT) cross-wired rows here too. Without
+                    // this, folders with a stable modseq (most of them) take the
+                    // QRESYNC fast path forever and their phantoms never get swept
+                    // (Bob 2026-06-17: CEBog phantoms persisted through the
+                    // reconcile-only sweep because CEBog syncs via QRESYNC).
+                    this.sweepPhantomRows(accountId, folderId, folder.path, serverUidNext);
+
                     this.emit("syncProgress", accountId, `sync:${folder.path}`, 100);
                     console.log(`  [qresync] ${accountId}/${folder.path}: done in ${Date.now() - __sfStart}ms (path: QRESYNC)`);
                     return newOnes.length;
@@ -1842,20 +1851,7 @@ export class ImapManager extends EventEmitter {
             // server hiccup — so delete them unconditionally (the real copy lives
             // in its true folder and re-syncs from there; the local store is a
             // cache). Only runs when STATUS gave a trustworthy UIDNEXT.
-            if (serverUidNext != null && serverUidNext > 0) {
-                try {
-                    const phantoms = this.db.getUidsForFolder(accountId, folderId).filter(u => u >= serverUidNext!);
-                    if (phantoms.length > 0) {
-                        for (const uid of phantoms) {
-                            this.unlinkBodyFile(accountId, uid, folderId).catch(() => {});
-                            this.db.deleteMessage(accountId, folderId, uid, `phantom: uid>=server UIDNEXT ${serverUidNext}`, `mailx-imap phantom sweep (${folder.path})`);
-                        }
-                        deletedCount += phantoms.length;
-                        this.db.recalcFolderCounts(folderId);
-                        console.log(`  [phantom-sweep] ${accountId}/${folder.path}: removed ${phantoms.length} cross-wired row(s) with uid >= UIDNEXT ${serverUidNext}`);
-                    }
-                } catch (e: any) { console.error(`  [phantom-sweep] ${accountId}/${folder.path}: ${e?.message || e}`); }
-            }
+            deletedCount += this.sweepPhantomRows(accountId, folderId, folder.path, serverUidNext);
             try {
                 // Reuse the server UID list set-diff already fetched.
                 // Without this we made TWO `UID SEARCH` calls per folder
@@ -2973,6 +2969,36 @@ export class ImapManager extends EventEmitter {
         this.deferredDeletes.set(key, t);
     }
 
+    /** Delete local rows whose uid >= the server's UIDNEXT for this folder.
+     *  Such a uid was NEVER assigned in this folder (UIDNEXT is the next one the
+     *  server will ever hand out), so the row is a cross-wired phantom ("UID is
+     *  not identity" corruption) — a real message stamped with the wrong
+     *  folder_id. They break prefetch (the server returns 0 FETCH responses for
+     *  uids it doesn't have → no body caches) and the normal set-diff reconcile
+     *  refuses to remove them when they're >50% of the folder. Deleting by the
+     *  UIDNEXT invariant is unconditional-safe: the uid is impossible, can't be a
+     *  move target, and the message's real copy re-syncs from its true folder
+     *  (the local store is a cache). Caller must have a TRUSTWORTHY uidNext
+     *  (STATUS result) AND confirmed UIDVALIDITY is unchanged for this folder
+     *  (full-sync and QRESYNC-success paths both satisfy that). Returns the count. */
+    private sweepPhantomRows(accountId: string, folderId: number, folderPath: string, serverUidNext: number | null): number {
+        if (serverUidNext == null || serverUidNext <= 0) return 0;
+        try {
+            const phantoms = this.db.getUidsForFolder(accountId, folderId).filter(u => u >= serverUidNext);
+            if (phantoms.length === 0) return 0;
+            for (const uid of phantoms) {
+                this.unlinkBodyFile(accountId, uid, folderId).catch(() => {});
+                this.db.deleteMessage(accountId, folderId, uid, `phantom: uid>=server UIDNEXT ${serverUidNext}`, `mailx-imap phantom sweep (${folderPath})`);
+            }
+            this.db.recalcFolderCounts(folderId);
+            console.log(`  [phantom-sweep] ${accountId}/${folderPath}: removed ${phantoms.length} cross-wired row(s) with uid >= UIDNEXT ${serverUidNext}`);
+            return phantoms.length;
+        } catch (e: any) {
+            console.error(`  [phantom-sweep] ${accountId}/${folderPath}: ${e?.message || e}`);
+            return 0;
+        }
+    }
+
     private async unlinkBodyFile(accountId: string, uid: number, folderId?: number): Promise<void> {
         try {
             const row: any = this.db.getMessageByUid(accountId, uid, folderId);

package/packages/mailx-imap/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.99",
+  "version": "0.1.100",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bobfrankston/mailx-imap",
-      "version": "0.1.99",
+      "version": "0.1.100",
       "license": "ISC",
       "dependencies": {
         "@bobfrankston/iflow-direct": "^0.1.27",

package/packages/mailx-imap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.99",
+  "version": "0.1.100",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",