@bobfrankston/mailx 1.0.185 → 1.0.187

package/client/.msger-window.json

@@ -1 +1 @@
-{"height":1344,"width":1946,"x":172,"y":85}
+{"height":1344,"width":2151,"x":626,"y":45}

package/client/android.html

@@ -15,7 +15,7 @@
             "@bobfrankston/mailx-store-web": "../packages/mailx-store-web/index.js",
             "@bobfrankston/mailx-store-web/": "../packages/mailx-store-web/",
             "@bobfrankston/mailx-types": "../packages/mailx-types/index.js",
-            "sql.js": "../node_modules/sql.js/dist/sql-wasm.js"
+            "sql.js": "../packages/mailx-store-web/sql-wasm-esm.js"
         }
     }
     </script>
@@ -90,6 +90,7 @@
                 <div class="tb-menu-dropdown" id="restart-dropdown" hidden>
                     <button class="tb-menu-item" id="btn-restart-quick" title="Reload the page">Reload</button>
                     <button class="tb-menu-item" id="btn-rebuild" title="Wipe local cache and re-sync">Reset local store</button>
+                    <button class="tb-menu-item" id="btn-factory-reset" title="Delete everything — accounts, settings, cache. Back to first-run.">Factory reset</button>
                 </div>
             </div>
         </div>

package/client/app.js

@@ -5,7 +5,7 @@
 import { initFolderTree, refreshFolderTree, updateFolderCounts } from "./components/folder-tree.js";
 import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, getSelectedMessages } from "./components/message-list.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 { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessages, undeleteMessage, restartServer, rebuildServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts, updateFlags } from "./lib/api-client.js";
 import * as messageState from "./lib/message-state.js";
 // ── New message badge (favicon + title) ──
 let baseTitle = "mailx";
@@ -146,6 +146,22 @@ initMessageList((accountId, uid, folderId) => {
     }
 });
 initViewer();
+// Status bar: show selected message UID/folder for debugging
+messageState.subscribe((change) => {
+    if (change === "selected" || change === "removed") {
+        const acctEl = document.getElementById("status-accounts");
+        if (!acctEl)
+            return;
+        const sel = messageState.getSelected();
+        if (sel) {
+            acctEl.textContent = `${sel.accountId}/uid:${sel.uid} folder:${sel.folderId}`;
+            acctEl.style.color = "";
+        }
+        else {
+            acctEl.textContent = "";
+        }
+    }
+});
 // ── Auto two-line when message list is narrow ──
 const messageList = document.getElementById("message-list");
 if (messageList) {
@@ -247,6 +263,26 @@ document.getElementById("btn-rebuild")?.addEventListener("click", async () => {
     }
     catch { /* server is shutting down */ }
 });
