@bobfrankston/rmfmail 1.1.163 → 1.1.169

package/packages/mailx-imap/index.ts

@@ -1275,7 +1275,7 @@ export class ImapManager extends EventEmitter {
                     for (const uid of qr.vanishedUids) {
                         const env = this.db.getMessageByUid(accountId, uid, folderId);
                         if (env) {
-                            this.db.deleteMessage(accountId, uid, "server VANISHED via QRESYNC", "mailx-imap syncFolder/qresync");
+                            this.db.deleteMessage(accountId, folderId, uid, "server VANISHED via QRESYNC", "mailx-imap syncFolder/qresync");
                             vanishedApplied++;
                         }
                     }
@@ -2130,7 +2130,7 @@ export class ImapManager extends EventEmitter {
                         const tag = env ? `msgid=${env.messageId || "?"} subj="${(env.subject || "").slice(0, 60)}"` : "unknown";
                         console.log(`  [reconcile-delete] ${accountId}/${folder.path} uid=${uid} ${tag}`);
                         this.unlinkBodyFile(accountId, uid, folder.id).catch(() => {});
-                        this.db.deleteMessage(accountId, uid, "Gmail-API reconcile: server list missing this UID", `mailx-imap Gmail reconcile (${folder.path})`);
+                        this.db.deleteMessage(accountId, folder.id, uid, "Gmail-API reconcile: server list missing this UID", `mailx-imap Gmail reconcile (${folder.path})`);
                     }
                     if (toDelete.length > 0) console.log(`  [api] ${accountId}/${folder.path}: ${toDelete.length} deleted`);
                 }
@@ -2446,6 +2446,26 @@ export class ImapManager extends EventEmitter {
             console.log(`  [periodic] ${accountId}: STATUS check every ${interval / 1000}s (${isGmail ? "API" : "IMAP+IDLE"})`);
         }
 
+        // DEADMAN: IDLE silently dropped on 2026-05-27 at 10:07 (empty
+        // error message swallowed the cause) and 90 minutes of new mail
+        // went undelivered until manual reload. Every 60s, check that an
+        // IDLE watcher exists for every IMAP-path account; if not, kick
+        // startWatching() to re-establish. startWatching itself is
+        // idempotent (the `watchers.has(accountId) continue` guard means
+        // accounts with healthy IDLE are skipped). One log line per
+        // detected gap so a chronically failing account is obvious in
+        // the log.
+        const deadmanInterval = setInterval(() => {
+            for (const [accountId] of this.configs) {
+                if (this.isGmailAccount(accountId)) continue; // Gmail = API, no IDLE
+                if (this.watchers.has(accountId)) continue;
+                console.log(`  [idle-deadman] ${accountId}: no IDLE watcher — attempting restart`);
+                this.startWatching().catch(e =>
+                    console.error(`  [idle-deadman] ${accountId} restart failed: ${e?.message || e}`));
+            }
+        }, 60_000);
+        this.syncIntervals.set("idle-deadman", deadmanInterval);
+
         // Sync actions (sends + flags/deletes/moves) every 30 seconds — skip during active sync
         const actionsInterval = setInterval(async () => {
             if (this.syncing) return;
@@ -2572,7 +2592,20 @@ export class ImapManager extends EventEmitter {
                 });
                 console.log(`  [idle] Watching INBOX for ${accountId}${useNotify ? " (+NOTIFY personal mailboxes)" : ""}`);
             } catch (e: any) {
-                console.error(`  [idle] Failed to watch ${accountId}: ${e.message}`);
+                // Defensive: same empty-message bug class as the transport
+                // path. `Failed to watch bobma: ` with nothing after the
+                // colon hid 86 minutes of IDLE outage on 2026-05-27 — new
+                // messages arrived in Thunderbird but mailx never noticed
+                // because IDLE silently died and the log gave no clue why.
+                const parts: string[] = [];
+                if (e?.message) parts.push(String(e.message));
+                if (e?.code) parts.push(`code=${e.code}`);
+                if (e?.errno !== undefined) parts.push(`errno=${e.errno}`);
+                if (e?.syscall) parts.push(`syscall=${e.syscall}`);
+                const desc = parts.length > 0
+                    ? parts.join(" ")
+                    : `<no message> ${typeof e} ${e?.constructor?.name || ""}`.trim();
+                console.error(`  [idle] Failed to watch ${accountId}: ${desc}`);
             }
         }
     }
