@bobfrankston/mailx 1.0.428 → 1.0.430

package/client/compose/compose.js

@@ -449,15 +449,30 @@ function applyInit(init) {
         }
     }
     // C42: append the account's signature (if configured) BEFORE rendering
-    // the body. For new mode: just signature. For reply/forward: appended
-    // after the quoted block. Drafts are skipped — the signature is already
-    // baked into the saved body. Editing existing draft also skipped.
+    // the body. Two sources, in priority order:
+    //   1. New `sig: { text, html? }` object — applied to NEW messages only.
+    //      `text` is HTML-escaped (newlines → <br>) unless `html: true` is set
+    //      (reserved for future use; currently `html` is ignored and text is
+    //      always escaped).
+    //   2. Legacy `signature: string` — HTML, applied to new + reply + forward.
+    //
+    // Drafts are skipped — the signature is already baked into the saved body.
+    // Editing an existing draft also skipped.
     let bodyToRender = init.bodyHtml || "";
     const acct = init.accounts.find(a => a.id === init.accountId);
-    const sig = acct?.signature || "";
-    if (sig && init.mode !== "draft" && !init.draftUid) {
-        const sigBlock = `<br><br>--<br>${sig}`;
-        bodyToRender = init.mode === "reply" || init.mode === "replyAll" || init.mode === "forward"
+    const isNew = init.mode !== "reply" && init.mode !== "replyAll"
+        && init.mode !== "forward" && init.mode !== "draft" && !init.draftUid;
+    const isReplyForward = init.mode === "reply" || init.mode === "replyAll"
+        || init.mode === "forward";
+    if (isNew && acct?.sig?.text) {
+        const sigText = acct.sig.html
+            ? acct.sig.text // future: trust as raw HTML
+            : escapeHtml(acct.sig.text).replace(/\n/g, "<br>");
+        bodyToRender = `${bodyToRender}<br><br>-- <br>${sigText}`;
+    }
+    else if (acct?.signature && init.mode !== "draft" && !init.draftUid) {
+        const sigBlock = `<br><br>--<br>${acct.signature}`;
+        bodyToRender = isReplyForward
             ? `<br>${sigBlock}<br>${bodyToRender}` // sig above the quote
             : `${bodyToRender}${sigBlock}`; // sig at the end for new
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.428",
+  "version": "1.0.430",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -36,7 +36,7 @@
     "@bobfrankston/iflow-node": "^0.1.8",
     "@bobfrankston/miscinfo": "^1.0.10",
     "@bobfrankston/oauthsupport": "^1.0.25",
-    "@bobfrankston/msger": "^0.1.361",
+    "@bobfrankston/msger": "^0.1.362",
     "@bobfrankston/mailx-host": "^0.1.8",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
@@ -100,7 +100,7 @@
       "@bobfrankston/iflow-node": "^0.1.8",
       "@bobfrankston/miscinfo": "^1.0.10",
       "@bobfrankston/oauthsupport": "^1.0.25",
-      "@bobfrankston/msger": "^0.1.361",
+      "@bobfrankston/msger": "^0.1.362",
       "@bobfrankston/mailx-host": "^0.1.8",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",

package/packages/mailx-settings/index.js

@@ -395,6 +395,8 @@ function normalizeAccount(acct, globalName) {
         // blocking the build. Once mailx-types has rebuilt once (post-field)
         // this cast can be removed.
         ...(acct.signature ? { signature: acct.signature } : {}),
+        ...(acct.sig && typeof acct.sig === "object" && typeof acct.sig.text === "string"
+            ? { sig: { text: acct.sig.text, html: !!acct.sig.html } } : {}),
     };
 }
 // ── Defaults ──

package/packages/mailx-store/db.d.ts

@@ -196,7 +196,18 @@ export declare class MailxDB {
     rollbackTransaction(): void;
     /** Record an address used in sent mail */
     recordSentAddress(name: string, email: string): void;
-    /** Seed contacts from all message senders in the DB */
+    /** Seed contacts from every address that appears in any cached message —
+     *  From, To, Cc, Bcc — across all folders. The original implementation
+     *  only scanned `from_address`, so addresses you'd sent to (To/Cc on
+     *  outgoing mail) never made it into autocomplete unless they had also
+     *  written back to you. That left compose unable to suggest people you
+     *  email regularly but who never reply. This pass walks the JSON arrays
+     *  too. Dedup by lowercased email; per-address `use_count` is the total
+     *  occurrences across the corpus, `last_used` is the most recent message
+     *  date in any field. Existing rows have their counters bumped (instead of
+     *  the old skip-if-exists behavior) so periodic re-seeds keep recency
+     *  fresh — `received`-tagged rows get usage data from observed traffic;
+     *  `sent` and `google` rows are left alone (they're authoritative). */
     seedContactsFromMessages(): number;
     /** Search contacts by name or email prefix */
     searchContacts(query: string, limit?: number): {

package/packages/mailx-store/db.js

@@ -1098,24 +1098,83 @@ export class MailxDB {
             this.db.prepare("INSERT INTO contacts (source, name, email, last_used, use_count, updated_at) VALUES ('sent', ?, ?, ?, 1, ?)").run(name, email, now, now);
         }
     }
-    /** Seed contacts from all message senders in the DB */
+    /** Seed contacts from every address that appears in any cached message —
+     *  From, To, Cc, Bcc — across all folders. The original implementation
+     *  only scanned `from_address`, so addresses you'd sent to (To/Cc on
+     *  outgoing mail) never made it into autocomplete unless they had also
+     *  written back to you. That left compose unable to suggest people you
+     *  email regularly but who never reply. This pass walks the JSON arrays
+     *  too. Dedup by lowercased email; per-address `use_count` is the total
+     *  occurrences across the corpus, `last_used` is the most recent message
+     *  date in any field. Existing rows have their counters bumped (instead of
+     *  the old skip-if-exists behavior) so periodic re-seeds keep recency
+     *  fresh — `received`-tagged rows get usage data from observed traffic;
+     *  `sent` and `google` rows are left alone (they're authoritative). */
     seedContactsFromMessages() {
+        const VALID = /^[^\s<>@]+@[^\s<>@]+\.[^\s<>@]+$/;
         const now = Date.now();
-        const rows = this.db.prepare(`SELECT from_name, from_address, COUNT(*) as cnt, MAX(date) as last
-             FROM messages
-             WHERE from_address != ''
-             GROUP BY from_address`).all();
-        let added = 0;
+        // Per-email aggregator. `name` keeps the first non-empty display name
+        // we see so autocomplete shows "Alice <alice@…>" not just the address.
+        const agg = new Map();
+        const bump = (name, address, date) => {
+            const email = (address || "").trim().toLowerCase();
+            if (!email || !VALID.test(email))
+                return;
+            const e = agg.get(email);
+            if (e) {
+                e.cnt++;
+                if (date > e.last)
+                    e.last = date;
+                if (!e.name && name)
+                    e.name = name;
+            }
+            else {
+                agg.set(email, { name: name || "", cnt: 1, last: date || 0 });
+            }
+        };
+        const rows = this.db.prepare("SELECT from_name, from_address, to_json, cc_json, bcc_json, date FROM messages").all();
         for (const r of rows) {
-            // Skip invalid addresses so contact autocomplete never proposes non-emails
-            if (!r.from_address || !/^[^\s<>@]+@[^\s<>@]+\.[^\s<>@]+$/.test(r.from_address))
-                continue;
-            const existing = this.db.prepare("SELECT id FROM contacts WHERE email = ?").get(r.from_address);
+            const date = r.date || 0;
+            bump(r.from_name, r.from_address, date);
+            for (const field of [r.to_json, r.cc_json, r.bcc_json]) {
+                if (!field)
+                    continue;
+                let parsed;
+                try {
+                    parsed = JSON.parse(field);
+                }
+                catch {
+                    continue;
+                }
+                if (!Array.isArray(parsed))
+                    continue;
+                for (const a of parsed) {
+                    if (!a)
+                        continue;
+                    bump(a.name || "", a.address || a.email || "", date);
+                }
+            }
+        }
+        let added = 0;
+        let bumped = 0;
+        const insStmt = this.db.prepare("INSERT INTO contacts (source, name, email, last_used, use_count, updated_at) VALUES ('received', ?, ?, ?, ?, ?)");
+        const updStmt = this.db.prepare("UPDATE contacts SET use_count = ?, last_used = max(last_used, ?), name = CASE WHEN name = '' AND ? != '' THEN ? ELSE name END, updated_at = ? WHERE email = ? AND source = 'received'");
+        for (const [email, info] of agg) {
+            const existing = this.db.prepare("SELECT id, source FROM contacts WHERE email = ?").get(email);
             if (!existing) {
-                this.db.prepare("INSERT INTO contacts (source, name, email, last_used, use_count, updated_at) VALUES ('received', ?, ?, ?, ?, ?)").run(r.from_name || "", r.from_address, r.last, r.cnt, now);
+                insStmt.run(info.name, email, info.last, info.cnt, now);
                 added++;
             }
+            else if (existing.source === "received") {
+                updStmt.run(info.cnt, info.last, info.name, info.name, now, email);
+                bumped++;
+            }
+            // 'sent' and 'google' rows are authoritative — leave their
+            // use_count alone. recordSentAddress bumps 'sent' rows on actual
+            // sends, syncGoogleContacts owns 'google' rows.
         }
+        if (bumped > 0)
+            console.log(`  [contacts] seed: ${added} new + ${bumped} refreshed`);
         return added;
     }
     /** Search contacts by name or email prefix */

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

@@ -39,7 +39,14 @@ export interface AccountConfig {
     deliveredToPrefix?: string[]; /** Prefixes to strip from Delivered-To to get clean alias (e.g., ["bobf-ma-", "bobf-"]) — order matters, longest first */
     identityDomains?: string[]; /** Domains where Delivered-To address should become the reply From (e.g., ["bob.ma", "bobf.frankston.com"]) */
     spam?: string; /** IMAP folder path for "Mark as spam" button (e.g., "_spam"). Button hidden when not set. */
-    signature?: string; /** HTML signature appended to outgoing messages from this account. Plain text or HTML allowed. */
+    signature?: string; /** Legacy: HTML signature appended to all outgoing messages (new + reply + forward). Plain text or HTML allowed. Superseded by `sig`. */
+    sig?: AccountSignature; /** Per-account signature object. Initially appended only to NEW messages; later options will cover replies/forwards. */
+}
+/** Signature configuration in accounts.jsonc. Initial shape carries `text`
+ *  only; `html: true` reserved for future support of raw HTML signatures. */
+export interface AccountSignature {
+    text: string; /** Plain-text signature body. Newlines preserved. Appended to NEW messages with the standard "-- " RFC 3676 separator. */
+    html?: boolean; /** Future flag: when true, `text` is treated as raw HTML rather than escaped plain text. Currently ignored. */
 }
 /** Standard IMAP special-use folder types */
 export type SpecialUse = "inbox" | "sent" | "drafts" | "trash" | "junk" | "archive" | "all";