@bobfrankston/mailx 1.0.46 → 1.0.47

package/bin/mailx.js

@@ -28,14 +28,15 @@ const verbose = hasFlag("verbose");
 const setupMode = hasFlag("setup");
 const addMode = hasFlag("add");
 const testMode = hasFlag("test");
+const rebuildMode = hasFlag("rebuild");
 
 // Validate arguments
-const knownFlags = ["server", "no-browser", "verbose", "external", "kill", "v", "version", "setup", "add", "test"];
+const knownFlags = ["server", "no-browser", "verbose", "external", "kill", "v", "version", "setup", "add", "test", "rebuild"];
 for (const arg of args) {
     const flag = arg.replace(/^--?/, "");
     if (arg.startsWith("-") && !knownFlags.includes(flag)) {
         console.error(`Unknown option: ${arg}`);
-        console.error("Usage: mailx [-server] [-verbose] [-kill] [-v] [-setup] [-no-browser] [-external]");
+        console.error("Usage: mailx [-server] [-verbose] [-kill] [-rebuild] [-v] [-setup] [-no-browser] [-external]");
         process.exit(1);
     }
 }
@@ -86,6 +87,31 @@ if (hasFlag("kill")) {
     process.exit(0);
 }
 
+// Rebuild: wipe DB + message store, keep accounts/settings
+if (rebuildMode) {
+    const { getConfigDir, getStorePath } = await import("@bobfrankston/mailx-settings");
+    const dbDir = getConfigDir();
+    const storePath = getStorePath();
+
+    console.log("Rebuilding mailx local cache...");
+    console.log("  Accounts and settings will be preserved.");
+
+    // Remove DB files
+    for (const f of ["mailx.db", "mailx.db-wal", "mailx.db-shm"]) {
+        const p = path.join(dbDir, f);
+        if (fs.existsSync(p)) { fs.unlinkSync(p); console.log(`  Deleted ${f}`); }
+    }
+
+    // Remove message store
+    if (fs.existsSync(storePath)) {
+        fs.rmSync(storePath, { recursive: true });
+        console.log(`  Deleted message store`);
+    }
+
+    console.log("  Rebuild complete. Run 'mailx' to start fresh.");
+    process.exit(0);
+}
+
 // Version
 if (hasFlag("v") || hasFlag("version")) {
     const root = path.join(import.meta.dirname, "..");

package/client/index.html

@@ -24,6 +24,7 @@
                 <div class="tb-menu-dropdown" id="view-dropdown" hidden>
                     <label class="tb-menu-item"><input type="checkbox" id="opt-two-line"> Two-line view</label>
                     <label class="tb-menu-item"><input type="checkbox" id="opt-preview" checked> Preview pane</label>
+                    <label class="tb-menu-item"><input type="checkbox" id="opt-snippet" checked> Preview snippets</label>
                     <label class="tb-menu-item"><input type="checkbox" id="opt-flagged"> ★ Flagged only</label>
                 </div>
             </div>
@@ -33,9 +34,17 @@
             <button class="tb-btn" id="btn-sync" title="Sync all folders (F5)">
                 <span class="tb-icon">↻</span> Sync
             </button>
-            <button class="tb-btn" id="btn-restart" title="Restart server and reload page">
-                <span class="tb-icon">⚡</span> Restart
-            </button>
+            <div class="tb-menu" id="restart-menu">
+                <button class="tb-btn" id="btn-restart" title="Restart server and reload page">
+                    <span class="tb-icon">⚡</span> Restart ▾
+                </button>
+                <div class="tb-menu-dropdown" id="restart-dropdown" hidden>
+                    <button class="tb-menu-item" id="btn-restart-quick" title="Restart the server process">Restart server</button>
+                    <button class="tb-menu-item" id="btn-rebuild" title="Wipe local DB and message cache, re-download everything. Accounts and settings are preserved. Safe and fast.">Rebuild local cache</button>
+                    <hr class="tb-menu-sep">
+                    <span class="tb-menu-hint">CLI: mailx --rebuild for full reset</span>
+                </div>
+            </div>
         </div>
     </header>
 

package/client/styles/components.css

@@ -91,6 +91,9 @@
 }
 .tb-menu-item:hover { background: var(--color-bg-hover); }
 .tb-menu-item input[type="checkbox"] { accent-color: var(--color-accent); }
