hypermail-mcp 0.7.9 → 0.7.10

package/README.md

@@ -3,6 +3,10 @@
 A **Model Context Protocol** server that lets an agent operate any of the user's
 inboxes through a single, unified tool surface.
 
+> **v0.7.10** — Fixed an account-store race where Gmail/Outlook token
+> refreshes could overwrite `get_new_emails` checkpoints. Checkpoint updates now
+> preserve token data and merge delivered IDs at the same timestamp.
+>
 > **v0.7.9** — Replaced server-side email watch/webhook/script delivery with
 > the pull-based `get_new_emails` tool. Agents schedule their own repeated calls
 > and fetch bounded batches of new inbox email.

package/dist/cli.js

@@ -13965,6 +13965,7 @@ var AccountStore = class _AccountStore {
   filePath;
   key;
   data;
+  writeLocks = /* @__PURE__ */ new Map();
   static async open(opts = {}) {
     const dataDir = resolveDataDir(opts.dataDir);
     await fs2.mkdir(dataDir, { recursive: true, mode: 448 });
@@ -13992,21 +13993,79 @@ var AccountStore = class _AccountStore {
     return rec ? { ...rec } : void 0;
   }
   async upsertAccount(rec) {
-    const norm = rec.email.trim().toLowerCase();
-    const next = { ...rec, email: norm };
-    const idx = this.data.accounts.findIndex((a) => a.email.toLowerCase() === norm);
-    if (idx >= 0) this.data.accounts[idx] = next;
-    else this.data.accounts.push(next);
-    await this.flush();
-    return { ...next };
+    return this.runSerial(rec.email, async () => {
+      const norm = rec.email.trim().toLowerCase();
+      const next = { ...rec, email: norm };
+      const idx = this.data.accounts.findIndex((a) => a.email.toLowerCase() === norm);
+      if (idx >= 0) this.data.accounts[idx] = next;
+      else this.data.accounts.push(next);
+      await this.flush();
+      return { ...next };
+    });
+  }
+  async updateTokens(email, tokens) {
+    return this.runSerial(email, async () => {
+      const norm = email.trim().toLowerCase();
+      const idx = this.data.accounts.findIndex((a) => a.email.toLowerCase() === norm);
+      if (idx < 0) return void 0;
+      const current = this.data.accounts[idx];
+      const next = { ...current, tokens };
+      this.data.accounts[idx] = next;
+      await this.flush();
+      return { ...next };
+    });
+  }
+  async updateNewEmailCheckpoint(email, checkpoint) {
+    return this.runSerial(email, async () => {
+      const norm = email.trim().toLowerCase();
+      const idx = this.data.accounts.findIndex((a) => a.email.toLowerCase() === norm);
+      if (idx < 0) return void 0;
+      const current = this.data.accounts[idx];
+      const currentCheckpoint = current.newEmailCheckpoint;
+      const mergedCheckpoint = currentCheckpoint?.receivedAt === checkpoint.receivedAt ? {
+        receivedAt: checkpoint.receivedAt,
+        deliveredIdsAtReceivedAt: [
+          .../* @__PURE__ */ new Set([
+            ...currentCheckpoint.deliveredIdsAtReceivedAt ?? [],
+            ...checkpoint.deliveredIdsAtReceivedAt ?? []
+          ])
+        ]
+      } : checkpoint;
+      const next = {
+        ...current,
+        newEmailCheckpoint: mergedCheckpoint
+      };
+      this.data.accounts[idx] = next;
+      await this.flush();
+      return { ...next };
+    });
   }
   async removeAccount(email) {
+    return this.runSerial(email, async () => {
+      const norm = email.trim().toLowerCase();
+      const before = this.data.accounts.length;
+      this.data.accounts = this.data.accounts.filter((a) => a.email.toLowerCase() !== norm);
+      if (this.data.accounts.length === before) return false;
+      await this.flush();
+      return true;
+    });
+  }
+  async runSerial(email, task) {
     const norm = email.trim().toLowerCase();
-    const before = this.data.accounts.length;
-    this.data.accounts = this.data.accounts.filter((a) => a.email.toLowerCase() !== norm);
-    if (this.data.accounts.length === before) return false;
-    await this.flush();
-    return true;
+    const previous = this.writeLocks.get(norm) ?? Promise.resolve();
+    const run = previous.catch(() => void 0).then(task);
+    const lock = run.then(
+      () => void 0,
+      () => void 0
+    );
+    this.writeLocks.set(norm, lock);
+    try {
+      return await run;
+    } finally {
+      if (this.writeLocks.get(norm) === lock) {
+        this.writeLocks.delete(norm);
+      }
+    }
   }
   async flush() {
     const buf = encrypt(this.data, this.key);
@@ -14203,10 +14262,10 @@ var OutlookClientFactory = class {
             this.tenantId
           );
           if (nextTokens.msalCache !== tokens.msalCache) {
-            store.upsertAccount({
-              ...fresh,
-              tokens: nextTokens
-            }).catch(() => {
+            store.updateTokens(
+              account.email,
+              nextTokens
+            ).catch(() => {
             });
           }
           return accessToken;
@@ -15826,10 +15885,10 @@ var GmailClientFactory = class {
           expiryDate: updated.expiry_date ?? currentTokens.expiryDate,
           scopes: updated.scope ? updated.scope.split(" ") : currentTokens.scopes
         };
-        await store.upsertAccount({
-          ...fresh,
-          tokens: nextTokens
-        }).catch(() => {
+        await store.updateTokens(
+          account.email,
+          nextTokens
+        ).catch(() => {
         });
       });
       persistLocks.set(key, chain);
@@ -17222,9 +17281,9 @@ async function initializeCheckpoint(store, provider, account) {
   const first = items[0];
   const receivedAt = first ? effectiveReceivedAt(first.receivedAt) : (/* @__PURE__ */ new Date()).toISOString();
   const deliveredIdsAtReceivedAt = items.filter((item) => effectiveReceivedAt(item.receivedAt) === receivedAt).map((item) => item.id);
-  await store.upsertAccount({
-    ...account,
-    newEmailCheckpoint: { receivedAt, deliveredIdsAtReceivedAt }
+  await store.updateNewEmailCheckpoint(account.email, {
+    receivedAt,
+    deliveredIdsAtReceivedAt
   });
 }
 async function hydrateAndAdvance(store, provider, account, selected) {
@@ -17264,24 +17323,11 @@ async function advanceCheckpoint(store, account, selected) {
   const ordered = oldestCandidatesFirst(selected);
   const newest = ordered[ordered.length - 1];
   if (!newest) return;
-  const previous = normalizeCheckpoint(account.newEmailCheckpoint);
   const newestTimestamp = newest.timestamp;
   const idsAtNewest = ordered.filter((candidate) => candidate.timestamp === newestTimestamp).map((candidate) => candidate.summary.id);
-  let deliveredIdsAtReceivedAt = idsAtNewest;
-  if (previous?.receivedAt === newestTimestamp) {
-    deliveredIdsAtReceivedAt = [
-      .../* @__PURE__ */ new Set([
-        ...previous.deliveredIdsAtReceivedAt ?? [],
-        ...idsAtNewest
-      ])
-    ];
-  }
-  await store.upsertAccount({
-    ...account,
-    newEmailCheckpoint: {
-      receivedAt: newestTimestamp,
-      deliveredIdsAtReceivedAt
-    }
+  await store.updateNewEmailCheckpoint(account.email, {
+    receivedAt: newestTimestamp,
+    deliveredIdsAtReceivedAt: idsAtNewest
   });
 }
 function normalizeCheckpoint(checkpoint) {
@@ -18098,7 +18144,7 @@ function registerTools(server, opts) {
 // package.json
 var package_default = {
   name: "hypermail-mcp",
-  version: "0.7.9",
+  version: "0.7.10",
   description: "Unified email MCP server \u2014 operate any inbox (Outlook now, IMAP/Gmail later) by passing an email address.",
   type: "module",
   bin: {