+document.getElementById("btn-factory-reset")?.addEventListener("click", async () => {
+    if (restartDropdown)
+        restartDropdown.hidden = true;
+    if (!confirm("Factory reset?\n\nThis deletes ALL data — accounts, settings, messages, cache.\nYou will need to set up your account again."))
+        return;
+    const ipc = window.mailxapi;
+    if (ipc?.resetAll) {
+        await ipc.resetAll();
+    }
+    else {
+        // Fallback: clear IndexedDB + localStorage manually
+        const dbs = await indexedDB.databases();
+        for (const db of dbs) {
+            if (db.name)
+                indexedDB.deleteDatabase(db.name);
+        }
+        localStorage.clear();
+        location.reload();
+    }
+});
 async function openCompose(mode) {
     const current = getCurrentMessage();
     const accounts = await getAccounts();
@@ -305,14 +341,10 @@ async function openCompose(mode) {
     }
     // Store init data for compose window to pick up
     sessionStorage.setItem("composeInit", JSON.stringify(init));
-    // IPC mode: navigate in same window (popups don't have custom protocol)
-    // HTTP mode: open as popup window
-    if (typeof mailxapi !== "undefined") {
-        window.location.href = "compose/compose.html";
-    }
-    else {
-        window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
-    }
+    // Open compose — always as popup via window.open().
+    // In IPC mode, msger's new_window_req_handler allows msger.localhost popups.
+    // DO NOT use window.location.href — msger exits on navigation.
+    window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
 }
 function quoteBody(msg) {
     const date = new Date(msg.date).toLocaleString();
@@ -398,6 +430,11 @@ document.getElementById("btn-compose")?.addEventListener("click", () => openComp
 document.getElementById("btn-reply")?.addEventListener("click", () => openCompose("reply"));
 document.getElementById("btn-reply-all")?.addEventListener("click", () => openCompose("replyAll"));
 document.getElementById("btn-forward")?.addEventListener("click", () => openCompose("forward"));
+// Context menu events from message-list right-click
+document.addEventListener("mailx-compose", ((e) => {
+    openCompose(e.detail.mode);
+}));
+document.addEventListener("mailx-delete", () => deleteSelectedMessages());
 // ── Search ──
 let searchTimeout;
 const searchInput = document.getElementById("search-input");
@@ -433,7 +470,16 @@ let currentFolderId = 0;
 let reloadDebounceTimer = null;
 searchInput?.addEventListener("input", () => {
     clearTimeout(searchTimeout);
-    searchTimeout = setTimeout(() => doSearch(false), 300);
+    if (searchInput.value.trim() === "") {
+        // Cleared — reset immediately, no debounce
+        const body = document.getElementById("ml-body");
+        if (body)
+            body.querySelectorAll(".filter-hidden").forEach(r => r.classList.remove("filter-hidden"));
+        reloadCurrentFolder();
+    }
+    else {
+        searchTimeout = setTimeout(() => doSearch(false), 300);
+    }
 });
 searchInput?.addEventListener("keydown", (e) => {
     if (e.key === "Enter") {
@@ -594,7 +640,8 @@ onWsEvent((event) => {
                 reloadDebounceTimer = null;
                 reloadCurrentFolder();
             }, 2000);
-            // Sync finished — re-enable sync button
+            // Sync succeeded — clear any transient error banner and re-enable sync button
+            hideAlert();
             const syncBtn = document.getElementById("btn-sync");
             if (syncBtn) {
                 syncBtn.disabled = false;
@@ -735,6 +782,27 @@ document.addEventListener("keydown", (e) => {
         e.preventDefault();
         document.getElementById("btn-sync")?.click();
     }
+    // R = Toggle read/unread
+    if (e.key === "r" && !e.ctrlKey && !e.metaKey && !e.altKey) {
+        const active = document.activeElement;
+        if (active && (active.tagName === "INPUT" || active.tagName === "TEXTAREA" || active.tagName === "SELECT"))
+            return;
+        const sel = messageState.getSelected();
+        if (!sel)
+            return;
+        e.preventDefault();
+        const isSeen = sel.flags.includes("\\Seen");
+        const newFlags = isSeen
+            ? sel.flags.filter((f) => f !== "\\Seen")
+            : [...sel.flags, "\\Seen"];
+        updateFlags(sel.accountId, sel.uid, newFlags).then(() => {
+            sel.flags = newFlags;
+            messageState.updateMessageFlags(sel.accountId, sel.uid, newFlags);
+            const row = document.querySelector(`.ml-row[data-uid="${sel.uid}"][data-account-id="${sel.accountId}"]`);
+            if (row)
+                row.classList.toggle("unread", !newFlags.includes("\\Seen"));
+        }).catch(() => { });
+    }
 });
 // ── View menu ──
 const viewBtn = document.getElementById("btn-view");

package/client/components/folder-tree.js

@@ -2,7 +2,7 @@
  * Folder tree component -- renders account folders with hierarchy,
  * expand/collapse, and optional unified inbox.
  */
-import { getAccounts, getFolders, moveMessage, moveMessages, markFolderRead, createFolder, renameFolder, deleteFolder, emptyFolder, setupAccount, getVersion } from "../lib/api-client.js";
+import { getAccounts, getFolders, moveMessage, moveMessages, markFolderRead, createFolder, renameFolder, deleteFolder, emptyFolder, setupAccount, getDeviceAccounts, getVersion } from "../lib/api-client.js";
 import { showContextMenu } from "./context-menu.js";
 let onFolderSelect;
 let onUnifiedInbox = null;
@@ -263,15 +263,38 @@ function renderNode(node, container, depth) {
     });
     // ── Drop target for message drag-and-drop ──
     if (node.id !== -1) {
+        let dragExpandTimer = null;
         folderEl.addEventListener("dragover", (e) => {
             e.preventDefault();
             e.dataTransfer.dropEffect = e.ctrlKey ? "copy" : "move";
             folderEl.classList.add("drop-target");
         });
-        folderEl.addEventListener("dragleave", () => folderEl.classList.remove("drop-target"));
+        folderEl.addEventListener("dragenter", () => {
+            if (hasChildren && !isExpanded && !dragExpandTimer) {
+                dragExpandTimer = setTimeout(() => {
+                    dragExpandTimer = null;
+                    expandState[expandKey] = true;
+                    saveExpandState();
+                    const treeContainer = document.getElementById("folder-tree");
+                    if (treeContainer)
+                        loadFolderTree(treeContainer);
+                }, 500);
+            }
+        });
+        folderEl.addEventListener("dragleave", () => {
+            folderEl.classList.remove("drop-target");
+            if (dragExpandTimer) {
+                clearTimeout(dragExpandTimer);
+                dragExpandTimer = null;
+            }
+        });
         folderEl.addEventListener("drop", async (e) => {
             e.preventDefault();
             folderEl.classList.remove("drop-target");
+            if (dragExpandTimer) {
+                clearTimeout(dragExpandTimer);
+                dragExpandTimer = null;
+            }
             // Multi-message or single-message drop
             const multiData = e.dataTransfer.getData("application/x-mailx-messages");
             const singleData = e.dataTransfer.getData("application/x-mailx-message");
@@ -357,8 +380,9 @@ async function loadFolderTree(container) {
             if (mainBody) {
                 mainBody.innerHTML = `<div style="padding:2rem;line-height:1.8;max-width:500px">
                     <h2 style="margin-bottom:1rem">Welcome to mailx</h2>
+                    <div id="setup-device-accounts"></div>
                     <div id="setup-cloud-status"></div>
-                    <p>Add your email account to get started.</p>
+                    <p id="setup-form-intro">Add your email account to get started.</p>
                     <form id="setup-form" style="margin-top:1rem">
                         <label style="display:block;margin-bottom:0.5rem">
                             Your name
@@ -462,6 +486,41 @@ async function loadFolderTree(container) {
                         </div>`;
                     }
                 }).catch(() => { });
+                // On Android, check for device Google accounts and show picker
+                getDeviceAccounts().then(async (deviceAccounts) => {
+                    const pickerEl = document.getElementById("setup-device-accounts");
+                    if (!pickerEl || deviceAccounts.length === 0)
+                        return;
+                    const formEl = document.getElementById("setup-form");
+                    const introEl = document.getElementById("setup-form-intro");
+                    if (introEl)
+                        introEl.textContent = "Select an account:";
+                    if (formEl)
+                        formEl.style.display = "none";
+                    pickerEl.innerHTML = deviceAccounts.map((a) => `<button class="device-account-btn" data-email="${a.email}" data-name="${a.name}" style="display:block;width:100%;padding:0.75rem 1rem;margin-bottom:0.5rem;background:var(--color-bg-surface);color:var(--color-text);border:1px solid var(--color-border);border-radius:6px;cursor:pointer;font-size:1rem;text-align:left">${a.email}</button>`).join("") + `<button id="setup-show-form" style="margin-top:0.5rem;padding:0.5rem 1rem;background:none;color:var(--color-text-muted);border:none;cursor:pointer;font-size:0.9rem">Use a different account...</button>`;
+                    pickerEl.querySelectorAll(".device-account-btn").forEach((btn) => {
+                        btn.addEventListener("click", async () => {
+                            const email = btn.dataset.email || "";
+                            const name = btn.dataset.name || "";
+                            pickerEl.innerHTML = `<div style="padding:0.5rem;color:var(--color-text-muted)">Setting up ${email}...</div>`;
+                            const result = await setupAccount(name, email, "");
+                            if (result?.ok) {
+                                pickerEl.innerHTML = `<div style="padding:0.5rem;color:var(--color-accent)">${result.message || "Account added!"}</div>`;
+                                setTimeout(() => location.reload(), 2000);
+                            }
+                            else {
+                                pickerEl.innerHTML = `<div style="padding:0.5rem;color:#f55">${result?.error || "Setup failed"}</div>`;
+                            }
+                        });
+                    });
+                    document.getElementById("setup-show-form")?.addEventListener("click", () => {
+                        pickerEl.style.display = "none";
+                        if (formEl)
+                            formEl.style.display = "block";
+                        if (introEl)
+                            introEl.textContent = "Add your email account to get started.";
+                    });
+                }).catch(() => { });
             }
             // Dismiss startup overlay
             const overlay = document.getElementById("startup-overlay");

package/client/components/message-list.js

@@ -4,6 +4,7 @@
  */
 import { getMessages as apiGetMessages, getUnifiedInbox as apiGetUnifiedInbox, searchMessages, updateFlags } from "../lib/api-client.js";
 import * as state from "../lib/message-state.js";
+import { showContextMenu } from "./context-menu.js";
 let onMessageSelect;
 let currentAccountId;
 let currentFolderId;
@@ -407,6 +408,71 @@ function appendMessages(body, accountId, items) {
             }
         });
         row.addEventListener("dragend", () => row.classList.remove("dragging"));
+        // ── Right-click context menu ──
+        row.addEventListener("contextmenu", (e) => {
+            e.preventDefault();
+            // Select row if not already selected
+            if (!row.classList.contains("selected")) {
+                clearSelection();
+                row.classList.add("selected");
+                lastClickedRow = row;
+                state.select(msg);
+                onMessageSelect(msgAccountId, msg.uid, msg.folderId);
+            }
+            const isSeen = msg.flags.includes("\\Seen");
+            const isFlagged = msg.flags.includes("\\Flagged");
+            const items = [
+                {
+                    label: isSeen ? "Mark unread" : "Mark read",
+                    action: async () => {
+                        const newFlags = isSeen
+                            ? msg.flags.filter((f) => f !== "\\Seen")
+                            : [...msg.flags, "\\Seen"];
+                        try {
+                            await updateFlags(msgAccountId, msg.uid, newFlags);
+                            msg.flags = newFlags;
+                            state.updateMessageFlags(msgAccountId, msg.uid, newFlags);
+                            row.classList.toggle("unread", !newFlags.includes("\\Seen"));
+                        }
+                        catch { /* ignore */ }
+                    },
+                },
+                {
+                    label: isFlagged ? "Unflag" : "Flag",
+                    action: async () => {
+                        const newFlags = isFlagged
+                            ? msg.flags.filter((f) => f !== "\\Flagged")
+                            : [...msg.flags, "\\Flagged"];
+                        try {
+                            await updateFlags(msgAccountId, msg.uid, newFlags);
+                            msg.flags = newFlags;
+                            row.classList.toggle("flagged");
+                            flag.textContent = row.classList.contains("flagged") ? "\u2605" : "\u2606";
+                        }
+                        catch { /* ignore */ }
+                    },
+                },
+                { label: "", action: () => { }, separator: true },
+                {
+                    label: "Reply",
+                    action: () => document.dispatchEvent(new CustomEvent("mailx-compose", { detail: { mode: "reply" } })),
+                },
+                {
+                    label: "Reply All",
+                    action: () => document.dispatchEvent(new CustomEvent("mailx-compose", { detail: { mode: "replyAll" } })),
+                },
+                {
+                    label: "Forward",
+                    action: () => document.dispatchEvent(new CustomEvent("mailx-compose", { detail: { mode: "forward" } })),
+                },
+                { label: "", action: () => { }, separator: true },
+                {
+                    label: "Delete",
+                    action: () => document.dispatchEvent(new CustomEvent("mailx-delete")),
+                },
+            ];
+            showContextMenu(e.clientX, e.clientY, items);
+        });
         body.appendChild(row);
     }
 }

package/client/components/message-viewer.js

@@ -2,7 +2,7 @@
  * 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 { getMessage, updateFlags, allowRemoteContent, getAttachment } from "../lib/api-client.js";
 import * as state from "../lib/message-state.js";
 /** Currently displayed message (for reply/forward) */
 let currentMessage = null;
@@ -144,12 +144,7 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
                         draftFolderId: msg.folderId,
                     };
                     sessionStorage.setItem("composeInit", JSON.stringify(init));
