@agenticmail/api 0.5.60 → 0.5.61

package/dist/index.js

@@ -1539,7 +1539,31 @@ async function closeCaches() {
   }
   receiverCache.clear();
 }
-async function notifyLocalRecipientsOfNewMail(accountManager, toField, ccField, bccField, fromAgent, subject, messageId) {
+async function findUidByMessageId(receiver, messageId, maxAttempts = 5) {
+  const client = receiver.getImapClient();
+  for (let i = 0; i < maxAttempts; i++) {
+    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];
+        }
+      } finally {
+        lock.release();
+      }
+    } catch {
+    }
+    if (i < maxAttempts - 1) {
+      await new Promise((r) => setTimeout(r, 200 * (i + 1)));
+    }
+  }
+  return 0;
+}
+async function notifyLocalRecipientsOfNewMail(accountManager, toField, ccField, bccField, fromAgent, subject, messageId, config) {
   const collected = [];
   const push = (v) => {
     if (!v) return;
@@ -1574,12 +1598,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 +1767,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 +2378,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.61",
   "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",