@bobfrankston/mailx 1.0.124 → 1.0.126

package/blowaway.cmd

@@ -1,2 +1,3 @@
 del C:\Users\Bob\.mailx\mailx.db C:\Users\Bob\.mailx\mailx.db-shm C:\Users\Bob\.mailx\mailx.db-wal
-: rmdir /s /q C:\Users\Bob\.mailx\mailxstore
+if .%1==.all rmdir /s /q C:\Users\Bob\.mailx\mailxstore
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.124",
+  "version": "1.0.126",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",

package/packages/mailx-imap/index.js

@@ -323,6 +323,34 @@ export class ImapManager extends EventEmitter {
             const fetched = await client.fetchMessagesSinceUid(folder.path, highestUid, { source: false });
             // Filter out the last known message (IMAP * always returns at least one)
             messages = fetched.filter(m => m.uid > highestUid);
+            // Gap detection: compare DB count vs IMAP count to catch interrupted syncs
+            const dbCount = this.db.getMessageCount(accountId, folderId);
+            try {
+                const imapCount = await client.getMessagesCount(folder.path);
+                const gap = imapCount - dbCount - messages.length;
+                if (gap > 0) {
+                    console.log(`  ${folder.path}: gap detected — IMAP has ${imapCount}, DB has ${dbCount}, ${messages.length} new → ${gap} missing`);
+                    // Full UID reconciliation: get all IMAP UIDs, find missing ones
+                    const existingUids = new Set(this.db.getUidsForFolder(accountId, folderId));
+                    const newUids = new Set(messages.map(m => m.uid));
+                    const allImapUids = await client.getUids(folder.path);
+                    const missingUids = allImapUids.filter(uid => !existingUids.has(uid) && !newUids.has(uid));
+                    if (missingUids.length > 0) {
+                        console.log(`  ${folder.path}: reconciling ${missingUids.length} missing messages`);
+                        // Fetch in chunks to avoid huge commands
+                        const chunkSize = 500;
+                        for (let i = 0; i < missingUids.length; i += chunkSize) {
+                            const chunk = missingUids.slice(i, i + chunkSize);
+                            const range = chunk.join(",");
+                            const recovered = await client.fetchMessages(folder.path, range, { source: false });
+                            messages.push(...recovered);
+                        }
+                    }
+                }
+            }
+            catch (e) {
+                console.error(`  ${folder.path}: gap detection failed: ${e.message}`);
+            }
             // Backfill: if historyDays extends further back than our oldest message, fetch the gap
             const oldestDate = this.db.getOldestDate(accountId, folderId);
             if (oldestDate > 0 && startDate.getTime() < oldestDate) {
@@ -497,7 +525,6 @@ export class ImapManager extends EventEmitter {
                 // Legacy fallback removed — was doubling connections.
                 // If native client has issues, set useNativeClient=false or use --legacy-imap flag.
                 await client.logout();
-                this.trackLogout(accountId);
                 client = null;
                 accountFolders.set(accountId, folders);
                 // Sync inbox immediately
@@ -510,7 +537,6 @@ export class ImapManager extends EventEmitter {
                             new Promise((_, reject) => setTimeout(() => reject(new Error("Sync timeout (60s)")), 60000))
                         ]);
                         await client.logout();
-                        this.trackLogout(accountId);
                         client = null;
                     }
                     catch (e) {
@@ -626,7 +652,6 @@ export class ImapManager extends EventEmitter {
                                 await client.logout();
                             }
                             catch { /* */ }
-                            this.trackLogout(accountId);
                             client = this.createClient(accountId);
                         }
                     }
@@ -714,7 +739,6 @@ export class ImapManager extends EventEmitter {
                     client = this.createClient(accountId);
                     const count = await client.getMessagesCount("INBOX");
                     await client.logout();
-                    this.trackLogout(accountId);
                     client = null;
                     const prev = this.lastInboxCounts.get(accountId) ?? count;
                     this.lastInboxCounts.set(accountId, count);
@@ -723,7 +747,6 @@ export class ImapManager extends EventEmitter {
                         client = this.createClient(accountId);
                         await this.syncFolder(accountId, inbox.id, client);
                         await client.logout();
-                        this.trackLogout(accountId);
                         client = null;
                     }
                 }
@@ -1267,7 +1290,6 @@ export class ImapManager extends EventEmitter {
                     await client.logout();
                 }
                 catch { }
-                this.trackLogout(accountId);
                 return;
             }
             const sendingFlag = `$Sending-${this.hostname}`;
@@ -1373,7 +1395,6 @@ export class ImapManager extends EventEmitter {
                 await client.logout();
             }
             catch { /* ignore */ }
-            this.trackLogout(accountId);
         }
     }
     /** Start background Outbox worker — runs immediately then every 10 seconds */

package/packages/mailx-store/db.d.ts

@@ -60,6 +60,7 @@ export declare class MailxDB {
     updateBodyPath(accountId: string, uid: number, bodyPath: string): void;
     getHighestUid(accountId: string, folderId: number): number;
     getOldestDate(accountId: string, folderId: number): number;
+    getMessageCount(accountId: string, folderId: number): number;
     /** Get all UIDs for a folder */
     getUidsForFolder(accountId: string, folderId: number): number[];
     /** Delete a message by account + UID */

package/packages/mailx-store/db.js

@@ -328,6 +328,10 @@ export class MailxDB {
         const r = this.db.prepare("SELECT MIN(date) as minDate FROM messages WHERE account_id = ? AND folder_id = ?").get(accountId, folderId);
         return r?.minDate || 0;
     }
+    getMessageCount(accountId, folderId) {
+        const r = this.db.prepare("SELECT count(*) as cnt FROM messages WHERE account_id = ? AND folder_id = ?").get(accountId, folderId);
+        return r?.cnt || 0;
+    }
     /** Get all UIDs for a folder */
     getUidsForFolder(accountId, folderId) {
         const rows = this.db.prepare("SELECT uid FROM messages WHERE account_id = ? AND folder_id = ?").all(accountId, folderId);