@bobfrankston/mailx-store 0.1.46 → 0.1.48

package/db.d.ts

@@ -9,7 +9,13 @@ import type { MessageEnvelope, Folder, EmailAddress, PagedResult, MessageQuery }
 export declare function setContactsDenyPatterns(patterns: string[]): void;
 export declare class MailxDB {
     private db;
-    constructor(dbDir: string);
+    /** True for the DB read-worker's connection. Read-only handles never run
+     *  DDL / migrations / backfills (the main writer already did, before this
+     *  handle opened) and reject any write at the SQLite level. */
+    readonly readOnly: boolean;
+    constructor(dbDir: string, opts?: {
+        readOnly?: boolean;
+    });
     /** Fail loud + early if expected columns are missing. Cheap (PRAGMA only
      *  runs at startup). The user-facing message names the recovery command. */
     private verifySchema;

package/db.js

@@ -403,10 +403,35 @@ const SCHEMA = `
 `;
 export class MailxDB {
     db;
-    constructor(dbDir) {
+    /** True for the DB read-worker's connection. Read-only handles never run
+     *  DDL / migrations / backfills (the main writer already did, before this
+     *  handle opened) and reject any write at the SQLite level. */
+    readOnly;
+    constructor(dbDir, opts = {}) {
         fs.mkdirSync(dbDir, { recursive: true });
         const dbPath = path.join(dbDir, "mailx.db");
+        this.readOnly = !!opts.readOnly;
         this.db = new DatabaseSync(dbPath);
+        if (this.readOnly) {
+            // Read-worker connection (Phase 0 read isolation). The main-thread
+            // MailxDB has ALREADY created the schema and run every migration /
+            // backfill before this worker is spawned, so we must NOT touch any
+            // of that here — two threads racing writes on one WAL file means
+            // SQLITE_BUSY and corruption risk. Strategy:
+            //   • Do NOT pass {readOnly:true} to DatabaseSync. An OS-read-only
+            //     handle on a WAL database can't maintain the -shm wal-index
+            //     and fails to read at all. We open read-WRITE at the OS level
+            //     so WAL reads work, then forbid writes LOGICALLY below.
+            //   • PRAGMA query_only = ON makes every statement on this handle
+            //     read-only — INSERT/UPDATE/DELETE/DDL all throw. That is the
+            //     guard that lets us reuse the full MailxDB read surface here
+            //     without any chance of a stray write.
+            // WAL mode is a persisted property of the file (the writer set it),
+            // so readers see committed snapshots with no journal_mode call.
+            this.db.exec("PRAGMA foreign_keys = ON");
+            this.db.exec("PRAGMA query_only = ON");
+            return;
+        }
         this.db.exec("PRAGMA journal_mode = WAL");
         this.db.exec("PRAGMA foreign_keys = ON");
         this.db.exec(SCHEMA);
@@ -1180,6 +1205,7 @@ export class MailxDB {
             accountId: r.account_id,
             folderId: r.folder_id,
             uid: r.uid,
+            uuid: r.uuid || "", // stable identity for row data-uuid / selection restore
             messageId: r.message_id || "",
             inReplyTo: r.in_reply_to || "",
             references: JSON.parse(r.refs || "[]"),
@@ -1803,17 +1829,24 @@ export class MailxDB {
         // The PARTITION BY collapses duplicates: keep the newest per
         // Message-ID. Empty Message-IDs (rare; non-RFC senders) are
         // grouped by row id so each gets its own bucket.
+        //
+        // Dedup is PER INBOX (account_id is in the partition key), not global.
+        // The same Message-ID delivered to two different accounts' inboxes
+        // (e.g. a list that hits both bob.ma and Gmail) is genuinely two
+        // copies the user expects to see in All Inboxes — collapsing across
+        // accounts hid the second one (Bob 2026-06-12). Within a single inbox,
+        // the to-self N-copies case still collapses as before.
         const total = this.db.prepare(`SELECT COUNT(*) as cnt FROM (
                 SELECT 1
                 FROM messages m
                 JOIN message_folders mf ON mf.message_row_id = m.id
                 WHERE mf.folder_id IN (${placeholders})${flagFilter}
-                GROUP BY CASE WHEN COALESCE(m.message_id, '') = '' THEN 'mid-empty:' || m.id ELSE m.message_id END
+                GROUP BY m.account_id, CASE WHEN COALESCE(m.message_id, '') = '' THEN 'mid-empty:' || m.id ELSE m.message_id END
             )`).get(...folderIds).cnt;
         const rows = this.db.prepare(`WITH ranked AS (
                 SELECT m.id AS m_id, mf.uid AS mf_uid, mf.folder_id AS mf_folder_id,
                     ROW_NUMBER() OVER (
-                        PARTITION BY CASE WHEN COALESCE(m.message_id, '') = '' THEN 'mid-empty:' || m.id ELSE m.message_id END
+                        PARTITION BY m.account_id, CASE WHEN COALESCE(m.message_id, '') = '' THEN 'mid-empty:' || m.id ELSE m.message_id END
                         ORDER BY m.date DESC, m.id DESC
                     ) AS rn
                 FROM messages m
@@ -1866,6 +1899,13 @@ export class MailxDB {
             // Bcc). The unified-inbox UI shows a small ⇆ badge on these
             // rows so the user knows "this is a copy of the same message".
             dupeCount: r.dupeCount | 0,
+            // uuid is the stable local identity each message-list row carries as
+            // data-uuid. Without it, restoreSelection() / rememberPosition() /
+            // the set-diff scroll anchor all match on empty string and fail, so
+            // the selected-row highlight vanishes on every reload (Bob
+            // 2026-06-13: "no highlighting in the summary"). getMessages already
+            // maps uuid; this unified-inbox map dropped it. SELECT m.* exposes it.
+            uuid: r.uuid || "",
         }));
         return { items, total, page, pageSize };
     }
@@ -3125,6 +3165,7 @@ export class MailxDB {
                 folderId: r.folder_id,
                 folderName: r.folder_name || "",
                 uid: r.uid,
+                uuid: r.uuid || "", // stable identity for row data-uuid / selection restore
                 messageId: r.message_id || "",
                 inReplyTo: r.in_reply_to || "",
                 references: JSON.parse(r.refs || "[]"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-store",
-  "version": "0.1.46",
+  "version": "0.1.48",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",