@marlinjai/email-mcp 1.2.7 → 1.2.8

package/dist/setup/wizard.js

@@ -1623,14 +1623,7 @@ var ImapAdapter = class {
     }
     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);
@@ -1643,7 +1636,11 @@ var ImapAdapter = class {
         );
         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);
@@ -1705,19 +1702,27 @@ var ImapAdapter = class {
   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),