@marlinjai/email-mcp 1.2.7 → 1.2.8

package/dist/index.js

@@ -8399,14 +8399,7 @@ var init_adapter3 = __esm({
         }
         try {
           const mailboxExists = this.client.mailbox?.exists ?? 0;
-          let statusCount = 0;
-          try {
-            const status = await this.client.status(folder, { messages: true });
-            statusCount = status.messages ?? 0;
-          } catch {
-          }
-          const effectiveCount = Math.max(mailboxExists, statusCount);
-          if (effectiveCount === 0) {
+          if (mailboxExists === 0) {
             return [];
           }
           const criteria = this.buildSearchCriteria(query);
@@ -8419,7 +8412,11 @@ var init_adapter3 = __esm({
             );
             allUids = Array.isArray(searchResult) ? searchResult : [];
           } catch {
-            allUids = await this.collectUidsViaFetch(query);
+            try {
+              allUids = await this.collectUidsViaFetch(query);
+            } catch {
+              return [];
+            }
           }
           const offset = query.offset || 0;
           const slicedUids = query.limit ? allUids.slice(offset, offset + query.limit) : allUids.slice(offset);
@@ -8481,19 +8478,27 @@ var init_adapter3 = __esm({
       async fetchEmails(uids, folder, returnBody) {
         if (!this.client) return [];
         const emails = [];
-        if (returnBody) {
-          for await (const msg of this.client.fetch(uids, { source: true, uid: true, flags: true })) {
+        const fetchOpts = returnBody ? { source: true, uid: true, flags: true } : { envelope: true, uid: true, flags: true, bodyStructure: true };
+        const uidRange = uids.join(",");
+        let messages;
+        try {
+          messages = await this.client.fetchAll(uidRange, fetchOpts, { uid: true });
+        } catch {
+          messages = [];
+          for (const uid of uids) {
+            try {
+              const batch = await this.client.fetchAll(String(uid), fetchOpts, { uid: true });
+              messages.push(...batch);
+            } catch {
+            }
+          }
+        }
+        for (const msg of messages) {
+          if (returnBody) {
             const parsed = await simpleParser(msg.source);
             parsed.flags = msg.flags;
             emails.push(mapParsedEmail(parsed, folder, this.accountId, msg.uid));
-          }
-        } else {
-          for await (const msg of this.client.fetch(uids, {
-            envelope: true,
-            uid: true,
-            flags: true,
-            bodyStructure: true
-          })) {
+          } else {
             const env = msg.envelope;
             emails.push({
               id: String(msg.uid),