@@ -2638,7 +2671,7 @@ export class ImapManager extends EventEmitter {
                 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})`);
+                this.db.deleteMessage(accountId, folderId, uid, "reconcile: server missing this UID after grace (legacy)", `mailx-imap deferred reconcile (${folderPath})`);
             }
             this.db.recalcFolderCounts(folderId);
             this.emit("folderCountsChanged", accountId, {});
@@ -2676,7 +2709,7 @@ export class ImapManager extends EventEmitter {
         }
         const envelope: any = this.db.getMessageByUid(accountId, uid, folderId);
         let storedPath = envelope?.bodyPath || "";
-        if (!storedPath) storedPath = this.db.getMessageBodyPath(accountId, uid) || "";
+        if (!storedPath) storedPath = this.db.getMessageBodyPath(accountId, uid, folderId) || "";
         if (storedPath && await this.bodyStore.hasByPath(storedPath)) {
             return this.bodyStore.readByPath(storedPath);
         }
@@ -3046,7 +3079,18 @@ export class ImapManager extends EventEmitter {
                             batchSucceeded = true;
                             this.clearFolderErrors(accountId, folder.path);
                         } catch (e: any) {
-                            const msg = String(e?.message || "");
+                            // Build a description that never collapses to "".
+                            // Even with the iflow transport fix below, defense
+                            // in depth: some error paths produce objects whose
+                            // .message is empty, or pass non-Error values.
+                            const parts: string[] = [];
+                            if (e?.message) parts.push(String(e.message));
+                            if (e?.code) parts.push(`code=${e.code}`);
+                            if (e?.errno !== undefined) parts.push(`errno=${e.errno}`);
+                            if (e?.syscall) parts.push(`syscall=${e.syscall}`);
+                            const msg = parts.length > 0
+                                ? parts.join(" ")
+                                : `<no message> ${typeof e} ${e?.constructor?.name || ""}`.trim();
                             console.error(`  [prefetch] ${accountId} folder ${folder.path} chunk ${chunkStart / PREFETCH_CHUNK_SIZE}: batch fetch failed: ${msg}`);
                             counters.errors++;
                             this.recordFolderError(accountId, folder.path);
@@ -3173,7 +3217,7 @@ export class ImapManager extends EventEmitter {
                 const msg = await sourceClient.fetchMessageByUid(fromFolder.path, uid, { source: true });
                 if (!msg) throw new Error(`Message UID ${uid} not found in ${fromFolder.path}`);
                 await sourceClient.moveMessageToServer(msg, fromFolder.path, targetClient, toFolder.path);
-                this.db.deleteMessage(fromAccountId, uid, `cross-account move to ${toAccountId}/${toFolder.path}`, "mailx-imap moveBetweenAccounts");
+                this.db.deleteMessage(fromAccountId, fromFolder.id, uid, `cross-account move to ${toAccountId}/${toFolder.path}`, "mailx-imap moveBetweenAccounts");
                 console.log(`  Cross-account move: ${fromAccountId}/${fromFolder.path} UID ${uid} → ${toAccountId}/${toFolder.path}`);
             });
         });
@@ -3507,7 +3551,7 @@ export class ImapManager extends EventEmitter {
             const existing = this.db.getMessageByUid(accountId, draftUid, drafts.id);
             if (existing) {
                 this.unlinkBodyFile(accountId, draftUid, drafts.id).catch(() => {});
-                this.db.deleteMessage(accountId, draftUid, "user sent the message (draft cleanup)", "mailx-imap deleteDraft (local)");
+                this.db.deleteMessage(accountId, drafts.id, draftUid, "user sent the message (draft cleanup)", "mailx-imap deleteDraft (local)");
                 localDeletedUid = draftUid;
             }
         }

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

@@ -1,12 +1,12 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.65",
+  "version": "0.1.67",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bobfrankston/mailx-imap",
-      "version": "0.1.65",
+      "version": "0.1.67",
       "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.65",
+  "version": "0.1.67",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",

package/packages/mailx-service/index.js

@@ -2549,7 +2549,7 @@ export class MailxService {
         // re-fetch here would be wasted IMAP work and risks racing.
         const bodyStore = this.imapManager.getBodyStore();
         let raw = null;
-        const storedPath = envelope.bodyPath || this.db.getMessageBodyPath(accountId, uid) || "";
+        const storedPath = envelope.bodyPath || this.db.getMessageBodyPath(accountId, uid, folderId ?? envelope.folderId) || "";
         if (storedPath && await bodyStore.hasByPath(storedPath)) {
             try {
                 raw = await bodyStore.readByPath(storedPath);