@bobfrankston/rmfmail 1.2.49 → 1.2.65

package/client/app.js

@@ -3,17 +3,41 @@
  * Wires together all UI components and WebSocket connection.
  */
 import { initFolderTree, refreshFolderTree, updateFolderCounts, setFolderSynced, getFolderSynced, setOutboxTotal } from "./components/folder-tree.js";
-import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, clearSearchMode, getSelectedMessages, markBodiesCached, getCurrentFocused, releaseFocus, removeMessagesAndReconcile, setRowFlagged, scrollFocusedIntoView, refreshPriorityIndex } from "./components/message-list.js";
+import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, clearSearchMode, getSelectedMessages, markBodiesCached, getCurrentFocused, releaseFocus, removeMessagesAndReconcile, setRowFlagged, scrollFocusedIntoView, refreshPriorityIndex, showSelectionMenu, revealMessage } from "./components/message-list.js";
 import { seenOf, flaggedOf, draftOf, setSeen, setFlagged } from "@bobfrankston/mailx-types";
 import { initTabs, setActiveView as setActiveTabView, openTab } from "./components/tabs.js";
 import { getCurrentMessage, initViewer, popOutCurrentMessage, printCurrentMessage, toggleFullscreenPreview, showPreviewBodyMenu, wrapHtmlBody } from "./components/message-viewer.js";
-import { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessage, deleteMessages, undeleteMessage, restartServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts, updateFlags, markAsSpamMessages, logClientEvent, sendMessage as apiSendMessage, subscribeStore, cancelServerSearch, installConsoleCapture } from "./lib/api-client.js";
+import { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessage, deleteMessages, undeleteMessage, restartServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts, updateFlags, markAsSpamMessages, logClientEvent, sendMessage as apiSendMessage, subscribeStore, cancelServerSearch, installConsoleCapture, getAttachment } from "./lib/api-client.js";
 import * as messageState from "./lib/message-state.js";
 // FIRST THING. Captures every console.log/warn/error + window errors +
 // unhandled promise rejections to the daemon log via logClientEvent, so
 // debugging client-side bugs never requires opening devtools — search
 // rmfmail-YYYY-MM-DD.log for "console.error" or "window.error" instead.
 installConsoleCapture();
