@bobfrankston/rmfmail 1.2.244 → 1.2.246

package/bin/mailx.ts

@@ -2810,13 +2810,63 @@ RFC 5322 with CRLF line endings. Bodies are quoted-printable encoded (readable i
     });
     // 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 }) => {
+    imapManager.on("wordEditClosed", (payload: { editId: string; fromPopout?: boolean; popoutId?: string }) => {
         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" });
+        // Coming back from Word, the window you were editing has to be the one
+        // in front — otherwise the edit lands in a window buried behind
+        // whatever Word was covering (Bob 2026-08-10).
+        //
+        // In-window compose: raise the main window through the service pipe,
+        // which msger consumes natively (msger 0.1.407).
+        if (!payload.popoutId) { handle.send({ _msgerWindow: "focus" }); return; }
+        // Popout compose: a separate OS window. msger's MessageBoxHandle
+        // exposes result/pid/close and no control channel — its stdin is
+        // closed right after the options are written — so there is nothing to
+        // send a focus command to. Raise it by process instead. Windows-only
+        // and deliberately so: this is the same platform-gated corner as the
+        // Word autosave sidecar, and Edit-in-Word is a Windows/Mac feature.
+        // A msger-side focus() would be the tidier home for this and is worth
+        // doing when msger is next opened.
+        const h = popoutWindows.get(`compose|${payload.popoutId}`);
+        const pid = (h as any)?.pid;
+        if (!pid) { console.log(`  [word-edit] popout ${payload.popoutId} has no live window to raise`); return; }
+        if (process.platform !== "win32") return;
+        void raiseWindowByPid(pid);
     });
+    /** Bring the main window of a process to the foreground (Windows).
+     *  Uses the documented AllowSetForegroundWindow → SetForegroundWindow
+     *  dance rather than a bare SetForegroundWindow, which Windows ignores
+     *  for a process that does not own the foreground — the same reason
+     *  msger's own focusOnCreate does it that way. Best-effort: a failure
+     *  leaves the window where it is and is logged, never thrown. */
+    async function raiseWindowByPid(pid: number): Promise<void> {
+        const ps = [
+            "$ErrorActionPreference='Stop'",
+            "Add-Type @'",
+            "using System;using System.Runtime.InteropServices;",
+            "public class RmfFg{",
+            "[DllImport(\"user32.dll\")] public static extern bool SetForegroundWindow(IntPtr h);",
+            "[DllImport(\"user32.dll\")] public static extern bool ShowWindow(IntPtr h,int c);",
+            "[DllImport(\"user32.dll\")] public static extern bool AllowSetForegroundWindow(int p);",
+            "}",
+            "'@",
+            `$p = Get-Process -Id ${pid} -ErrorAction SilentlyContinue`,
+            "if ($p -and $p.MainWindowHandle -ne 0) {",
+            `  [RmfFg]::AllowSetForegroundWindow(${pid}) | Out-Null`,
+            "  [RmfFg]::ShowWindow($p.MainWindowHandle, 9) | Out-Null",   // SW_RESTORE
+            "  [RmfFg]::SetForegroundWindow($p.MainWindowHandle) | Out-Null",
+            "}",
+        ].join("\n");
+        try {
+            const { spawn } = await import("node:child_process");
+            const child = spawn("powershell", ["-NoProfile", "-ExecutionPolicy", "Bypass", "-Command", ps],
+                { detached: false, stdio: "ignore", windowsHide: true });
+            child.on("error", (e: any) => console.log(`  [word-edit] could not raise compose window: ${e?.message || e}`));
+        } catch (e: any) {
+            console.log(`  [word-edit] raise failed: ${e?.message || e}`);
+        }
+    }
+
     // 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.
     const { onCloudError } = await import("@bobfrankston/mailx-settings");

package/client/app.bundle.js

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