+button.tb-menu-item { background: none; border: none; color: inherit; width: 100%; text-align: left; }
+.tb-menu-sep { border: none; border-top: 1px solid var(--color-border); margin: var(--gap-xs) 0; }
+.tb-menu-hint { display: block; padding: var(--gap-xs) var(--gap-md); font-size: 0.75rem; color: var(--color-text-muted); }
 .tb-sep { width: 1px; height: 1.2rem; background: var(--color-border); margin: 0 var(--gap-xs); }
 
 .search-bar {
@@ -338,6 +341,7 @@
         margin-left: var(--gap-xs);
     }
 }
+.no-snippets .ml-preview { display: none; }
 .ml-date { white-space: nowrap; text-align: right; color: var(--color-text-muted); font-family: var(--font-mono); font-size: var(--font-size-sm); }
 
 .ml-empty {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.46",
+  "version": "1.0.47",
   "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.26",
+    "@bobfrankston/iflow": "^1.0.28",
     "@bobfrankston/miscinfo": "^1.0.6",
     "@bobfrankston/oauthsupport": "^1.0.11",
     "@bobfrankston/rust-builder": "^0.1.2",

package/packages/mailx-imap/index.js

@@ -6,7 +6,7 @@
 import { ImapClient, createAutoImapConfig } from "@bobfrankston/iflow";
 import { authenticateOAuth } from "@bobfrankston/oauthsupport";
 import { FileMessageStore } from "@bobfrankston/mailx-store";
-import { loadSettings, getStorePath } from "@bobfrankston/mailx-settings";
+import { loadSettings, getStorePath, getConfigDir } from "@bobfrankston/mailx-settings";
 import { EventEmitter } from "node:events";
 import * as fs from "node:fs";
 import * as path from "node:path";
@@ -26,13 +26,23 @@ function toEmailAddresses(addrs) {
         return [];
     return addrs.map(toEmailAddress);
 }
+/** Decode HTML entities (  & etc.) to plain characters */
+function decodeEntities(text) {
+    return text
+        .replace(/&#(\d+);/g, (_, n) => String.fromCodePoint(Number(n)))
+        .replace(/&#x([0-9a-fA-F]+);/g, (_, h) => String.fromCodePoint(parseInt(h, 16)))
+        .replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">")
+        .replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&nbsp;/g, " ");
+}
 /** Extract a plain-text preview from message source */
 async function extractPreview(source) {
     try {
         const parsed = await simpleParser(source);
         const bodyText = parsed.text || "";
         const bodyHtml = parsed.html || "";
-        const preview = bodyText.replace(/\s+/g, " ").trim().slice(0, 200);
+        // Use text part; fall back to stripping HTML tags if text is empty
+        let raw = bodyText || bodyHtml.replace(/<[^>]+>/g, " ");
+        const preview = decodeEntities(raw).replace(/\s+/g, " ").trim().slice(0, 200);
         const hasAttachments = (parsed.attachments?.length || 0) > 0;
         return { bodyHtml, bodyText, preview, hasAttachments };
     }
@@ -105,11 +115,13 @@ export class ImapManager extends EventEmitter {
         if (this.configs.has(account.id))
             return;
         // createAutoImapConfig auto-detects Gmail from server/username and sets up OAuth
+        // Token directory in ~/.mailx/ so tokens persist across npm reinstalls
         const config = createAutoImapConfig({
             server: account.imap.host,
             port: account.imap.port,
             username: account.imap.user,
-            password: account.imap.password
+            password: account.imap.password,
+            tokenDirectory: getConfigDir()
         });
         this.configs.set(account.id, config);
         // Register account in DB

package/packages/mailx-server/index.js

@@ -9,7 +9,7 @@ import * as fs from "node:fs";
 import { MailxDB } from "@bobfrankston/mailx-store";
 import { ImapManager } from "@bobfrankston/mailx-imap";
 import { createApiRouter } from "@bobfrankston/mailx-api";
-import { loadSettings, getConfigDir, getSharedDir, initLocalConfig } from "@bobfrankston/mailx-settings";
+import { loadSettings, getConfigDir, getStorePath, getSharedDir, initLocalConfig } from "@bobfrankston/mailx-settings";
 import { ports } from "@bobfrankston/miscinfo";
 import { createServer } from "node:http";
 const PORT = ports.mailx;
@@ -67,7 +67,7 @@ app.use((req, res, next) => {
     res.on("finish", () => {
         const ms = Date.now() - start;
         // Skip noisy polling endpoints
-        if (req.path === "/api/sync/pending")
+        if (req.path.endsWith("/sync/pending"))
             return;
         console.log(`  ${req.method} ${req.path} ${res.statusCode} ${ms}ms`);
     });
@@ -125,12 +125,43 @@ ${accountInfo.map((a) => `<tr><td>${a.name}</td><td>${a.folders}</td><td>${a.inb
 app.post("/api/restart", (req, res) => {
     res.json({ ok: true });
     broadcast({ type: "reload" });
-    // Graceful shutdown — node --watch will auto-restart
     setTimeout(async () => {
         console.log("  Restart requested via API");
         await shutdown();
     }, 500);
 });
+// Rebuild: wipe DB + message store, keep accounts/settings, restart
+app.post("/api/rebuild", (req, res) => {
+    res.json({ ok: true });
+    broadcast({ type: "reload" });
+    setTimeout(async () => {
+        console.log("  Rebuild requested — wiping DB and message store...");
+        imapManager.stopPeriodicSync();
+        try {
+            await imapManager.shutdown();
+        }
+        catch { /* proceed */ }
+        db.close();
+        // Remove DB files
+        const dbDir = getConfigDir();
+        for (const f of ["mailx.db", "mailx.db-wal", "mailx.db-shm"]) {
+            const p = path.join(dbDir, f);
+            if (fs.existsSync(p)) {
+                fs.unlinkSync(p);
+                console.log(`  Deleted ${f}`);
+            }
+        }
+        // Remove message store
+        const storePath = getStorePath();
+        if (fs.existsSync(storePath)) {
+            fs.rmSync(storePath, { recursive: true });
+            console.log(`  Deleted ${storePath}`);
+        }
+        console.log("  Rebuild complete — restarting...");
+        server?.close();
+        process.exit(0);
+    }, 500);
+});
 // SPA fallback
 app.get("*", (req, res) => {
     if (!req.path.startsWith("/api"))

package/packages/mailx-settings/index.js

@@ -107,11 +107,13 @@ function getSharedDir() {
             if (resolved)
                 return resolved;
         }
-        // Nothing mounted — save last provider entry for API fallback
-        const lastProvider = [...entries].reverse().find(e => typeof e !== "string");
-        if (lastProvider) {
-            pendingCloudConfig = lastProvider;
-            console.log(`  No cloud drive mounted — will try ${lastProvider.provider} API`);
+        // Nothing mounted — save last provider entry for API fallback (log once)
+        if (!pendingCloudConfig) {
+            const lastProvider = [...entries].reverse().find(e => typeof e !== "string");
+            if (lastProvider) {
+                pendingCloudConfig = lastProvider;
+                console.log(`  No cloud drive mounted — will try ${lastProvider.provider} API`);
+            }
         }
     }
     // Legacy: derive from settingsPath