@bobfrankston/mailx 1.0.121 → 1.0.123

package/client/app.js

@@ -546,18 +546,25 @@ onWsEvent((event) => {
                 statusSync.textContent = `Syncing ${event.accountId}: ${event.phase} ${event.progress || 0}%`;
             if (startupStatus)
                 startupStatus.textContent = `Syncing ${event.accountId}: ${event.phase}`;
-            // Mark syncing folder in tree
+            // Mark syncing folder in tree — bubble up to visible parent if collapsed
             const syncPath = event.phase?.startsWith("sync:") ? event.phase.slice(5) : null;
             // Clear previous syncing markers for this account
             document.querySelectorAll(`.ft-folder.ft-syncing[data-account-id="${event.accountId}"]`).forEach(el => el.classList.remove("ft-syncing"));
-            if (syncPath) {
-                const folderEl = document.querySelector(`.ft-folder[data-account-id="${event.accountId}"][data-folder-path="${CSS.escape(syncPath)}"]`);
-                if (folderEl) {
-                    if (event.progress < 100)
-                        folderEl.classList.add("ft-syncing");
-                    else
-                        folderEl.classList.remove("ft-syncing");
+            if (syncPath && event.progress < 100) {
+                // Try exact match first
+                let folderEl = document.querySelector(`.ft-folder[data-account-id="${event.accountId}"][data-folder-path="${CSS.escape(syncPath)}"]`);
+                if (!folderEl) {
+                    // Folder not visible (parent collapsed) — find nearest visible ancestor
+                    const parts = syncPath.split(/[./]/);
+                    for (let i = parts.length - 1; i >= 1; i--) {
+                        const parentPath = parts.slice(0, i).join(".");
+                        folderEl = document.querySelector(`.ft-folder[data-account-id="${event.accountId}"][data-folder-path="${CSS.escape(parentPath)}"]`);
+                        if (folderEl)
+                            break;
+                    }
                 }
+                if (folderEl)
+                    folderEl.classList.add("ft-syncing");
             }
             break;
         }

package/client/components/folder-tree.js

@@ -74,6 +74,19 @@ function buildTree(folders, delimiter, accountId) {
             root.push(node);
         }
     }
+    // Aggregate counts from children to parents (so collapsed parents show totals)
+    function aggregateCounts(nodes) {
+        let unread = 0, total = 0;
+        for (const n of nodes) {
+            const child = aggregateCounts(n.children);
+            n.unreadCount += child.unread;
+            n.totalCount += child.total;
+            unread += n.unreadCount;
+            total += n.totalCount;
+        }
+        return { unread, total };
+    }
+    aggregateCounts(root);
     return root;
 }
 /** Sort: INBOX first, then special folders, then alphabetical */

package/package.json

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

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

@@ -52,9 +52,10 @@ export declare class ImapManager extends EventEmitter {
     /** Track active IMAP connections for diagnostics */
     private activeConnections;
     /** Create a fresh IMAP client for an account (disposable, single-use).
-     *  Returns CompatImapClient (native) or ImapClient (imapflow) based on useNativeClient flag. */
+     *  Returns CompatImapClient (native) or ImapClient (imapflow) based on useNativeClient flag.
+     *  The client's logout() is wrapped to auto-decrement the connection counter. */
     private createClient;
-    /** Track client logout for connection counting */
+    /** Track client logout for connection counting (called automatically by wrapped logout) */
     private trackLogout;
     /** Number of registered IMAP accounts */
     getAccountCount(): number;

package/packages/mailx-imap/index.js

@@ -187,7 +187,8 @@ export class ImapManager extends EventEmitter {
     /** Track active IMAP connections for diagnostics */
     activeConnections = new Map(); // accountId → count
     /** Create a fresh IMAP client for an account (disposable, single-use).
-     *  Returns CompatImapClient (native) or ImapClient (imapflow) based on useNativeClient flag. */
+     *  Returns CompatImapClient (native) or ImapClient (imapflow) based on useNativeClient flag.
+     *  The client's logout() is wrapped to auto-decrement the connection counter. */
     createClient(accountId) {
         if (this.reauthenticating.has(accountId))
             throw new Error(`Account ${accountId} is re-authenticating`);
@@ -203,12 +204,26 @@ export class ImapManager extends EventEmitter {
         this.activeConnections.set(accountId, count);
         const clientType = this.useNativeClient ? "native" : "imapflow";
         console.log(`  [conn] ${accountId}: +1 ${clientType} (${count} active)`);
+        let client;
         if (this.useNativeClient) {
-            return new CompatImapClient(config, () => new NodeTransport({ rejectUnauthorized: config.rejectUnauthorized !== false }));
+            client = new CompatImapClient(config, () => new NodeTransport({ rejectUnauthorized: config.rejectUnauthorized !== false }));
         }
-        return new ImapClient(config);
+        else {
+            client = new ImapClient(config);
+        }
+        // Wrap logout to auto-decrement connection counter (prevents leaks from missed trackLogout calls)
+        const originalLogout = client.logout.bind(client);
+        let loggedOut = false;
+        client.logout = async () => {
+            await originalLogout();
+            if (!loggedOut) {
+                loggedOut = true;
+                this.trackLogout(accountId);
+            }
+        };
+        return client;
     }
-    /** Track client logout for connection counting */
+    /** Track client logout for connection counting (called automatically by wrapped logout) */
     trackLogout(accountId) {
         const count = Math.max(0, (this.activeConnections.get(accountId) || 1) - 1);
         this.activeConnections.set(accountId, count);
@@ -299,26 +314,37 @@ export class ImapManager extends EventEmitter {
         const highestUid = this.db.getHighestUid(accountId, folderId);
         let messages;
         const firstSync = highestUid === 0;
+        const historyDays = getHistoryDays(accountId);
+        const startDate = historyDays > 0
+            ? new Date(Date.now() - historyDays * 86400000)
+            : new Date(0);
         if (highestUid > 0) {
-            // Incremental: only fetch messages newer than what we have
-            const fetched = await client.fetchMessagesSinceUid(folder.path, highestUid, { source: true });
+            // Incremental: fetch new messages — metadata only for speed, bodies on demand
+            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);
+            // 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) {
+                const existingUids = new Set(this.db.getUidsForFolder(accountId, folderId));
+                const backfill = await client.fetchMessageByDate(folder.path, startDate, new Date(oldestDate), { source: false });
+                const newBackfill = backfill.filter(m => !existingUids.has(m.uid));
+                if (newBackfill.length > 0) {
+                    console.log(`  ${folder.path}: backfilling ${newBackfill.length} older messages`);
+                    messages.push(...newBackfill);
+                }
+            }
         }
         else {
-            // First sync: use date-based fetch with bodies for local-first
-            const historyDays = getHistoryDays(accountId);
-            const startDate = historyDays > 0
-                ? new Date(Date.now() - historyDays * 86400000)
-                : new Date(0);
-            messages = await client.fetchMessageByDate(folder.path, startDate, new Date(), { source: true });
-            // Sort newest first so most recent messages appear in the UI immediately
-            messages.sort((a, b) => {
-                const da = a.date instanceof Date ? a.date.getTime() : (typeof a.date === "number" ? a.date : 0);
-                const db = b.date instanceof Date ? b.date.getTime() : (typeof b.date === "number" ? b.date : 0);
-                return db - da;
-            });
+            // First sync: metadata only — bodies fetched on demand when user clicks a message
+            messages = await client.fetchMessageByDate(folder.path, startDate, new Date(), { source: false });
         }
+        // Sort newest first so most recent messages appear in the UI immediately
+        messages.sort((a, b) => {
+            const da = a.date instanceof Date ? a.date.getTime() : (typeof a.date === "number" ? a.date : 0);
+            const db = b.date instanceof Date ? b.date.getTime() : (typeof b.date === "number" ? b.date : 0);
+            return db - da;
+        });
         if (messages.length > 0)
             console.log(`  ${folder.path}: ${messages.length} new messages`);
         let newCount = 0;
@@ -1236,8 +1262,14 @@ export class ImapManager extends EventEmitter {
         try {
             // Get all UIDs in Outbox
             const uids = await client.getUids(outboxFolder.path);
-            if (uids.length === 0)
+            if (uids.length === 0) {
+                try {
+                    await client.logout();
+                }
+                catch { }
+                this.trackLogout(accountId);
                 return;
+            }
             const sendingFlag = `$Sending-${this.hostname}`;
             for (const uid of uids) {
                 // Check flags — skip if already being sent or permanently failed
@@ -1341,6 +1373,7 @@ 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

@@ -59,6 +59,7 @@ export declare class MailxDB {
     updateMessageFlags(accountId: string, uid: number, flags: string[]): void;
     updateBodyPath(accountId: string, uid: number, bodyPath: string): void;
     getHighestUid(accountId: string, folderId: number): number;
+    getOldestDate(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

@@ -324,6 +324,10 @@ export class MailxDB {
         const r = this.db.prepare("SELECT MAX(uid) as maxUid FROM messages WHERE account_id = ? AND folder_id = ?").get(accountId, folderId);
         return r?.maxUid || 0;
     }
+    getOldestDate(accountId, folderId) {
+        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;
+    }
     /** 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);