@bobfrankston/rmfmail 1.2.220 → 1.2.221

package/bin/mailx.ts

@@ -2791,10 +2791,21 @@ RFC 5322 with CRLF line endings. Bodies are quoted-printable encoded (readable i
     // and emits this when Word writes; compose.ts listens and reloads Quill.
     imapManager.on("wordEditUpdated", (payload: { editId: string; html: string }) => {
         handle.send({ _event: "wordEditUpdated", type: "wordEditUpdated", ...payload });
-        // Bring compose back to the front after a Word save — the service's
-        // old mailx-host focusMainWindow call was a silent no-op (the helper
-        // never existed); this native msger command is the real mechanism.
-        handle.send({ _msgerWindow: "focus" });
+        // Deliberately NO { _msgerWindow: "focus" } here. The autosave sidecar
+        // saves every ~2s while the user types, and each save lands in this
+        // handler — so this line pulled the foreground off Word mid-sentence,
+        // every couple of seconds, for the whole editing session (Bob
+        // 2026-08-06: "keeps flipping back to rmfmail on any change"). The
+        // focus now happens once, on wordEditClosed, below.
+    });
+    // Word (or the document) closed — the external edit is over. THIS is the
+    // moment to bring rmfmail forward, replacing the old per-save focus grab.
+    imapManager.on("wordEditClosed", (payload: { editId: string; fromPopout?: boolean }) => {
+        handle.send({ _event: "wordEditClosed", type: "wordEditClosed", ...payload });
+        // Only raise the MAIN window when the compose lives IN it. A popout
+        // compose is a separate window with no service channel, so focusing
+        // main would just cover it up.
+        if (!payload.fromPopout) handle.send({ _msgerWindow: "focus" });
     });
     // Cloud-write/read failures from mailx-settings → push to UI as a banner so
     // silent fall-back-to-local can no longer swallow Drive errors.

package/client/app.bundle.js

@@ -614,8 +614,8 @@ function readConfigHelp(name) {
 function unsubscribeOneClick(url) {
   return ipc().unsubscribeOneClick?.(url);
 }
-function openInWord(editId, html) {
-  return ipc().openInWord?.(editId, html) ?? Promise.resolve({ ok: false, path: "", opener: "none" });
+function openInWord(editId, html, fromPopout = false) {
+  return ipc().openInWord?.(editId, html, fromPopout) ?? Promise.resolve({ ok: false, path: "", opener: "none" });
 }
 function closeWordEdit(editId) {
   return ipc().closeWordEdit?.(editId) ?? Promise.resolve();