@bobfrankston/rmfmail 1.1.105 → 1.1.107

package/client/lib/rmf-tiny.js

@@ -322,19 +322,48 @@ export async function createTinyMceEditor(container, opts = {}) {
             // (reply / forward — user types above the quoted block);
             // anything else → cursor at END (legacy "put cursor at end"
             // semantics).
-            try {
-                editor.selection.select(editor.getBody(), true);
-                editor.selection.collapse(pos === 0 /* true = start */);
-                editor.focus();
-                // Scroll the viewport to match the caret. For pos 0 that's
-                // the TOP of the body — on a reply the user types above the
-                // quoted block and must land looking at that empty line, not
-                // scrolled down inside the quote (Bob 2026-05-18: "the cursor
-                // should be at the top of the window").
-                if (pos === 0)
+            const place = () => {
+                const body = editor.getBody();
+                if (pos === 0) {
+                    // Put the caret INSIDE the first block element. Collapsing
+                    // to raw body-start lands it outside any block (before /
+                    // between bare nodes) where contentEditable insertion is
+                    // unpredictable — Bob 2026-05-21: "typing goes in the
+                    // wrong place until you try again". rmfmail's reply body
+                    // now leads with a real <p>; drop the caret into it.
+                    const first = body.firstChild;
+                    if (first && first.nodeType === 1 /* element */) {
+                        editor.selection.setCursorLocation(first, 0);
+                    }
+                    else {
+                        editor.selection.select(body, true);
+                        editor.selection.collapse(true);
+                    }
+                    editor.focus();
+                    // Viewport to the top so the user looks at the empty
+                    // reply line, not scrolled down into the quote.
                     editor.getWin()?.scrollTo(0, 0);
-                else
+                }
+                else {
+                    editor.selection.select(body, true);
+                    editor.selection.collapse(false);
+                    editor.focus();
                     editor.selection.scrollIntoView();
+                }
+            };
+            try {
+                place();
+                // Re-apply on the next frame. Cross-iframe focus (compose is
+                // an iframe; TinyMCE's edit area is a nested iframe) lets the
+                // first selection set get clobbered by a late layout / focus
+                // event — the "have to click in and try again" symptom. A
+                // second pass after the frame settles makes it stick.
+                editor.getWin()?.requestAnimationFrame?.(() => {
+                    try {
+                        place();
+                    }
+                    catch { /* */ }
+                });
             }
             catch { /* */ }
         },

package/client/styles/components.css

@@ -125,6 +125,24 @@ button.tb-menu-item { background: none; border: none; color: inherit; width: 100
 .tb-menu-item input[type="radio"] { accent-color: var(--color-accent); }
 .tb-sep { width: 1px; height: 1.2rem; background: var(--color-border); margin: 0 var(--gap-xs); }
 
+/* Inline load-status badge on the TinyMCE menu item (pending → ready). */
+.tb-menu-status { font-size: 0.8em; color: var(--color-text-muted); }
+.tb-menu-status[data-state="pending"] { color: var(--color-accent); }
+.tb-menu-status[data-state="ready"]   { color: oklch(0.6 0.13 150); }
+.tb-menu-status[data-state="error"]   { color: oklch(0.55 0.18 25); }
+.tb-menu-status[data-state="pending"]::before {
+    content: "";
+    display: inline-block;
+    width: 0.7em; height: 0.7em;
+    margin-right: 0.3em;
+    border: 2px solid currentColor;
+    border-right-color: transparent;
+    border-radius: 50%;
+    animation: tb-menu-spin 0.7s linear infinite;
+    vertical-align: -0.05em;
+}
+@keyframes tb-menu-spin { to { transform: rotate(360deg); } }
+
 /* Submenu — single-line label that expands a nested popout. Used for the
    Theme picker so the parent dropdown isn't cluttered with three radios. */
 .tb-menu-submenu { position: relative; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/rmfmail",
-  "version": "1.1.105",
+  "version": "1.1.107",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",

package/packages/mailx-store/charset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"charset.d.ts","sourceRoot":"","sources":["charset.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH;0DAC0D;AAC1D,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAQtD"}
+{"version":3,"file":"charset.d.ts","sourceRoot":"","sources":["charset.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH;0DAC0D;AAC1D,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAiBtD"}

package/packages/mailx-store/charset.js

@@ -17,11 +17,31 @@ export function sniffAndFixCharset(raw) {
     const re = /charset\s*=\s*"?(iso-8859-1|us-ascii|windows-1252|latin1)"?/gi;
     if (!re.test(head))
         return raw;
+    // The rewrite is only sound when the raw bytes ARE the body bytes — i.e.
+    // an 8bit / binary part. For a quoted-printable or base64 part the raw
+    // .eml is pure ASCII (the high bytes live inside `=XX` / base64 chars),
+    // so isValidUtf8(raw) passes vacuously and we would relabel a genuine
+    // Windows-1252 part as utf-8 — every smart-quote / em-dash then decodes
+    // as mojibake (Bob's 2026-05-21 report: a QP Windows-1252 Outlook mail).
+    // Requiring an actual non-ASCII byte in the raw gates the heuristic to
+    // the only case where the UTF-8 sniff is meaningful.
+    if (!hasNonAscii(raw))
+        return raw;
     if (!isValidUtf8(raw))
         return raw;
     const fixed = head.replace(/charset\s*=\s*"?(iso-8859-1|us-ascii|windows-1252|latin1)"?/gi, "charset=utf-8");
     return Buffer.concat([Buffer.from(fixed, "latin1"), raw.subarray(head.length)]);
 }
+/** True if the buffer contains at least one byte >= 0x80. A pure-ASCII
+ *  buffer is trivially valid UTF-8, so the isValidUtf8 sniff tells us
+ *  nothing about a quoted-printable / base64 body — gate on this first. */
+function hasNonAscii(buf) {
+    for (let i = 0; i < buf.length; i++) {
+        if (buf[i] >= 0x80)
+            return true;
+    }
+    return false;
+}
 /** Strict UTF-8 validity check: rejects overlong forms, invalid start
  *  bytes, and dangling continuations. Used to confirm the body is really
  *  UTF-8 before overriding a Latin-1 declaration. */

package/packages/mailx-store/charset.js.map

@@ -1 +1 @@
-{"version":3,"file":"charset.js","sourceRoot":"","sources":["charset.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH;0DAC0D;AAC1D,MAAM,UAAU,kBAAkB,CAAC,GAAW;IAC1C,MAAM,UAAU,GAAG,KAAK,CAAC;IACzB,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAClF,MAAM,EAAE,GAAG,+DAA+D,CAAC;IAC3E,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,GAAG,CAAC;IAC/B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IAClC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,+DAA+D,EAAE,eAAe,CAAC,CAAC;IAC7G,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AACpF,CAAC;AAED;;qDAEqD;AACrD,SAAS,WAAW,CAAC,GAAW;IAC5B,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACjB,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;YAAC,CAAC,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QAChC,IAAI,IAAY,CAAC;QACjB,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAAC,IAAI,CAAC,GAAG,IAAI;gBAAE,OAAO,KAAK,CAAC;YAAC,IAAI,GAAG,CAAC,CAAC;QAAC,CAAC;aAC7D,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI;YAAE,IAAI,GAAG,CAAC,CAAC;aAClC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAAC,IAAI,CAAC,GAAG,IAAI;gBAAE,OAAO,KAAK,CAAC;YAAC,IAAI,GAAG,CAAC,CAAC;QAAC,CAAC;;YAClE,OAAO,KAAK,CAAC;QAClB,IAAI,CAAC,GAAG,IAAI,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7B,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI;gBAAE,OAAO,KAAK,CAAC;QACnD,CAAC;QACD,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;IAClB,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC"}
+{"version":3,"file":"charset.js","sourceRoot":"","sources":["charset.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH;0DAC0D;AAC1D,MAAM,UAAU,kBAAkB,CAAC,GAAW;IAC1C,MAAM,UAAU,GAAG,KAAK,CAAC;IACzB,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAClF,MAAM,EAAE,GAAG,+DAA+D,CAAC;IAC3E,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,GAAG,CAAC;IAC/B,yEAAyE;IACzE,uEAAuE;IACvE,wEAAwE;IACxE,sEAAsE;IACtE,wEAAwE;IACxE,yEAAyE;IACzE,uEAAuE;IACvE,qDAAqD;IACrD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IAClC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IAClC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,+DAA+D,EAAE,eAAe,CAAC,CAAC;IAC7G,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AACpF,CAAC;AAED;;2EAE2E;AAC3E,SAAS,WAAW,CAAC,GAAW;IAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAClC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;IACpC,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED;;qDAEqD;AACrD,SAAS,WAAW,CAAC,GAAW;IAC5B,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACjB,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;YAAC,CAAC,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QAChC,IAAI,IAAY,CAAC;QACjB,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAAC,IAAI,CAAC,GAAG,IAAI;gBAAE,OAAO,KAAK,CAAC;YAAC,IAAI,GAAG,CAAC,CAAC;QAAC,CAAC;aAC7D,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI;YAAE,IAAI,GAAG,CAAC,CAAC;aAClC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAAC,IAAI,CAAC,GAAG,IAAI;gBAAE,OAAO,KAAK,CAAC;YAAC,IAAI,GAAG,CAAC,CAAC;QAAC,CAAC;;YAClE,OAAO,KAAK,CAAC;QAClB,IAAI,CAAC,GAAG,IAAI,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7B,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI;gBAAE,OAAO,KAAK,CAAC;QACnD,CAAC;QACD,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;IAClB,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC"}

package/packages/mailx-store/charset.ts

@@ -17,11 +17,30 @@ export function sniffAndFixCharset(raw: Buffer): Buffer {
     const head = raw.subarray(0, Math.min(HEAD_LIMIT, raw.length)).toString("latin1");
     const re = /charset\s*=\s*"?(iso-8859-1|us-ascii|windows-1252|latin1)"?/gi;
     if (!re.test(head)) return raw;
+    // The rewrite is only sound when the raw bytes ARE the body bytes — i.e.
+    // an 8bit / binary part. For a quoted-printable or base64 part the raw
+    // .eml is pure ASCII (the high bytes live inside `=XX` / base64 chars),
+    // so isValidUtf8(raw) passes vacuously and we would relabel a genuine
+    // Windows-1252 part as utf-8 — every smart-quote / em-dash then decodes
+    // as mojibake (Bob's 2026-05-21 report: a QP Windows-1252 Outlook mail).
+    // Requiring an actual non-ASCII byte in the raw gates the heuristic to
+    // the only case where the UTF-8 sniff is meaningful.
+    if (!hasNonAscii(raw)) return raw;
     if (!isValidUtf8(raw)) return raw;
     const fixed = head.replace(/charset\s*=\s*"?(iso-8859-1|us-ascii|windows-1252|latin1)"?/gi, "charset=utf-8");
     return Buffer.concat([Buffer.from(fixed, "latin1"), raw.subarray(head.length)]);
 }
 
+/** True if the buffer contains at least one byte >= 0x80. A pure-ASCII
+ *  buffer is trivially valid UTF-8, so the isValidUtf8 sniff tells us
+ *  nothing about a quoted-printable / base64 body — gate on this first. */
+function hasNonAscii(buf: Buffer): boolean {
+    for (let i = 0; i < buf.length; i++) {
+        if (buf[i] >= 0x80) return true;
+    }
+    return false;
+}
+
 /** Strict UTF-8 validity check: rejects overlong forms, invalid start
  *  bytes, and dangling continuations. Used to confirm the body is really
  *  UTF-8 before overriding a Latin-1 declaration. */