@bobfrankston/mailx 1.0.434 → 1.0.436

package/client/android.html

@@ -72,20 +72,35 @@
                     <label class="tb-menu-item" title="Stack From + Subject on two lines per row, date to the right — denser on narrow windows"><input type="checkbox" id="opt-two-line"> Two-line view</label>
                     <label class="tb-menu-item" title="Show the reading pane below/beside the message list"><input type="checkbox" id="opt-preview" checked> Preview pane</label>
                     <label class="tb-menu-item" title="Show a short body-text preview (first ~80 chars) beneath each row's subject"><input type="checkbox" id="opt-snippet" checked> Preview snippets</label>
+                    <label class="tb-menu-item" title="Collapse reply chains to one row"><input type="checkbox" id="opt-threaded"> Group by thread</label>
+                    <label class="tb-menu-item" title="Filter the list to rows in the selected message's thread"><input type="checkbox" id="opt-thread-filter"> Only this conversation</label>
                     <label class="tb-menu-item" title="Show only flagged (★) messages in the list"><input type="checkbox" id="opt-flagged"> ★ Flagged only</label>
                     <label class="tb-menu-item" title="Show unread/total counts next to each folder in the tree"><input type="checkbox" id="opt-folder-counts"> Folder counts</label>
+                    <label class="tb-menu-item" title="Show the right-side calendar/tasks sidebar"><input type="checkbox" id="opt-calendar-sidebar"> Calendar sidebar</label>
                 </div>
             </div>
             <div class="tb-menu" id="settings-menu">
                 <button class="tb-btn" id="btn-settings">Settings</button>
                 <div class="tb-menu-dropdown" id="settings-dropdown" hidden>
+                    <span class="tb-menu-label">Theme</span>
+                    <label class="tb-menu-item"><input type="radio" name="opt-theme" value="system" id="opt-theme-system"> System</label>
+                    <label class="tb-menu-item"><input type="radio" name="opt-theme" value="light" id="opt-theme-light"> Light</label>
+                    <label class="tb-menu-item"><input type="radio" name="opt-theme" value="dark" id="opt-theme-dark"> Dark</label>
+                    <hr class="tb-menu-sep">
                     <span class="tb-menu-label">Editor</span>
                     <label class="tb-menu-item"><input type="radio" name="opt-editor" value="quill" id="opt-editor-quill" checked> Quill</label>
                     <label class="tb-menu-item"><input type="radio" name="opt-editor" value="tiptap" id="opt-editor-tiptap"> tiptap</label>
                     <hr class="tb-menu-sep">
-                    <label class="tb-menu-item" title="Ghost-text completions while composing — Ollama / Claude / OpenAI back-end, off by default"><input type="checkbox" id="opt-autocomplete"> AI autocomplete</label>
+                    <label class="tb-menu-item" title="Ghost-text completions while composing"><input type="checkbox" id="opt-autocomplete"> AI autocomplete</label>
+                    <label class="tb-menu-item" title="Right-click in message body → Translate"><input type="checkbox" id="opt-ai-translate"> AI translate (off by default)</label>
+                    <label class="tb-menu-item" title="Right-click in compose editor → Proofread"><input type="checkbox" id="opt-ai-proofread"> AI proofread (off by default)</label>
+                    <hr class="tb-menu-sep">
+                    <button class="tb-menu-item" id="btn-edit-jsonc" title="Edit accounts.jsonc / allowlist.jsonc / contacts.jsonc">Edit config files...</button>
+                    <button class="tb-menu-item" id="btn-about" title="Show version and build info">About mailx...</button>
                 </div>
             </div>
+            <button class="tb-btn" id="btn-tb-delete" title="Delete selected (Del)">🗑</button>
+            <button class="tb-btn" id="btn-tb-spam" title="Mark as spam — move to Junk">⚠</button>
             <span id="app-version" class="app-version">mailx</span>
         </div>
         <div class="toolbar-right">
@@ -143,7 +158,9 @@
                     <option value="current">This folder</option>
                 </select>
                 <input type="search" id="search-input" placeholder="Search..." autocomplete="off" title="Search messages">
+                <label class="search-server-check" title="Also search the IMAP server"><input type="checkbox" id="search-server-too"> Server</label>
             </search>
+            <div class="ml-folder-title" id="ml-folder-title"></div>
             <div class="ml-header">
                 <span class="ml-col ml-col-avatar"></span>
                 <span class="ml-col ml-col-flag"></span>
