@bobfrankston/mailx 1.0.122 → 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.122",
+  "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.js

@@ -319,15 +319,15 @@ export class ImapManager extends EventEmitter {
             ? 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: true });
+                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`);
@@ -336,8 +336,8 @@ export class ImapManager extends EventEmitter {
             }
         }
         else {
-            // First sync: use date-based fetch with bodies for local-first
-            messages = await client.fetchMessageByDate(folder.path, startDate, new Date(), { source: true });
+            // 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) => {