@bobfrankston/mailx 1.0.336 → 1.0.338

package/client/app.js

@@ -482,27 +482,15 @@ document.getElementById("btn-factory-reset")?.addEventListener("click", async ()
 });
 async function openCompose(mode) {
     const current = getCurrentMessage();
-    // Reply / Reply-All / Forward all need an original message to populate
-    // From, To, Subject, and the quoted body. Two failure modes used to
-    // silently produce a blank compose:
-    //   (1) getCurrentMessage() returns null — viewer still loading, message
-    //       cleared mid-folder-switch, or fetch failed.
-    //   (2) currentMessage is set but is a stub — header metadata arrived
-    //       but body / from / subject haven't been populated yet.
-    // Bail out in both cases instead of opening an empty form.
-    if (mode === "reply" || mode === "replyAll" || mode === "forward") {
-        const m = current?.message;
-        const stubReason = !current ? "no current message" :
-            !m?.from ? "msg.from missing" :
-                !m?.subject && m?.subject !== "" ? "msg.subject missing" :
-                    (mode !== "forward" && !m?.messageId) ? "msg.messageId missing (can't thread reply)" :
-                        null;
-        if (stubReason) {
-            console.warn(`[compose] ${mode} ignored — ${stubReason}; current=`, current);
-            alert(`Cannot ${mode === "forward" ? "forward" : "reply to"} this message yet — ` +
-                `it's still loading (${stubReason}). Please wait a moment and try again.`);
-            return;
-        }
+    // Local-first: if the row is selected we already have its headers in the
+    // local DB. Populate the compose form unconditionally; the user can edit
+    // anything missing. Don't show "still loading" alerts — the message IS
+    // loaded (it's in the list), body is a separate fetch that isn't needed
+    // for Reply's headers. Missing fields become empty strings.
+    if ((mode === "reply" || mode === "replyAll" || mode === "forward") && !current) {
+        // Only true blocker: no message selected at all.
+        console.warn(`[compose] ${mode} — no message selected`);
+        return;
     }
     const accounts = await getAccounts();
     const accountId = current?.accountId || accounts[0]?.id || "";
@@ -554,21 +542,31 @@ async function openCompose(mode) {
         console.log(`[compose] no identity match`);
         return undefined;
     }
+    // Defensive: msg.from / msg.to may be missing on rows that arrived before
+    // headers finished loading. Don't push undefined into init.to — that
+    // bubbles to the compose form as literal "undefined". Empty-out gracefully.
     if (msg && mode === "reply") {
-        init.to = [msg.from];
+        init.to = msg.from ? [msg.from] : [];
         init.subject = `Re: ${cleanSubject}`;
         init.bodyHtml = quoteBody(msg);
-        init.inReplyTo = msg.messageId;
-        init.references = [...(msg.references || []), msg.messageId];
+        init.inReplyTo = msg.messageId || "";
+        init.references = [...(msg.references || []), msg.messageId].filter(Boolean);
         init.fromAddress = detectReplyFrom();
     }
     else if (msg && mode === "replyAll") {
-        init.to = [msg.from, ...msg.to.filter((a) => a.address !== msg.from.address)];
-        init.cc = msg.cc || [];
+        const toList = msg.from ? [msg.from] : [];
+        if (Array.isArray(msg.to)) {
+            for (const a of msg.to) {
+                if (a?.address && a.address !== msg.from?.address)
+                    toList.push(a);
+            }
+        }
+        init.to = toList;
+        init.cc = Array.isArray(msg.cc) ? msg.cc : [];
         init.subject = `Re: ${cleanSubject}`;
         init.bodyHtml = quoteBody(msg);
-        init.inReplyTo = msg.messageId;
-        init.references = [...(msg.references || []), msg.messageId];
+        init.inReplyTo = msg.messageId || "";
+        init.references = [...(msg.references || []), msg.messageId].filter(Boolean);
         init.fromAddress = detectReplyFrom();
     }
     else if (msg && mode === "forward") {

package/package.json

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

package/packages/mailx-imap/index.js

@@ -2999,10 +2999,17 @@ export class ImapManager extends EventEmitter {
         // config.jsonc is per-machine / local-only — never polled.
         const cloudFiles = ["accounts.jsonc", "allowlist.jsonc", "clients.jsonc"];
         const CLOUD_POLL_MS = 3 * 60 * 1000;
+        // Normalize before comparing: strip BOM, CRLF→LF, trailing whitespace.
+        // Without this, cloud round-trips that re-wrap newlines or add a
+        // trailing newline trigger a local overwrite every poll, which fires
+        // fs.watch, which shows the spurious "accounts.jsonc changed" banner.
+        const normalize = (s) => s.replace(/^\uFEFF/, "").replace(/\r\n/g, "\n").replace(/[ \t\r\n]+$/, "");
         const pollCloud = async () => {
             let cloudRead;
+            let parseJsonc;
             try {
                 ({ cloudRead } = await import("@bobfrankston/mailx-settings"));
+                ({ parseJsonc } = await import("jsonc-parser").then(m => ({ parseJsonc: m.parse })));
             }
             catch {
                 return; /* cloud module unavailable */
@@ -3018,17 +3025,25 @@ export class ImapManager extends EventEmitter {
                         localContent = fs.readFileSync(localPath, "utf-8");
                     }
                     catch { /* missing */ }
-                    if (localContent === cloudContent)
-                        continue;
-                    // Cloud copy differs — write through so watchers / downstream
-                    // readers see the new value. fs.watch above will fire and
-                    // emit configChanged → UI banner.
+                    if (localContent !== null) {
+                        if (normalize(localContent) === normalize(cloudContent))
+                            continue;
+                        // Semantic check: parse both as JSONC and compare structures.
+                        // Catches reorderings that normalize() doesn't (e.g. JSON with
+                        // same keys in different order after a cloud-side re-serialize).
+                        try {
+                            const a = parseJsonc(localContent);
+                            const b = parseJsonc(cloudContent);
+                            if (a !== undefined && b !== undefined &&
+                                JSON.stringify(a) === JSON.stringify(b))
+                                continue;
+                        }
+                        catch { /* fall through to write */ }
+                    }
                     fs.writeFileSync(localPath, cloudContent);
                     console.log(`  [cloud-poll] ${filename} updated from cloud copy`);
                 }
                 catch (e) {
-                    // Drive unreachable, auth expired, file missing in cloud —
-                    // silent retry on next tick; no user-visible fallout.
                     console.log(`  [cloud-poll] ${filename} check skipped: ${e?.message || e}`);
                 }
             }

package/packages/mailx-settings/index.js

@@ -453,7 +453,11 @@ export function loadAccounts() {
                     localContent = fs.readFileSync(localPath, "utf-8");
                 }
                 catch { /* missing */ }
-                if (sharedContent !== localContent) {
+                // Normalize before comparing — GDrive-mounted copies often
+                // differ in BOM / line endings / trailing newline without any
+                // semantic change, and that triggered the spurious banner.
+                const norm = (s) => s.replace(/^\uFEFF/, "").replace(/\r\n/g, "\n").replace(/[ \t\r\n]+$/, "");
+                if (norm(sharedContent) !== norm(localContent)) {
                     fs.mkdirSync(LOCAL_DIR, { recursive: true });
                     fs.writeFileSync(localPath, sharedContent);
                 }