@bobfrankston/mailx 1.0.61 → 1.0.66

package/client/app.js

@@ -562,15 +562,14 @@ onWsEvent((event) => {
             showAlert(event.message, "ws-error");
             break;
         case "accountError": {
-            const acctEl = document.getElementById("status-accounts");
-            if (acctEl) {
-                acctEl.innerHTML = "";
-                acctEl.style.color = "oklch(0.65 0.2 25)";
-                const text = document.createElement("span");
-                text.textContent = `${event.accountId}: ${event.hint} `;
-                acctEl.appendChild(text);
-                // Add re-auth button for auth errors
-                if (event.error.includes("token") || event.error.includes("auth") || event.error.includes("Command failed")) {
+            // Show in alert banner with re-auth button
+            const msg = `${event.accountId}: ${event.hint}`;
+            showAlert(msg, `acct-${event.accountId}`);
+            // Add re-auth button to the banner
+            const bannerText = document.getElementById("alert-text");
+            if (bannerText && bannerText.textContent === msg) {
+                const existing = bannerText.parentElement?.querySelector(".status-action");
+                if (!existing) {
                     const btn = document.createElement("button");
                     btn.textContent = "Re-authenticate";
                     btn.className = "status-action";
@@ -581,8 +580,12 @@ onWsEvent((event) => {
                             const res = await fetch(`/api/reauth/${event.accountId}`, { method: "POST" });
                             const data = await res.json();
                             if (data.ok) {
-                                acctEl.textContent = `${event.accountId}: reconnected`;
-                                acctEl.style.color = "";
+                                hideAlert();
+                                const acctEl = document.getElementById("status-accounts");
+                                if (acctEl) {
+                                    acctEl.textContent = `${event.accountId}: reconnected`;
+                                    acctEl.style.color = "";
+                                }
                             }
                             else {
                                 btn.textContent = "Re-authenticate";
@@ -594,9 +597,15 @@ onWsEvent((event) => {
                             btn.disabled = false;
                         }
                     });
-                    acctEl.appendChild(btn);
+                    bannerText.parentElement?.insertBefore(btn, document.getElementById("alert-dismiss"));
                 }
             }
+            // Also show in status bar
+            const acctEl = document.getElementById("status-accounts");
+            if (acctEl) {
+                acctEl.textContent = `${event.accountId}: ${event.hint}`;
+                acctEl.style.color = "oklch(0.65 0.2 25)";
+            }
             break;
         }
     }
@@ -608,6 +617,11 @@ document.addEventListener("keydown", (e) => {
         e.preventDefault();
         openCompose("new");
     }
+    // Ctrl+F = Forward
+    if (e.ctrlKey && e.key === "f") {
+        e.preventDefault();
+        openCompose("forward");
+    }
     // Ctrl+R = Reply
     if (e.ctrlKey && e.key === "r" && !e.shiftKey) {
         e.preventDefault();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.61",
+  "version": "1.0.66",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -20,9 +20,9 @@
     "postinstall": "node launcher/builder/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow": "^1.0.30",
+    "@bobfrankston/iflow": "^1.0.31",
     "@bobfrankston/miscinfo": "^1.0.6",
-    "@bobfrankston/oauthsupport": "^1.0.13",
+    "@bobfrankston/oauthsupport": "^1.0.16",
     "@bobfrankston/rust-builder": "^0.1.2",
     "mailparser": "^3.7.2",
     "quill": "^2.0.3",

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

@@ -30,7 +30,9 @@ export declare class ImapManager extends EventEmitter {
     constructor(db: MailxDB);
     /** Get OAuth access token for an account (for SMTP auth) */
     getOAuthToken(accountId: string): Promise<string | null>;
-    /** Force re-authentication for an OAuth account — deletes cached token, triggers browser consent */
+    /** Accounts currently re-authenticating — all operations skip these */
+    private reauthenticating;
+    /** Force re-authentication for an OAuth account — deletes cached IMAP token, triggers browser consent */
     reauthenticate(accountId: string): Promise<boolean>;
     /** Delete a message directly on the IMAP server (for stuck outbox messages not in local DB) */
     deleteOnServer(accountId: string, folderPath: string, uid: number): Promise<void>;

package/packages/mailx-imap/index.js

@@ -72,31 +72,42 @@ export class ImapManager extends EventEmitter {
             return null;
         return config.tokenProvider();
     }
-    /** Force re-authentication for an OAuth account — deletes cached token, triggers browser consent */
+    /** Accounts currently re-authenticating — all operations skip these */
+    reauthenticating = new Set();
+    /** Force re-authentication for an OAuth account — deletes cached IMAP token, triggers browser consent */
     async reauthenticate(accountId) {
-        const settings = loadSettings();
-        const account = settings.accounts.find(a => a.id === accountId);
-        if (!account)
-            return false;
-        // Delete cached tokens
-        const accountDir = account.imap.user.replace(/[@.]/g, "_");
-        const tokenDir = path.join(getConfigDir(), "tokens", accountDir);
-        for (const f of ["token.json", "contacts-token.json"]) {
-            const p = path.join(tokenDir, f);
-            if (fs.existsSync(p)) {
-                fs.unlinkSync(p);
-                console.log(`  [reauth] Deleted ${p}`);
-            }
-        }
-        // Re-register the account to get a fresh config with new tokenProvider
-        this.configs.delete(accountId);
-        await this.addAccount(account);
-        // Trigger the OAuth flow by requesting a token
+        if (this.reauthenticating.has(accountId))
+            return false; // already in progress
+        this.reauthenticating.add(accountId);
         try {
-            const token = await this.getOAuthToken(accountId);
-            if (token) {
+            const settings = loadSettings();
+            const account = settings.accounts.find(a => a.id === accountId);
+            if (!account)
+                return false;
+            // Stop IDLE watcher for this account
+            const stopWatcher = this.watchers.get(accountId);
+            if (stopWatcher) {
+                try {
+                    await stopWatcher();
+                }
+                catch { /* */ }
+                this.watchers.delete(accountId);
+            }
+            // Delete only the IMAP token (not contacts — separate scope, separate consent)
+            const accountDir = account.imap.user.replace(/[@.]/g, "_");
+            const tokenDir = path.join(getConfigDir(), "tokens", accountDir);
+            const tokenPath = path.join(tokenDir, "token.json");
+            if (fs.existsSync(tokenPath)) {
+                fs.unlinkSync(tokenPath);
+                console.log(`  [reauth] Deleted ${tokenPath}`);
+            }
+            // Re-register the account to get a fresh config with new tokenProvider
+            this.configs.delete(accountId);
+            await this.addAccount(account);
+            // addAccount already pre-validates the token (opens browser if needed)
+            const config = this.configs.get(accountId);
+            if (config?.tokenProvider) {
                 console.log(`  [reauth] ${accountId}: success`);
-                // Trigger a sync now that auth works
                 this.syncInbox().catch(() => { });
                 return true;
             }
@@ -104,6 +115,9 @@ export class ImapManager extends EventEmitter {
         catch (e) {
             console.error(`  [reauth] ${accountId}: ${e.message}`);
         }
+        finally {
+            this.reauthenticating.delete(accountId);
+        }
         return false;
     }
     /** Delete a message directly on the IMAP server (for stuck outbox messages not in local DB) */
@@ -139,6 +153,8 @@ export class ImapManager extends EventEmitter {
     }
     /** Create a fresh ImapClient for an account (disposable, single-use) */
     createClient(accountId) {
+        if (this.reauthenticating.has(accountId))
+            throw new Error(`Account ${accountId} is re-authenticating`);
         const config = this.configs.get(accountId);
         if (!config)
             throw new Error(`No config for account ${accountId}`);
@@ -423,14 +439,11 @@ export class ImapManager extends EventEmitter {
             catch (e) {
                 this.emit("syncError", accountId, e.message);
                 console.error(`Sync error for ${accountId}: ${e.message}`);
-                // Classify error and emit user-facing hint
-                const msg = e.message || "";
-                if (msg.includes("token") || msg.includes("auth") || msg.includes("Command failed")) {
-                    this.emit("accountError", accountId, msg, "Re-authenticate: mailx -setup or check credentials");
-                }
-                else if (msg.includes("timeout")) {
-                    this.emit("accountError", accountId, msg, "Server slow or unreachable — will retry");
-                }
+                // Emit user-facing error — always offer re-auth for OAuth accounts
+                const config = this.configs.get(accountId);
+                const isOAuth = !!config?.tokenProvider;
+                const hint = isOAuth ? "Authentication may have expired" : "Check server connectivity";
+                this.emit("accountError", accountId, e.message || "unknown", hint);
             }
             finally {
                 if (client)
@@ -544,6 +557,8 @@ export class ImapManager extends EventEmitter {
     lastInboxCounts = new Map();
     async quickInboxCheck() {
         for (const [accountId] of this.configs) {
+            if (this.reauthenticating.has(accountId))
+                continue;
             let client = null;
             try {
                 const inbox = this.db.getFolders(accountId).find(f => f.specialUse === "inbox");
@@ -1188,6 +1203,13 @@ export class ImapManager extends EventEmitter {
         }
         const accountDir = account.imap.user.replace(/[@.]/g, "_");
         const tokenDir = path.join(getConfigDir(), "tokens", accountDir);
+        const tokenPath = path.join(tokenDir, "contacts-token.json");
+        // If no cached token exists, skip — don't open interactive browser consent for contacts
+        // The user can trigger contacts sync manually or it will be set up during mailx -setup
+        if (!fs.existsSync(tokenPath)) {
+            console.log(`  [contacts] No token for ${accountId} — skipping (run mailx -setup to authorize)`);
+            return null;
+        }
         const token = await authenticateOAuth(credentialsPath, {
             scope: "https://www.googleapis.com/auth/contacts.readonly",
             tokenDirectory: tokenDir,