@bobfrankston/mailx 1.0.436 → 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;
             }
         }
@@ -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>

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.436",
+  "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-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