@bobfrankston/rmfmail 1.2.261 → 1.2.268

package/client/app.ts

@@ -1011,9 +1011,8 @@ async function openCompose(mode: ComposeMode, overrideMsg?: any, overrideAccount
     // bootstraps (200-500 ms for TinyMCE, less for Quill); by then the IPC
     // round-trip has resolved. Earlier code awaited getAccounts FIRST,
     // adding the IPC latency to the perceived Ctrl+N → editor-visible time.
-    // We post `compose-init-ready` to the iframe once init is in
-    // sessionStorage so compose.ts's IIFE can read synchronously without
-    // polling.
+    // handOffComposeInit() below does the actual handoff (parent stash +
+    // `compose-init` postMessage + sessionStorage + heartbeat).
     const accountsP = getAccounts();
     const msg = current?.message;
     // Title bar text needs the subject from msg (no IPC dependency) — build
@@ -1254,6 +1253,32 @@ async function openCompose(mode: ComposeMode, overrideMsg?: any, overrideAccount
         frame = showComposeOverlay(composeTitle);
     }
 
+    handOffComposeInit(frame, init);
+}
+
+/**
+ * Hand a compose init payload to the compose iframe.
+ *
+ * THIS IS THE ONLY SUPPORTED WAY to seed a compose overlay — every entry
+ * point (Ctrl+N, reply, mailto, Windows Share, Android share, edit-draft)
+ * must go through it. It runs four handoffs at once because under WebView2's
+ * custom-protocol host no single one is reliable:
+ *
+ *   1. `window.__mailxComposeInits[key]` — a parent-window stash the
+ *      same-origin iframe reads synchronously via window.parent. Most
+ *      reliable, and the only race-free one.
+ *   2. `compose-init` postMessage carrying the payload.
+ *   3. sessionStorage (the original mechanism).
+ *   4. A 100 ms heartbeat for 3 s, plus a re-post on iframe `load`.
+ *
+ * The belt-and-braces is not paranoia: sessionStorage AND postMessage have
+ * each failed in production (Bob 2026-05-24, replyAll opened with empty
+ * fields), which is why the stash exists. The mailto / share / Android-share
+ * / edit-draft paths were still on the old sessionStorage-only handoff and
+ * so kept reproducing that same empty-compose bug — clicking a mailto link
+ * in another app opened compose with nothing filled in (Bob 2026-08-19).
+ */
+function handOffComposeInit(frame: HTMLIFrameElement | null | undefined, init: any): void {
     const initJson = JSON.stringify(init);
     try { sessionStorage.setItem("composeInit", initJson); }
     catch (e: any) { console.error("[compose] sessionStorage.setItem failed:", e?.message || e); }
@@ -2288,8 +2313,10 @@ document.getElementById("rail-inbox")?.addEventListener("click", () => {
     inbox?.click();
 });
 document.getElementById("rail-unified")?.addEventListener("click", () => {
-    const unified = document.querySelector('.folder-tree .all-inboxes') as HTMLElement | null
-        || document.getElementById("ft-all-inboxes");
+    // The || document.getElementById("ft-all-inboxes") fallback was dropped
+    // 2026-08-19: no HTML declares that id and nothing creates it, so the
+    // querySelector was always the only live path.
+    const unified = document.querySelector('.folder-tree .all-inboxes') as HTMLElement | null;
     unified?.click();
 });
 document.getElementById("rail-contacts")?.addEventListener("click", async () => {
@@ -2546,8 +2573,7 @@ document.addEventListener("mailx-share-intent", ((e: CustomEvent) => {
     if (Array.isArray(detail.attachments) && detail.attachments.length) {
         init.attachments = detail.attachments.filter((a: any) => a?.filename && a?.dataBase64);
     }
-    sessionStorage.setItem("composeInit", JSON.stringify(init));
-    showComposeOverlay(init.subject || "Compose");
+    handOffComposeInit(showComposeOverlay(init.subject || "Compose"), init);
 }) as EventListener);
 
 // ── Search ──
@@ -2984,11 +3010,10 @@ window.addEventListener("message", (e) => {
         }
         return;
     }
-    if (e.data?.type === "openLink" && e.data.url) {
-        const api = (window as any).mailxapi;
-        if (api?.openExternal) api.openExternal(e.data.url);
-        else window.open(e.data.url, "_blank", "noopener,noreferrer");
-    }
+    // (removed 2026-08-19, dead-code audit) An "openLink" postMessage
+    // handler lived here. Nothing has posted that type since the preview
+    // iframe moved to "linkClick" — it was unreachable. Link opening is
+    // handled by the "linkClick" branch below.
     if (e.data?.type === "linkClick" && e.data.url) {
         const url = e.data.url;
         console.log(`[android-link] parent got linkClick → ${url}`);
@@ -3013,10 +3038,11 @@ window.addEventListener("message", (e) => {
         } catch { /* diagnostic only */ }
         return;
     }
-    if (e.data?.type === "previewToggleFullscreen") {
-        toggleFullscreenPreview();
-        return;
-    }
+    // (removed 2026-08-19, dead-code audit) A "previewToggleFullscreen"
+    // postMessage handler lived here, fed by an iframe-level dblclick that
+    // was itself removed for hijacking word-selection. Nothing has posted
+    // the type since; the chrome dblclick handler is the only entry into
+    // fullscreen-preview.
     if (e.data?.type === "previewContextMenu") {
         // Translate iframe-relative coords to viewport. Find the iframe whose
         // contentWindow matches the source so we map correctly even when
@@ -3037,75 +3063,15 @@ window.addEventListener("message", (e) => {
         );
         return;
     }
-    if (e.data?.type === "linkContextMenu") {
-        // C29: right-click in body iframe → Open / Save / Copy URL menu.
-        // Iframe's clientX/Y is relative to the iframe; translate to viewport.
-        let iframeRect: DOMRect | null = null;
-        for (const f of Array.from(document.querySelectorAll("iframe"))) {
-            if ((f as HTMLIFrameElement).contentWindow === e.source) { iframeRect = f.getBoundingClientRect(); break; }
-        }
-        const x = (iframeRect?.left || 0) + (e.data.x || 0);
-        const y = (iframeRect?.top || 0) + (e.data.y || 0);
-        const url: string = e.data.url || "";
-        // Find a sensible filename for the Save action.
-        const guessName = (() => {
-            try {
-                const u = new URL(url);
-                const last = u.pathname.split("/").pop() || "";
-                return last && last.includes(".") ? last : "";
-            } catch { return ""; }
-        })();
-        const items: { label: string; action: () => void }[] = [
-            { label: "Open in browser", action: () => {
-                window.open(url, "_blank", "noopener,noreferrer");
-            }},
-            { label: guessName ? `Save "${guessName}"…` : "Save link as…", action: () => {
-                // Trigger a download via anchor with download attr.
-                const a = document.createElement("a");
-                a.href = url;
-                if (guessName) a.download = guessName;
-                else a.download = "";
-                a.style.display = "none";
-                document.body.appendChild(a);
-                a.click();
-                setTimeout(() => a.remove(), 1000);
-            }},
-            { label: "Copy URL", action: async () => {
-                try { await navigator.clipboard.writeText(url); }
-                catch { prompt("URL:", url); }
-            }},
-            { label: "Copy link text", action: async () => {
-                try { await navigator.clipboard.writeText(e.data.text || url); }
-                catch { prompt("Text:", e.data.text || url); }
-            }},
-        ];
-        // Build a tiny inline menu (showContextMenu would do but it's in components/).
-        const menu = document.createElement("div");
-        menu.style.cssText = `position:fixed;z-index:2400;background:var(--color-bg);border:1px solid var(--color-border);border-radius:6px;box-shadow:0 4px 16px rgba(0,0,0,0.2);padding:4px 0;font-size:13px;min-width:180px;`;
-        menu.style.left = `${Math.min(x, window.innerWidth - 200)}px`;
-        menu.style.top = `${Math.min(y, window.innerHeight - 200)}px`;
-        // mousedown inside the menu must NOT reach the document-level
-        // dismiss handler — otherwise the menu is removed before click
-        // fires on the row and the action silently no-ops (user report
-        // 2026-04-24). Stop propagation at the menu root covers every row.
-        menu.addEventListener("mousedown", (ev) => ev.stopPropagation());
-        for (const it of items) {
-            const row = document.createElement("div");
-            row.textContent = it.label;
-            row.style.cssText = `padding:6px 12px;cursor:pointer;`;
-            row.addEventListener("mouseenter", () => row.style.background = "var(--color-bg-hover)");
-            row.addEventListener("mouseleave", () => row.style.background = "");
-            row.addEventListener("click", () => { menu.remove(); it.action(); });
-            menu.appendChild(row);
-        }
-        document.body.appendChild(menu);
-        const dismiss = () => { menu.remove(); document.removeEventListener("mousedown", dismiss); document.removeEventListener("keydown", dismiss); };
-        setTimeout(() => {
-            document.addEventListener("mousedown", dismiss);
-            document.addEventListener("keydown", dismiss);
-        }, 0);
-        return;
-    }
+    // (removed 2026-08-19) A second, dead link context menu used to live
+    // here — a "linkContextMenu" postMessage handler labelled "Copy URL",
+    // built when the preview iframe still posted that message type. Nothing
+    // has posted it since the viewer moved to showBodyContextMenu(), so it
+    // was unreachable code offering a different label ("Copy URL") for the
+    // same action the live menu calls "Copy link URL" — the kind of drift
+    // Bob spotted 2026-08-19 ("other menus have both copy link and copy
+    // url"). The live implementation is in components/message-viewer.ts;
+    // keep link-menu changes there and nowhere else.
     if (e.data?.type === "mailx-send-error") {
         // Send failed AFTER compose closed (fire-and-forget model). Surface in
         // the status bar so the user sees something instead of the silence.
@@ -3781,8 +3747,7 @@ async function openComposeFromMailto(m: {
         references: m.inReplyTo ? [m.inReplyTo] : [],
         accounts: accounts.map((a: any) => ({ id: a.id, name: a.name, email: a.email, signature: a.signature, sig: a.sig })),
     };
-    sessionStorage.setItem("composeInit", JSON.stringify(init));
-    try { frame?.contentWindow?.postMessage({ type: "compose-init-ready" }, "*"); } catch { /* */ }
+    handOffComposeInit(frame, init);
 }
 
 /** C46: open compose from a Windows Share sheet drop. Shared files become
@@ -3825,8 +3790,7 @@ async function openComposeFromShare(s: {
         attachments: s.attachments,
         accounts: accounts.map((a: any) => ({ id: a.id, name: a.name, email: a.email, signature: a.signature, sig: a.sig })),
     };
-    sessionStorage.setItem("composeInit", JSON.stringify(init));
-    try { frame?.contentWindow?.postMessage({ type: "compose-init-ready" }, "*"); } catch { /* */ }
+    handOffComposeInit(frame, init);
 }
 
 // ── Keyboard shortcuts ──
@@ -4477,8 +4441,16 @@ document.addEventListener("keydown", (e) => {
     }
     const bd = document.getElementById("rail-menu-backdrop");
     if (bd) { bd.remove(); closed = true; }
-    const themeSub = document.getElementById("theme-submenu");
-    if (themeSub && !themeSub.hidden) { themeSub.hidden = true; closed = true; }
+    // Was getElementById("theme-submenu") — an id nothing declares, so Escape
+    // silently never closed the theme submenu (dead-code audit 2026-08-19).
+    // The real element is #theme-submenu-popout; also reset the toggle's
+    // aria-expanded so the button doesn't claim to be open.
+    const themeSub = document.getElementById("theme-submenu-popout");
+    if (themeSub && !themeSub.hidden) {
+        themeSub.hidden = true;
+        document.getElementById("theme-submenu-toggle")?.setAttribute("aria-expanded", "false");
+        closed = true;
+    }
     if (closed) {
         e.preventDefault();
         refreshToolbarOverlayShield();
@@ -6113,8 +6085,7 @@ document.addEventListener("mailx-popout-message", (async (e: any) => {
             }
             if (loaded.length) (init as any).attachments = loaded;
         }
-        sessionStorage.setItem("composeInit", JSON.stringify(init));
-        showComposeOverlay(msg.subject ? `Edit: ${msg.subject}` : "Edit draft");
+        handOffComposeInit(showComposeOverlay(msg.subject ? `Edit: ${msg.subject}` : "Edit draft"), init);
         return;
     }
     // ONE read-only popout, not three. This handler used to build its own

package/client/components/message-list.js

@@ -8,7 +8,7 @@ import { showMessage as viewerShow, clearViewer as viewerClear } from "./message
 import { showContextMenu } from "./context-menu.js";
 import { pickFolder } from "./folder-picker.js";
 import { foldText } from "../lib/fold-text.js";
-import { seenOf, flaggedOf, draftOf, setSeen, setFlagged } from "@bobfrankston/mailx-types";
+import { seenOf, flaggedOf, draftOf, setSeen, setFlagged, isJunkPreviewText, displayNameClaimsOtherAddress } from "@bobfrankston/mailx-types";
 let onMessageSelect;
 let currentAccountId;
 let currentFolderId;
@@ -1923,7 +1923,18 @@ class MessageRow {
             from.textContent = msg.to.map((a) => a.name || a.address).join(", ");
         }
         else {
-            from.textContent = msg.from.name || msg.from.address;
+            // The row normally shows the display name alone — which is exactly
+            // what a display-name spoof relies on ("security@paypal.com"
+            // wired to anywhere). When the name asserts an address that
+            // isn't the real one, show the real one too so the row can't
+            // lie on its own (Bob 2026-08-19).
+            const fromName = msg.from.name || msg.from.address;
+            const fromClaim = displayNameClaimsOtherAddress(msg.from.name || "", msg.from.address || "");
+            from.textContent = fromClaim ? `${fromName} — actually ${msg.from.address}` : fromName;
+            if (fromClaim) {
+                from.classList.add("ml-from-spoofed");
+                from.title = `Display name claims ${fromClaim}, but the message is from ${msg.from.address}`;
+            }
         }
         if (showAccountTag && accountId) {
             const tag = document.createElement("span");
@@ -1961,7 +1972,11 @@ class MessageRow {
             });
             subject.prepend(threadPill);
         }
-        if (msg.preview) {
+        // isJunkPreviewText: rows indexed before extractPreview learned to skip
+        // a text/plain part that is literally "undefined" (Bob 2026-08-19).
+        // Suppressing it here means those rows read correctly straight away
+        // instead of waiting for a -repair re-sync.
+        if (msg.preview && !isJunkPreviewText(msg.preview)) {
             // Defensive cleanup for older rows whose preview was indexed
             // before extractPreview() stripped data: URIs. Quill-pasted
             // images can leave a `data:image/png;base64,…` blob in the