-                    if (typeof window.mailxapi !== "undefined") {
-                        window.location.href = "compose/compose.html";
-                    }
-                    else {
-                        window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
-                    }
+                    window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
                 };
             }
             else {
@@ -280,9 +275,22 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
                 const chip = document.createElement("a");
                 chip.className = "mv-att-chip";
                 chip.textContent = `\uD83D\uDCCE ${att.filename} (${formatSize(att.size)})`;
-                chip.href = `/api/message/${accountId}/${uid}/attachment/${i}?folderId=${msg.folderId}`;
-                chip.target = "_blank";
+                chip.href = "#";
                 chip.title = `${att.filename} (${att.mimeType})`;
+                chip.addEventListener("click", async (e) => {
+                    e.preventDefault();
+                    try {
+                        const data = await getAttachment(accountId, uid, i, msg.folderId);
+                        // Create blob URL and open
+                        const bytes = Uint8Array.from(atob(data.content), c => c.charCodeAt(0));
+                        const blob = new Blob([bytes], { type: data.contentType });
+                        const url = URL.createObjectURL(blob);
+                        window.open(url, "_blank");
+                    }
+                    catch (err) {
+                        console.error(`Attachment download failed: ${err.message}`);
+                    }
+                });
                 attEl.appendChild(chip);
             }
         }