+// ── Main-thread stall watchdog ──
+// Bob 2026-06-22: "trying to scroll does nothing, as if the UI thread is
+// locked"; the UI must always be responsive. A blocked event loop is
+// otherwise invisible — the symptom shows up in the UI but never names its
+// cause. This watchdog re-arms a 1s timer and reports the slip whenever the
+// callback fires late by more than a threshold: a 1s timer that fires at
+// 1.0s is healthy; one that fires at 4.2s means the main thread was wedged
+// ~3.2s (long IPC on the loop, giant synchronous render, parse on main).
+// The slip duration + wall-clock pinpoints which interaction blew out.
+(function installStallWatchdog() {
+    const EXPECTED_MS = 1000;
+    const STALL_MS = 250; // only report slips that a user would feel
+    let last = performance.now();
+    const tick = () => {
+        const now = performance.now();
+        const slip = now - last - EXPECTED_MS;
+        if (slip > STALL_MS) {
+            console.warn(`  [stall] main thread blocked ~${slip.toFixed(0)}ms (event loop frozen — UI was unresponsive this long)`);
+        }
+        last = now;
+        setTimeout(tick, EXPECTED_MS);
+    };
+    setTimeout(tick, EXPECTED_MS);
+})();
 // ── New message badge (favicon + title) ──
 /** The user-visible app name. Single point of change for the rename;
  *  every UI surface that shows "rmfmail" reads from here. Static HTML
@@ -881,6 +905,17 @@ document.getElementById("btn-factory-reset")?.addEventListener("click", async ()
 });
 async function openCompose(mode, overrideMsg, overrideAccountId) {
     logClientEvent("openCompose-entry", { mode });
+    // Opening a compose (Ctrl+N, the Compose button, the rail) must dismiss any
+    // open toolbar menu. Click-outside already closes them via the overlay
+    // shield, but a keyboard Ctrl+N over an open Settings/View menu left it
+    // stuck open behind the new compose (Bob 2026-06-21). Close them here so
+    // every compose-open path behaves the same.
+    for (const id of ["settings-dropdown", "view-dropdown", "restart-dropdown"]) {
+        const dd = document.getElementById(id);
+        if (dd && !dd.hidden)
+            hideDropdownHard(dd);
+    }
+    refreshToolbarOverlayShield();
     // `overrideMsg` lets a detached surface (the message pop-out) compose a
     // reply/forward for ITS message rather than whatever the main viewer has
     // selected. Same `{ message, accountId }` shape getCurrentMessage returns.
@@ -920,7 +955,16 @@ async function openCompose(mode, overrideMsg, overrideAccountId) {
     // Now finish initialisation off the critical path — editor bootstrap
     // inside the iframe runs concurrently with this await.
     const accounts = await accountsP;
-    const accountId = current?.accountId || accounts[0]?.id || "";
+    // For a brand-new compose, default the From to the account whose folder
+    // you're currently viewing — pressing Ctrl+N while reading AOL should
+    // compose AS aol, not the first/defaultSend account. In the unified "All
+    // Inboxes" view there's no single account (currentAccountId === ""), so
+    // fall back to the selected message's account, then the first account.
+    // Reply/forward keep using the message's own account (you answer from the
+    // address that received it; detectReplyFrom refines further).
+    const accountId = mode === "new"
+        ? (currentAccountId || current?.accountId || accounts[0]?.id || "")
+        : (current?.accountId || currentAccountId || accounts[0]?.id || "");
     const rePrefix = /^(re|fwd?):\s*/i;
     const cleanSubject = msg ? msg.subject.replace(rePrefix, "") : "";
     const init = {
@@ -1077,6 +1121,32 @@ async function openCompose(mode, overrideMsg, overrideAccountId) {
         init.subject = msg.subject || "";
         init.bodyHtml = editAsNewBody(msg);
     }
+    // Carry the original message's attachments into forward / edit-as-new so
+    // reopening a sent message to edit (or forwarding one) keeps its files —
+    // they were being silently dropped (Bob 2026-06-21). Fetch each via
+    // getAttachment (the same path the viewer's download uses) and hand compose
+    // the base64 it expects. Reply/replyAll intentionally omit attachments.
+    if (msg && (mode === "editAsNew" || mode === "forward") && Array.isArray(msg.attachments) && msg.attachments.length) {
+        const msgAccountId = current?.accountId || accountId;
+        const loaded = [];
+        for (const att of msg.attachments) {
+            try {
+                const data = await getAttachment(msgAccountId, msg.uid, att.id, msg.folderId);
+                if (data?.content) {
+                    loaded.push({
+                        filename: data.filename || att.filename || "attachment",
+                        mimeType: data.contentType || att.contentType || "application/octet-stream",
+                        dataBase64: data.content,
+                    });
+                }
+            }
+            catch (e) {
+                console.error(`[compose] ${mode}: failed to load attachment ${att.id}: ${e?.message || e}`);
+            }
+        }
+        if (loaded.length)
+            init.attachments = loaded;
+    }
     // Store init data for compose window to pick up. Two parallel paths
     // because sessionStorage propagation to a freshly-loading iframe has
     // intermittently failed under WebView2's custom-protocol host (Bob
@@ -1632,6 +1702,14 @@ async function performUndo() {
 document.addEventListener("mailx-moved", (e) => {
     pushUndo({ kind: "move", at: Date.now(), payload: e.detail });
 });
+// Bulk flag/unflag (Filtered menu, row context menu) emits "mailx-flagged-batch"
+// with the per-row prior state so Ctrl+Z restores the whole batch at once.
+document.addEventListener("mailx-flagged-batch", (e) => {
+    const payload = e.detail;
+    if (Array.isArray(payload) && payload.length) {
+        pushUndo({ kind: "flag", at: Date.now(), payload });
+    }
+});
 // ── Right-button drag → Move / Copy menu ───────────────────────────────
 // Browser drag-and-drop is left-button only, so a RIGHT-button drag is a
 // custom mouse-tracked gesture: right-press a message row, drag onto a folder
@@ -1980,6 +2058,14 @@ document.getElementById("btn-spam-report")?.addEventListener("click", async () =
     }
 });
 document.getElementById("btn-compose")?.addEventListener("click", () => openCompose("new"));
