@bobfrankston/rmfmail 1.1.2 → 1.1.3

package/packages/mailx-service/local-store.ts

@@ -17,8 +17,8 @@
  */
 
 import * as fs from "node:fs";
-import { parseSerial } from "@bobfrankston/mailx-store";
-import type { MailxDB, FileMessageStore } from "@bobfrankston/mailx-store";
+import { parseSerial, storeBus } from "@bobfrankston/mailx-store";
+import type { MailxDB, FileMessageStore, StoreBus } from "@bobfrankston/mailx-store";
 import type {
     MessageEnvelope, Message, MessageQuery, PagedResult,
 } from "@bobfrankston/mailx-types";
@@ -138,6 +138,11 @@ export class LocalStore {
     constructor(
         private db: MailxDB,
         private bodyStore: FileMessageStore,
+        /** Event bus for Store mutations. Defaults to the process-singleton
+         *  so cross-package subscribers (bin/mailx.ts forwarder → WebView,
+         *  in-process reconciler triggers) see all writes without explicit
+         *  wiring. Tests can pass a fresh StoreBus for isolation. */
+        public readonly bus: StoreBus = storeBus,
     ) {}
 
     // ── Account list (read-only here; mutations go through MailxService
@@ -157,6 +162,19 @@ export class LocalStore {
         return this.db.getFolders(accountId);
     }
 
+    /** Look up a folder by RFC 6154 specialUse tag (`trash`, `drafts`, `sent`,
+     *  `junk`, etc.) for the given account. Falls back to a case-insensitive
+     *  path match for legacy rows where specialUse never got tagged.
+     *  Returns null when the account has no such folder configured. */
+    findSpecialFolder(accountId: string, specialUse: string): { id: number; path: string } | null {
+        const folders = this.db.getFolders(accountId);
+        const f = folders.find(x =>
+            x.specialUse === specialUse ||
+            x.path.toLowerCase() === specialUse.toLowerCase()
+        );
+        return f ? { id: f.id, path: f.path } : null;
+    }
+
     // ── Message envelopes ──
 
     /** Single envelope by (account, uid, folder). Null when the row isn't
@@ -405,5 +423,131 @@ export class LocalStore {
         return this.db.listContacts(query, page, pageSize);
     }
 
-    // Write paths and sync-queue enqueue methods come in step 3.
+    // ── Write paths (local-only; mirror to server is queued separately) ──
+
+    /** Update a message's flag set. Local DB write completes synchronously;
+     *  the server-mirror enqueue is the caller's responsibility (typically
+     *  via SyncQueue.enqueueFlag) so callers that don't want a server push
+     *  — pure-local UI state like "pin in pane" — can skip it.
+     *
+     *  Publishes:
+     *    `message:<uuid>` { kind: "flagsChanged" }
+     *    `folder:<id>`    (auto fan-out)
+     */
+    updateFlags(accountId: string, uid: number, folderId: number, flags: string[]): void {
+        this.db.updateMessageFlags(accountId, uid, flags);
+        const env: any = this.db.getMessageByUid(accountId, uid, folderId);
+        const msgUuid: string | undefined = env?.uuid;
+        if (msgUuid) {
+            this.bus.publish({
+                topic: `message:${msgUuid}`,
+                kind: "flagsChanged",
+                accountId, folderId, uid, msgUuid, flags,
+            });
+        }
+    }
+
+    /** Move a message between folders in the same account. Adds a tombstone
+     *  on the Message-ID so the next sync doesn't re-import the pre-move row
+     *  in the source folder before the server-side MOVE completes; tombstone
+     *  is cleared on terminal IMAP failure (see processSyncActions).
+     *
+     *  Returns true if a local row existed and was moved, false otherwise.
+     *
+     *  Publishes:
+     *    `message:<uuid>` { kind: "messageMoved", folderId: source, targetFolderId }
+     *    `folder:<source>` and `folder:<target>` (auto fan-out + explicit count)
+     */
+    moveMessage(accountId: string, uid: number, fromFolderId: number, targetFolderId: number): boolean {
+        const env: any = this.db.getMessageByUid(accountId, uid, fromFolderId);
+        if (!env) return false;
+        if (env.messageId) this.db.addTombstone(accountId, env.messageId, env.subject || "");
+        const moved = this.db.moveMessageLocal(accountId, uid, fromFolderId, targetFolderId);
+        if (!moved) return false;
+        this.db.recalcFolderCounts(fromFolderId);
+        this.db.recalcFolderCounts(targetFolderId);
+        const msgUuid: string | undefined = env?.uuid;
+        if (msgUuid) {
+            this.bus.publish({
+                topic: `message:${msgUuid}`,
+                kind: "messageMoved",
+                accountId, folderId: fromFolderId, targetFolderId, uid, msgUuid,
+            });
+        }
+        // Folder count change isn't tied to a specific message uuid — publish
+        // to both folder topics directly. (The fan-out only covers the source
+        // via the message event's folderId; target needs its own publish.)
+        this.bus.publish({
+            topic: `folder:${targetFolderId}`,
+            kind: "folderCountsChanged",
+            accountId, folderId: targetFolderId,
+        });
+        return true;
+    }
+
+    /** Trash a message. If a trash folder is configured and the message is
+     *  not already in it, this is a move-to-trash. If the message is already
+     *  in trash (or no trash exists), it's a hard delete + body unlink.
+     *
+     *  Returns "moved-to-trash" or "expunged" so the caller knows whether
+     *  to enqueue an IMAP MOVE or a DELETE+EXPUNGE on the queue.
+     */
+    trashMessage(accountId: string, uid: number, folderId: number, trashFolderId: number | null): "moved-to-trash" | "expunged" {
+        const env: any = this.db.getMessageByUid(accountId, uid, folderId);
+        if (env?.messageId) this.db.addTombstone(accountId, env.messageId, env.subject || "");
+        const msgUuid: string | undefined = env?.uuid;
+        if (trashFolderId != null && trashFolderId !== folderId) {
+            this.db.moveMessageLocal(accountId, uid, folderId, trashFolderId);
+            this.db.recalcFolderCounts(folderId);
+            this.db.recalcFolderCounts(trashFolderId);
+            if (msgUuid) {
+                this.bus.publish({
+                    topic: `message:${msgUuid}`,
+                    kind: "messageMoved",
+                    accountId, folderId, targetFolderId: trashFolderId, uid, msgUuid,
+                });
+            }
+            this.bus.publish({
+                topic: `folder:${trashFolderId}`,
+                kind: "folderCountsChanged",
+                accountId, folderId: trashFolderId,
+            });
+            return "moved-to-trash";
+        }
+        this.db.deleteMessage(accountId, uid, "user-initiated trash (already in trash → expunge)", "LocalStore.trashMessage");
+        this.db.recalcFolderCounts(folderId);
+        if (msgUuid) {
+            this.bus.publish({
+                topic: `message:${msgUuid}`,
+                kind: "messageRemoved",
+                accountId, folderId, uid, msgUuid,
+            });
+        }
+        return "expunged";
+    }
+
+    /** Restore a message from trash back to its original folder. Local-only;
+     *  caller handles the queue (cancel-pending-MOVE vs queue-counter-MOVE).
+     *  Returns true if a local row was moved. */
+    undeleteMessage(accountId: string, uid: number, trashFolderId: number, originalFolderId: number): boolean {
+        const moved = this.db.moveMessageLocal(accountId, uid, trashFolderId, originalFolderId);
+        if (!moved) return false;
+        this.db.recalcFolderCounts(trashFolderId);
+        this.db.recalcFolderCounts(originalFolderId);
+        const env: any = this.db.getMessageByUid(accountId, uid, originalFolderId);
+        const msgUuid: string | undefined = env?.uuid;
+        if (msgUuid) {
+            this.bus.publish({
+                topic: `message:${msgUuid}`,
+                kind: "messageMoved",
+                accountId, folderId: trashFolderId, targetFolderId: originalFolderId, uid, msgUuid,
+            });
+        }
+        this.bus.publish({
+            topic: `folder:${originalFolderId}`,
+            kind: "folderCountsChanged",
+            accountId, folderId: originalFolderId,
+        });
+        return true;
+    }
 }