package/client/compose/compose.js

@@ -5,14 +5,9 @@
  */
 import { createEditor } from "./editor.js";
 import { getVersion, getSettings, getAccounts, searchContacts, sendMessage, saveDraft as apiSaveDraft, deleteDraft } from "../lib/api-client.js";
-/** Close compose — navigate back in IPC mode, window.close() in HTTP mode */
+/** Close compose window */
 function closeCompose() {
-    if (typeof window.mailxapi !== "undefined") {
-        window.location.href = "../index.html";
-    }
-    else {
-        closeCompose();
-    }
+    window.close();
 }
 // ── Load editor scripts dynamically ──
 function loadScript(src) {

package/client/lib/api-client.js

@@ -294,6 +294,22 @@ export function saveSettings(settings) {
         return getIpc().saveSettingsData?.(settings);
     return api("/settings", { method: "PUT", body: JSON.stringify(settings) });
 }
+export async function getAttachment(accountId, uid, attachmentId, folderId) {
+    if (hasIPC())
+        return getIpc().getAttachment(accountId, uid, attachmentId, folderId);
+    // HTTP mode: fetch as blob
+    const params = folderId != null ? `?folderId=${folderId}` : "";
+    const res = await fetch(`/api/message/${accountId}/${uid}/attachment/${attachmentId}${params}`);
+    if (!res.ok)
+        throw new Error("Attachment not found");
+    const blob = await res.blob();
+    const buf = await blob.arrayBuffer();
+    return {
+        content: btoa(String.fromCharCode(...new Uint8Array(buf))),
+        contentType: res.headers.get("content-type") || "application/octet-stream",
+        filename: `attachment-${attachmentId}`,
+    };
+}
 export function repairAccounts() {
     if (hasIPC())
         return getIpc().repairAccounts?.();
@@ -309,6 +325,11 @@ export function setupAccount(name, email, password) {
         return getIpc().setupAccount?.(name, email, password);
     return api("/setup", { method: "POST", body: JSON.stringify({ name, email, password }) });
 }
+export async function getDeviceAccounts() {
+    if (hasIPC())
+        return getIpc().getDeviceAccounts?.() ?? [];
+    return [];
+}
 // Legacy exports for backward compatibility
 export const connectWebSocket = connectEvents;
 export const onWsEvent = onEvent;

package/client/lib/mailxapi.js

@@ -143,6 +143,11 @@
         getAutocompleteSettings: function() { return callNode("getAutocompleteSettings"); },
         saveAutocompleteSettings: function(settings) { return callNode("saveAutocompleteSettings", settings); },
 
+        // Attachments
+        getAttachment: function(accountId, uid, attachmentId, folderId) {
+            return callNode("getAttachment", { accountId: accountId, uid: uid, attachmentId: attachmentId, folderId: folderId });
+        },
+
         // Setup & Repair
         setupAccount: function(name, email, password) {
             return callNode("setupAccount", { name: name, email: email, password: password });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.185",
+  "version": "1.0.187",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -24,7 +24,7 @@
     "@bobfrankston/iflow-node": "^0.1.2",
     "@bobfrankston/miscinfo": "^1.0.8",
     "@bobfrankston/oauthsupport": "^1.0.21",
-    "@bobfrankston/msger": "^0.1.236",
+    "@bobfrankston/msger": "^0.1.237",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

package/packages/mailx-service/jsonrpc.js

@@ -122,6 +122,11 @@ async function dispatchAction(svc, action, p) {
         case "saveAutocompleteSettings":
             svc.saveAutocompleteSettings(p);
             return { ok: true };
+        // Attachments
+        case "getAttachment": {
+            const att = await svc.getAttachment(p.accountId, p.uid, p.attachmentId, p.folderId);
+            return { content: att.content.toString("base64"), contentType: att.contentType, filename: att.filename };
+        }
         // Setup & Repair
         case "setupAccount":
             return svc.setupAccount(p.name, p.email, p.password);

package/packages/mailx-store-web/android-bootstrap.js

@@ -14,7 +14,7 @@
 import { WebMailxDB } from "./db.js";
 import { WebMessageStore } from "./web-message-store.js";
 import { WebMailxService } from "./web-service.js";
-import { loadAccounts, clearSettings } from "./web-settings.js";
+import { loadAccounts, saveAccounts, clearSettings } from "./web-settings.js";
 import { GmailApiWebProvider } from "./gmail-api-web.js";
 // ── State ──
 let db;
@@ -237,6 +237,130 @@ class AndroidSyncManager {
     async searchOnServer() { return []; }
     async syncAllContacts() { }
 }
+// ── OAuth credentials (same "installed" client as desktop) ──
+const OAUTH_CLIENT = {
+    clientId: "1067464114116-ndd19nqat8lucb0mbb0mvl7i3tbhnc43.apps.googleusercontent.com",
+    clientSecret: "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",
+    authUri: "https://accounts.google.com/o/oauth2/auth",
+    tokenUri: "https://oauth2.googleapis.com/token",
+    redirectUri: "http://localhost",
+};
+const OAUTH_SCOPES = "https://mail.google.com/ https://www.googleapis.com/auth/contacts.readonly https://www.googleapis.com/auth/drive.file";
+// ── Token cache (IndexedDB) ──
+async function getCachedToken(email) {
+    const key = `oauth-token-${email.replace(/[@.]/g, "_")}`;
+    const raw = localStorage.getItem(key);
+    if (!raw)
+        return null;
+    try {
+        return JSON.parse(raw);
+    }
+    catch {
+        return null;
+    }
+}
+async function setCachedToken(email, token) {
+    const key = `oauth-token-${email.replace(/[@.]/g, "_")}`;
+    localStorage.setItem(key, JSON.stringify(token));
+}
+async function clearCachedToken(email) {
+    const key = `oauth-token-${email.replace(/[@.]/g, "_")}`;
+    localStorage.removeItem(key);
+}
+// ── Token exchange ──
+async function exchangeCodeForTokens(code) {
+    const body = new URLSearchParams({
+        code,
+        client_id: OAUTH_CLIENT.clientId,
+        client_secret: OAUTH_CLIENT.clientSecret,
+        redirect_uri: OAUTH_CLIENT.redirectUri,
+        grant_type: "authorization_code",
+    });
+    const res = await fetch(OAUTH_CLIENT.tokenUri, {
+        method: "POST",
+        headers: { "Content-Type": "application/x-www-form-urlencoded" },
+        body: body.toString(),
+    });
+    if (!res.ok) {
+        const text = await res.text();
+        throw new Error(`Token exchange failed: ${res.status} ${text}`);
+    }
+    return res.json();
+}
+async function refreshAccessToken(refreshToken) {
+    const body = new URLSearchParams({
+        refresh_token: refreshToken,
+        client_id: OAUTH_CLIENT.clientId,
+        client_secret: OAUTH_CLIENT.clientSecret,
+        grant_type: "refresh_token",
+    });
+    const res = await fetch(OAUTH_CLIENT.tokenUri, {
+        method: "POST",
+        headers: { "Content-Type": "application/x-www-form-urlencoded" },
+        body: body.toString(),
+    });
+    if (!res.ok) {
+        const text = await res.text();
+        throw new Error(`Token refresh failed: ${res.status} ${text}`);
+    }
+    return res.json();
+}
+// ── Token provider (browser OAuth, same as desktop) ──
+function createNativeTokenProvider(email) {
+    return async () => {
+        // Check cached token first
+        const cached = await getCachedToken(email);
+        if (cached?.access_token) {
+            const expiresAt = cached.expires_at || 0;
+            const bufferMs = 5 * 60 * 1000; // 5 min buffer
+            if (Date.now() < expiresAt - bufferMs) {
+                return cached.access_token;
+            }
+            // Try refresh
+            if (cached.refresh_token) {
+                try {
+                    console.log(`[oauth] Refreshing token for ${email}`);
+                    const refreshed = await refreshAccessToken(cached.refresh_token);
+                    const token = {
+                        access_token: refreshed.access_token,
+                        refresh_token: cached.refresh_token,
+                        expires_at: Date.now() + refreshed.expires_in * 1000,
+                    };
+                    await setCachedToken(email, token);
+                    return token.access_token;
+                }
+                catch (e) {
+                    console.warn(`[oauth] Refresh failed: ${e.message}, starting new flow`);
+                }
+            }
+        }
+        // No valid token — start browser OAuth flow
+        const bridge = window._nativeBridge;
+        if (!bridge?.app?.startOAuth) {
+            throw new Error("No native OAuth bridge");
+        }
+        const authUrl = `${OAUTH_CLIENT.authUri}?` + new URLSearchParams({
+            client_id: OAUTH_CLIENT.clientId,
+            redirect_uri: OAUTH_CLIENT.redirectUri,
+            response_type: "code",
+            scope: OAUTH_SCOPES,
+            access_type: "offline",
+            prompt: "consent",
+            login_hint: email,
+        }).toString();
+        console.log(`[oauth] Starting browser consent for ${email}`);
+        const code = await bridge.app.startOAuth(authUrl);
+        const tokens = await exchangeCodeForTokens(code);
+        const token = {
+            access_token: tokens.access_token,
+            refresh_token: tokens.refresh_token,
+            expires_at: Date.now() + tokens.expires_in * 1000,
+        };
+        await setCachedToken(email, token);
+        console.log(`[oauth] Token obtained for ${email}`);
+        return token.access_token;
+    };
+}
 // ── Initialization ──
 export async function initAndroid() {
     console.log("[android] Initializing mailx...");
@@ -250,6 +374,11 @@ export async function initAndroid() {
     for (const account of accounts) {
         if (!account.enabled)
             continue;
+        // Set up OAuth token provider for Gmail accounts via Android AccountManager
+        const domain = account.email?.split("@")[1]?.toLowerCase() || "";
+        if (domain === "gmail.com" || domain === "googlemail.com") {
+            syncManager.setTokenProvider(account.id, createNativeTokenProvider(account.email));
+        }
         await syncManager.addAccount(account);
     }
     installBridge();
@@ -323,13 +452,71 @@ function installBridge() {
         saveSettingsData: async (data) => { await service.saveSettingsData(data); return { ok: true }; },
         getVersion: async () => {
             const settings = await service.getSettings();
-            return { version: "1.0.0-android", theme: settings.ui?.theme || "system", storage: service.getStorageInfo(), platform: "android" };
+            const nativeVersion = window._nativeBridge?.info?.version || "?";
+            return { version: nativeVersion, theme: settings.ui?.theme || "system", storage: service.getStorageInfo(), platform: "android" };
         },
         getAutocompleteSettings: () => service.getAutocompleteSettings(),
         saveAutocompleteSettings: async (settings) => { await service.saveAutocompleteSettings(settings); return { ok: true }; },
-        setupAccount: async () => ({ ok: false, error: "Use desktop for initial setup" }),
+        getDeviceAccounts: async () => {
+            const bridge = window._nativeBridge;
+            if (bridge?.app?.getDeviceAccounts) {
+                return bridge.app.getDeviceAccounts();
+            }
+            return [];
+        },
+        setupAccount: async (name, email, _password) => {
+            try {
+                if (!email || !email.includes("@")) {
+                    return { ok: false, error: "Email address required" };
+                }
+                const domain = email.split("@")[1].toLowerCase();
+                const id = domain.split(".")[0] || "account";
+                const account = {
+                    id,
+                    name: name || email.split("@")[0],
+                    email,
+                    enabled: true,
+                    imap: { host: `imap.${domain}`, port: 993, tls: true, auth: "oauth2", user: email },
+                    smtp: { host: `smtp.${domain}`, port: 587, tls: true, auth: "oauth2", user: email },
+                };
+                // Apply known provider defaults
+                if (domain === "gmail.com" || domain === "googlemail.com") {
+                    account.label = "Gmail";
+                    account.imap = { host: "imap.gmail.com", port: 993, tls: true, auth: "oauth2", user: email };
+                    account.smtp = { host: "smtp.gmail.com", port: 587, tls: true, auth: "oauth2", user: email };
+                }
+                const existing = await loadAccounts();
+                if (existing.some(a => a.email === email)) {
+                    return { ok: true, message: "Account already exists" };
+                }
+                existing.push(account);
+                await saveAccounts(existing);
+                // Set up token provider before adding account
+                const setupDomain = email.split("@")[1].toLowerCase();
+                if (setupDomain === "gmail.com" || setupDomain === "googlemail.com") {
+                    syncManager.setTokenProvider(account.id, createNativeTokenProvider(email));
+                }
+                await syncManager.addAccount(account);
+                db.upsertAccount(account.id, account.name, account.email, JSON.stringify(account));
+                console.log(`[android] Account added: ${email}`);
+                return { ok: true, message: `Added ${email}. Syncing...` };
+            }
+            catch (e) {
+                return { ok: false, error: e.message };
+            }
+        },
         repairAccounts: async () => ({ ok: false, error: "Use desktop for repair" }),
         resetStore: () => resetStore(),
+        resetAll: async () => {
+            const bridge = window._nativeBridge;
+            if (bridge?.app?.resetAll) {
+                await bridge.app.resetAll();
+            }
+            else {
+                await resetStore();
+                location.reload();
+            }
+        },
         restart: () => { location.reload(); },
         onEvent: (handler) => { eventHandlers.push(handler); },
     };

package/packages/mailx-store-web/sql-wasm-esm.js

@@ -0,0 +1,10 @@
+// ESM wrapper for sql.js (UMD) — loads as classic script, re-exports the global
+await new Promise((resolve, reject) => {
+    const s = document.createElement("script");
+    s.src = new URL("../../node_modules/sql.js/dist/sql-wasm.js", import.meta.url).href;
+    s.onload = resolve;
+    s.onerror = reject;
+    document.head.appendChild(s);
+});
+const initSqlJs = globalThis.initSqlJs;
+export default initSqlJs;