@agenticmail/api 0.5.61 → 0.5.62

package/dist/index.js

@@ -1539,30 +1539,64 @@ async function closeCaches() {
   }
   receiverCache.clear();
 }
-async function findUidByMessageId(receiver, messageId, maxAttempts = 5) {
+async function findUidByMessageId(receiver, messageId, maxAttempts = 8) {
+  const target = normalizeMessageId(messageId);
   const client = receiver.getImapClient();
-  for (let i = 0; i < maxAttempts; i++) {
+  const tryHeaderSearch = async () => {
+    const lock = await client.getMailboxLock("INBOX");
     try {
-      const lock = await client.getMailboxLock("INBOX");
-      try {
-        const results = await client.search(
-          { header: ["Message-ID", messageId] },
-          { uid: true }
-        );
-        if (Array.isArray(results) && results.length > 0) {
-          return results[results.length - 1];
+      const results = await client.search(
+        { header: ["Message-ID", messageId] },
+        { uid: true }
+      );
+      if (Array.isArray(results) && results.length > 0) {
+        return results[results.length - 1];
+      }
+    } finally {
+      lock.release();
+    }
+    return 0;
+  };
+  const tryEnvelopeScan = async () => {
+    const lock = await client.getMailboxLock("INBOX");
+    try {
+      const status = await client.status("INBOX", { messages: true });
+      const total = status?.messages ?? 0;
+      if (total === 0) return 0;
+      const start = Math.max(1, total - 9);
+      const range = `${start}:${total}`;
+      let bestUid = 0;
+      for await (const msg of client.fetch(range, { uid: true, envelope: true })) {
+        if (!msg.envelope?.messageId) continue;
+        if (normalizeMessageId(msg.envelope.messageId) === target) {
+          if (msg.uid > bestUid) bestUid = msg.uid;
         }
-      } finally {
-        lock.release();
       }
-    } catch {
+      return bestUid;
+    } finally {
+      lock.release();
     }
-    if (i < maxAttempts - 1) {
-      await new Promise((r) => setTimeout(r, 200 * (i + 1)));
+  };
+  const delays = [0, 250, 500, 750, 1e3, 1250, 1500, 2e3];
+  for (let i = 0; i < maxAttempts; i++) {
+    if (delays[i]) await new Promise((r) => setTimeout(r, delays[i]));
+    try {
+      const headerHit = await tryHeaderSearch();
+      if (headerHit > 0) return headerHit;
+      const scanHit = await tryEnvelopeScan();
+      if (scanHit > 0) return scanHit;
+    } catch (err) {
+      if (i === maxAttempts - 1) {
+        console.warn(`[mail] findUidByMessageId attempt ${i + 1} failed for ${messageId}: ${err.message}`);
+      }
     }
   }
   return 0;
 }
+function normalizeMessageId(id) {
+  if (!id) return "";
+  return id.trim().replace(/^<+|>+$/g, "").toLowerCase();
+}
 async function notifyLocalRecipientsOfNewMail(accountManager, toField, ccField, bccField, fromAgent, subject, messageId, config) {
   const collected = [];
   const push = (v) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agenticmail/api",
-  "version": "0.5.61",
+  "version": "0.5.62",
   "description": "REST API server for AgenticMail — email and SMS endpoints for AI agents",
   "type": "module",
   "main": "dist/index.js",