package/packages/mailx-service/reconciler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reconciler.d.ts","sourceRoot":"","sources":["reconciler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,WAAW,iBAAiB;IAC9B;;sDAEkD;IAClD,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,qEAAqE;IACrE,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,wDAAwD;IACxD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;8DAC0D;IAC1D,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;0EACsE;IACtE,6BAA6B,CAAC,EAAE,MAAM,CAAC;IACvC,mEAAmE;IACnE,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC;yCACqC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACnC;AAYD,qBAAa,UAAU;IAcf,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,KAAK;IAfjB,OAAO,CAAC,IAAI,CAA8B;IAC1C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,WAAW,CAA+C;IAClE,OAAO,CAAC,aAAa,CAA+C;IACpE,OAAO,CAAC,cAAc,CAA+C;IACrE,OAAO,CAAC,eAAe,CAAK;IAC5B;;;wEAGoE;IACpE,OAAO,CAAC,UAAU,CAAgE;gBAGtE,EAAE,EAAE,OAAO,EACX,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,SAAS,EACxB,IAAI,GAAE,iBAAsB;IAKhC,KAAK,IAAI,IAAI;IAyCb,IAAI,IAAI,IAAI;IAOZ;oDACgD;IAChD,OAAO,CAAC,iBAAiB;IAMzB;;;gDAG4C;IAC5C,OAAO,CAAC,eAAe;IAcvB;oEACgE;IAChE,OAAO,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAOjC;;2DAEuD;IACvD,OAAO,CAAC,eAAe;IAkEvB,yEAAyE;IACzE,IAAI,IAAI,IAAI;CAGf"}
+{"version":3,"file":"reconciler.d.ts","sourceRoot":"","sources":["reconciler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,WAAW,iBAAiB;IAC9B;;sDAEkD;IAClD,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,qEAAqE;IACrE,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,wDAAwD;IACxD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;8DAC0D;IAC1D,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;0EACsE;IACtE,6BAA6B,CAAC,EAAE,MAAM,CAAC;IACvC,mEAAmE;IACnE,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC;yCACqC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACnC;AAYD,qBAAa,UAAU;IAcf,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,KAAK;IAfjB,OAAO,CAAC,IAAI,CAA8B;IAC1C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,WAAW,CAA+C;IAClE,OAAO,CAAC,aAAa,CAA+C;IACpE,OAAO,CAAC,cAAc,CAA+C;IACrE,OAAO,CAAC,eAAe,CAAK;IAC5B;;;wEAGoE;IACpE,OAAO,CAAC,UAAU,CAAgE;gBAGtE,EAAE,EAAE,OAAO,EACX,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,SAAS,EACxB,IAAI,GAAE,iBAAsB;IAKhC,KAAK,IAAI,IAAI;IAyCb,IAAI,IAAI,IAAI;IAOZ;oDACgD;IAChD,OAAO,CAAC,iBAAiB;IAMzB;;;gDAG4C;IAC5C,OAAO,CAAC,eAAe;IAcvB;oEACgE;IAChE,OAAO,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAOjC;;2DAEuD;IACvD,OAAO,CAAC,eAAe;IAqFvB,yEAAyE;IACzE,IAAI,IAAI,IAAI;CAGf"}

package/packages/mailx-service/reconciler.js

@@ -27,6 +27,7 @@
  *
  * Part of docs/local-first-plan.md (step 4).
  */
+import { storeBus } from "@bobfrankston/mailx-store";
 const DEFAULTS = {
     bodyFetchConcurrency: 2,
     statusEmitIntervalMs: 5_000,
@@ -156,8 +157,15 @@ export class Reconciler {
                 try {
                     const raw = await this.imapManager.fetchMessageBody(next.accountId, next.folderId, next.uid);
                     if (raw) {
-                        this.imapManager.emit("bodyAvailable", {
-                            accountId: next.accountId, folderId: next.folderId, uid: next.uid,
+                        // Look up uuid for the message topic; the body has just
+                        // landed, so the DB row's body_path was updated by
+                        // fetchMessageBody and the envelope is fresh.
+                        const env = this.db.getMessageByUid(next.accountId, next.uid, next.folderId);
+                        const msgUuid = env?.uuid;
+                        storeBus.publish({
+                            topic: msgUuid ? `message:${msgUuid}` : `folder:${next.folderId}`,
+                            kind: "bodyAvailable",
+                            accountId: next.accountId, folderId: next.folderId, uid: next.uid, msgUuid,
                         });
                     }
                     else {
@@ -170,8 +178,12 @@ export class Reconciler {
                         // (non-transient) bodyFetchError so the message-
                         // viewer's listener can show a clear failure banner
                         // instead of a silent permanent blank.
-                        this.imapManager.emit("bodyFetchError", {
-                            accountId: next.accountId, folderId: next.folderId, uid: next.uid,
+                        const env = this.db.getMessageByUid(next.accountId, next.uid, next.folderId);
+                        const msgUuid = env?.uuid;
+                        storeBus.publish({
+                            topic: msgUuid ? `message:${msgUuid}` : `folder:${next.folderId}`,
+                            kind: "bodyFetchError",
+                            accountId: next.accountId, folderId: next.folderId, uid: next.uid, msgUuid,
                             error: "body fetch returned no content (message too large for the API or stub)",
                             transient: false,
                         });
@@ -180,10 +192,14 @@ export class Reconciler {
                 catch (err) {
                     if (err?.isNotFound) {
                         try {
+                            const env = this.db.getMessageByUid(next.accountId, next.uid, next.folderId);
+                            const msgUuid = env?.uuid;
                             this.db.deleteMessage(next.accountId, next.uid);
                             this.db.recalcFolderCounts(next.folderId);
-                            this.imapManager.emit("messageRemoved", {
-                                accountId: next.accountId, folderId: next.folderId, uid: next.uid,
+                            storeBus.publish({
+                                topic: msgUuid ? `message:${msgUuid}` : `folder:${next.folderId}`,
+                                kind: "messageRemoved",
+                                accountId: next.accountId, folderId: next.folderId, uid: next.uid, msgUuid,
                             });
                         }
                         catch { /* */ }
@@ -203,8 +219,12 @@ export class Reconciler {
                             setTimeout(() => this.pumpBodyFetches(), backoffMs);
                         }
                         else {
-                            this.imapManager.emit("bodyFetchError", {
-                                accountId: next.accountId, folderId: next.folderId, uid: next.uid,
+                            const env = this.db.getMessageByUid(next.accountId, next.uid, next.folderId);
+                            const msgUuid = env?.uuid;
+                            storeBus.publish({
+                                topic: msgUuid ? `message:${msgUuid}` : `folder:${next.folderId}`,
+                                kind: "bodyFetchError",
+                                accountId: next.accountId, folderId: next.folderId, uid: next.uid, msgUuid,
                                 error: msg, transient,
                             });
                         }

package/packages/mailx-service/reconciler.js.map

@@ -1 +1 @@
-{"version":3,"file":"reconciler.js","sourceRoot":"","sources":["reconciler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reconciler.js","sourceRoot":"","sources":["reconciler.ts"],"names":[],"mappings":"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"}

package/packages/mailx-service/reconciler.ts

@@ -30,6 +30,7 @@
 
 import type { ImapManager } from "@bobfrankston/mailx-imap";
 import type { MailxDB } from "@bobfrankston/mailx-store";
+import { storeBus } from "@bobfrankston/mailx-store";
 import type { SyncQueue } from "./sync-queue.js";
 
 export interface ReconcilerOptions {
@@ -182,8 +183,15 @@ export class Reconciler {
                 try {
                     const raw = await this.imapManager.fetchMessageBody(next.accountId, next.folderId, next.uid);
                     if (raw) {
-                        this.imapManager.emit("bodyAvailable", {
-                            accountId: next.accountId, folderId: next.folderId, uid: next.uid,
+                        // Look up uuid for the message topic; the body has just
+                        // landed, so the DB row's body_path was updated by
+                        // fetchMessageBody and the envelope is fresh.
+                        const env: any = this.db.getMessageByUid(next.accountId, next.uid, next.folderId);
+                        const msgUuid: string | undefined = env?.uuid;
+                        storeBus.publish({
+                            topic: msgUuid ? `message:${msgUuid}` : `folder:${next.folderId}`,
+                            kind: "bodyAvailable",
+                            accountId: next.accountId, folderId: next.folderId, uid: next.uid, msgUuid,
                         });
                     } else {
                         // fetchMessageBody returned null without throwing.
@@ -195,8 +203,12 @@ export class Reconciler {
                         // (non-transient) bodyFetchError so the message-
                         // viewer's listener can show a clear failure banner
                         // instead of a silent permanent blank.
-                        this.imapManager.emit("bodyFetchError", {
-                            accountId: next.accountId, folderId: next.folderId, uid: next.uid,
+                        const env: any = this.db.getMessageByUid(next.accountId, next.uid, next.folderId);
+                        const msgUuid: string | undefined = env?.uuid;
+                        storeBus.publish({
+                            topic: msgUuid ? `message:${msgUuid}` : `folder:${next.folderId}`,
+                            kind: "bodyFetchError",
+                            accountId: next.accountId, folderId: next.folderId, uid: next.uid, msgUuid,
                             error: "body fetch returned no content (message too large for the API or stub)",
                             transient: false,
                         });
@@ -204,10 +216,14 @@ export class Reconciler {
                 } catch (err: any) {
                     if (err?.isNotFound) {
                         try {
+                            const env: any = this.db.getMessageByUid(next.accountId, next.uid, next.folderId);
+                            const msgUuid: string | undefined = env?.uuid;
                             this.db.deleteMessage(next.accountId, next.uid);
                             this.db.recalcFolderCounts(next.folderId);
-                            this.imapManager.emit("messageRemoved", {
-                                accountId: next.accountId, folderId: next.folderId, uid: next.uid,
+                            storeBus.publish({
+                                topic: msgUuid ? `message:${msgUuid}` : `folder:${next.folderId}`,
+                                kind: "messageRemoved",
+                                accountId: next.accountId, folderId: next.folderId, uid: next.uid, msgUuid,
                             });
                         } catch { /* */ }
                     } else {
@@ -224,8 +240,12 @@ export class Reconciler {
                             const backoffMs = 500 * Math.pow(2, next.attempts);
                             setTimeout(() => this.pumpBodyFetches(), backoffMs);
                         } else {
-                            this.imapManager.emit("bodyFetchError", {
-                                accountId: next.accountId, folderId: next.folderId, uid: next.uid,
+                            const env: any = this.db.getMessageByUid(next.accountId, next.uid, next.folderId);
+                            const msgUuid: string | undefined = env?.uuid;
+                            storeBus.publish({
+                                topic: msgUuid ? `message:${msgUuid}` : `folder:${next.folderId}`,
+                                kind: "bodyFetchError",
+                                accountId: next.accountId, folderId: next.folderId, uid: next.uid, msgUuid,
                                 error: msg, transient,
                             });
                         }

package/packages/mailx-service/sync-queue.d.ts

@@ -37,7 +37,15 @@ export declare class SyncQueue {
     private db;
     private imapManager;
     private bodyFetches;
+    /** Per-account debounce timers. Multiple rapid enqueues (3 flag toggles,
+     *  bulk move/delete) coalesce into one processSyncActions drain after
+     *  DRAIN_DEBOUNCE_MS. Was previously in ImapManager.debounceSyncActions;
+     *  moved here because the queue surface is now the source of truth for
+     *  "what needs draining" and it's where the rate limit belongs. */
+    private drainTimers;
+    private static readonly DRAIN_DEBOUNCE_MS;
     constructor(db: MailxDB, imapManager: ImapManager);
+    private scheduleDrain;
     /** Queue a server-side move. The local rows have already been moved in
      *  the DB; the mirror reaches the server on the next reconciler pass. */
     enqueueMove(accountId: string, uid: number, fromFolderId: number, toFolderId: number): void;
@@ -45,6 +53,14 @@ export declare class SyncQueue {
     enqueueFlag(accountId: string, uid: number, folderId: number, flags: string[]): void;
     /** Queue a server-side delete (or trash, depending on action). */
     enqueueDelete(accountId: string, uid: number, folderId: number, kind?: "delete" | "trash"): void;
+    /** Cancel a pending MOVE action if it hasn't drained yet. Returns true
+     *  when an action was found and marked complete (effectively retracted),
+     *  false when no matching action exists — caller then queues a
+     *  counter-move (the server already saw the original move).
+     *
+     *  Used by undelete: if the to-trash MOVE is still queued, retract it
+     *  rather than queue a redundant trash→original. */
+    cancelPendingMove(accountId: string, uid: number, fromFolderId: number, targetFolderId: number): boolean;
     /** Queue an IMAP APPEND of a draft body. Drafts already have crash
      *  recovery via the editing/.eml on disk, so this lane is in-memory
      *  fire-and-forget for now — the architectural value is centralizing

package/packages/mailx-service/sync-queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync-queue.d.ts","sourceRoot":"","sources":["sync-queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,MAAM,IAAI,GAAG,aAAa,GAAG,MAAM,GAAG,UAAU,GAAG,UAAU,CAAC;AAEpE;;;sDAGsD;AACtD,UAAU,YAAY;IAAG,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE;AAEzG,qBAAa,SAAS;IAId,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,WAAW;IAJvB,OAAO,CAAC,WAAW,CAAmC;gBAG1C,EAAE,EAAE,OAAO,EACX,WAAW,EAAE,WAAW;IAKpC;6EACyE;IACzE,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAK3F,0EAA0E;IAC1E,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAKpF,kEAAkE;IAClE,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,GAAE,QAAQ,GAAG,OAAkB,GAAG,IAAI;IAK1G;;;;;6DAKyD;IACzD,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAO1G;;2DAEuD;IACvD,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAMxD;;;4DAGwD;IACxD,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,IAAoB,GAAG,IAAI;IAYpG;;;qEAGiE;IACjE,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,WAAW,SAAI,GAAG,OAAO;IAQ7D;2EACuE;IACvE,aAAa,CAAC,OAAO,GAAE,IAAiB,GAAG,YAAY,GAAG,IAAI;IAY9D,4DAA4D;IAC5D,YAAY,IAAI;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE;CAMlE"}
+{"version":3,"file":"sync-queue.d.ts","sourceRoot":"","sources":["sync-queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,MAAM,IAAI,GAAG,aAAa,GAAG,MAAM,GAAG,UAAU,GAAG,UAAU,CAAC;AAEpE;;;sDAGsD;AACtD,UAAU,YAAY;IAAG,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE;AAEzG,qBAAa,SAAS;IAWd,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,WAAW;IAXvB,OAAO,CAAC,WAAW,CAAmC;IACtD;;;;uEAImE;IACnE,OAAO,CAAC,WAAW,CAAoD;IACvE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAQ;gBAGrC,EAAE,EAAE,OAAO,EACX,WAAW,EAAE,WAAW;IAGpC,OAAO,CAAC,aAAa;IAWrB;6EACyE;IACzE,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAK3F,0EAA0E;IAC1E,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAKpF,kEAAkE;IAClE,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,GAAE,QAAQ,GAAG,OAAkB,GAAG,IAAI;IAK1G;;;;;;wDAMoD;IACpD,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO;IAOxG;;;;;6DAKyD;IACzD,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAO1G;;2DAEuD;IACvD,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAMxD;;;4DAGwD;IACxD,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,IAAoB,GAAG,IAAI;IAYpG;;;qEAGiE;IACjE,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,WAAW,SAAI,GAAG,OAAO;IAQ7D;2EACuE;IACvE,aAAa,CAAC,OAAO,GAAE,IAAiB,GAAG,YAAY,GAAG,IAAI;IAY9D,4DAA4D;IAC5D,YAAY,IAAI;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE;CAMlE"}

package/packages/mailx-service/sync-queue.js

@@ -23,26 +23,56 @@ export class SyncQueue {
     db;
     imapManager;
     bodyFetches = new Map();
+    /** Per-account debounce timers. Multiple rapid enqueues (3 flag toggles,
+     *  bulk move/delete) coalesce into one processSyncActions drain after
+     *  DRAIN_DEBOUNCE_MS. Was previously in ImapManager.debounceSyncActions;
+     *  moved here because the queue surface is now the source of truth for
+     *  "what needs draining" and it's where the rate limit belongs. */
+    drainTimers = new Map();
+    static DRAIN_DEBOUNCE_MS = 1000;
     constructor(db, imapManager) {
         this.db = db;
         this.imapManager = imapManager;
     }
+    scheduleDrain(accountId) {
+        const existing = this.drainTimers.get(accountId);
+        if (existing)
+            clearTimeout(existing);
+        this.drainTimers.set(accountId, setTimeout(() => {
+            this.drainTimers.delete(accountId);
+            this.imapManager.processSyncActions(accountId).catch(() => { });
+        }, SyncQueue.DRAIN_DEBOUNCE_MS));
+    }
     // ── Message-mirror enqueues (commit local DB row first; then call here) ──
     /** Queue a server-side move. The local rows have already been moved in
      *  the DB; the mirror reaches the server on the next reconciler pass. */
     enqueueMove(accountId, uid, fromFolderId, toFolderId) {
         this.db.queueSyncAction(accountId, "move", uid, fromFolderId, { targetFolderId: toFolderId });
-        this.imapManager.processSyncActions(accountId).catch(() => { });
+        this.scheduleDrain(accountId);
     }
     /** Queue a server-side flag update (\Seen, \Flagged, \Answered, etc.). */
     enqueueFlag(accountId, uid, folderId, flags) {
         this.db.queueSyncAction(accountId, "flags", uid, folderId, { flags });
-        this.imapManager.processSyncActions(accountId).catch(() => { });
+        this.scheduleDrain(accountId);
     }
     /** Queue a server-side delete (or trash, depending on action). */
     enqueueDelete(accountId, uid, folderId, kind = "delete") {
         this.db.queueSyncAction(accountId, kind, uid, folderId, {});
-        this.imapManager.processSyncActions(accountId).catch(() => { });
+        this.scheduleDrain(accountId);
+    }
+    /** Cancel a pending MOVE action if it hasn't drained yet. Returns true
+     *  when an action was found and marked complete (effectively retracted),
+     *  false when no matching action exists — caller then queues a
+     *  counter-move (the server already saw the original move).
+     *
+     *  Used by undelete: if the to-trash MOVE is still queued, retract it
+     *  rather than queue a redundant trash→original. */
+    cancelPendingMove(accountId, uid, fromFolderId, targetFolderId) {
+        const pending = this.db.findPendingSyncAction(accountId, "move", uid, fromFolderId, targetFolderId);
+        if (!pending)
+            return false;
+        this.db.completeSyncAction(pending.id);
+        return true;
     }
     /** Queue an IMAP APPEND of a draft body. Drafts already have crash
      *  recovery via the editing/.eml on disk, so this lane is in-memory

package/packages/mailx-service/sync-queue.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync-queue.js","sourceRoot":"","sources":["sync-queue.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sync-queue.js","sourceRoot":"","sources":["sync-queue.ts"],"names":[],"mappings":"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"}

package/packages/mailx-service/sync-queue.ts

@@ -33,31 +33,61 @@ interface BodyFetchKey { accountId: string; folderId: number; uid: number; lane:
 
 export class SyncQueue {
     private bodyFetches = new Map<string, BodyFetchKey>();
+    /** Per-account debounce timers. Multiple rapid enqueues (3 flag toggles,
+     *  bulk move/delete) coalesce into one processSyncActions drain after
+     *  DRAIN_DEBOUNCE_MS. Was previously in ImapManager.debounceSyncActions;
+     *  moved here because the queue surface is now the source of truth for
+     *  "what needs draining" and it's where the rate limit belongs. */
+    private drainTimers = new Map<string, ReturnType<typeof setTimeout>>();
+    private static readonly DRAIN_DEBOUNCE_MS = 1000;
 
     constructor(
         private db: MailxDB,
         private imapManager: ImapManager,
     ) {}
 
+    private scheduleDrain(accountId: string): void {
+        const existing = this.drainTimers.get(accountId);
+        if (existing) clearTimeout(existing);
+        this.drainTimers.set(accountId, setTimeout(() => {
+            this.drainTimers.delete(accountId);
+            this.imapManager.processSyncActions(accountId).catch(() => { /* retried by reconciler */ });
+        }, SyncQueue.DRAIN_DEBOUNCE_MS));
+    }
+
     // ── Message-mirror enqueues (commit local DB row first; then call here) ──
 
     /** Queue a server-side move. The local rows have already been moved in
      *  the DB; the mirror reaches the server on the next reconciler pass. */
     enqueueMove(accountId: string, uid: number, fromFolderId: number, toFolderId: number): void {
         this.db.queueSyncAction(accountId, "move", uid, fromFolderId, { targetFolderId: toFolderId });
-        this.imapManager.processSyncActions(accountId).catch(() => { /* retried by reconciler */ });
+        this.scheduleDrain(accountId);
     }
 
     /** Queue a server-side flag update (\Seen, \Flagged, \Answered, etc.). */
     enqueueFlag(accountId: string, uid: number, folderId: number, flags: string[]): void {
         this.db.queueSyncAction(accountId, "flags", uid, folderId, { flags });
-        this.imapManager.processSyncActions(accountId).catch(() => { /* retried */ });
+        this.scheduleDrain(accountId);
     }
 
     /** Queue a server-side delete (or trash, depending on action). */
     enqueueDelete(accountId: string, uid: number, folderId: number, kind: "delete" | "trash" = "delete"): void {
         this.db.queueSyncAction(accountId, kind, uid, folderId, {});
-        this.imapManager.processSyncActions(accountId).catch(() => { /* retried */ });
+        this.scheduleDrain(accountId);
+    }
+
+    /** Cancel a pending MOVE action if it hasn't drained yet. Returns true
+     *  when an action was found and marked complete (effectively retracted),
+     *  false when no matching action exists — caller then queues a
+     *  counter-move (the server already saw the original move).
+     *
+     *  Used by undelete: if the to-trash MOVE is still queued, retract it
+     *  rather than queue a redundant trash→original. */
+    cancelPendingMove(accountId: string, uid: number, fromFolderId: number, targetFolderId: number): boolean {
+        const pending = this.db.findPendingSyncAction(accountId, "move", uid, fromFolderId, targetFolderId);
+        if (!pending) return false;
+        this.db.completeSyncAction(pending.id);
+        return true;
     }
 
     /** Queue an IMAP APPEND of a draft body. Drafts already have crash

package/packages/mailx-settings/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-settings",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",

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

@@ -0,0 +1,79 @@
+/**
+ * StoreBus — typed pub/sub for Store events.
+ *
+ * Postmessage-style: subscribers register a topic string + handler; publishers
+ * emit a {topic, kind, ...} object. The exact same shape works inside Node,
+ * across worker_threads (postMessage), and across the WebView⇄host boundary
+ * (also postMessage). That's the load-bearing property: one mental model from
+ * DB write to UI re-render, on any platform.
+ *
+ * Topics
+ * ──────
+ *   `message:<uuid>`   — a specific message changed (flags, body, removal)
+ *   `folder:<id>`      — anything inside folder <id> changed; the bus fans
+ *                        out per-message events to the parent folder topic
+ *                        automatically (see fanOutToFolder())
+ *   `account:<id>`     — account-scoped event (sync status, auth, quota)
+ *   `*`                — wildcard; receives every event. Use for the IPC
+ *                        forwarder that pushes to the WebView, and for
+ *                        diagnostics. Avoid in normal UI subscribers.
+ *
+ * Batching
+ * ────────
+ * Bulk writes (sync round inserts 200 envelopes) would emit 200 events. The
+ * `withBatch(fn)` wrapper buffers events fired during fn() and coalesces
+ * per-topic into one {kind:"batch", changedUuids, summary} event at the end.
+ * Subscribers either iterate `changedUuids` or treat batch as "rerender this
+ * topic." Nested withBatch() is supported; inner scopes just append to the
+ * outer's buffer.
+ */
+export type StoreEventKind = "messageInserted" | "messageUpdated" | "messageRemoved" | "messageMoved" | "flagsChanged" | "bodyAvailable" | "bodyFetchError" | "folderCountsChanged" | "draftSaved" | "draftSaveDeferred" | "batch";
+export interface StoreEvent {
+    topic: string;
+    kind: StoreEventKind;
+    accountId?: string;
+    folderId?: number;
+    targetFolderId?: number;
+    uid?: number;
+    msgUuid?: string;
+    flags?: string[];
+    error?: string;
+    /** Set on `batch` events. UUIDs of every message touched in the scope. */
+    changedUuids?: string[];
+    /** Set on `batch` events. */
+    summary?: {
+        inserted: number;
+        updated: number;
+        deleted: number;
+    };
+    /** Arbitrary additional payload for kind-specific data the typed fields
+     *  above don't cover (e.g. flag-set details, body path). Keep small. */
+    [extra: string]: unknown;
+}
+export type StoreEventHandler = (event: StoreEvent) => void;
+export declare class StoreBus {
+    private subscribers;
+    private batchDepth;
+    private buffer;
+    subscribe(topic: string, handler: StoreEventHandler): () => void;
+    /** Publish an event. If a folderId is set and the topic is a message
+     *  topic, the bus also publishes a copy to the parent folder topic so
+     *  list views (subscribed to folder:<id>) wake without subscribing to
+     *  every message individually. */
+    publish(event: StoreEvent): void;
+    /** Run `fn` with publishes buffered. On exit, coalesces per-topic and
+     *  delivers either the single event (when only one fired for that topic)
+     *  or a synthetic batch event summarizing the changes. */
+    withBatch<T>(fn: () => T): T;
+    private flush;
+    private deliver;
+    /** When a message-topic event fires and carries a folderId, generate
+     *  the parallel folder-topic event so folder subscribers don't have to
+     *  also subscribe to every message individually. Returns null when no
+     *  fan-out applies. */
+    private fanOutToFolder;
+}
+/** Singleton bus shared by every Store consumer in the process. Workers
+ *  get their own; the worker boundary serializes events via postMessage. */
+export declare const storeBus: StoreBus;
+//# sourceMappingURL=bus.d.ts.map