@bobfrankston/mailx 1.0.236 → 1.0.237

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.236",
+  "version": "1.0.237",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -24,7 +24,7 @@
     "@bobfrankston/iflow-node": "^0.1.2",
     "@bobfrankston/miscinfo": "^1.0.8",
     "@bobfrankston/oauthsupport": "^1.0.22",
-    "@bobfrankston/msger": "^0.1.298",
+    "@bobfrankston/msger": "^0.1.299",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",
@@ -78,7 +78,7 @@
       "@bobfrankston/iflow-node": "^0.1.2",
       "@bobfrankston/miscinfo": "^1.0.8",
       "@bobfrankston/oauthsupport": "^1.0.22",
-      "@bobfrankston/msger": "^0.1.298",
+      "@bobfrankston/msger": "^0.1.299",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",
       "@capacitor/core": "^8.3.0",

package/packages/mailx-imap/index.d.ts

@@ -137,7 +137,11 @@ export declare class ImapManager extends EventEmitter {
      *  (deleted from another device, for example). The caller uses that to
      *  delete the stale row locally instead of showing a generic error. */
     private fetchMessageBodyViaApi;
-    /** Background body prefetch — download bodies for messages that don't have them */
+    /** Background body prefetch — download bodies for messages that don't have them.
+     *  Server-side deletions (isNotFound) aren't errors here: we delete the
+     *  stale row locally and keep going. Only unrelated errors (network,
+     *  auth, rate limits) count against the error budget, and the budget is
+     *  generous so a few transient failures don't kill the whole run. */
     private prefetchBodies;
     /** Get the body store for direct access */
     getBodyStore(): FileMessageStore;

package/packages/mailx-imap/index.js

@@ -1402,34 +1402,60 @@ export class ImapManager extends EventEmitter {
             return null;
         }
     }
-    /** Background body prefetch — download bodies for messages that don't have them */
+    /** Background body prefetch — download bodies for messages that don't have them.
+     *  Server-side deletions (isNotFound) aren't errors here: we delete the
+     *  stale row locally and keep going. Only unrelated errors (network,
+     *  auth, rate limits) count against the error budget, and the budget is
+     *  generous so a few transient failures don't kill the whole run. */
     async prefetchBodies(accountId) {
-        // Fetch ALL missing bodies in one pass — don't wait for next sync cycle
         let totalFetched = 0;
+        let deleted = 0;
         let errors = 0;
+        const ERROR_BUDGET = 20;
         while (true) {
             const missing = this.db.getMessagesWithoutBody(accountId, 100);
             if (missing.length === 0)
                 break;
-            if (totalFetched === 0)
+            if (totalFetched === 0 && deleted === 0)
                 console.log(`  [prefetch] ${accountId}: ${missing.length}+ bodies to fetch`);
+            let madeProgress = false;
             for (const msg of missing) {
                 try {
                     const result = await this.fetchMessageBody(accountId, msg.folderId, msg.uid);
-                    if (result)
+                    if (result) {
                         totalFetched++;
+                        madeProgress = true;
+                    }
                 }
                 catch (e) {
+                    if (e?.isNotFound) {
+                        // Message deleted on the server — drop the stale row so
+                        // we stop re-asking. This also moves the loop forward
+                        // (next getMessagesWithoutBody call won't return it).
+                        try {
+                            this.db.deleteMessage(accountId, msg.uid);
+                            this.bodyStore.deleteMessage(accountId, msg.folderId, msg.uid).catch(() => { });
+                            deleted++;
+                            madeProgress = true;
+                        }
+                        catch { /* ignore */ }
+                        continue;
+                    }
                     errors++;
-                    if (errors >= 3) {
-                        console.error(`  [prefetch] ${accountId}: stopping after ${errors} errors (${totalFetched} cached)`);
+                    if (errors >= ERROR_BUDGET) {
+                        console.error(`  [prefetch] ${accountId}: stopping after ${errors} errors (${totalFetched} cached, ${deleted} pruned)`);
                         return;
                     }
                 }
             }
+            // Safety: if we made zero progress this iteration, bail — otherwise
+            // we'd loop forever on rows that keep failing without isNotFound.
+            if (!madeProgress)
+                break;
+        }
+        if (totalFetched > 0 || deleted > 0) {
+            console.log(`  [prefetch] ${accountId}: ${totalFetched} bodies cached, ${deleted} stale rows pruned (done)`);
         }
-        if (totalFetched > 0)
-            console.log(`  [prefetch] ${accountId}: ${totalFetched} bodies cached (done)`);
     }
     /** Get the body store for direct access */
     getBodyStore() {