@bobfrankston/mailx 1.0.104 → 1.0.105

package/client/components/folder-tree.js

@@ -300,32 +300,73 @@ async function loadFolderTree(container) {
         const accounts = await getAccounts();
         if (accounts.length === 0) {
             container.innerHTML = `<div class="folder-loading">No accounts</div>`;
-            // Show setup instructions in the main content area (full width)
+            // Show simple setup form in the main content area
             const mainBody = document.getElementById("ml-body");
             if (mainBody) {
-                mainBody.innerHTML = `<div style="padding:2rem;line-height:1.8;max-width:600px">
+                mainBody.innerHTML = `<div style="padding:2rem;line-height:1.8;max-width:500px">
                     <h2 style="margin-bottom:1rem">Welcome to mailx</h2>
-                    <p>Create <code>~/.mailx/settings.jsonc</code> with your email accounts.</p>
-                    <p>If you have settings on OneDrive, create <code>~/.mailx/config.jsonc</code>:</p>
-                    <code style="display:block;padding:0.75rem;background:var(--color-bg-surface);border:1px solid var(--color-border);border-radius:4px;margin:0.5rem 0;white-space:pre;font-size:0.85rem">{ "sharedDir": "~/OneDrive/home/.mailx" }</code>
-                    <h3 style="margin-top:1.5rem">Gmail (just your email):</h3>
-                    <code style="display:block;padding:0.75rem;background:var(--color-bg-surface);border:1px solid var(--color-border);border-radius:4px;margin:0.5rem 0;white-space:pre;font-size:0.85rem">{ "name": "Your Name",
-  "accounts": [
-    { "email": "you@gmail.com" }
-  ]
-}</code>
-                    <h3 style="margin-top:1rem">Standard IMAP:</h3>
-                    <code style="display:block;padding:0.75rem;background:var(--color-bg-surface);border:1px solid var(--color-border);border-radius:4px;margin:0.5rem 0;white-space:pre;font-size:0.85rem">{ "name": "Your Name",
-  "accounts": [
-    { "email": "you@example.com",
-      "password": "secret",
-      "imap": { "host": "imap.example.com" },
-      "smtp": { "host": "smtp.example.com" }
-    }
-  ]
-}</code>
-                    <p style="margin-top:1rem;color:var(--color-text-muted)">Known providers (Gmail, Outlook, Yahoo, iCloud) auto-configure from just the email address. For other providers, specify IMAP/SMTP hosts. Restart after editing settings.</p>
+                    <p>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
+                            <input id="setup-name" type="text" placeholder="Your Name" style="display:block;width:100%;padding:0.5rem;margin-top:0.25rem;background:var(--color-bg-surface);color:var(--color-text);border:1px solid var(--color-border);border-radius:4px">
+                        </label>
+                        <label style="display:block;margin-bottom:0.5rem">
+                            Email address
+                            <input id="setup-email" type="email" placeholder="you@gmail.com" required style="display:block;width:100%;padding:0.5rem;margin-top:0.25rem;background:var(--color-bg-surface);color:var(--color-text);border:1px solid var(--color-border);border-radius:4px">
+                        </label>
+                        <label id="setup-password-row" style="display:block;margin-bottom:0.5rem">
+                            Password <span style="color:var(--color-text-muted);font-size:0.85rem">(not needed for Gmail/Outlook)</span>
+                            <input id="setup-password" type="password" placeholder="password" style="display:block;width:100%;padding:0.5rem;margin-top:0.25rem;background:var(--color-bg-surface);color:var(--color-text);border:1px solid var(--color-border);border-radius:4px">
+                        </label>
+                        <button type="submit" style="margin-top:1rem;padding:0.5rem 2rem;background:var(--color-accent);color:#fff;border:none;border-radius:4px;cursor:pointer;font-size:1rem">Add Account</button>
+                        <div id="setup-status" style="margin-top:1rem;color:var(--color-text-muted)"></div>
+                    </form>
+                    <details style="margin-top:2rem;color:var(--color-text-muted)">
+                        <summary>Manual setup (advanced)</summary>
+                        <p style="margin-top:0.5rem">Create <code>~/.mailx/settings.jsonc</code> or point to shared settings:</p>
+                        <code style="display:block;padding:0.75rem;background:var(--color-bg-surface);border:1px solid var(--color-border);border-radius:4px;margin:0.5rem 0;white-space:pre;font-size:0.85rem">{ "sharedDir": "~/OneDrive/home/.mailx" }</code>
+                    </details>
                 </div>`;
+                // Wire up the setup form
+                const form = document.getElementById("setup-form");
+                const emailInput = document.getElementById("setup-email");
+                const statusEl = document.getElementById("setup-status");
+                // Hide password for known OAuth providers
+                emailInput?.addEventListener("input", () => {
+                    const domain = emailInput.value.split("@")[1]?.toLowerCase() || "";
+                    const isOAuth = ["gmail.com", "googlemail.com", "outlook.com", "hotmail.com"].includes(domain);
+                    const pwRow = document.getElementById("setup-password-row");
+                    if (pwRow)
+                        pwRow.style.display = isOAuth ? "none" : "block";
+                });
+                form?.addEventListener("submit", async (e) => {
+                    e.preventDefault();
+                    const name = document.getElementById("setup-name").value.trim();
+                    const email = emailInput.value.trim();
+                    const password = document.getElementById("setup-password").value;
+                    if (!email)
+                        return;
+                    statusEl.textContent = "Setting up account...";
+                    try {
+                        const res = await fetch("/api/setup", {
+                            method: "POST",
+                            headers: { "Content-Type": "application/json" },
+                            body: JSON.stringify({ name, email, password }),
+                        });
+                        const data = await res.json();
+                        if (data.ok) {
+                            statusEl.textContent = "Account added! Restarting...";
+                            setTimeout(() => location.reload(), 2000);
+                        }
+                        else {
+                            statusEl.textContent = `Error: ${data.error || "Setup failed"}`;
+                        }
+                    }
+                    catch (err) {
+                        statusEl.textContent = `Error: ${err.message}`;
+                    }
+                });
             }
             // Dismiss startup overlay
             const overlay = document.getElementById("startup-overlay");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.104",
+  "version": "1.0.105",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -20,7 +20,7 @@
     "postinstall": "node launcher/builder/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow": "^1.0.39",
+    "@bobfrankston/iflow": "^1.0.40",
     "@bobfrankston/miscinfo": "^1.0.7",
     "@bobfrankston/oauthsupport": "^1.0.20",
     "@bobfrankston/rust-builder": "^0.1.3",

package/packages/mailx-api/index.js

@@ -4,6 +4,7 @@
  */
 import { Router } from "express";
 import { MailxService } from "@bobfrankston/mailx-service";
+import { loadAccounts, saveAccounts, initLocalConfig } from "@bobfrankston/mailx-settings";
 export function createApiRouter(db, imapManager) {
     const svc = new MailxService(db, imapManager);
     const router = Router();
@@ -105,6 +106,37 @@ export function createApiRouter(db, imapManager) {
             res.status(500).json({ error: e.message });
         }
     });
+    // ── First-time setup ──
+    router.post("/setup", async (req, res) => {
+        try {
+            const { name, email, password } = req.body;
+            if (!email) {
+                res.status(400).json({ error: "Email address required" });
+                return;
+            }
+            // Ensure ~/.mailx exists
+            initLocalConfig();
+            // Build account config (normalizeAccount handles provider detection)
+            const account = { email, name: name || email.split("@")[0] };
+            if (password)
+                account.password = password;
+            // Load existing accounts, add new one, save
+            const accounts = loadAccounts();
+            const domain = email.split("@")[1]?.toLowerCase() || "";
+            const id = domain.split(".")[0] || "account";
+            if (accounts.some((a) => a.email === email)) {
+                res.json({ ok: false, error: "Account already exists" });
+                return;
+            }
+            account.id = id;
+            accounts.push(account);
+            saveAccounts(accounts);
+            res.json({ ok: true, message: "Account added. Restart to begin syncing." });
+        }
+        catch (e) {
+            res.status(500).json({ error: e.message });
+        }
+    });
     // ── Send ──
     router.post("/send", async (req, res) => {
         try {

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

@@ -39,6 +39,8 @@ export declare class ImapManager extends EventEmitter {
     getOAuthToken(accountId: string): Promise<string | null>;
     /** Accounts currently re-authenticating — all operations skip these */
     private reauthenticating;
+    /** Last reauth attempt timestamp per account — prevents reauth loops (5 min cooldown) */
+    private lastReauthAttempt;
     /** 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) */

package/packages/mailx-imap/index.js

@@ -101,6 +101,8 @@ export class ImapManager extends EventEmitter {
     }
     /** Accounts currently re-authenticating — all operations skip these */
     reauthenticating = new Set();
+    /** Last reauth attempt timestamp per account — prevents reauth loops (5 min cooldown) */
+    lastReauthAttempt = new Map();
     /** Force re-authentication for an OAuth account — deletes cached IMAP token, triggers browser consent */
     async reauthenticate(accountId) {
         if (this.reauthenticating.has(accountId))
@@ -515,19 +517,28 @@ export class ImapManager extends EventEmitter {
                     console.log(`  [transient] ${accountId}: ${errMsg} — will retry next cycle`);
                 }
                 else if (isAuth && isOAuth) {
-                    // OAuth auth error: auto-attempt re-auth
-                    console.log(`  [auth] ${accountId}: attempting automatic re-authentication...`);
-                    this.reauthenticate(accountId).then(ok => {
-                        if (!ok && !this.accountErrorShown.has(accountId)) {
-                            this.accountErrorShown.add(accountId);
-                            this.emit("accountError", accountId, errMsg, "Authentication expired — re-authenticate", true);
-                        }
-                    }).catch(() => {
-                        if (!this.accountErrorShown.has(accountId)) {
-                            this.accountErrorShown.add(accountId);
-                            this.emit("accountError", accountId, errMsg, "Authentication expired — re-authenticate", true);
-                        }
-                    });
+                    // OAuth auth error: auto-reauth ONCE, then show banner
+                    const lastReauth = this.lastReauthAttempt.get(accountId) || 0;
+                    const cooldown = Date.now() - lastReauth > 300000; // 5 min cooldown
+                    if (cooldown && !this.reauthenticating.has(accountId)) {
+                        this.lastReauthAttempt.set(accountId, Date.now());
+                        console.log(`  [auth] ${accountId}: attempting automatic re-authentication...`);
+                        this.reauthenticate(accountId).then(ok => {
+                            if (!ok && !this.accountErrorShown.has(accountId)) {
+                                this.accountErrorShown.add(accountId);
+                                this.emit("accountError", accountId, errMsg, "Authentication expired — re-authenticate", true);
+                            }
+                        }).catch(() => {
+                            if (!this.accountErrorShown.has(accountId)) {
+                                this.accountErrorShown.add(accountId);
+                                this.emit("accountError", accountId, errMsg, "Authentication expired — re-authenticate", true);
+                            }
+                        });
+                    }
+                    else if (!this.accountErrorShown.has(accountId)) {
+                        this.accountErrorShown.add(accountId);
+                        this.emit("accountError", accountId, errMsg, "Authentication expired — re-authenticate", true);
+                    }
                 }
                 else if (!this.accountErrorShown.has(accountId)) {
                     // Non-transient, non-OAuth: show error banner
@@ -1097,6 +1108,11 @@ export class ImapManager extends EventEmitter {
             try {
                 await client.appendMessage(outboxPath, rawMessage, ["\\Seen"]);
                 console.log(`  [outbox] Queued message in ${outboxPath}`);
+                // Sync outbox folder so message appears in UI immediately
+                const outboxFolder = this.findFolder(accountId, "outbox");
+                if (outboxFolder) {
+                    this.syncFolder(accountId, outboxFolder.id).catch(() => { });
+                }
                 return;
             }
             finally {
@@ -1236,19 +1252,29 @@ export class ImapManager extends EventEmitter {
                         envelope: { from: sender, to: recipients },
                     });
                     console.log(`  [outbox] Sent UID ${uid} → ${recipients.join(", ")}`);
-                    // Move to Sent
+                    // Move to Sent and sync both folders so UI updates
                     const sentFolder = this.findFolder(accountId, "sent");
                     if (sentFolder) {
                         await client.moveMessage(msg, outboxFolder.path, sentFolder.path);
+                        this.syncFolder(accountId, sentFolder.id).catch(() => { });
+                        this.syncFolder(accountId, outboxFolder.id).catch(() => { });
                     }
                     else {
                         await client.deleteMessageByUid(outboxFolder.path, uid);
                     }
                 }
                 catch (e) {
-                    console.error(`  [outbox] Send failed UID ${uid}: ${e.message}`);
+                    const errMsg = e.message || String(e);
+                    console.error(`  [outbox] Send failed UID ${uid}: ${errMsg}`);
                     await client.removeFlags(outboxFolder.path, uid, [sendingFlag]);
                     await client.addFlags(outboxFolder.path, uid, ["$Failed"]);
+                    // Notify UI about the send failure
+                    this.emit("accountError", accountId, `Send failed: ${errMsg}`, "Message kept in Outbox", false);
+                    // Auth failures should not retry — back off this account
+                    if (/auth|login|credential|invalid/i.test(errMsg)) {
+                        this.outboxBackoff.set(accountId, Date.now() + 3600000); // 1 hour
+                        console.error(`  [outbox] Auth failure for ${accountId} — outbox paused for 1 hour`);
+                    }
                 }
             }
         }

package/packages/mailx-server/index.js

@@ -57,14 +57,13 @@ if (settings.accounts.length === 0) {
 const dbDir = getConfigDir();
 const db = new MailxDB(dbDir);
 const imapManager = new ImapManager(db);
-// Native IMAP client has connection leak — logout() doesn't reliably close sockets.
-// Use legacy imapflow by default until fixed. --native-imap to test.
-if (process.argv.includes("--native-imap") || process.argv.includes("-native-imap") || process.env.MAILX_NATIVE_IMAP) {
-    imapManager.useNativeClient = true;
-    console.log("  Using native IMAP client (transport-agnostic)");
+// Native IMAP client is default. Use --legacy-imap to fall back to imapflow.
+if (process.argv.includes("--legacy-imap") || process.argv.includes("-legacy-imap") || process.env.MAILX_LEGACY_IMAP) {
+    console.log("  Using legacy IMAP client (imapflow)");
 }
 else {
-    console.log("  Using legacy IMAP client (imapflow)");
+    imapManager.useNativeClient = true;
+    console.log("  Using native IMAP client (transport-agnostic)");
 }
 // ── Express App ──
 const app = express();
@@ -94,7 +93,7 @@ app.get("/api/version", (req, res) => {
     res.json({ version: SERVER_VERSION, theme: settings.ui?.theme || "system", storage });
 });
 app.all("/info", (req, res) => {
-    res.json({ version: SERVER_VERSION, uptime: Math.round(process.uptime()), port: PORT });
+    res.json({ version: SERVER_VERSION, uptime: Math.round(process.uptime()), port: PORT, imap: imapManager.useNativeClient ? "native" : "imapflow" });
 });
 app.get("/status", (req, res) => {
     const accounts = db.getAccounts();

package/rebuild.cmd

@@ -1,7 +1,4 @@
-setlocal
-set MAILX_NATIVE_IMAP=1
 cld
 call npmglobalize
 call killmail.cmd
 launch.ps1
-endlocal