@bobfrankston/mailx 1.0.45 → 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/app.js

@@ -5,7 +5,7 @@
 import { initFolderTree, refreshFolderTree } from "./components/folder-tree.js";
 import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder } from "./components/message-list.js";
 import { showMessage, getCurrentMessage } from "./components/message-viewer.js";
-import { connectWebSocket, onWsEvent, triggerSync, getAccounts, getFolders } from "./lib/api-client.js";
+import { connectWebSocket, onWsEvent, triggerSync, getAccounts, getFolders, deleteMessage, undeleteMessage, restartServer, getSyncPending } from "./lib/api-client.js";
 // ── New message badge (favicon + title) ──
 let baseTitle = "mailx";
 let lastSeenCount = 0;
@@ -180,7 +180,7 @@ document.getElementById("btn-restart")?.addEventListener("click", async () => {
     if (statusSync)
         statusSync.textContent = "Restarting...";
     try {
-        await fetch("/api/restart", { method: "POST" });
+        await restartServer();
     }
     catch { /* server is shutting down */ }
     // Server broadcasts reload event; if missed, WebSocket reconnect will trigger page reload
@@ -247,11 +247,7 @@ async function deleteCurrentMessage() {
         return;
     const { accountId, message } = current;
     try {
-        const res = await fetch(`/api/message/${accountId}/${message.uid}`, { method: "DELETE" });
-        if (!res.ok) {
-            const err = await res.json().catch(() => ({ error: res.statusText }));
-            throw new Error(err.error || res.statusText);
-        }
+        await deleteMessage(accountId, message.uid);
         lastDeleted = { accountId, uid: message.uid, folderId: message.folderId, subject: message.subject };
         // Show undo notification in status bar
         const statusSync = document.getElementById("status-sync");
@@ -296,15 +292,7 @@ async function undoDelete() {
         return;
     const { accountId, uid, folderId } = lastDeleted;
     try {
-        const res = await fetch(`/api/message/${accountId}/${uid}/undelete`, {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ folderId }),
-        });
-        if (!res.ok) {
-            const err = await res.json().catch(() => ({ error: res.statusText }));
-            throw new Error(err.error || res.statusText);
-        }
+        await undeleteMessage(accountId, uid, folderId);
         const statusSync = document.getElementById("status-sync");
         if (statusSync)
             statusSync.textContent = "Message restored";
@@ -638,10 +626,7 @@ fetch("/api/version").then(r => r.json()).then(d => {
 let serverDown = false;
 setInterval(async () => {
     try {
-        const res = await fetch("/api/sync/pending");
-        if (!res.ok)
-            return;
-        const data = await res.json();
+        const data = await getSyncPending();
         const el = document.getElementById("status-pending");
         if (el) {
             el.textContent = data.pending > 0 ? `↻ ${data.pending} pending` : "";

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 } from "../lib/api-client.js";
+import { getAccounts, getFolders, moveMessage, markFolderRead, createFolder, renameFolder, deleteFolder, emptyFolder } from "../lib/api-client.js";
 import { showContextMenu } from "./context-menu.js";
 let onFolderSelect;
 let onUnifiedInbox = null;
@@ -166,7 +166,7 @@ function renderNode(node, container, depth) {
         const items = [
             { label: "Mark all read", action: async () => {
                     try {
-                        await fetch(`/api/folder/${node.accountId}/${node.id}/mark-read`, { method: "POST" });
+                        await markFolderRead(node.accountId, node.id);
                         const treeContainer = document.getElementById("folder-tree");
                         if (treeContainer)
                             loadFolderTree(treeContainer);
@@ -179,11 +179,7 @@ function renderNode(node, container, depth) {
                     if (!name)
                         return;
                     try {
-                        await fetch(`/api/folder/${node.accountId}`, {
-                            method: "POST",
-                            headers: { "Content-Type": "application/json" },
-                            body: JSON.stringify({ parentPath: node.path, name }),
-                        });
+                        await createFolder(node.accountId, node.path, name);
                         const treeContainer = document.getElementById("folder-tree");
                         if (treeContainer)
                             loadFolderTree(treeContainer);
@@ -197,11 +193,7 @@ function renderNode(node, container, depth) {
                     if (!newName || newName === node.name)
                         return;
                     try {
-                        await fetch(`/api/folder/${node.accountId}/${node.id}/rename`, {
-                            method: "POST",
-                            headers: { "Content-Type": "application/json" },
-                            body: JSON.stringify({ newName }),
-                        });
+                        await renameFolder(node.accountId, node.id, newName);
                         const treeContainer = document.getElementById("folder-tree");
                         if (treeContainer)
                             loadFolderTree(treeContainer);
@@ -214,7 +206,7 @@ function renderNode(node, container, depth) {
                     if (!confirm(`Delete folder "${node.name}"? Messages will be moved to Trash.`))
                         return;
                     try {
-                        await fetch(`/api/folder/${node.accountId}/${node.id}`, { method: "DELETE" });
+                        await deleteFolder(node.accountId, node.id);
                         const treeContainer = document.getElementById("folder-tree");
                         if (treeContainer)
                             loadFolderTree(treeContainer);
@@ -230,7 +222,7 @@ function renderNode(node, container, depth) {
                     if (!confirm(`Permanently delete all messages in "${node.name}"?`))
                         return;
                     try {
-                        await fetch(`/api/folder/${node.accountId}/${node.id}/empty`, { method: "POST" });
+                        await emptyFolder(node.accountId, node.id);
                         const treeContainer = document.getElementById("folder-tree");
                         if (treeContainer)
                             loadFolderTree(treeContainer);
@@ -267,18 +259,8 @@ function renderNode(node, container, depth) {
             try {
                 let moved = 0;
                 for (const msg of toMove) {
-                    const body = { targetFolderId: node.id };
-                    if (msg.accountId !== node.accountId)
-                        body.targetAccountId = node.accountId;
-                    const res = await fetch(`/api/message/${msg.accountId}/${msg.uid}/move`, {
-                        method: "POST",
-                        headers: { "Content-Type": "application/json" },
-                        body: JSON.stringify(body),
-                    });
-                    if (!res.ok) {
-                        const err = await res.json().catch(() => ({ error: res.statusText }));
-                        throw new Error(err.error);
-                    }
+                    const targetAccountId = msg.accountId !== node.accountId ? node.accountId : undefined;
+                    await moveMessage(msg.accountId, msg.uid, node.id, targetAccountId);
                     moved++;
                 }
                 if (statusEl)

package/client/components/message-list.js

@@ -2,7 +2,7 @@
  * Message list component -- renders paginated message rows.
  * Loads more messages on scroll.
  */
-import { getMessages, getUnifiedInbox, searchMessages } from "../lib/api-client.js";
+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");
@@ -302,11 +302,7 @@ function appendMessages(body, accountId, items) {
                 ? currentFlags.filter((f) => f !== "\\Flagged")
                 : [...currentFlags, "\\Flagged"];
             try {
-                await fetch(`/api/message/${msgAccountId}/${msg.uid}/flags`, {
-                    method: "PATCH",
-                    headers: { "Content-Type": "application/json" },
-                    body: JSON.stringify({ flags: newFlags }),
-                });
+                await updateFlags(msgAccountId, msg.uid, newFlags);
                 msg.flags = newFlags;
                 row.classList.toggle("flagged");
                 flag.textContent = row.classList.contains("flagged") ? "\u2605" : "\u2606";

package/client/components/message-viewer.js

@@ -1,7 +1,7 @@
 /**
  * Message viewer component -- displays full message in sandboxed iframe.
  */
-import { getMessage, updateFlags } from "../lib/api-client.js";
+import { getMessage, updateFlags, allowRemoteContent } from "../lib/api-client.js";
 /** Currently displayed message (for reply/forward) */
 let currentMessage = null;
 let currentAccountId = "";
@@ -189,30 +189,18 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
             };
             banner.querySelector("#btn-load-remote").addEventListener("click", loadRemote);
             banner.querySelector("#btn-allow-sender")?.addEventListener("click", async () => {
-                await fetch("/api/settings/allow-remote", {
-                    method: "POST",
-                    headers: { "Content-Type": "application/json" },
-                    body: JSON.stringify({ type: "sender", value: senderAddr }),
-                });
+                await allowRemoteContent("sender", senderAddr);
                 loadRemote();
             });
             banner.querySelector("#btn-allow-domain")?.addEventListener("click", async () => {
-                await fetch("/api/settings/allow-remote", {
-                    method: "POST",
-                    headers: { "Content-Type": "application/json" },
-                    body: JSON.stringify({ type: "domain", value: senderDomain }),
-                });
+                await allowRemoteContent("domain", senderDomain);
                 loadRemote();
             });
             banner.querySelector("#btn-allow-to")?.addEventListener("click", async () => {
                 const addr = deliveredTo || toAddr;
                 if (!addr)
                     return;
-                await fetch("/api/settings/allow-remote", {
-                    method: "POST",
-                    headers: { "Content-Type": "application/json" },
-                    body: JSON.stringify({ type: "recipient", value: addr }),
-                });
+                await allowRemoteContent("recipient", addr);
                 loadRemote();
             });
         }

package/client/compose/compose.js

@@ -261,7 +261,7 @@ async function saveDraft() {
         return; // empty
     lastDraftContent = content;
     try {
-        const res = await fetch("/api/draft", {
+        const data = await fetch("/api/draft", {
             method: "POST",
             headers: { "Content-Type": "application/json" },
             body: JSON.stringify({
@@ -273,12 +273,9 @@ async function saveDraft() {
                 cc: ccInput.value,
                 previousDraftUid: draftUid,
             }),
-        });
-        if (res.ok) {
-            const data = await res.json();
-            if (data.draftUid)
-                draftUid = data.draftUid;
-        }
+        }).then(r => r.ok ? r.json() : null);
+        if (data?.draftUid)
+            draftUid = data.draftUid;
     }
     catch { /* ignore draft save errors */ }
 }

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/lib/api-client.js

@@ -122,6 +122,81 @@ export function allowRemoteContent(type, value) {
         body: JSON.stringify({ type, value })
     });
 }
+// ── Message actions ──
+// IMPORTANT: All server operations MUST go through these centralized methods
+// so IPC mode works. Never use fetch("/api/...") directly in components.
+export function deleteMessage(accountId, uid) {
+    if (hasIPC)
+        return mailxapi.deleteMessage(accountId, uid);
+    return api(`/message/${accountId}/${uid}`, { method: "DELETE" });
+}
+export function undeleteMessage(accountId, uid, folderId) {
+    if (hasIPC)
+        return mailxapi.undeleteMessage(accountId, uid, folderId);
+    return api(`/message/${accountId}/${uid}/undelete`, {
+        method: "POST",
+        body: JSON.stringify({ folderId })
+    });
+}
+export function moveMessage(accountId, uid, targetFolderId, targetAccountId) {
+    if (hasIPC)
+        return mailxapi.moveMessage(accountId, uid, targetFolderId, targetAccountId);
+    const body = { targetFolderId };
+    if (targetAccountId)
+        body.targetAccountId = targetAccountId;
+    return api(`/message/${accountId}/${uid}/move`, {
+        method: "POST",
+        body: JSON.stringify(body)
+    });
+}
+export function restartServer() {
+    if (hasIPC)
+        return mailxapi.restart?.();
+    return api("/restart", { method: "POST" }).catch(() => { });
+}
+// ── Folder management ──
+export function markFolderRead(accountId, folderId) {
+    if (hasIPC)
+        return mailxapi.markFolderRead?.(accountId, folderId);
+    return api(`/folder/${accountId}/${folderId}/mark-read`, { method: "POST" });
+}
+export function createFolder(accountId, parentPath, name) {
+    if (hasIPC)
+        return mailxapi.createFolder?.(accountId, parentPath, name);
+    return api(`/folder/${accountId}`, {
+        method: "POST",
+        body: JSON.stringify({ parentPath, name })
+    });
+}
+export function renameFolder(accountId, folderId, newName) {
+    if (hasIPC)
+        return mailxapi.renameFolder?.(accountId, folderId, newName);
+    return api(`/folder/${accountId}/${folderId}/rename`, {
+        method: "POST",
+        body: JSON.stringify({ newName })
+    });
+}
+export function deleteFolder(accountId, folderId) {
+    if (hasIPC)
+        return mailxapi.deleteFolder?.(accountId, folderId);
+    return api(`/folder/${accountId}/${folderId}`, { method: "DELETE" });
+}
+export function emptyFolder(accountId, folderId) {
+    if (hasIPC)
+        return mailxapi.emptyFolder?.(accountId, folderId);
+    return api(`/folder/${accountId}/${folderId}/empty`, { method: "POST" });
+}
+// ── Compose ──
+export function sendMessage(body) {
+    if (hasIPC)
+        return mailxapi.sendMessage?.(body);
+    return api("/send", { method: "POST", body: JSON.stringify(body) });
+}
+export function saveDraft(body) {
+    if (hasIPC)
+        return mailxapi.saveDraft?.(body);
+    return api("/draft", { method: "POST", body: JSON.stringify(body) });
+}
 const eventHandlers = [];
 export function onEvent(handler) {
     eventHandlers.push(handler);

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.45",
+  "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.25",
+    "@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