@agenticmail/api 0.5.60 → 0.5.62

package/dist/index.js

@@ -1539,7 +1539,65 @@ async function closeCaches() {
   }
   receiverCache.clear();
 }
-async function notifyLocalRecipientsOfNewMail(accountManager, toField, ccField, bccField, fromAgent, subject, messageId) {
+async function findUidByMessageId(receiver, messageId, maxAttempts = 8) {
+  const target = normalizeMessageId(messageId);
+  const client = receiver.getImapClient();
+  const tryHeaderSearch = async () => {
+    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];
+      }
+    } 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;
+        }
+      }
+      return bestUid;
+    } finally {
+      lock.release();
+    }
+  };
+  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) => {
     if (!v) return;
@@ -1574,12 +1632,29 @@ async function notifyLocalRecipientsOfNewMail(accountManager, toField, ccField,
     }
     if (!recipient || notified.has(recipient.id)) continue;
     notified.add(recipient.id);
+    let uid = 0;
+    let lookup = "no-message-id";
+    if (messageId) {
+      try {
+        const recipientPassword = getAgentPassword(recipient);
+        const receiver = await getReceiver(
+          recipient.stalwartPrincipal,
+          recipientPassword,
+          config
+        );
+        uid = await findUidByMessageId(receiver, messageId);
+        lookup = uid > 0 ? "resolved" : "failed";
+      } catch {
+        lookup = "failed";
+      }
+    }
     pushEventToAgent(recipient.id, {
       type: "new",
-      // uid is unknown without an IMAP fetch; use 0 as a sentinel —
-      // this matches the watcher's autoFetch=false path. SSE consumers
-      // that want full message detail can call /mail/inbox.
-      uid: 0,
+      uid,
+      // Tell consumers whether the UID is real or a sentinel — preserves
+      // backwards compat (uid is still always a number) while giving
+      // clients a reliable signal to fall back to /mail/inbox.
+      uidLookup: lookup,
       internal: true,
       from: { name: fromAgent.name, address: fromAgent.email },
       subject,
@@ -1726,7 +1801,8 @@ function createMailRoutes(accountManager, config, db, gatewayManager) {
         bcc,
         agent,
         subject,
-        result.messageId
+        result.messageId,
+        config
       ).catch((err) => {
         console.warn(`[mail] Internal SSE notify failed: ${err.message}`);
       });
@@ -2336,7 +2412,8 @@ function createMailRoutes(accountManager, config, db, gatewayManager) {
           mailOpts.bcc,
           agent,
           mailOpts.subject,
-          result.messageId
+          result.messageId,
+          config
         ).catch((err) => {
           console.warn(`[mail] Internal SSE notify (approve) failed: ${err.message}`);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agenticmail/api",
-  "version": "0.5.60",
+  "version": "0.5.62",
   "description": "REST API server for AgenticMail — email and SMS endpoints for AI agents",
   "type": "module",
   "main": "dist/index.js",
@@ -27,7 +27,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@agenticmail/core": "^0.5.59",
+    "@agenticmail/core": "^0.5.61",
     "cors": "^2.8.5",
     "dotenv": "^16.4.7",
     "express": "^4.21.0",