@bobfrankston/mailx 1.0.435 → 1.0.437

package/client/app.js

@@ -633,21 +633,27 @@ async function openCompose(mode) {
         ? explicitDomains
         : (accountDomain ? [accountDomain] : []);
     function detectReplyFrom() {
-        if (!msg || identityDomains.length === 0)
+        if (!msg)
+            return undefined;
+        // Delivered-To is set by the receiving server — it IS an identity at this
+        // account, by definition. Trust it unconditionally when present (after
+        // deliveredToPrefix stripping in the service). Fall back to To/Cc only
+        // when their domain matches the account's identityDomains, since To/Cc
+        // can be set by the sender and aren't authoritative.
+        if (msg.deliveredTo) {
+            console.log(`[compose] reply From → ${msg.deliveredTo} (Delivered-To)`);
+            return msg.deliveredTo;
+        }
+        if (identityDomains.length === 0)
             return undefined;
-        // Prefer Delivered-To header (the address the server actually delivered
-        // to, which is the alias the message arrived at). Fall back to To, then
-        // Cc, in order. Bcc isn't visible to recipients so skipped.
         const candidates = [
-            msg.deliveredTo,
             ...((msg.to || []).map((a) => a.address)),
             ...((msg.cc || []).map((a) => a.address)),
         ].filter(Boolean);
-        console.log(`[compose] detectReplyFrom: deliveredTo=${msg.deliveredTo}, to=${msg.to?.map((a) => a.address)}, cc=${msg.cc?.map((a) => a.address)}, identityDomains=${identityDomains}, accountEmail=${account?.email}`);
         for (const addr of candidates) {
             const domain = addr.split("@")[1]?.toLowerCase();
             if (domain && identityDomains.some(d => domain === d || domain.endsWith(`.${d}`))) {
-                console.log(`[compose] reply From → ${addr}`);
+                console.log(`[compose] reply From → ${addr} (To/Cc match)`);
                 return addr;
             }
         }
@@ -2219,7 +2225,7 @@ document.getElementById("btn-open-log")?.addEventListener("click", async () => {
     }
 });
 async function openJsoncEditor(initialFile) {
-    const { readJsoncFile, writeJsoncFile, readConfigHelp } = await import("./lib/api-client.js");
+    const { readJsoncFile, writeJsoncFile, readConfigHelp, formatJsonc } = await import("./lib/api-client.js");
     const backdrop = document.createElement("div");
     backdrop.className = "mailx-modal-backdrop";
     const panel = document.createElement("div");
@@ -2232,6 +2238,7 @@ async function openJsoncEditor(initialFile) {
         <label class="mailx-modal-label">File
             <select class="mailx-modal-input" id="jsonc-file">
                 <option value="accounts.jsonc">accounts.jsonc — accounts (shared via Google Drive)</option>
+                <option value="contacts.jsonc">contacts.jsonc — preferred + denylist + discovered (shared)</option>
                 <option value="allowlist.jsonc">allowlist.jsonc — remote-content allowlist (shared)</option>
                 <option value="clients.jsonc">clients.jsonc — per-device registrations (shared)</option>
                 <option value="config.jsonc">config.jsonc — local per-machine overrides (not synced)</option>
@@ -2253,6 +2260,7 @@ async function openJsoncEditor(initialFile) {
         </div>
         <div class="mailx-modal-error" id="jsonc-error" hidden></div>
         <div class="mailx-modal-buttons">
+            <button type="button" class="mailx-modal-btn" data-action="format" title="Reformat indentation while preserving comments and trailing commas">Format</button>
             <span class="mailx-modal-spacer"></span>
             <button type="button" class="mailx-modal-btn" data-action="cancel">Cancel</button>
             <button type="button" class="mailx-modal-btn mailx-modal-btn-primary" data-action="save">Save</button>
@@ -2311,17 +2319,34 @@ async function openJsoncEditor(initialFile) {
         renderGutter();
     };
     const showValidation = (err) => {
-        errorEl.textContent = `Line ${err.line}, col ${err.col}: ${err.message}`;
+        // CRITICAL: do NOT move the cursor here. Validation fires every 600ms
+        // while the user types; auto-selecting the error position yanked the
+        // cursor mid-edit and made fixing the error impossible (the user
+        // reported this as a fatal bug — the very mechanism preventing a save
+        // was preventing the fix). Location is shown via the gutter highlight
+        // + the "Line N, col M" message, and the user can click "Jump" to
+        // explicitly navigate.
+        errorEl.innerHTML = "";
+        const text = document.createElement("span");
+        text.textContent = `Line ${err.line}, col ${err.col}: ${err.message}  `;
+        const jumpBtn = document.createElement("button");
+        jumpBtn.type = "button";
+        jumpBtn.className = "mailx-modal-btn mailx-modal-btn-link";
+        jumpBtn.textContent = "Jump to error";
+        jumpBtn.addEventListener("click", () => {
+            textarea.focus();
+            try {
+                textarea.setSelectionRange(err.pos, err.pos + 1);
+            }
+            catch { /* */ }
+        });
+        errorEl.appendChild(text);
+        errorEl.appendChild(jumpBtn);
         errorEl.hidden = false;
         textarea.classList.add("mailx-modal-input-error");
         saveBtn.disabled = true;
         errorLine = err.line;
         renderGutter();
-        // Select the problem character so the browser draws a visible marker
-        try {
-            textarea.setSelectionRange(err.pos, err.pos + 1);
-        }
-        catch { /* out-of-range → ignore */ }
     };
     let validateTimer;
     const scheduleValidate = () => {
@@ -2377,6 +2402,31 @@ async function openJsoncEditor(initialFile) {
                 close();
                 return;
             }
+            if (action === "format") {
+                // Reformat via the service-side jsonc-parser format() — the
+                // edits are whitespace-only, so `//` and `/* */` comments
+                // survive intact (which JSON.stringify(parse(...)) does not).
+                btn.disabled = true;
+                const orig = btn.textContent;
+                btn.textContent = "Formatting…";
+                try {
+                    const r = await formatJsonc(textarea.value);
+                    if (r?.content !== undefined) {
+                        textarea.value = r.content;
+                        renderGutter();
+                        scheduleValidate();
+                    }
+                }
+                catch (e) {
+                    errorEl.textContent = `Format failed: ${e.message}`;
+                    errorEl.hidden = false;
+                }
+                finally {
+                    btn.disabled = false;
+                    btn.textContent = orig || "Format";
+                }
+                return;
+            }
             if (action === "save") {
                 // Final sync-check; refuse to save if it doesn't parse
                 const err = validateJsonc(textarea.value);

package/client/components/message-viewer.js

@@ -2,7 +2,7 @@
  * Message viewer component -- displays full message in sandboxed iframe.
  * Subscribes to message-state: clears when selected becomes null.
  */
-import { getMessage, updateFlags, allowRemoteContent, getAttachment, addContact, listContacts, upsertContact } from "../lib/api-client.js";
+import { getMessage, updateFlags, allowRemoteContent, getAttachment, addContact, listContacts, upsertContact, unsubscribeOneClick } from "../lib/api-client.js";
 import { showContextMenu } from "./context-menu.js";
 import * as state from "../lib/message-state.js";
 /** Currently displayed message (for reply/forward) */
@@ -358,17 +358,13 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
         }
         headerEl.querySelector(".mv-date").textContent = new Date(msg.date).toLocaleString(undefined, { year: "numeric", month: "short", day: "numeric", hour: "2-digit", minute: "2-digit", hour12: false });
         // Unsubscribe button (upper right of header).
-        //   - HTTPS URL: open externally (same path as right-click → open link
-        //     in a new window). Earlier code attempted RFC 8058 one-click POST
-        //     first, but the IPC path was failing silently — the button "moved
-        //     a tad" (CSS :active) but no visible feedback. User preference:
-        //     just open the link, the way the working right-click does.
-        //   - mailto: URL: open a pre-filled compose window so the reply gets
-        //     sent from the correct mailx account, not the OS default mail
-        //     handler.
+        //   - One-Click (RFC 8058): POST via service; show result in status bar.
+        //   - Plain HTTPS URL: open externally for user confirmation.
+        //   - mailto: open a pre-filled compose so the reply uses the right account.
         const unsubBtn = document.getElementById("mv-unsubscribe");
         const httpUrl = msg.listUnsubscribeHttp || "";
         const mailUrl = msg.listUnsubscribeMail || "";
+        const oneClick = !!msg.listUnsubscribeOneClick;
         const anyUrl = httpUrl || mailUrl || msg.listUnsubscribe || "";
         if (unsubBtn) {
             if (anyUrl) {
@@ -376,8 +372,26 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
                 unsubBtn.textContent = "Unsubscribe";
                 unsubBtn.removeAttribute("title");
                 unsubBtn.href = httpUrl || mailUrl || "#";
-                unsubBtn.onclick = (e) => {
+                unsubBtn.onclick = async (e) => {
                     e.preventDefault();
+                    const status = document.getElementById("status-sync");
+                    if (httpUrl && oneClick) {
+                        if (status)
+                            status.textContent = "Unsubscribing…";
+                        try {
+                            const result = await unsubscribeOneClick(httpUrl);
+                            if (status) {
+                                status.textContent = result.ok
+                                    ? `Unsubscribed (${result.status} ${result.statusText})`
+                                    : `Unsubscribe failed: ${result.status} ${result.statusText}`;
+                            }
+                        }
+                        catch (err) {
+                            if (status)
+                                status.textContent = `Unsubscribe error: ${err?.message || err}`;
+                        }
+                        return;
+                    }
                     if (httpUrl) {
                         const api = window.mailxapi;
                         if (api?.openExternal)

package/client/lib/api-client.js

@@ -339,6 +339,9 @@ export function readJsoncFile(name) {
 export function writeJsoncFile(name, content) {
     return ipc().writeJsoncFile?.(name, content);
 }
+export function formatJsonc(content) {
+    return ipc().formatJsonc?.(content);
+}
 export function readConfigHelp(name) {
     return ipc().readConfigHelp?.(name) ?? Promise.resolve({ content: "" });
 }

package/client/lib/mailxapi.js

@@ -131,6 +131,9 @@
         writeJsoncFile: function(name, content) {
             return callNode("writeJsoncFile", { name: name, content: content });
         },
+        formatJsonc: function(content) {
+            return callNode("formatJsonc", { content: content });
+        },
         readConfigHelp: function(name) {
             return callNode("readConfigHelp", { name: name });
         },

package/package.json

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

package/packages/mailx-service/index.d.ts

@@ -252,6 +252,7 @@ export declare class MailxService {
      *  Names are whitelisted so the UI can't read arbitrary files.
      *  `config.jsonc` is the local per-machine config (not cloud-synced). */
     readJsoncFile(name: string): Promise<string | null>;
+    formatJsonc(content: string): Promise<string>;
     /** Return the help section for a named config file, extracted from docs/config-help.md.
      *  Matches a level-2 heading whose text equals the filename. Returns markdown. */
     readConfigHelp(name: string): Promise<string>;

package/packages/mailx-service/index.js

@@ -1762,6 +1762,17 @@ export class MailxService {
         const { cloudRead } = await import("@bobfrankston/mailx-settings");
         return cloudRead(name);
     }
+    // Reformat JSONC preserving comments — applyEdits returns whitespace-only edits.
+    async formatJsonc(content) {
+        const { format, applyEdits } = await import("jsonc-parser");
+        const edits = format(content, undefined, {
+            tabSize: 2,
+            insertSpaces: true,
+            eol: "\n",
+            insertFinalNewline: true,
+        });
+        return applyEdits(content, edits);
+    }
     /** Return the help section for a named config file, extracted from docs/config-help.md.
      *  Matches a level-2 heading whose text equals the filename. Returns markdown. */
     async readConfigHelp(name) {

package/packages/mailx-service/jsonrpc.js

@@ -169,6 +169,8 @@ async function dispatchAction(svc, action, p) {
         case "writeJsoncFile":
             await svc.writeJsoncFile(p.name, p.content);
             return { ok: true };
+        case "formatJsonc":
+            return { content: await svc.formatJsonc(p.content) };
         case "readConfigHelp":
             return { content: await svc.readConfigHelp(p.name) };
         case "unsubscribeOneClick":

package/packages/mailx-store/db.js

@@ -287,6 +287,10 @@ export class MailxDB {
             this.db.exec("CREATE UNIQUE INDEX IF NOT EXISTS idx_messages_uuid ON messages(uuid)");
         }
         catch { /* already exists */ }
+        // bcc_json: pre-existing DBs predate this column. Without the migration
+        // every contacts seed pass throws "no such column: m.bcc_json" and the
+        // local autocomplete corpus stays empty.
+        this.addColumnIfMissing("messages", "bcc_json", "TEXT DEFAULT '[]'");
         // calendar_events: recurring_event_id carries the Google Calendar
         // series id when the event is an expanded instance of a recurrence.
         // Filters like "hide recurring events" check this column.
@@ -343,7 +347,7 @@ export class MailxDB {
      *  runs at startup). The user-facing message names the recovery command. */
     verifySchema() {
         const required = {
-            messages: ["thread_id", "provider_id", "uuid"],
+            messages: ["thread_id", "provider_id", "uuid", "bcc_json"],
             calendar_events: ["recurring_event_id", "html_link"],
         };
         for (const [table, cols] of Object.entries(required)) {
@@ -1434,10 +1438,21 @@ export class MailxDB {
         query = (query || "").trim();
         if (!query)
             return [];
-        const substr = `%${query}%`;
+        // Split into whitespace-separated tokens. Each token must appear in
+        // name or email — order- and adjacency-independent. So "eleanor elkin"
+        // matches "Eleanor Elkin", "Elkin, Eleanor", "Eleanor M Elkin", and
+        // "elkin@eleanor.example". The first token gets the prefix bonus for
+        // ranking; remaining tokens just have to be present.
+        const tokens = query.split(/\s+/).filter(Boolean);
+        const firstSubstr = `%${tokens[0]}%`;
+        const firstPrefix = `${tokens[0]}%`;
+        const tokenWhere = tokens.map(() => "(name LIKE ? OR email LIKE ?)").join(" AND ");
+        const tokenParams = [];
+        for (const t of tokens) {
+            tokenParams.push(`%${t}%`, `%${t}%`);
+        }
         let rows;
         try {
-            const prefixQ = `${query}%`;
             // Source tier: anything not in the two reserved system sources
             // ('google', 'discovered') is preferred-tier — i.e. came out of
             // contacts.jsonc#preferred[]. The user's `source: "work"` /
@@ -1456,17 +1471,17 @@ export class MailxDB {
                             ELSE 40
                          END) AS match_rank
                  FROM contacts
-                 WHERE email LIKE ? OR name LIKE ?
+                 WHERE ${tokenWhere}
                  ORDER BY match_rank DESC, use_count DESC, last_used DESC
-                 LIMIT ?`).all(prefixQ, prefixQ, substr, substr, substr, substr, limit * 2);
+                 LIMIT ?`).all(firstPrefix, firstPrefix, firstSubstr, firstSubstr, ...tokenParams, limit * 2);
         }
         catch (e) {
             console.error(`  [searchContacts] ranked query failed (${e?.message}) — falling back to simple LIKE`);
             rows = this.db.prepare(`SELECT name, email, source, use_count, last_used, 0 AS match_rank
                  FROM contacts
-                 WHERE email LIKE ? OR name LIKE ?
+                 WHERE ${tokenWhere}
                  ORDER BY use_count DESC, last_used DESC
-                 LIMIT ?`).all(substr, substr, limit * 2);
+                 LIMIT ?`).all(...tokenParams, limit * 2);
         }
         // Filter out denylisted emails as a defense-in-depth — applyContactsConfig
         // already purges discovered rows on denylist, but a Google sync that

package/unwedge.cmd

@@ -1 +1 @@
-rmdir C:\Users\Bob\.claude\session-env\7299facd-d726-4f8a-8e7a-dbd852680c95 /s /q
+rmdir C:\Users\Bob\.claude\session-env\6787e337-1af0-423c-ae58-8d981702aebb /s /q