+// Toolbar "Selection" button — opens the bulk-actions menu anchored under the
+// button (flag/read/move/delete + select-all/flagged/invert/clear). Rendered
+// via the shared context-menu component so it self-dismisses on outside click.
+document.getElementById("btn-selection")?.addEventListener("click", (e) => {
+    e.stopPropagation();
+    const r = e.currentTarget.getBoundingClientRect();
+    void showSelectionMenu(r.left, r.bottom + 2);
+});
 document.getElementById("btn-mark-unread")?.addEventListener("click", () => {
     // Toggle \Seen on the currently-focused message. Mirrors the R
     // keyboard shortcut and the right-click "Mark unread" menu item, but
@@ -2507,6 +2593,28 @@ let currentAccountId = "";
 let currentFolderId = 0;
 let reloadDebounceTimer = null;
 let lastListReloadAt = 0;
+// Search-as-find: closing search returns the user to the message they had
+// selected among the results, in its own folder — not back to the pre-search
+// view scrolled "who knows where" (Bob 2026-06-25). Capture the focused result
+// BEFORE clearing search mode, then navigate to that message's folder and
+// reselect it. With no selected result (or no folderId) fall back to the old
+// reloadCurrentFolder behavior.
+function closeSearchAndReveal() {
+    const focused = getCurrentFocused();
+    clearSearchMode();
+    const body = document.getElementById("ml-body");
+    if (body)
+        body.querySelectorAll(".filter-hidden").forEach(r => r.classList.remove("filter-hidden"));
+    if (focused && focused.folderId) {
+        currentAccountId = focused.accountId;
+        currentFolderId = focused.folderId;
+        revealMessage(focused.accountId, focused.folderId, focused.uid);
+    }
+    else {
+        reloadCurrentFolder();
+    }
+    setTitle(APP_NAME);
+}
 searchInput?.addEventListener("input", () => {
     clearTimeout(searchTimeout);
     if (serverSearchTimer) {
@@ -2519,12 +2627,7 @@ searchInput?.addEventListener("input", () => {
         // Cleared — reset immediately, no debounce. Must exit search mode
         // first; otherwise reloadCurrentFolder() sees searchMode=true and
         // re-runs the stale query (user-reported regression 2026-04-24).
-        clearSearchMode();
-        const body = document.getElementById("ml-body");
-        if (body)
-            body.querySelectorAll(".filter-hidden").forEach(r => r.classList.remove("filter-hidden"));
-        reloadCurrentFolder();
-        setTitle(APP_NAME);
+        closeSearchAndReveal();
     }
     else {
         // Short debounce — just enough to coalesce a keystroke burst. The
@@ -2546,13 +2649,7 @@ searchInput?.addEventListener("keydown", (e) => {
         }
         cancelServerSearch();
         updateSearchHighlight();
-        clearSearchMode();
-        // Clear any client-side filters
-        const body = document.getElementById("ml-body");
-        if (body)
-            body.querySelectorAll(".filter-hidden").forEach(r => r.classList.remove("filter-hidden"));
-        reloadCurrentFolder();
-        setTitle(APP_NAME);
+        closeSearchAndReveal();
     }
 });
 // Re-run the active search when the scope dropdown or "server too" checkbox
@@ -3952,6 +4049,7 @@ const viewDropdown = document.getElementById("view-dropdown");
 const optTwoLine = document.getElementById("opt-two-line");
 const optPreview = document.getElementById("opt-preview");
 const optSnippet = document.getElementById("opt-snippet");
+const optFlagStars = document.getElementById("opt-flag-stars");
 const optThreaded = document.getElementById("opt-threaded");
 const optFlagged = document.getElementById("opt-flagged");
 const optFolderCounts = document.getElementById("opt-folder-counts");
@@ -4031,6 +4129,16 @@ function hideDropdownHard(dd) {
 // while any toolbar dropdown is open — its pointerdown lands here in the
 // parent doc, triggering the same outside-click close. The shield sits
 // above compose (z 1600) but below the dropdown itself (z 2000).
+// Cleanup for the in-iframe Escape forwarder (see below). Null when no
+// forwarder is attached.
+let tbEscapeCleanup = null;
+function closeToolbarDropdowns() {
+    for (const id of ["settings-dropdown", "view-dropdown", "restart-dropdown"]) {
+        const dd = document.getElementById(id);
+        if (dd && !dd.hidden)
+            hideDropdownHard(dd);
+    }
+}
 function refreshToolbarOverlayShield() {
     const dropdownOpen = ["settings-dropdown", "view-dropdown", "restart-dropdown"]
         .some(id => {
@@ -4047,18 +4155,57 @@ function refreshToolbarOverlayShield() {
             shield.addEventListener("pointerdown", (ev) => {
                 ev.preventDefault();
                 ev.stopPropagation();
-                for (const id of ["settings-dropdown", "view-dropdown", "restart-dropdown"]) {
-                    const dd = document.getElementById(id);
-                    if (dd)
-                        dd.hidden = true;
-                }
-                shield?.remove();
+                closeToolbarDropdowns();
+                refreshToolbarOverlayShield();
             });
             document.body.appendChild(shield);
         }
+        // Escape with the cursor inside the compose editor never reaches the
+        // parent's Escape handler — the same-origin iframe captures the
+        // keystroke. While a toolbar menu is open over compose, attach a
+        // capture-phase keydown to each compose/popout iframe document that
+        // closes the menu and swallows the event, so compose's OWN Escape
+        // (the save/discard prompt) doesn't also fire. Only active while a
+        // menu is open; detached when it closes (Bob 2026-06-21 "fix esc").
+        if (!tbEscapeCleanup) {
+            const docs = [];
+            document.querySelectorAll(".compose-overlay iframe, .popout-overlay iframe")
+                .forEach(ifr => { try {
+                if (ifr.contentDocument)
+                    docs.push(ifr.contentDocument);
+            }
+            catch { /* cross-origin */ } });
+            if (docs.length) {
+                const onEsc = (e) => {
+                    if (e.key !== "Escape")
+                        return;
+                    if (!["settings-dropdown", "view-dropdown", "restart-dropdown"]
+                        .some(id => { const el = document.getElementById(id); return el && !el.hidden; }))
+                        return;
+                    e.preventDefault();
+                    e.stopPropagation();
+                    closeToolbarDropdowns();
+                    refreshToolbarOverlayShield();
+                };
+                for (const d of docs)
+                    d.addEventListener("keydown", onEsc, true);
+                tbEscapeCleanup = () => {
+                    for (const d of docs) {
+                        try {
+                            d.removeEventListener("keydown", onEsc, true);
+                        }
+                        catch { /* */ }
+                    }
+                    tbEscapeCleanup = null;
+                };
+            }
+        }
     }
-    else if (shield) {
-        shield.remove();
+    else {
+        if (shield)
+            shield.remove();
+        if (tbEscapeCleanup)
+            tbEscapeCleanup();
     }
 }
 // Escape always closes any open dropdown/backdrop, regardless of how it was
@@ -4094,6 +4241,7 @@ document.addEventListener("keydown", (e) => {
 const savedTwoLine = localStorage.getItem("mailx-two-line") === "true";
 const savedPreview = localStorage.getItem("mailx-preview") !== "false"; // default true
 const savedSnippet = localStorage.getItem("mailx-snippet") !== "false"; // default true
+const savedFlagStars = localStorage.getItem("mailx-flag-stars") !== "false"; // default true (show)
 const savedThreaded = localStorage.getItem("mailx-threaded") === "true";
 const savedFlagged = localStorage.getItem("mailx-flagged") === "true";
 const savedFolderCounts = localStorage.getItem("mailx-folder-counts") === "true";
@@ -4103,6 +4251,8 @@ if (optPreview)
     optPreview.checked = savedPreview;
 if (optSnippet)
     optSnippet.checked = savedSnippet;
+if (optFlagStars)
+    optFlagStars.checked = savedFlagStars;
 if (optThreaded)
     optThreaded.checked = savedThreaded;
 if (optFlagged)
@@ -4115,6 +4265,8 @@ if (!savedPreview)
     document.querySelector(".main-area")?.classList.add("no-preview");
 if (!savedSnippet)
     document.getElementById("message-list")?.classList.add("no-snippets");
+if (!savedFlagStars)
+    document.getElementById("message-list")?.classList.add("no-empty-stars");
 if (savedThreaded)
     document.getElementById("ml-body")?.classList.add("threaded");
 if (savedFlagged) {
@@ -4349,6 +4501,12 @@ optSnippet?.addEventListener("change", () => {
     }
     localStorage.setItem("mailx-snippet", String(optSnippet.checked));
 });
+optFlagStars?.addEventListener("change", () => {
+    const list = document.getElementById("message-list");
+    // checked = show empty stars (no class); unchecked = hide them.
+    list?.classList.toggle("no-empty-stars", !optFlagStars.checked);
+    localStorage.setItem("mailx-flag-stars", String(optFlagStars.checked));
+});
 // ── Search help button (?) ──
 // Toggles a NON-modal panel with the search-syntax reference so it stays
 // visible while the user types into the search box — build a query