@marlinjai/email-mcp 1.2.2 → 1.2.4

package/README.md

@@ -202,6 +202,13 @@ pnpm test:watch
 pnpm test:integration
 ```
 
+## Support
+
+If this project is useful to you, consider supporting its development:
+
+- [GitHub Sponsors](https://github.com/sponsors/marlinjai)
+- [Buy Me a Coffee](https://buymeacoffee.com/marlinjai)
+
 ## License
 
 MIT

package/dist/index.js

@@ -8387,6 +8387,10 @@ var init_adapter3 = __esm({
         } catch {
           folder = requestedFolder;
         }
+        try {
+          await this.client.noop();
+        } catch {
+        }
         let lock;
         try {
           lock = await this.client.getMailboxLock(folder);
@@ -8394,8 +8398,15 @@ 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;
-          if (mailboxExists === 0) {
+          const effectiveCount = Math.max(realMessageCount, mailboxExists);
+          if (effectiveCount === 0) {
             return [];
           }
           const criteria = this.buildSearchCriteria(query);
@@ -8408,7 +8419,9 @@ var init_adapter3 = __esm({
             );
             allUids = Array.isArray(searchResult) ? searchResult : [];
           } catch (searchError) {
-            if (!hasCriteria) {
+            const errorMsg = String(searchError?.responseText || searchError?.message || "").toLowerCase();
+            const isInvalidMessage = errorMsg.includes("invalid message");
+            if (isInvalidMessage || !hasCriteria) {
               allUids = await this.collectUidsViaFetch(query);
             } else {
               throw searchError;
@@ -8426,18 +8439,47 @@ var init_adapter3 = __esm({
       }
       /**
        * Fallback UID collection when UID SEARCH fails (e.g. iCloud "Invalid message number").
-       * Uses FETCH 1:* with sequence numbers to collect UIDs directly, optionally filtering
-       * by flag-based criteria (unread, starred).
+       * Uses a multi-level fallback chain:
+       * 1. FETCH 1:* with sequence numbers
+       * 2. FETCH 1:N using mailbox.exists as explicit range
+       * 3. Individual sequence number fetches (slowest but most resilient)
        */
       async collectUidsViaFetch(query) {
         if (!this.client) return [];
         const uids = [];
-        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);
+        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 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 {
+            }
+          }
+          return uids;
         }
-        return uids;
       }
       /**
        * Fetches email data for a set of UIDs, either with full body or lightweight headers.
@@ -8624,7 +8666,8 @@ var init_adapter3 = __esm({
       }
       async deleteEmail(emailId, permanent, sourceFolder) {
         if (!this.client) throw new Error("Not connected");
-        const folder = sourceFolder || "INBOX";
+        const folder = sourceFolder ? await this.resolveFolder(sourceFolder) : "INBOX";
+        const trashFolder = await this.resolveFolder("Trash");
         let lock;
         try {
           lock = await this.client.getMailboxLock(folder);
@@ -8632,10 +8675,10 @@ var init_adapter3 = __esm({
           throw formatImapError(error48, `Failed to open folder "${folder}"`);
         }
         try {
-          if (permanent) {
+          if (permanent || folder === trashFolder) {
             await this.client.messageDelete(emailId, { uid: true });
           } else {
-            await this.client.messageMove(emailId, "Trash", { uid: true });
+            await this.client.messageMove(emailId, trashFolder, { uid: true });
           }
         } finally {
           lock.release();
@@ -8668,7 +8711,9 @@ var init_adapter3 = __esm({
       async batchDelete(emailIds, permanent, sourceFolder) {
         if (!this.client) throw new Error("Not connected");
         const result = { succeeded: [], failed: [] };
-        const folder = sourceFolder || "INBOX";
+        const folder = sourceFolder ? await this.resolveFolder(sourceFolder) : "INBOX";
+        const trashFolder = await this.resolveFolder("Trash");
+        const shouldPermanentDelete = permanent || folder === trashFolder;
         let lock;
         try {
           lock = await this.client.getMailboxLock(folder);
@@ -8677,19 +8722,19 @@ var init_adapter3 = __esm({
         }
         try {
           const uidRange = emailIds.join(",");
-          if (permanent) {
+          if (shouldPermanentDelete) {
             await this.client.messageDelete(uidRange, { uid: true });
           } else {
-            await this.client.messageMove(uidRange, "Trash", { uid: true });
+            await this.client.messageMove(uidRange, trashFolder, { uid: true });
           }
           result.succeeded = [...emailIds];
         } catch (error48) {
           for (const id of emailIds) {
             try {
-              if (permanent) {
+              if (shouldPermanentDelete) {
                 await this.client.messageDelete(id, { uid: true });
               } else {
-                await this.client.messageMove(id, "Trash", { uid: true });
+                await this.client.messageMove(id, trashFolder, { uid: true });
               }
               result.succeeded.push(id);
             } catch (e) {