@marlinjai/email-mcp 1.2.6 → 1.2.8

package/dist/index.js

@@ -8398,33 +8398,24 @@ var init_adapter3 = __esm({
           throw formatImapError(error48, `Failed to open folder "${folder}"`);
         }
         try {
-          let realMessageCount = -1;
-          try {
-            const status = await this.client.status(folder, { messages: true });
-            realMessageCount = status.messages ?? -1;
-          } catch {
-          }
-          const mailboxExists = this.client.mailbox?.exists ?? -1;
-          const effectiveCount = Math.max(realMessageCount, mailboxExists);
-          if (effectiveCount <= 0) {
+          const mailboxExists = this.client.mailbox?.exists ?? 0;
+          if (mailboxExists === 0) {
             return [];
           }
           const criteria = this.buildSearchCriteria(query);
           const hasCriteria = Object.keys(criteria).length > 0;
-          let allUids;
+          let allUids = [];
           try {
             const searchResult = await this.client.search(
               hasCriteria ? criteria : { all: true },
               { uid: true }
             );
             allUids = Array.isArray(searchResult) ? searchResult : [];
-          } catch (searchError) {
-            const errorMsg = String(searchError?.responseText || searchError?.message || "").toLowerCase();
-            const isInvalidMessage = errorMsg.includes("invalid message");
-            if (isInvalidMessage || !hasCriteria) {
+          } catch {
+            try {
               allUids = await this.collectUidsViaFetch(query);
-            } else {
-              throw searchError;
+            } catch {
+              return [];
             }
           }
           const offset = query.offset || 0;
@@ -8447,39 +8438,39 @@ var init_adapter3 = __esm({
       async collectUidsViaFetch(query) {
         if (!this.client) return [];
         const uids = [];
-        try {
-          for await (const msg of this.client.fetch("1:*", { uid: true, flags: true })) {
-            if (query.unreadOnly && msg.flags?.has("\\Seen")) continue;
-            if (query.starredOnly && !msg.flags?.has("\\Flagged")) continue;
-            uids.push(msg.uid);
-          }
-          return uids;
-        } catch {
-          const exists = this.client.mailbox?.exists ?? 0;
-          if (exists > 0) {
-            try {
-              for await (const msg of this.client.fetch(`1:${exists}`, { uid: true, flags: true })) {
-                if (query.unreadOnly && msg.flags?.has("\\Seen")) continue;
-                if (query.starredOnly && !msg.flags?.has("\\Flagged")) continue;
-                uids.push(msg.uid);
-              }
-              return uids;
-            } catch {
+        const exists = this.client.mailbox?.exists ?? 0;
+        const safeFetch = async (range) => {
+          try {
+            const messages = await this.client.fetchAll(range, { uid: true, flags: true });
+            for (const msg of messages) {
+              if (query.unreadOnly && msg.flags?.has("\\Seen")) continue;
+              if (query.starredOnly && !msg.flags?.has("\\Flagged")) continue;
+              uids.push(msg.uid);
             }
+            return uids.length > 0;
+          } catch {
+            return false;
           }
-          const count = exists > 0 ? exists : 50;
-          for (let seq = 1; seq <= count; seq++) {
-            try {
-              for await (const msg of this.client.fetch(String(seq), { uid: true, flags: true })) {
-                if (query.unreadOnly && msg.flags?.has("\\Seen")) continue;
-                if (query.starredOnly && !msg.flags?.has("\\Flagged")) continue;
-                uids.push(msg.uid);
-              }
-            } catch {
+        };
+        if (await safeFetch("1:*")) return uids;
+        uids.length = 0;
+        if (exists > 0) {
+          if (await safeFetch(`1:${exists}`)) return uids;
+          uids.length = 0;
+        }
+        const count = exists > 0 ? exists : 50;
+        for (let seq = 1; seq <= count; seq++) {
+          try {
+            const msgs = await this.client.fetchAll(String(seq), { uid: true, flags: true });
+            for (const msg of msgs) {
+              if (query.unreadOnly && msg.flags?.has("\\Seen")) continue;
+              if (query.starredOnly && !msg.flags?.has("\\Flagged")) continue;
+              uids.push(msg.uid);
             }
+          } catch {
           }
-          return uids;
         }
+        return uids;
       }
       /**
        * Fetches email data for a set of UIDs, either with full body or lightweight headers.
@@ -8487,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),