@bobfrankston/mailx 1.0.382 → 1.0.384

package/client/app.js

@@ -971,6 +971,36 @@ async function refreshSpamButtonVisibility() {
 }
 document.addEventListener("mailx-message-shown", refreshSpamButtonVisibility);
 document.addEventListener("mailx-folder-changed", refreshSpamButtonVisibility);
+// Q100 placeholder — append a row to ~/.mailx/spam.csv for later analysis.
+// No folder move, no flag change, no auto-delete. Button is always visible
+// (no configuration required; unlike btn-spam which needs a junk folder).
+document.getElementById("btn-spam-report")?.addEventListener("click", async () => {
+    const current = getCurrentMessage();
+    const msg = current?.message;
+    const accountId = current?.accountId;
+    if (!msg || !accountId)
+        return;
+    const btn = document.getElementById("btn-spam-report");
+    const originalLabel = btn.textContent;
+    btn.disabled = true;
+    btn.textContent = "…";
+    try {
+        const { recordSpamReport } = await import("./lib/api-client.js");
+        await recordSpamReport(accountId, msg.uid, msg.folderId);
+        btn.textContent = "✓";
+        const status = document.getElementById("status-sync");
+        if (status)
+            status.textContent = "Logged to ~/.mailx/spam.csv";
+        setTimeout(() => { btn.textContent = originalLabel; btn.disabled = false; }, 1500);
+    }
+    catch (e) {
+        btn.textContent = "✗";
+        const status = document.getElementById("status-sync");
+        if (status)
+            status.textContent = `Spam log failed: ${e?.message || e}`;
+        setTimeout(() => { btn.textContent = originalLabel; btn.disabled = false; }, 2500);
+    }
+});
 document.getElementById("btn-compose")?.addEventListener("click", () => openCompose("new"));
 document.getElementById("btn-mark-unread")?.addEventListener("click", () => {
     // Toggle \Seen on the currently-selected message. Mirrors the R

package/client/index.html

@@ -35,6 +35,11 @@
             <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>
@@ -133,6 +138,7 @@
                     <button class="tb-btn" id="btn-forward" title="Forward">→</button>
                     <button class="tb-btn" id="btn-delete" title="Delete (Del)">🗑</button>
                     <button class="tb-btn" id="btn-spam" title="Mark as spam — move to configured spam folder" hidden>⚠</button>
+                    <button class="tb-btn" id="btn-spam-report" title="Report as spam (append to ~/.mailx/spam.csv for later analysis)">🚫</button>
                     <button class="tb-btn" id="btn-flag" title="Flag">⚑</button>
                     <button class="tb-btn" id="btn-mark-unread" title="Mark unread (R)">◉</button>
                     <button class="tb-btn" id="mv-view-thread" title="View thread (conversation)" hidden>💬</button>

package/client/lib/api-client.js

@@ -170,6 +170,12 @@ export function deleteTask(uuid) {
 export function drainStoreSync() {
     return ipc().drainStoreSync?.();
 }
+/** Report the currently-viewed message as spam → appends a row to
+ *  `~/.mailx/spam.csv`. Placeholder: no folder move, no flag change, no
+ *  auto-delete. Training data for a smarter pass later. */
+export function recordSpamReport(accountId, uid, folderId) {
+    return ipc().recordSpamReport?.(accountId, uid, folderId);
+}
 export function getOutboxStatus() {
     return ipc().getOutboxStatus();
 }

package/client/lib/mailxapi.js

@@ -122,6 +122,9 @@
         updateTask: function(uuid, patch) { return callNode("updateTask", { uuid: uuid, patch: patch }); },
         deleteTask: function(uuid) { return callNode("deleteTask", { uuid: uuid }); },
         drainStoreSync: function() { return callNode("drainStoreSync"); },
+        recordSpamReport: function(accountId, uid, folderId) {
+            return callNode("recordSpamReport", { accountId: accountId, uid: uid, folderId: folderId });
+        },
         readJsoncFile: function(name) {
             return callNode("readJsoncFile", { name: name });
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.382",
+  "version": "1.0.384",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -39,7 +39,7 @@
     "@bobfrankston/tcp-transport": "^0.1.4",
     "@bobfrankston/node-tcp-transport": "^0.1.4",
     "@bobfrankston/smtp-direct": "^0.1.4",
-    "@bobfrankston/mailx-sync": "^0.1.8"
+    "@bobfrankston/mailx-sync": "^0.1.9"
   },
   "devDependencies": {
     "@types/mailparser": "^3.4.6"
@@ -103,7 +103,7 @@
       "@bobfrankston/tcp-transport": "^0.1.4",
       "@bobfrankston/node-tcp-transport": "^0.1.4",
       "@bobfrankston/smtp-direct": "^0.1.4",
-      "@bobfrankston/mailx-sync": "^0.1.8"
+      "@bobfrankston/mailx-sync": "^0.1.9"
     }
   }
 }

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

@@ -227,6 +227,20 @@ export declare class ImapManager extends EventEmitter {
      *  prefetch session alongside any still in flight, blowing through Gmail's
      *  per-minute quota and racing on disk writes. One prefetch per account. */
     private prefetchingAccounts;
+    /** Per-folder error cooldowns — `accountId:folderPath` → [timestamps].
+     *  Used to skip folders that repeatedly time out (Dovecot on slow shared
+     *  hosting SELECTs big `_Spam` / archive folders at 300s+ latency; the
+     *  prefetch error budget was burning out on a handful of bad folders
+     *  before the INBOX could finish). A folder with 2+ errors in the last
+     *  15 minutes is skipped until the cooldown passes. User-reported via
+     *  log analysis 2026-04-23: bobma prefetch timing out on Added2.organizations,
+     *  Added2.technews, _Spam, "Prefirst.Jerry's Retreat", Added2.zines. */
+    private folderErrorCooldown;
+    private readonly FOLDER_ERROR_WINDOW_MS;
+    private readonly FOLDER_ERROR_THRESHOLD;
+    private shouldSkipFolder;
+    private recordFolderError;
+    private clearFolderErrors;
     private prefetchBodies;
     private _prefetchBodies;
     /** Get the body store for direct access */

package/packages/mailx-imap/index.js

@@ -1925,6 +1925,34 @@ export class ImapManager extends EventEmitter {
      *  prefetch session alongside any still in flight, blowing through Gmail's
      *  per-minute quota and racing on disk writes. One prefetch per account. */
     prefetchingAccounts = new Set();
+    /** Per-folder error cooldowns — `accountId:folderPath` → [timestamps].
+     *  Used to skip folders that repeatedly time out (Dovecot on slow shared
+     *  hosting SELECTs big `_Spam` / archive folders at 300s+ latency; the
+     *  prefetch error budget was burning out on a handful of bad folders
+     *  before the INBOX could finish). A folder with 2+ errors in the last
+     *  15 minutes is skipped until the cooldown passes. User-reported via
+     *  log analysis 2026-04-23: bobma prefetch timing out on Added2.organizations,
+     *  Added2.technews, _Spam, "Prefirst.Jerry's Retreat", Added2.zines. */
+    folderErrorCooldown = new Map();
+    FOLDER_ERROR_WINDOW_MS = 15 * 60_000;
+    FOLDER_ERROR_THRESHOLD = 2;
+    shouldSkipFolder(accountId, folderPath) {
+        const key = `${accountId}:${folderPath}`;
+        const now = Date.now();
+        const errors = (this.folderErrorCooldown.get(key) || [])
+            .filter(t => now - t < this.FOLDER_ERROR_WINDOW_MS);
+        this.folderErrorCooldown.set(key, errors);
+        return errors.length >= this.FOLDER_ERROR_THRESHOLD;
+    }
+    recordFolderError(accountId, folderPath) {
+        const key = `${accountId}:${folderPath}`;
+        const arr = this.folderErrorCooldown.get(key) || [];
+        arr.push(Date.now());
+        this.folderErrorCooldown.set(key, arr);
+    }
+    clearFolderErrors(accountId, folderPath) {
+        this.folderErrorCooldown.delete(`${accountId}:${folderPath}`);
+    }
     async prefetchBodies(accountId) {
         if (this.prefetchingAccounts.has(accountId))
             return;
@@ -2061,10 +2089,26 @@ export class ImapManager extends EventEmitter {
                 let client = null;
                 try {
                     client = await this.createClientWithLimit(accountId);
-                    for (const [folderId, uids] of byFolder) {
+                    // INBOX-first ordering so the folder the user actually looks at
+                    // gets its bodies even if a later folder eats the error budget.
+                    const orderedFolders = Array.from(byFolder.entries()).sort(([aid], [bid]) => {
+                        const af = folders.find(f => f.id === aid);
+                        const bf = folders.find(f => f.id === bid);
+                        const ai = af?.specialUse === "inbox" ? 0 : 1;
+                        const bi = bf?.specialUse === "inbox" ? 0 : 1;
+                        return ai - bi;
+                    });
+                    for (const [folderId, uids] of orderedFolders) {
                         const folder = folders.find(f => f.id === folderId);
                         if (!folder)
                             continue;
+                        // Skip folders that have repeatedly timed out — keeps one
+                        // slow folder from burning the whole error budget and
+                        // starving the folder the user is actually looking at.
+                        if (this.shouldSkipFolder(accountId, folder.path)) {
+                            console.log(`  [prefetch] ${accountId}: skipping ${folder.path} (recent timeouts — cooling down)`);
+                            continue;
+                        }
                         const received = new Set();
                         // onBody fires synchronously as each message streams in from the server.
                         // Disk/DB writes are kicked off fire-and-forget; we await them after the
@@ -2091,10 +2135,13 @@ export class ImapManager extends EventEmitter {
                                 })());
                             });
                             batchSucceeded = true;
+                            // Folder responded — clear its error history.
+                            this.clearFolderErrors(accountId, folder.path);
                         }
                         catch (e) {
                             console.error(`  [prefetch] ${accountId} folder ${folder.path}: batch fetch failed: ${e.message}`);
                             counters.errors++;
+                            this.recordFolderError(accountId, folder.path);
                             if (counters.errors >= ERROR_BUDGET)
                                 break;
                         }

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

@@ -109,6 +109,18 @@ export declare class MailxService {
         targetFolderId: number;
         moved: number;
     }>;
+    /** Append a spam report row to `~/.mailx/spam.csv` — placeholder mechanism
+     *  per user 2026-04-23 ("let's make it smart later; no auto-delete until
+     *  safety issues are addressed"). One row per click. Columns: timestamp
+     *  (ms since epoch), ISO date, ISO time, accountId, Delivered-To, From
+     *  address, Subject, eml file path. CSV fields RFC 4180-quoted so commas
+     *  and quotes in subjects survive. No move, no flag change, no server
+     *  hit — just the log. Useful as training data for a future classifier.
+     */
+    recordSpamReport(accountId: string, uid: number, folderId: number): Promise<{
+        ok: true;
+        row: string;
+    }>;
     undeleteMessage(accountId: string, uid: number, folderId: number): Promise<void>;
     deleteOnServer(accountId: string, folderPath: string, uid: number): Promise<void>;
     createFolder(accountId: string, parentPath: string, name: string): Promise<void>;

package/packages/mailx-service/index.js

@@ -943,6 +943,56 @@ export class MailxService {
         await this.moveMessages(accountId, uids, target.id);
         return { targetFolderId: target.id, moved: uids.length };
     }
+    /** Append a spam report row to `~/.mailx/spam.csv` — placeholder mechanism
+     *  per user 2026-04-23 ("let's make it smart later; no auto-delete until
+     *  safety issues are addressed"). One row per click. Columns: timestamp
+     *  (ms since epoch), ISO date, ISO time, accountId, Delivered-To, From
+     *  address, Subject, eml file path. CSV fields RFC 4180-quoted so commas
+     *  and quotes in subjects survive. No move, no flag change, no server
+     *  hit — just the log. Useful as training data for a future classifier.
+     */
+    async recordSpamReport(accountId, uid, folderId) {
+        const env = this.db.getMessageByUid(accountId, uid, folderId);
+        if (!env)
+            throw new Error(`Message not found: ${accountId}/${uid}`);
+        const bodyPath = env.bodyPath || "";
+        // Prefer `body_path` (authoritative). `Delivered-To` isn't in the
+        // envelope struct, so parse from the cached `.eml` if available.
+        let deliveredTo = "";
+        if (bodyPath) {
+            try {
+                const raw = fs.readFileSync(bodyPath, "utf-8").slice(0, 4096);
+                const m = raw.match(/^Delivered-To:\s*(.+)$/mi);
+                if (m)
+                    deliveredTo = m[1].trim();
+            }
+            catch { /* not fatal — leave blank */ }
+        }
+        const now = new Date();
+        const isoDate = now.toISOString().slice(0, 10);
+        const isoTime = now.toISOString().slice(11, 19);
+        const fromAddr = env.from?.address || "";
+        const subject = env.subject || "";
+        const csvEscape = (s) => `"${String(s).replace(/"/g, '""')}"`;
+        const row = [
+            String(now.getTime()),
+            csvEscape(isoDate),
+            csvEscape(isoTime),
+            csvEscape(accountId),
+            csvEscape(deliveredTo),
+            csvEscape(fromAddr),
+            csvEscape(subject),
+            csvEscape(bodyPath),
+        ].join(",") + "\n";
+        const spamCsvPath = path.join(getConfigDir(), "spam.csv");
+        // Write a header if the file doesn't exist yet so the CSV is self-describing.
+        if (!fs.existsSync(spamCsvPath)) {
+            fs.writeFileSync(spamCsvPath, "timestamp_ms,date,time,account,delivered_to,from,subject,eml_path\n", "utf-8");
+        }
+        fs.appendFileSync(spamCsvPath, row, "utf-8");
+        console.log(`  [spam] reported ${accountId}/${uid} → spam.csv`);
+        return { ok: true, row };
+    }
     async undeleteMessage(accountId, uid, folderId) {
         // Clear the tombstone first so a subsequent sync can re-import if
         // the server still has the row. Messages with no Message-ID just

package/packages/mailx-service/jsonrpc.js

@@ -123,6 +123,8 @@ async function dispatchAction(svc, action, p) {
         case "drainStoreSync":
             await svc.drainStoreSync();
             return { ok: true };
+        case "recordSpamReport":
+            return await svc.recordSpamReport(p.accountId, p.uid, p.folderId);
         case "getOutboxStatus":
             return svc.getOutboxStatus();
         case "listQueuedOutgoing":