@@ -192,8 +209,11 @@
     <footer class="status-bar" id="status-bar">
         <span id="status-accounts"></span>
         <span id="status-sync">Initializing...</span>
+        <span id="status-offline" class="status-offline" hidden title="No network — local actions queue for later">⚡ offline</span>
+        <span id="status-diag" class="status-diag" hidden title=""></span>
         <span id="status-pending"></span>
         <span id="status-queue"></span>
+        <span class="app-version" id="status-version">mailx</span>
     </footer>
 
     <div id="startup-overlay" class="startup-overlay">

package/client/app.js

@@ -437,8 +437,13 @@ document.addEventListener("pointerdown", (e) => {
     if (!panel || !panel.classList.contains("open"))
         return;
     const target = e.target;
-    // Ignore clicks inside the panel itself and on the hamburger toggle
-    if (target.closest(".folder-panel") || target.closest("#btn-menu"))
+    // Ignore clicks inside the panel itself and on either toggle button.
+    // Without `#btn-folder-toggle` in this list, clicking the folder icon
+    // while the panel is open closed it here (capture phase) then the click
+    // handler reopened it — net effect: panel stuck open, "doesn't toggle".
+    if (target.closest(".folder-panel")
+        || target.closest("#btn-menu")
+        || target.closest("#btn-folder-toggle"))
         return;
     // Only auto-dismiss when we're in overlay mode (small or medium screens).
     // On wide screens the panel is a permanent column and the "open" class
@@ -2214,7 +2219,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");
@@ -2248,6 +2253,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>
@@ -2306,17 +2312,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 = () => {
@@ -2372,6 +2395,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-list.js

@@ -701,6 +701,57 @@ function appendMessages(body, accountId, items) {
             lastClickedRow = row;
             updateBulkBar();
         });
+        // Right-click (or long-press) on the avatar → bulk-selection menu.
+        // Putting it on the avatar is contextually right: the avatar is the
+        // "select" affordance, so its menu owns operations on the selection
+        // set. "Select all visible" is the load-bearing item — there's no
+        // Ctrl-A equivalent on touch and the scope-after-search use case
+        // demands it.
+        avatar.addEventListener("contextmenu", async (e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            const { showContextMenu } = await import("./context-menu.js");
+            const body = document.getElementById("ml-body");
+            const visibleRows = body
+                ? Array.from(body.querySelectorAll(".ml-row:not(.filter-hidden)"))
+                : [];
+            const selectedCount = body
+                ? body.querySelectorAll(".ml-row.selected").length
+                : 0;
+            showContextMenu(e.clientX, e.clientY, [
+                {
+                    label: `Select all (${visibleRows.length})`,
+                    action: () => {
+                        if (!body)
+                            return;
+                        body.classList.add("multi-select-on");
+                        for (const r of visibleRows)
+                            r.classList.add("selected");
+                        lastClickedRow = visibleRows[visibleRows.length - 1] || null;
+                        updateBulkBar();
+                    },
+                    disabled: visibleRows.length === 0,
+                },
+                {
+                    label: `Clear selection${selectedCount ? ` (${selectedCount})` : ""}`,
+                    action: () => exitMultiSelect(),
+                    disabled: selectedCount === 0,
+                },
+                {
+                    label: "Invert selection",
+                    action: () => {
+                        if (!body)
+                            return;
+                        body.classList.add("multi-select-on");
+                        for (const r of visibleRows)
+                            r.classList.toggle("selected");
+                        lastClickedRow = visibleRows[visibleRows.length - 1] || null;
+                        updateBulkBar();
+                    },
+                    disabled: visibleRows.length === 0,
+                },
+            ]);
+        });
         const flag = document.createElement("span");
         flag.className = "ml-flag";
         flag.textContent = msg.flags.includes("\\Flagged") ? "\u2605" : "\u2606";
@@ -923,12 +974,29 @@ function appendMessages(body, accountId, items) {
         // ── Right-click context menu ──
         row.addEventListener("contextmenu", (e) => {
             e.preventDefault();
-            // Select row if not already selected
+            // Selection-on-context-click semantics:
+            //   - If the right-clicked row is already selected → keep the
+            //     existing selection (single or multi). The menu acts on
+            //     whatever is selected.
+            //   - If it's NOT selected and we're in multi-select mode →
+            //     ADD this row to the selection (don't clear). Long-press
+            //     to open a context menu used to wipe the multi-select set,
+            //     which was the user-reported "annoying" behavior.
+            //   - If it's NOT selected and we're NOT in multi-select →
+            //     single-select this row (replace prior selection).
+            const body = row.parentElement;
+            const inMulti = !!body?.classList.contains("multi-select-on");
             if (!row.classList.contains("selected")) {
-                clearSelection();
-                row.classList.add("selected");
-                lastClickedRow = row;
-                focusMessage(msgAccountId, msg);
+                if (inMulti) {
+                    row.classList.add("selected");
+                    lastClickedRow = row;
+                }
+                else {
+                    clearSelection();
+                    row.classList.add("selected");
+                    lastClickedRow = row;
+                    focusMessage(msgAccountId, msg);
+                }
             }
             const isSeen = msg.flags.includes("\\Seen");
             const isFlagged = msg.flags.includes("\\Flagged");

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.434",
+  "version": "1.0.436",
   "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

@@ -11,10 +11,23 @@ export declare class MailxService {
     private imapManager;
     private _accountsCache;
     constructor(db: MailxDB, imapManager: ImapManager);
-    /** Read contacts.jsonc from cloud + apply preferred/denylist to the DB.
-     *  No-op if the file is missing or empty. */
+    private _contactsFlushTimer;
+    private _contactsFlushInFlight;
+    private readonly CONTACTS_FLUSH_DEBOUNCE_MS;
+    /** Schedule a debounced flush of the local contacts state to GDrive.
+     *  Multiple changes within the debounce window collapse to one write. */
+    markContactsDirty(): void;
+    /** Write current DB contacts state to GDrive contacts.jsonc. Called via
+     *  the debounced timer; also exposed for force-flush on shutdown or
+     *  after a manual seed. Idempotent — safe to call multiple times. */
+    flushContactsConfig(): Promise<void>;
+    /** Read contacts.jsonc from cloud + apply (preferred + denylist + discovered)
+     *  into the DB. On first run with no file, seed from message corpus and
+     *  write a fresh contacts.jsonc to GDrive — that auto-bootstrap is what
+     *  makes a new device useful immediately on a shared GDrive setup. */
     loadContactsConfig(): Promise<{
         preferred: number;
+        discovered: number;
         purged: number;
         conflicts: string[];
     } | null>;
@@ -239,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

@@ -116,21 +116,76 @@ export class MailxService {
                 this.loadContactsConfig().catch(e => console.error(`  [contacts] reload failed: ${e?.message || e}`));
             }
         });
+        // Wire DB → cloud flush. Debounced to absorb bursts (a sync run can
+        // call recordSentAddress hundreds of times). 30s flush window is
+        // long enough that the steady state is one cloud write per sync,
+        // short enough that quitting after a single send still flushes.
+        this.db.setOnContactsChanged(() => this.markContactsDirty());
         // Initial load of contacts.jsonc — fire-and-forget; missing file is fine.
         this.loadContactsConfig().catch(() => { });
     }
-    /** Read contacts.jsonc from cloud + apply preferred/denylist to the DB.
-     *  No-op if the file is missing or empty. */
+    _contactsFlushTimer = null;
+    _contactsFlushInFlight = false;
+    CONTACTS_FLUSH_DEBOUNCE_MS = 30_000;
+    /** Schedule a debounced flush of the local contacts state to GDrive.
+     *  Multiple changes within the debounce window collapse to one write. */
+    markContactsDirty() {
+        if (this._contactsFlushTimer)
+            clearTimeout(this._contactsFlushTimer);
+        this._contactsFlushTimer = setTimeout(() => {
+            this._contactsFlushTimer = null;
+            this.flushContactsConfig().catch(e => console.error(`  [contacts] flush failed: ${e?.message || e}`));
+        }, this.CONTACTS_FLUSH_DEBOUNCE_MS);
+    }
+    /** Write current DB contacts state to GDrive contacts.jsonc. Called via
+     *  the debounced timer; also exposed for force-flush on shutdown or
+     *  after a manual seed. Idempotent — safe to call multiple times. */
+    async flushContactsConfig() {
+        if (this._contactsFlushInFlight)
+            return;
+        this._contactsFlushInFlight = true;
+        try {
+            const cfg = this.db.exportContactsConfig();
+            const { cloudWrite } = await import("@bobfrankston/mailx-settings");
+            await cloudWrite("contacts.jsonc", JSON.stringify(cfg, null, 2));
+            console.log(`  [contacts] flushed to cloud: ${cfg.preferred.length} preferred + ${cfg.discovered.length} discovered + ${cfg.denylist.length} denylisted`);
+        }
+        finally {
+            this._contactsFlushInFlight = false;
+        }
+    }
+    /** Read contacts.jsonc from cloud + apply (preferred + denylist + discovered)
+     *  into the DB. On first run with no file, seed from message corpus and
+     *  write a fresh contacts.jsonc to GDrive — that auto-bootstrap is what
+     *  makes a new device useful immediately on a shared GDrive setup. */
     async loadContactsConfig() {
         let raw = null;
+        let cloudAvailable = false;
         try {
             const { cloudRead } = await import("@bobfrankston/mailx-settings");
             raw = await cloudRead("contacts.jsonc");
+            cloudAvailable = true;
         }
-        catch { /* cloud unavailable — leave config empty */ }
+        catch { /* cloud unavailable */ }
         if (!raw) {
-            // No file yet. Make sure the in-memory denylist is empty.
-            this.db.applyContactsConfig({ preferred: [], denylist: [] });
+            // No file (yet). Reset in-memory denylist and seed discovered
+            // from the local message corpus so autocomplete works immediately.
+            this.db.applyContactsConfig({ preferred: [], denylist: [], discovered: [] });
+            try {
+                this.db.seedContactsFromMessages();
+            }
+            catch { /* corpus may be empty */ }
+            // Auto-bootstrap GDrive copy if cloud is reachable. The file gets
+            // a header comment so a user opening it on Drive sees what it is.
+            if (cloudAvailable) {
+                try {
+                    await this.flushContactsConfig();
+                    console.log("  [contacts] auto-seeded contacts.jsonc on GDrive from local corpus");
+                }
+                catch (e) {
+                    console.error(`  [contacts] auto-seed flush failed: ${e?.message || e}`);
+                }
+            }
             return null;
         }
         const { parse: parseJsonc } = await import("jsonc-parser");
@@ -138,10 +193,18 @@ export class MailxService {
         const cfg = parseJsonc(raw, errors, { allowTrailingComma: true });
         if (errors.length) {
             console.error(`  [contacts] contacts.jsonc has parse errors — applying empty config: ${errors.map((e) => e.error).join(", ")}`);
-            this.db.applyContactsConfig({ preferred: [], denylist: [] });
+            this.db.applyContactsConfig({ preferred: [], denylist: [], discovered: [] });
             return null;
         }
-        return this.db.applyContactsConfig(cfg || {});
+        const result = this.db.applyContactsConfig(cfg || {});
+        // Run local seeder in case this device has corpus addresses the cloud
+        // copy doesn't know about yet. The seeder will fire notifyContactsChanged
+        // if it adds anything, which schedules a flush back to GDrive.
+        try {
+            this.db.seedContactsFromMessages();
+        }
+        catch { /* corpus may be empty */ }
+        return result;
     }
     /** Append an entry to contacts.jsonc#preferred[] and write back to cloud,
      *  then re-apply. Mutates the file in place — preserves existing entries
@@ -1699,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.d.ts

@@ -201,6 +201,14 @@ export declare class MailxDB {
     private _denylist;
     isAddressDenylisted(emailLower: string): boolean;
     setContactsDenylist(emails: string[]): void;
+    /** Callback fired when local-DB contacts mutations happen (sends adding
+     *  to discovered, corpus seeder finding new addresses). The service
+     *  registers a debounced cloud flush here so the GDrive copy stays in
+     *  sync. NOT fired from applyContactsConfig — that's the inbound path
+     *  and would create a write loop. */
+    private _onContactsChanged?;
+    setOnContactsChanged(cb: () => void): void;
+    private notifyContactsChanged;
     /** Seed `discovered`-tier contacts from every address that appears in
      *  any cached message — From / To / Cc / Bcc across all folders. One row
      *  per email; first non-empty name observed wins. Sent-folder rows skip
@@ -213,10 +221,15 @@ export declare class MailxDB {
      *  source. Recency-weighted use_count differentiates within the tier. */
     seedContactsFromMessages(): number;
     /** Apply the contents of contacts.jsonc — replaces all preferred-tier rows
-     *  with the entries in `preferred[]`, sets the in-memory denylist, and
-     *  purges any discovered rows whose email is now denylisted. Preferred
-     *  rows are *not* auto-purged on denylist hit — if the user explicitly
-     *  added them they win that conflict; we just log a warning. */
+     *  with the entries in `preferred[]`, merges `discovered[]` into the local
+     *  cache, sets the in-memory denylist, and purges any discovered rows
+     *  whose email is now denylisted. Preferred rows are *not* auto-purged on
+     *  denylist hit — if the user explicitly added them they win that
+     *  conflict; we just log a warning.
+     *
+     *  Discovered rows from the file are MERGED with whatever the local
+     *  message-corpus seeder has produced. Each device contributes its
+     *  observed addresses; over time GDrive accumulates the union. */
     applyContactsConfig(cfg: {
         preferred?: {
             name?: string;
@@ -226,11 +239,38 @@ export declare class MailxDB {
             org?: string;
         }[];
         denylist?: string[];
+        discovered?: {
+            name?: string;
+            email: string;
+            useCount?: number;
+            lastUsed?: number;
+        }[];
     }): {
         preferred: number;
+        discovered: number;
         purged: number;
         conflicts: string[];
     };
+    /** Build the contacts.jsonc shape from current DB state — for round-trip
+     *  to GDrive. Preferred-tier rows come from anything not in the reserved
+     *  system sources; discovered comes from `source='discovered'` rows;
+     *  denylist comes from the in-memory set (set by applyContactsConfig).
+     *  Caller is responsible for actually writing the cloud copy. */
+    exportContactsConfig(): {
+        preferred: {
+            name: string;
+            email: string;
+            source: string;
+            organization?: string;
+        }[];
+        denylist: string[];
+        discovered: {
+            name: string;
+            email: string;
+            useCount: number;
+            lastUsed: number;
+        }[];
+    };
     /** Search contacts by name or email prefix.
      *
      *  Source-tier bonus is what makes the curated address book win against

package/packages/mailx-store/db.js

@@ -1157,6 +1157,7 @@ export class MailxDB {
         else {
             this.db.prepare("INSERT INTO contacts (source, name, email, last_used, use_count, updated_at) VALUES ('discovered', ?, ?, ?, 1, ?)").run(name || "", email, now, now);
         }
+        this.notifyContactsChanged();
     }
     /** True if `email` (lowercased) appears in the active denylist. Cached
      *  in-memory; refreshed on contacts.jsonc reload via setContactsDenylist. */
@@ -1167,6 +1168,21 @@ export class MailxDB {
     setContactsDenylist(emails) {
         this._denylist = new Set(emails.map(e => (e || "").trim().toLowerCase()).filter(Boolean));
     }
+    /** Callback fired when local-DB contacts mutations happen (sends adding
+     *  to discovered, corpus seeder finding new addresses). The service
+     *  registers a debounced cloud flush here so the GDrive copy stays in
+     *  sync. NOT fired from applyContactsConfig — that's the inbound path
+     *  and would create a write loop. */
+    _onContactsChanged;
+    setOnContactsChanged(cb) {
+        this._onContactsChanged = cb;
+    }
+    notifyContactsChanged() {
+        try {
+            this._onContactsChanged?.();
+        }
+        catch { /* ignore */ }
+    }
     /** Seed `discovered`-tier contacts from every address that appears in
      *  any cached message — From / To / Cc / Bcc across all folders. One row
      *  per email; first non-empty name observed wins. Sent-folder rows skip
@@ -1275,17 +1291,24 @@ export class MailxDB {
         }
         if (added > 0 || bumped > 0) {
             console.log(`  [contacts] seed: ${added} new + ${bumped} refreshed (discovered)`);
+            this.notifyContactsChanged();
         }
         return added;
     }
     /** Apply the contents of contacts.jsonc — replaces all preferred-tier rows
-     *  with the entries in `preferred[]`, sets the in-memory denylist, and
-     *  purges any discovered rows whose email is now denylisted. Preferred
-     *  rows are *not* auto-purged on denylist hit — if the user explicitly
-     *  added them they win that conflict; we just log a warning. */
+     *  with the entries in `preferred[]`, merges `discovered[]` into the local
+     *  cache, sets the in-memory denylist, and purges any discovered rows
+     *  whose email is now denylisted. Preferred rows are *not* auto-purged on
+     *  denylist hit — if the user explicitly added them they win that
+     *  conflict; we just log a warning.
+     *
+     *  Discovered rows from the file are MERGED with whatever the local
+     *  message-corpus seeder has produced. Each device contributes its
+     *  observed addresses; over time GDrive accumulates the union. */
     applyContactsConfig(cfg) {
         const preferred = Array.isArray(cfg.preferred) ? cfg.preferred : [];
         const denylist = Array.isArray(cfg.denylist) ? cfg.denylist : [];
+        const discovered = Array.isArray(cfg.discovered) ? cfg.discovered : [];
         this.setContactsDenylist(denylist);
         // Wipe and rewrite preferred-tier rows owned by contacts.jsonc.
         // The address-book UI's legacy `upsertContact` still writes
@@ -1319,6 +1342,39 @@ export class MailxDB {
             }
             catch { /* dup row, skip */ }
         }
+        // Merge discovered[] from cloud into local cache. For each entry:
+        // existing row wins on use_count (max), name fills if empty, lastUsed
+        // is max. Missing rows are inserted. Denylisted entries skipped.
+        const insDiscovered = this.db.prepare("INSERT INTO contacts (source, name, email, last_used, use_count, updated_at) VALUES ('discovered', ?, ?, ?, ?, ?)");
+        const updDiscovered = this.db.prepare(`UPDATE contacts SET use_count = max(use_count, ?),
+                                 last_used = max(last_used, ?),
+                                 name = CASE WHEN name = '' AND ? != '' THEN ? ELSE name END,
+                                 updated_at = ?
+             WHERE id = ?`);
+        let discoveredAdded = 0;
+        for (const entry of discovered) {
+            if (!entry)
+                continue;
+            const email = (entry.email || "").trim();
+            if (!email || !VALID.test(email))
+                continue;
+            const lower = email.toLowerCase();
+            if (denySet.has(lower))
+                continue;
+            if (isJunkContact(lower, entry.name || ""))
+                continue;
+            const name = (entry.name || "").trim();
+            const useCount = Math.max(0, entry.useCount || 0);
+            const lastUsed = Math.max(0, entry.lastUsed || 0);
+            const existing = this.db.prepare("SELECT id FROM contacts WHERE source = 'discovered' AND lower(email) = ?").get(lower);
+            if (!existing) {
+                insDiscovered.run(name, email, lastUsed, useCount, now);
+                discoveredAdded++;
+            }
+            else {
+                updDiscovered.run(useCount, lastUsed, name, name, now, existing.id);
+            }
+        }
         // Purge discovered rows for any denylisted email.
         const purge = this.db.prepare("DELETE FROM contacts WHERE source = 'discovered' AND lower(email) = ?");
         let purged = 0;
@@ -1329,8 +1385,38 @@ export class MailxDB {
         if (conflicts.length > 0) {
             console.warn(`  [contacts] config: ${conflicts.length} preferred entries also appear in denylist — denylist wins, entries skipped: ${conflicts.join(", ")}`);
         }
-        console.log(`  [contacts] config applied: ${inserted} preferred row(s), ${denySet.size} denylisted, ${purged} discovered row(s) purged`);
-        return { preferred: inserted, purged, conflicts };
+        console.log(`  [contacts] config applied: ${inserted} preferred + ${discoveredAdded} discovered row(s), ${denySet.size} denylisted, ${purged} discovered row(s) purged`);
+        return { preferred: inserted, discovered: discoveredAdded, purged, conflicts };
+    }
+    /** Build the contacts.jsonc shape from current DB state — for round-trip
+     *  to GDrive. Preferred-tier rows come from anything not in the reserved
+     *  system sources; discovered comes from `source='discovered'` rows;
+     *  denylist comes from the in-memory set (set by applyContactsConfig).
+     *  Caller is responsible for actually writing the cloud copy. */
+    exportContactsConfig() {
+        const preferredRows = this.db.prepare(`SELECT name, email, source, organization
+             FROM contacts
+             WHERE source NOT IN ('google', 'discovered', 'manual')
+             ORDER BY source, lower(email), lower(name)`).all();
+        const discoveredRows = this.db.prepare(`SELECT name, email, use_count, last_used
+             FROM contacts
+             WHERE source = 'discovered'
+             ORDER BY use_count DESC, last_used DESC, lower(email)`).all();
+        return {
+            preferred: preferredRows.map(r => {
+                const out = { name: r.name || "", email: r.email, source: r.source };
+                if (r.organization)
+                    out.organization = r.organization;
+                return out;
+            }),
+            denylist: Array.from(this._denylist),
+            discovered: discoveredRows.map(r => ({
+                name: r.name || "",
+                email: r.email,
+                useCount: r.use_count,
+                lastUsed: r.last_used,
+            })),
+        };
     }
     /** Search contacts by name or email prefix.
      *

package/tdview.cmd

@@ -1 +1,2 @@
-call mdview todo.md -pos 100,100,1 -size 900,1400
+echo call mdview %~dp0todo.md -pos 100,100,1 -size 900,1400
+call mdview %~dp0todo.md -pos 100,100,1 -size 900,1400

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