@bobfrankston/rmfmail 1.1.101 → 1.1.103

package/packages/mailx-imap/index.js

@@ -2874,16 +2874,16 @@ export class ImapManager extends EventEmitter {
                         // owns deletion via a 30-min grace; defer to it.
                         const someReceived = received.size > 0;
                         if (batchSucceeded && someReceived) {
+                            // Mirror of the IMAP-path fix: never delete on a
+                            // partial batch — Gmail API has its own transient
+                            // miss modes (rate-limit retry losing a message,
+                            // /batch response parse error) that look exactly
+                            // like server-side expunge. Set-diff reconcile in
+                            // syncAccountViaApi owns deletion.
                             for (const uid of uidsInFolder) {
                                 if (received.has(uid))
                                     continue;
-                                try {
-                                    this.unlinkBodyFile(accountId, uid, folderId).catch(() => { });
-                                    this.db.deleteMessage(accountId, uid, "prefetch batch: server didn't return body for queued UID — assumed deleted", "mailx-imap prefetchBodies (Gmail batch)");
-                                    counters.deleted++;
-                                    madeProgress = true;
-                                }
-                                catch { /* ignore */ }
+                                this.markPrefetchEmpty(accountId, folderId, uid);
                             }
                         }
                         else if (batchSucceeded && !someReceived) {
@@ -3007,18 +3007,24 @@ export class ImapManager extends EventEmitter {
                         // authoritative deletion path with a 30-min
                         // grace window; prefetch defers to it.
                         const someReceived = received.size > 0;
-                        if (batchSucceeded && someReceived)
+                        if (batchSucceeded && someReceived) {
+                            // DO NOT DELETE missing UIDs. A partial response is
+                            // an iflow parser miss / mid-stream hiccup MUCH more
+                            // often than a real server expunge — and deleting on
+                            // that signal cost Bob a Bambu Labs verification
+                            // code (audit id 3785, 2026-05-20), plus dozens of
+                            // other valid messages over the day. Set-diff
+                            // reconcile in syncFolder is the authoritative
+                            // deletion path with a 30-min grace window; prefetch
+                            // defers to it. Mark the UIDs as prefetch-empty so
+                            // the TTL backoff (5min → 12h) retries them — that
+                            // path is non-destructive.
                             for (const uid of chunk) {
                                 if (received.has(uid))
                                     continue;
-                                try {
-                                    this.unlinkBodyFile(accountId, uid, folderId).catch(() => { });
-                                    this.db.deleteMessage(accountId, uid, "prefetch batch: server didn't return body for queued UID — assumed deleted", "mailx-imap prefetchBodies (IMAP batch)");
-                                    counters.deleted++;
-                                    madeProgress = true;
-                                }
-                                catch { /* ignore */ }
+                                this.markPrefetchEmpty(accountId, folderId, uid);
                             }
+                        }
                         else if (batchSucceeded && !someReceived) {
                             console.error(`  [prefetch] ${accountId}/${folder.path}: chunk ${chunkStart}-${chunkStart + chunk.length - 1} returned 0/${chunk.length} bodies — NOT pruning (set-diff reconcile owns deletion). UIDs: ${chunk.slice(0, 5).join(",")}${chunk.length > 5 ? "..." : ""}`);
                             for (const uid of chunk)