@bobfrankston/mailx 1.0.171 → 1.0.173

package/client/app.js

@@ -4,8 +4,9 @@
  */
 import { initFolderTree, refreshFolderTree, updateFolderCounts } from "./components/folder-tree.js";
 import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, getSelectedMessages } from "./components/message-list.js";
-import { showMessage, getCurrentMessage } from "./components/message-viewer.js";
+import { showMessage, getCurrentMessage, initViewer } from "./components/message-viewer.js";
 import { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessages, undeleteMessage, restartServer, rebuildServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts } from "./lib/api-client.js";
+import * as messageState from "./lib/message-state.js";
 // ── New message badge (favicon + title) ──
 let baseTitle = "mailx";
 let lastSeenCount = 0;
@@ -117,15 +118,7 @@ alertDismiss?.addEventListener("click", hideAlert);
 const folderTree = document.getElementById("folder-tree");
 let currentFolderSpecialUse = "";
 function clearViewer() {
-    const body = document.getElementById("mv-body");
-    const header = document.getElementById("mv-header");
-    const att = document.getElementById("mv-attachments");
-    if (body)
-        body.innerHTML = "";
-    if (header)
-        header.hidden = true;
-    if (att)
-        att.hidden = true;
+    messageState.select(null); // Deselect — viewer clears via subscription
 }
 initFolderTree(folderTree, (accountId, folderId, folderName, specialUse) => {
     currentFolderSpecialUse = specialUse;
@@ -152,6 +145,7 @@ initMessageList((accountId, uid, folderId) => {
         document.getElementById("message-list")?.classList.add("narrow-hidden");
     }
 });
+initViewer();
 // ── Auto two-line when message list is narrow ──
 const messageList = document.getElementById("message-list");
 if (messageList) {
@@ -320,17 +314,8 @@ async function deleteSelectedMessages() {
         selected.push({ accountId: current.accountId, uid: current.message.uid, folderId: current.message.folderId });
     }
     const statusSync = document.getElementById("status-sync");
-    const mlBody = document.getElementById("ml-body");
     try {
-        // Find the row after the last selected for re-selection
-        let nextRow = null;
-        if (mlBody) {
-            const lastRow = mlBody.querySelector(`.ml-row[data-uid="${selected[selected.length - 1].uid}"]`);
-            if (lastRow)
-                nextRow = (lastRow.nextElementSibling || lastRow.previousElementSibling);
-        }
-        // Delete all selected — bulk operation, one IMAP session
-        // Group by account
+        // Delete on server — group by account for bulk operations
         const byAccount = new Map();
         for (const msg of selected) {
             const uids = byAccount.get(msg.accountId) || [];
@@ -340,11 +325,6 @@ async function deleteSelectedMessages() {
         for (const [accountId, uids] of byAccount) {
             await deleteMessages(accountId, uids);
         }
-        // Remove rows from DOM
-        for (const msg of selected) {
-            if (mlBody)
-                mlBody.querySelector(`.ml-row[data-uid="${msg.uid}"]`)?.remove();
-        }
         // Undo supports the last batch
         if (selected.length === 1) {
             lastDeleted = { ...selected[0], subject: "" };
@@ -352,7 +332,7 @@ async function deleteSelectedMessages() {
                 statusSync.textContent = `Deleted 1 message — Ctrl+Z to undo`;
         }
         else {
-            lastDeleted = null; // Multi-delete undo not supported yet
+            lastDeleted = null;
             if (statusSync)
                 statusSync.textContent = `Deleted ${selected.length} messages`;
         }
@@ -363,18 +343,8 @@ async function deleteSelectedMessages() {
             if (statusSync?.textContent?.includes("undo"))
                 statusSync.textContent = "";
         }, 30000);
-        // Select next row or clear viewer
-        if (nextRow?.classList.contains("ml-row")) {
-            nextRow.click();
-        }
-        else {
-            const bodyEl = document.getElementById("mv-body");
-            const headerEl = document.getElementById("mv-header");
-            if (bodyEl)
-                bodyEl.innerHTML = `<div class="mv-empty">Select a message to read</div>`;
-            if (headerEl)
-                headerEl.hidden = true;
-        }
+        // Remove from shared state — list and viewer update automatically
+        messageState.removeMessages(selected);
     }
     catch (e) {
         console.error(`Delete failed: ${e.message}`);
@@ -454,8 +424,7 @@ searchInput?.addEventListener("keydown", (e) => {
         reloadCurrentFolder();
     }
 });
-// ── Reload message list after drag-move ──
-document.addEventListener("mailx-message-moved", () => reloadCurrentFolder());
+// Message state handles move/delete — no manual event listener needed
 // ── Folder filter ──
 const ftFilterInput = document.getElementById("ft-filter-input");
 if (ftFilterInput) {

package/client/components/folder-tree.js

@@ -248,10 +248,11 @@ function renderNode(node, container, depth) {
                         return;
                     try {
                         await emptyFolder(node.accountId, node.id);
+                        const { setMessages } = await import("../lib/message-state.js");
+                        setMessages([]); // Folder emptied — clear list and viewer
                         const treeContainer = document.getElementById("folder-tree");
                         if (treeContainer)
                             loadFolderTree(treeContainer);
-                        document.dispatchEvent(new CustomEvent("mailx-message-moved"));
                     }
                     catch (err) {
                         alert(`Failed: ${err.message}`);
@@ -298,10 +299,12 @@ function renderNode(node, container, depth) {
                 const moved = toMove.length;
                 if (statusEl)
                     statusEl.textContent = `Moved ${moved} message${moved > 1 ? "s" : ""} to ${node.name}`;
+                // Remove from shared state — list and viewer update automatically
+                const { removeMessages } = await import("../lib/message-state.js");
+                removeMessages(toMove);
                 const treeContainer = document.getElementById("folder-tree");
                 if (treeContainer)
                     loadFolderTree(treeContainer);
-                document.dispatchEvent(new CustomEvent("mailx-message-moved"));
             }
             catch (err) {
                 console.error(`Move failed: ${err.message}`);

package/client/components/message-list.js

@@ -1,17 +1,9 @@
 /**
- * Message list component -- renders paginated message rows.
- * Loads more messages on scroll.
+ * Message list component — renders paginated message rows.
+ * Reads from message-state; operations mutate state, list reacts.
  */
-import { getMessages, getUnifiedInbox, searchMessages, updateFlags } from "../lib/api-client.js";
-/** Clear the message viewer when no message is selected */
-function clearViewer() {
-    const bodyEl = document.getElementById("mv-body");
-    const headerEl = document.getElementById("mv-header");
-    if (bodyEl)
-        bodyEl.innerHTML = `<div class="mv-empty">Select a message to read</div>`;
-    if (headerEl)
-        headerEl.hidden = true;
-}
+import { getMessages as apiGetMessages, getUnifiedInbox as apiGetUnifiedInbox, searchMessages, updateFlags } from "../lib/api-client.js";
+import * as state from "../lib/message-state.js";
 let onMessageSelect;
 let currentAccountId;
 let currentFolderId;
@@ -71,6 +63,48 @@ export function initMessageList(handler) {
             }
         });
     }
+    // Subscribe to state changes — react to removeMessages (move/delete)
+    state.subscribe((change) => {
+        if (change === "removed") {
+            syncDomToState();
+        }
+    });
+}
+/**
+ * Sync DOM rows to current state after messages are removed.
+ * Removes DOM rows that are no longer in state, updates selection.
+ */
+function syncDomToState() {
+    const body = document.getElementById("ml-body");
+    if (!body)
+        return;
+    // Build set of UIDs still in state
+    const stateUids = new Set(state.getMessages().map(m => `${m.accountId}:${m.uid}`));
+    // Remove rows not in state
+    for (const row of Array.from(body.querySelectorAll(".ml-row"))) {
+        const el = row;
+        const key = `${el.dataset.accountId}:${el.dataset.uid}`;
+        if (!stateUids.has(key)) {
+            el.remove();
+        }
+    }
+    // Update selection to match state
+    clearSelection();
+    const sel = state.getSelected();
+    if (sel) {
+        const row = body.querySelector(`.ml-row[data-uid="${sel.uid}"][data-account-id="${sel.accountId}"]`)
+            || body.querySelector(`.ml-row[data-uid="${sel.uid}"]`);
+        if (row) {
+            row.classList.add("selected");
+            lastClickedRow = row;
+            // Trigger viewer update
+            onMessageSelect(sel.accountId, sel.uid, sel.folderId);
+        }
+    }
+    // If no messages left, show empty
+    if (state.getMessages().length === 0) {
+        body.innerHTML = `<div class="ml-empty">No messages</div>`;
+    }
 }
 /** Reload the currently displayed folder (preserves current selection) */
 export function reloadCurrentFolder() {
@@ -86,8 +120,6 @@ export function reloadCurrentFolder() {
 }
 /** Load unified inbox (all accounts) */
 export async function loadUnifiedInbox(autoSelect = true) {
-    if (autoSelect)
-        clearViewer();
     unifiedMode = true;
     currentPage = 1;
     totalMessages = 0;
@@ -96,36 +128,25 @@ export async function loadUnifiedInbox(autoSelect = true) {
         return;
     const savedScroll = !autoSelect ? body.scrollTop : 0;
     const savedUid = !autoSelect ? body.querySelector(".ml-row.selected")?.getAttribute("data-uid") : null;
-    // Only show loading indicator on fresh navigation, not reloads
     if (autoSelect) {
         body.innerHTML = `<div class="ml-empty">Loading...</div>`;
     }
     try {
-        const result = await getUnifiedInbox(1);
+        const result = await apiGetUnifiedInbox(1);
         totalMessages = result.total;
         if (result.items.length === 0) {
+            state.setMessages([]);
             body.innerHTML = `<div class="ml-empty">${result.total > 0 ? `${result.total} messages syncing...` : "Syncing — messages will appear shortly"}</div>`;
             return;
         }
-        // Build new rows into a fragment, then swap atomically (no flash)
-        const fragment = document.createDocumentFragment();
-        const tempDiv = document.createElement("div");
-        appendMessages(tempDiv, "", result.items);
-        while (tempDiv.firstChild)
-            fragment.appendChild(tempDiv.firstChild);
-        body.replaceChildren(fragment);
+        state.setMessages(result.items);
+        renderMessages(body, "", result.items);
         if (autoSelect) {
-            const firstRow = body.querySelector(".ml-row");
-            if (firstRow)
-                firstRow.click();
+            selectFirst(body);
         }
         else {
             body.scrollTop = savedScroll;
-            if (savedUid) {
-                const row = body.querySelector(`.ml-row[data-uid="${savedUid}"]`);
-                if (row)
-                    row.classList.add("selected");
-            }
+            restoreSelection(body, savedUid);
         }
     }
     catch (e) {
@@ -157,29 +178,29 @@ export async function loadSearchResults(query, scope = "all", accountId = "", fo
                 body.innerHTML = `<div class="ml-empty">Invalid regex</div>`;
                 return;
             }
-            // Get all messages from current context and filter
             const source = scope === "current" && accountId
-                ? await getMessages(accountId, folderId, 1, 10000)
+                ? await apiGetMessages(accountId, folderId, 1, 10000)
                 : await searchMessages("*", 1, 10000, "all");
             const matches = source.items.filter((m) => regex.test(m.subject || "") || regex.test(m.from?.name || "") || regex.test(m.from?.address || "") || regex.test(m.preview || ""));
             totalMessages = matches.length;
+            state.setMessages(matches);
             if (matches.length === 0) {
                 body.innerHTML = `<div class="ml-empty">No regex matches</div>`;
                 return;
             }
             body.innerHTML = "";
             appendMessages(body, "", matches);
-            const firstRow = body.querySelector(".ml-row");
-            if (firstRow)
-                firstRow.click();
+            selectFirst(body);
             return;
         }
         const result = await searchMessages(query, 1, 50, scope, accountId, folderId);
         totalMessages = result.total;
         if (result.items.length === 0) {
+            state.setMessages([]);
             body.innerHTML = `<div class="ml-empty">No results for "${query}"</div>`;
             return;
         }
+        state.setMessages(result.items);
         body.innerHTML = "";
         appendMessages(body, "", result.items);
     }
@@ -188,9 +209,6 @@ export async function loadSearchResults(query, scope = "all", accountId = "", fo
     }
 }
 export async function loadMessages(accountId, folderId, page = 1, specialUse = "", autoSelect = true) {
-    // Clear viewer when navigating to a new folder (not on reloads)
-    if (autoSelect)
-        clearViewer();
     searchMode = false;
     unifiedMode = false;
     showToInsteadOfFrom = ["sent", "drafts", "outbox"].includes(specialUse) ||
@@ -206,49 +224,34 @@ export async function loadMessages(accountId, folderId, page = 1, specialUse = "
     const fromHeader = document.querySelector(".ml-col-from");
     if (fromHeader)
         fromHeader.textContent = showToInsteadOfFrom ? "To" : "From";
-    // Save scroll position and selected UID for non-autoSelect reloads
     const savedScroll = !autoSelect ? body.scrollTop : 0;
     const savedUid = !autoSelect ? body.querySelector(".ml-row.selected")?.getAttribute("data-uid") : null;
-    // Only show loading indicator on fresh navigation, not reloads
     if (autoSelect) {
         body.innerHTML = `<div class="ml-empty">Loading...</div>`;
     }
     try {
-        const result = await getMessages(accountId, folderId, 1);
+        const result = await apiGetMessages(accountId, folderId, 1);
         totalMessages = result.total;
         if (result.items.length === 0) {
+            state.setMessages([]);
             body.innerHTML = `<div class="ml-empty">No messages</div>`;
-            clearViewer();
             return;
         }
-        // Build new rows into a fragment, then swap atomically (no flash)
-        const fragment = document.createDocumentFragment();
-        const tempDiv = document.createElement("div");
-        appendMessages(tempDiv, accountId, result.items);
-        while (tempDiv.firstChild)
-            fragment.appendChild(tempDiv.firstChild);
-        body.replaceChildren(fragment);
+        state.setMessages(result.items);
+        renderMessages(body, accountId, result.items);
         if (autoSelect) {
-            // Explicit folder navigation — select first message
-            const firstRow = body.querySelector(".ml-row");
-            if (firstRow)
-                firstRow.click();
+            selectFirst(body);
         }
         else {
-            // Sync reload — restore scroll position and selection after layout
             requestAnimationFrame(() => {
                 body.scrollTop = savedScroll;
-                if (savedUid) {
-                    const row = body.querySelector(`.ml-row[data-uid="${savedUid}"]`);
-                    if (row)
-                        row.classList.add("selected");
-                }
+                restoreSelection(body, savedUid);
             });
         }
     }
     catch (e) {
         if (e.name === "AbortError")
-            return; // Superseded by newer request
+            return;
         body.innerHTML = `<div class="ml-empty">Error: ${e.message}</div>`;
     }
 }
@@ -262,8 +265,11 @@ async function loadMoreMessages() {
         const result = searchMode
             ? await searchMessages(currentSearchQuery, currentPage)
             : unifiedMode
-                ? await getUnifiedInbox(currentPage)
-                : await getMessages(currentAccountId, currentFolderId, currentPage);
+                ? await apiGetUnifiedInbox(currentPage)
+                : await apiGetMessages(currentAccountId, currentFolderId, currentPage);
+        // Append to state
+        const current = state.getMessages();
+        state.setMessages([...current, ...result.items]);
         appendMessages(body, unifiedMode ? "" : currentAccountId, result.items);
     }
     catch (e) {
@@ -273,9 +279,29 @@ async function loadMoreMessages() {
         loading = false;
     }
 }
+/** Replace body contents with rendered rows */
+function renderMessages(body, accountId, items) {
+    const fragment = document.createDocumentFragment();
+    const tempDiv = document.createElement("div");
+    appendMessages(tempDiv, accountId, items);
+    while (tempDiv.firstChild)
+        fragment.appendChild(tempDiv.firstChild);
+    body.replaceChildren(fragment);
+}
+function selectFirst(body) {
+    const firstRow = body.querySelector(".ml-row");
+    if (firstRow)
+        firstRow.click();
+}
+function restoreSelection(body, savedUid) {
+    if (savedUid) {
+        const row = body.querySelector(`.ml-row[data-uid="${savedUid}"]`);
+        if (row)
+            row.classList.add("selected");
+    }
+}
 function appendMessages(body, accountId, items) {
     for (const msg of items) {
-        // Use per-message accountId for unified inbox, fallback to list-level accountId
         const msgAccountId = msg.accountId || accountId;
         const row = document.createElement("div");
         row.className = "ml-row";
@@ -289,7 +315,7 @@ function appendMessages(body, accountId, items) {
         row.dataset.folderId = String(msg.folderId);
         const flag = document.createElement("span");
         flag.className = "ml-flag";
-        flag.textContent = msg.flags.includes("\\Flagged") ? "\u2605" : "\u2606"; // ★ or ☆
+        flag.textContent = msg.flags.includes("\\Flagged") ? "\u2605" : "\u2606";
         flag.title = "Toggle flag";
         const from = document.createElement("span");
         from.className = "ml-from";
@@ -299,13 +325,11 @@ function appendMessages(body, accountId, items) {
         else {
             from.textContent = msg.from.name || msg.from.address;
         }
-        // Account tag for unified inbox
         if (!accountId && msgAccountId) {
             const tag = document.createElement("span");
             tag.className = "ml-account-tag";
-            const label = msgAccountId;
-            tag.textContent = label.charAt(0).toUpperCase();
-            tag.title = label;
+            tag.textContent = msgAccountId.charAt(0).toUpperCase();
+            tag.title = msgAccountId;
             from.prepend(tag);
         }
         const subject = document.createElement("span");
@@ -341,25 +365,23 @@ function appendMessages(body, accountId, items) {
         row.appendChild(subject);
         row.addEventListener("click", (e) => {
             if (e.shiftKey && lastClickedRow) {
-                // Shift+click: range select from last clicked to this row
                 clearSelection();
                 selectRange(lastClickedRow, row);
             }
             else if (e.ctrlKey || e.metaKey) {
-                // Ctrl+click: toggle this row
                 row.classList.toggle("selected");
             }
             else {
-                // Plain click: single select
                 clearSelection();
                 row.classList.add("selected");
             }
             lastClickedRow = row;
             row.classList.remove("unread");
+            // Update shared state + notify viewer
+            state.select(msg);
             onMessageSelect(msgAccountId, msg.uid, msg.folderId);
         });
         row.addEventListener("dragstart", (e) => {
-            // If dragging a non-selected row, select it first
             if (!row.classList.contains("selected")) {
                 clearSelection();
                 row.classList.add("selected");
@@ -367,7 +389,6 @@ function appendMessages(body, accountId, items) {
             }
             const selected = getSelectedMessages();
             e.dataTransfer.setData("application/x-mailx-messages", JSON.stringify(selected));
-            // Legacy single-message format for backwards compat
             e.dataTransfer.setData("application/x-mailx-message", JSON.stringify({
                 accountId: msgAccountId,
                 uid: msg.uid,
@@ -376,7 +397,6 @@ function appendMessages(body, accountId, items) {
             }));
             e.dataTransfer.effectAllowed = "copyMove";
             row.classList.add("dragging");
-            // Show drag count
             if (selected.length > 1) {
                 const badge = document.createElement("div");
                 badge.textContent = `${selected.length} messages`;

package/client/components/message-viewer.js

@@ -1,7 +1,9 @@
 /**
  * Message viewer component -- displays full message in sandboxed iframe.
+ * Subscribes to message-state: clears when selected becomes null.
  */
 import { getMessage, updateFlags, allowRemoteContent } from "../lib/api-client.js";
+import * as state from "../lib/message-state.js";
 /** Currently displayed message (for reply/forward) */
 let currentMessage = null;
 let currentAccountId = "";
@@ -12,6 +14,35 @@ export function getCurrentMessage() {
         return null;
     return { accountId: currentAccountId, message: currentMessage };
 }
+/** Initialize viewer — subscribe to state changes */
+export function initViewer() {
+    state.subscribe((change) => {
+        if (change === "removed" || change === "messages") {
+            const sel = state.getSelected();
+            if (!sel) {
+                clearViewer();
+            }
+            else if (sel.uid !== currentMessage?.uid || sel.accountId !== currentAccountId) {
+                // State auto-selected a new message after removal — show it
+                showMessage(sel.accountId, sel.uid, sel.folderId);
+            }
+        }
+    });
+}
+function clearViewer() {
+    currentMessage = null;
+    currentAccountId = "";
+    showMessageGeneration++;
+    const headerEl = document.getElementById("mv-header");
+    const bodyEl = document.getElementById("mv-body");
+    const attEl = document.getElementById("mv-attachments");
+    if (bodyEl)
+        bodyEl.innerHTML = `<div class="mv-empty">Select a message to read</div>`;
+    if (headerEl)
+        headerEl.hidden = true;
+    if (attEl)
+        attEl.hidden = true;
+}
 export async function showMessage(accountId, uid, folderId, specialUse, isRetry = false) {
     const gen = ++showMessageGeneration;
     if (!isRetry)
@@ -51,6 +82,8 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
             if (unsubUrl) {
                 unsubBtn.hidden = false;
                 unsubBtn.href = unsubUrl;
+                unsubBtn.textContent = "Unsubscribe";
+                unsubBtn.title = unsubUrl;
                 unsubBtn.target = "_blank";
                 unsubBtn.rel = "noopener noreferrer";
             }

package/client/lib/message-state.js

@@ -0,0 +1,83 @@
+/**
+ * Shared message state — single source of truth for the message list and viewer.
+ *
+ * The message list and viewer both reference message objects from this store.
+ * Operations (move, delete, sync) mutate the store; UI components subscribe
+ * and update themselves. No manual DOM cleanup, no custom events.
+ */
+/** The currently loaded messages (what the list shows) */
+let messages = [];
+/** The currently selected/viewed message (same ref as an entry in messages[]) */
+let selected = null;
+const listeners = [];
+/** Subscribe to state changes. Returns unsubscribe function. */
+export function subscribe(fn) {
+    listeners.push(fn);
+    return () => {
+        const i = listeners.indexOf(fn);
+        if (i >= 0)
+            listeners.splice(i, 1);
+    };
+}
+function notify(change) {
+    for (const fn of listeners) {
+        try {
+            fn(change);
+        }
+        catch { /* don't let one subscriber break others */ }
+    }
+}
+/** Replace the entire message list (folder load, search, unified inbox) */
+export function setMessages(msgs) {
+    messages = msgs;
+    // If the previously selected message is no longer in the list, deselect
+    if (selected && !messages.find(m => m.uid === selected.uid && m.accountId === selected.accountId)) {
+        selected = null;
+    }
+    notify("messages");
+}
+/** Get current messages */
+export function getMessages() {
+    return messages;
+}
+/** Select a message (by reference or null to deselect) */
+export function select(msg) {
+    selected = msg;
+    notify("selected");
+}
+/** Get the selected message */
+export function getSelected() {
+    return selected;
+}
+/**
+ * Remove messages from the list (after move or delete).
+ * If the selected message is removed, auto-selects the next message or null.
+ */
+export function removeMessages(uids) {
+    const removeSet = new Set(uids.map(u => `${u.accountId}:${u.uid}`));
+    let selectedIdx = -1;
+    if (selected) {
+        selectedIdx = messages.findIndex(m => m.uid === selected.uid && m.accountId === selected.accountId);
+    }
+    const wasSelectedRemoved = selected && removeSet.has(`${selected.accountId}:${selected.uid}`);
+    messages = messages.filter(m => !removeSet.has(`${m.accountId}:${m.uid}`));
+    if (wasSelectedRemoved) {
+        // Auto-select next message (same index, or last, or null)
+        if (messages.length > 0) {
+            const nextIdx = Math.min(selectedIdx, messages.length - 1);
+            selected = messages[nextIdx];
+        }
+        else {
+            selected = null;
+        }
+    }
+    notify("removed");
+}
+/** Update flags on a message in the list */
+export function updateMessageFlags(accountId, uid, flags) {
+    const msg = messages.find(m => m.uid === uid && m.accountId === accountId);
+    if (msg)
+        msg.flags = flags;
+    // No notify — flag changes are cosmetic, handled inline by the list
+}
+//# sourceMappingURL=message-state.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.171",
+  "version": "1.0.173",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -20,11 +20,11 @@
     "postinstall": "node bin/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow-direct": "^0.1.3",
+    "@bobfrankston/iflow-direct": "^0.1.4",
     "@bobfrankston/iflow-node": "^0.1.1",
     "@bobfrankston/miscinfo": "^1.0.7",
     "@bobfrankston/oauthsupport": "^1.0.20",
-    "@bobfrankston/msger": "^0.1.220",
+    "@bobfrankston/msger": "^0.1.222",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

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

@@ -73,6 +73,12 @@ export declare class ImapManager extends EventEmitter {
     getAccountCount(): number;
     /** Register an account */
     addAccount(account: AccountConfig): Promise<void>;
+    /** Check if an account uses Gmail (should use API instead of IMAP) */
+    private isGmailAccount;
+    /** Get a Gmail API provider for an account (reuses tokenProvider from IMAP config) */
+    private getGmailProvider;
+    /** Convert ProviderMessage to the shape expected by storeMessages/upsertMessage */
+    private providerMsgToLocal;
     /** Sync folder list for an account */
     syncFolders(accountId: string, client?: any): Promise<Folder[]>;
     /** Store a batch of messages to DB immediately — used by onChunk for incremental sync */
@@ -84,6 +90,12 @@ export declare class ImapManager extends EventEmitter {
     private _syncAll;
     /** Sync a single account — manages its own connection lifecycle */
     private syncAccount;
+    /** Sync a Gmail account via REST API — no IMAP connections */
+    private syncAccountViaApi;
+    /** Sync a single folder via Gmail/Outlook API */
+    private syncFolderViaApi;
+    /** Store API-fetched messages to DB */
+    private storeApiMessages;
     /** Kill and recreate the persistent ops connection */
     private reconnectOps;
     /** Handle sync errors — classify and emit appropriate UI events */
@@ -115,6 +127,10 @@ export declare class ImapManager extends EventEmitter {
     private enqueueFetch;
     /** Fetch a single message body on demand, caching in the store */
     fetchMessageBody(accountId: string, folderId: number, uid: number): Promise<Buffer | null>;
+    /** Fetch message body via Gmail/Outlook API */
+    private fetchMessageBodyViaApi;
+    /** Background body prefetch — download bodies for messages that don't have them */
+    private prefetchBodies;
     /** Get the body store for direct access */
     getBodyStore(): FileMessageStore;
     /** Bulk trash messages — local-first, single IMAP connection for all */