@marlinjai/email-mcp 1.2.0 → 1.2.2

package/dist/index.js

@@ -7680,11 +7680,16 @@ var init_adapter2 = __esm({
         }
         this.accountId = credentials.id;
         this.accessToken = credentials.oauth.access_token;
-        this.client = Client.init({
+        const client = Client.init({
           authProvider: (done) => {
             done(null, this.accessToken);
           }
         });
+        const originalApi = client.api.bind(client);
+        client.api = (path3) => {
+          return originalApi(path3).header("Prefer", 'IdType="ImmutableId"');
+        };
+        this.client = client;
       }
       async disconnect() {
         this.client = null;
@@ -8389,60 +8394,96 @@ var init_adapter3 = __esm({
           throw formatImapError(error48, `Failed to open folder "${folder}"`);
         }
         try {
+          const mailboxExists = this.client.mailbox?.exists ?? -1;
+          if (mailboxExists === 0) {
+            return [];
+          }
           const criteria = this.buildSearchCriteria(query);
-          const searchResult = await this.client.search(
-            Object.keys(criteria).length > 0 ? criteria : { all: true },
-            { uid: true }
-          );
-          const allUids = Array.isArray(searchResult) ? searchResult : [];
+          const hasCriteria = Object.keys(criteria).length > 0;
+          let allUids;
+          try {
+            const searchResult = await this.client.search(
+              hasCriteria ? criteria : { all: true },
+              { uid: true }
+            );
+            allUids = Array.isArray(searchResult) ? searchResult : [];
+          } catch (searchError) {
+            if (!hasCriteria) {
+              allUids = await this.collectUidsViaFetch(query);
+            } else {
+              throw searchError;
+            }
+          }
           const offset = query.offset || 0;
           const slicedUids = query.limit ? allUids.slice(offset, offset + query.limit) : allUids.slice(offset);
           if (slicedUids.length === 0) return [];
-          const emails = [];
-          if (query.returnBody) {
-            for await (const msg of this.client.fetch(slicedUids, { source: true, uid: true, flags: true })) {
-              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(slicedUids, {
-              envelope: true,
-              uid: true,
-              flags: true,
-              bodyStructure: true
-            })) {
-              const env = msg.envelope;
-              emails.push({
-                id: String(msg.uid),
-                accountId: this.accountId,
-                threadId: env.messageId || void 0,
-                folder,
-                from: env.from?.[0] ? { name: env.from[0].name || void 0, email: env.from[0].address || "" } : { email: "" },
-                to: (env.to || []).map((a) => ({ name: a.name || void 0, email: a.address || "" })),
-                cc: env.cc?.length ? env.cc.map((a) => ({ name: a.name || void 0, email: a.address || "" })) : void 0,
-                bcc: env.bcc?.length ? env.bcc.map((a) => ({ name: a.name || void 0, email: a.address || "" })) : void 0,
-                subject: env.subject || "(no subject)",
-                date: env.date ? new Date(env.date).toISOString() : (/* @__PURE__ */ new Date()).toISOString(),
-                body: { text: void 0, html: void 0 },
-                snippet: env.subject || "",
-                attachments: [],
-                flags: {
-                  read: msg.flags?.has("\\Seen") ?? false,
-                  starred: msg.flags?.has("\\Flagged") ?? false,
-                  flagged: msg.flags?.has("\\Flagged") ?? false,
-                  draft: msg.flags?.has("\\Draft") ?? false
-                }
-              });
-            }
-          }
-          return emails;
+          return await this.fetchEmails(slicedUids, folder, query.returnBody);
         } catch (error48) {
           throw formatImapError(error48, `Search failed in folder "${folder}"`);
         } finally {
           lock.release();
         }
       }
+      /**
+       * 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).
+       */
+      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);
+        }
+        return uids;
+      }
+      /**
+       * Fetches email data for a set of UIDs, either with full body or lightweight headers.
+       */
+      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 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
+          })) {
+            const env = msg.envelope;
+            emails.push({
+              id: String(msg.uid),
+              accountId: this.accountId,
+              threadId: env.messageId || void 0,
+              folder,
+              from: env.from?.[0] ? { name: env.from[0].name || void 0, email: env.from[0].address || "" } : { email: "" },
+              to: (env.to || []).map((a) => ({ name: a.name || void 0, email: a.address || "" })),
+              cc: env.cc?.length ? env.cc.map((a) => ({ name: a.name || void 0, email: a.address || "" })) : void 0,
+              bcc: env.bcc?.length ? env.bcc.map((a) => ({ name: a.name || void 0, email: a.address || "" })) : void 0,
+              subject: env.subject || "(no subject)",
+              date: env.date ? new Date(env.date).toISOString() : (/* @__PURE__ */ new Date()).toISOString(),
+              body: { text: void 0, html: void 0 },
+              snippet: env.subject || "",
+              attachments: [],
+              flags: {
+                read: msg.flags?.has("\\Seen") ?? false,
+                starred: msg.flags?.has("\\Flagged") ?? false,
+                flagged: msg.flags?.has("\\Flagged") ?? false,
+                draft: msg.flags?.has("\\Draft") ?? false
+              }
+            });
+          }
+        }
+        return emails;
+      }
       async getEmail(id, folder) {
         if (!this.client) throw new Error("Not connected");
         const targetFolder = folder || "INBOX";
@@ -8814,7 +8855,21 @@ var init_account_manager = __esm({
       }
       async getProvider(accountId) {
         const existing = this.providers.get(accountId);
-        if (existing) return existing;
+        if (existing) {
+          const creds = this.credentials.get(accountId);
+          if (creds?.oauth?.expiry) {
+            const expiryDate = new Date(creds.oauth.expiry);
+            const now = /* @__PURE__ */ new Date();
+            if (!isNaN(expiryDate.getTime()) && expiryDate <= now) {
+              await this.disconnectAccount(accountId);
+              await this.connectAccount(accountId);
+              const refreshed = this.providers.get(accountId);
+              if (!refreshed) throw new Error(`Failed to reconnect account ${accountId} after token expiry`);
+              return refreshed;
+            }
+          }
+          return existing;
+        }
         await this.connectAccount(accountId);
         const provider = this.providers.get(accountId);
         if (!provider) throw new Error(`Failed to connect account ${accountId}`);
@@ -8866,38 +8921,43 @@ var init_account_manager = __esm({
         if (!creds.oauth?.expiry) return;
         const expiryDate = new Date(creds.oauth.expiry);
         const fiveMinutesFromNow = new Date(Date.now() + 5 * 60 * 1e3);
-        if (expiryDate > fiveMinutesFromNow) return;
-        try {
-          if (creds.provider === ProviderType.Gmail) {
-            const auth = new GmailAuth(GMAIL_CLIENT_ID, GMAIL_CLIENT_SECRET);
-            const newTokens = await auth.refreshAccessToken(creds.oauth.refresh_token);
-            creds.oauth = newTokens;
-            await this.store.save(creds);
-          } else if (creds.provider === ProviderType.Outlook) {
-            const outlookAuth = new OutlookAuth(OUTLOOK_CLIENT_ID);
-            const homeAccountId = creds.oauth.msal_home_account_id;
-            if (homeAccountId) {
-              const result = await outlookAuth.refreshTokenSilent(homeAccountId);
-              creds.oauth = {
-                access_token: result.accessToken,
-                refresh_token: creds.oauth.refresh_token,
-                expiry: result.expiresOn?.toISOString() ?? "",
-                msal_home_account_id: result.homeAccountId ?? homeAccountId
-              };
-            } else if (creds.oauth.refresh_token) {
-              const result = await outlookAuth.refreshToken(creds.oauth.refresh_token);
-              creds.oauth = {
-                access_token: result.accessToken,
-                refresh_token: creds.oauth.refresh_token,
-                expiry: result.expiresOn?.toISOString() ?? ""
-              };
-            } else {
-              throw new Error("No MSAL account ID or refresh token \u2014 re-authenticate via setup wizard");
+        if (!isNaN(expiryDate.getTime()) && expiryDate > fiveMinutesFromNow) return;
+        if (creds.provider === ProviderType.Gmail) {
+          const auth = new GmailAuth(GMAIL_CLIENT_ID, GMAIL_CLIENT_SECRET);
+          const newTokens = await auth.refreshAccessToken(creds.oauth.refresh_token);
+          if (!newTokens.access_token) {
+            throw new Error("Gmail token refresh returned empty access token \u2014 re-authenticate via setup wizard");
+          }
+          creds.oauth = newTokens;
+          await this.store.save(creds);
+        } else if (creds.provider === ProviderType.Outlook) {
+          const outlookAuth = new OutlookAuth(OUTLOOK_CLIENT_ID);
+          const homeAccountId = creds.oauth.msal_home_account_id;
+          if (homeAccountId) {
+            const result = await outlookAuth.refreshTokenSilent(homeAccountId);
+            if (!result.accessToken) {
+              throw new Error("Outlook token refresh returned empty access token \u2014 re-authenticate via setup wizard");
             }
-            await this.store.save(creds);
+            creds.oauth = {
+              access_token: result.accessToken,
+              refresh_token: creds.oauth.refresh_token,
+              expiry: result.expiresOn?.toISOString() ?? "",
+              msal_home_account_id: result.homeAccountId ?? homeAccountId
+            };
+          } else if (creds.oauth.refresh_token) {
+            const result = await outlookAuth.refreshToken(creds.oauth.refresh_token);
+            if (!result.accessToken) {
+              throw new Error("Outlook token refresh returned empty access token \u2014 re-authenticate via setup wizard");
+            }
+            creds.oauth = {
+              access_token: result.accessToken,
+              refresh_token: creds.oauth.refresh_token,
+              expiry: result.expiresOn?.toISOString() ?? ""
+            };
+          } else {
+            throw new Error("No MSAL account ID or refresh token \u2014 re-authenticate via setup wizard");
           }
-        } catch (error48) {
-          console.error(`Token refresh failed for ${creds.provider}: ${error48.message}`);
+          await this.store.save(creds);
         }
       }
     };