@bobfrankston/rmfmail 1.1.138 → 1.1.140

package/client/app.ts

@@ -937,13 +937,24 @@ async function openCompose(mode: ComposeMode, overrideMsg?: any, overrideAccount
     }
 
 
-    // Store init data for compose window to pick up. sessionStorage is the
-    // canonical handoff path — same origin between parent and iframe; the
-    // compose IIFE reads it after the editor finishes booting. We also
-    // postMessage the iframe so it can short-circuit the listen-for-message
-    // wait if it's already past editor init.
-    sessionStorage.setItem("composeInit", JSON.stringify(init));
-    try { frame?.contentWindow?.postMessage({ type: "compose-init-ready" }, "*"); } catch { /* */ }
+    // 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
+    // 2026-05-24: reply-all opened with empty To/Subject; daemon log shows
+    // reply-init dump fired correctly but the iframe IIFE saw sessionStorage
+    // empty and timed out the wait). postMessage carries the FULL init
+    // payload so the iframe can populate even when storage doesn't bridge.
+    // sessionStorage remains as the fast-path for iframes that finish
+    // loading before postMessage fires.
+    const initJson = JSON.stringify(init);
+    try { sessionStorage.setItem("composeInit", initJson); }
+    catch (e: any) { console.error("[compose] sessionStorage.setItem failed:", e?.message || e); }
+    const post = (): void => {
+        try { frame?.contentWindow?.postMessage({ type: "compose-init", init }, "*"); } catch { /* */ }
+    };
+    post();
+    // Iframe may not be loaded yet — re-post on load so the listener exists.
+    try { frame?.addEventListener("load", post, { once: true }); } catch { /* */ }
 }
 
 function showComposeOverlay(title = "Compose"): HTMLIFrameElement {

package/client/compose/compose.bundle.js

@@ -701,7 +701,13 @@ async function createTinyMceEditor(container2, opts = {}) {
       // everything else so genuine HTML formatting (bold / italic /
       // tables / inline color) still comes through verbatim.
       content_style: [
-        "body { font-family: system-ui, sans-serif; font-size: 14px; }",
+        // High-contrast caret: a 1-2 px slate-coloured I-beam vanishes
+        // against white especially on hi-DPI displays. caret-color
+        // recolours the native insertion bar; caret-shape:block (CSS
+        // UI L4, Chromium 125+) widens it into a solid block. The
+        // block falls back to the default bar where unsupported, so
+        // the color alone still buys most of the visibility win.
+        "body { font-family: system-ui, sans-serif; font-size: 14px; caret-color: #d32f2f; caret-shape: block; }",
         "blockquote { border-left: 3px solid #c0c8d0; margin: 0 0 0 4px; padding: 2px 0 2px 10px; color: #555; }",
         "div.reply { margin-top: 0.5em; }",
         "div.reply > p:first-child { color: #666; font-size: 0.95em; margin: 0 0 4px 0; }",
@@ -3723,13 +3729,23 @@ function setupAutocomplete(input) {
     const { start, end } = tokenSpanAtCaret(val, caret);
     return val.substring(start, end).trim();
   }
-  function replaceCaretToken(replacement) {
+  function replaceCaretToken(replacement, contact) {
     const val = input.value;
     const caret = input.selectionStart ?? val.length;
     const { start, end } = tokenSpanAtCaret(val, caret);
     let before = val.substring(0, start);
-    const after = val.substring(end);
+    let after = val.substring(end);
     before = before.replace(/[ \t,]+$/, "");
+    if (contact) {
+      const haystack = `${contact.name} ${contact.email}`.toLowerCase();
+      const stripStranded = (s) => splitRecipients(s).map((p) => p.trim()).filter((p) => p.length > 0 && (p.includes("@") || !haystack.includes(p.toLowerCase()))).join(", ");
+      if (before) before = stripStranded(before);
+      const afterCore = after.replace(/^[\s,]+/, "").replace(/[\s,]+$/, "");
+      if (afterCore) {
+        const cleanedAfter = stripStranded(afterCore);
+        after = cleanedAfter ? ", " + cleanedAfter : "";
+      }
+    }
     const lead = before.length ? ", " : "";
     const isLast = after.trim() === "";
     const insert = lead + replacement + (isLast ? ", " : "");
@@ -3812,7 +3828,7 @@ function setupAutocomplete(input) {
               e.preventDefault();
               if (e.button !== 0) return;
               const display = formatRecipient(r.name, r.email);
-              replaceCaretToken(display);
+              replaceCaretToken(display, { name: r.name, email: r.email });
             });
             item.addEventListener("contextmenu", (e) => {
               e.preventDefault();
@@ -4148,12 +4164,18 @@ function scheduleDraftSave() {
     });
   }, DRAFT_INPUT_DEBOUNCE_MS);
 }
+var _postedInit = null;
 var _parentInitReady = !!sessionStorage.getItem("composeInit");
 var _parentInitListeners = [];
 window.addEventListener("message", (e) => {
-  if (e.data?.type !== "compose-init-ready") return;
-  _parentInitReady = true;
-  for (const fn of _parentInitListeners.splice(0)) fn();
+  if (e.data?.type === "compose-init-ready") {
+    _parentInitReady = true;
+    for (const fn of _parentInitListeners.splice(0)) fn();
+  } else if (e.data?.type === "compose-init" && e.data.init) {
+    _postedInit = e.data.init;
+    _parentInitReady = true;
+    for (const fn of _parentInitListeners.splice(0)) fn();
+  }
 });
 function waitForParentInit(maxMs) {
   if (_parentInitReady) return Promise.resolve();
@@ -4170,16 +4192,17 @@ function waitForParentInit(maxMs) {
 }
 (async () => {
   _ctick("init IIFE start");
-  if (!sessionStorage.getItem("composeInit")) {
+  if (!sessionStorage.getItem("composeInit") && !_postedInit) {
     _ctick("waiting for parent init");
     await waitForParentInit(1500);
     _ctick("parent init received");
   }
   const stored = sessionStorage.getItem("composeInit");
-  if (stored) {
+  const initRaw = _postedInit || (stored ? JSON.parse(stored) : null);
+  if (initRaw) {
     sessionStorage.removeItem("composeInit");
-    const init = JSON.parse(stored);
-    _ctick(`init parsed (mode=${init.mode}, bodyHtml=${init.bodyHtml?.length || 0} bytes)`);
+    const init = initRaw;
+    _ctick(`init parsed (mode=${init.mode}, bodyHtml=${init.bodyHtml?.length || 0} bytes, src=${_postedInit ? "postMessage" : "sessionStorage"})`);
     if (init.accounts && init.accounts.length > 0) {
       applyInit(init);
       _ctick("applyInit done \u2014 compose visible");