apple-mail-mcp 2.19.15 → 2.19.17

package/README.md

@@ -826,7 +826,7 @@ Reply to an existing message.
 | Parameter   | Type    | Required | Description                                                                                    |
 | ----------- | ------- | -------- | ---------------------------------------------------------------------------------------------- |
 | `id`        | string  | Yes      | Message ID to reply to                                                                         |
-| `body`      | string  | Yes      | Reply body (plain text; HTML tags such as `<br>` are not rendered)                              |
+| `body`      | string  | Yes      | Reply body (plain text; HTML tags such as `<br>` are not rendered)                             |
 | `replyAll`  | boolean | No       | Reply to all recipients (default: false)                                                       |
 | `send`      | boolean | No       | Send immediately (default: true, false = save as draft)                                        |
 | `transport` | string  | No       | `smtp` or `applescript`; omitted prefers configured SMTP when sending. Drafts use AppleScript. |
@@ -1081,11 +1081,31 @@ Matching ignores letter case **and Unicode normalization form**: a typed
 precomposed `México` (NFC) finds a mailbox the server stores decomposed (NFD —
 common for folders created on a Mac, and what iCloud keeps), and the server's
 own stored spelling is what gets selected. Two mailboxes whose names differ
-*only* in case or normalization look identical in any listing, so a name that
+_only_ in case or normalization look identical in any listing, so a name that
 matches both is refused with an error saying so — rename one of them. For the
 same reason `create-mailbox` treats a normalization-equivalent existing name as
 already existing, and `rename-mailbox` refuses to create such a twin.
 
+**Messages awaiting expunge are not listed.** On IMAP accounts, search,
+list, thread and mail-stats queries only match messages _not_ flagged
+`\Deleted` (IMAP `UNDELETED`). iCloud keeps flagged-but-never-expunged
+messages out of its message counts yet still returns them from `UID SEARCH`,
+which made a filter-less `list-messages` fail on such a mailbox before 2.19.16.
+
+**Very large IMAP mailboxes are read newest-first in bounded windows**
+([#256](https://github.com/sweetrb/apple-mail-mcp/issues/256)). Above 10,000
+messages, a filter-less `list-messages`/`search-messages` pages by message
+sequence number from the top of the mailbox — it fetches UIDs and flags for
+just enough of the newest messages to fill `limit` + `offset` (skipping
+`\Deleted` ones) and full rows for the page alone, so `limit: 1` on a
+793,614-message mailbox costs one small `FETCH`, not a whole-mailbox `SEARCH`.
+A filtered search there runs the same criteria over newest-first sequence
+windows (5,000 messages, growing to 50,000) and stops once the page is full;
+the reported total then reads `at least N` unless the walk reached the bottom
+of the mailbox. A `SEARCH` or `FETCH` that fails names the mailbox, its size and
+the server's own reason (or a likely timeout) instead of reporting "no
+messages".
+
 **Mail's local "On My Mac" mailboxes** are not children of any account — they
 hang off the application — so they are reported under the synthetic account label
 **`On My Mac`**. An unscoped call includes them (listed last); `account="On My

package/build/cli.js

@@ -58045,6 +58045,7 @@ var imapClient_exports = {};
 __export(imapClient_exports, {
   HEADER_WINDOW_BYTES: () => HEADER_WINDOW_BYTES,
   IMAP_ENV: () => IMAP_ENV,
+  LARGE_MAILBOX_MESSAGES: () => LARGE_MAILBOX_MESSAGES,
   MAX_COMPOSE_SOURCE_BYTES: () => MAX_COMPOSE_SOURCE_BYTES,
   MAX_RFC822_FILE_BYTES: () => MAX_RFC822_FILE_BYTES,
   MAX_RFC822_INLINE_BYTES: () => MAX_RFC822_INLINE_BYTES,
@@ -58323,7 +58324,7 @@ async function resolveMailboxPath(client, mailbox, _mode) {
   return staticMailboxAlias(mailbox);
 }
 function buildCriteria(a, listMode) {
-  const c = {};
+  const c = { ...NOT_DELETED };
   if (a.query) c.or = [{ subject: a.query }, { from: a.query }];
   if (a.body) c.body = a.body;
   if (a.from) c.from = a.from;
@@ -58335,7 +58336,6 @@ function buildCriteria(a, listMode) {
   if (a.isFlagged === false) c.unflagged = true;
   if (a.dateFrom) c.since = new Date(a.dateFrom);
   if (a.dateTo) c.before = new Date(a.dateTo);
-  if (Object.keys(c).length === 0) c.all = true;
   return c;
 }
 function validDate(d) {
@@ -58429,44 +58429,139 @@ function messageIdentity(entry) {
   const messageId = raw.replace(/^<+|>+$/g, "").trim().toLowerCase();
   return messageId ? `mid:${messageId}` : `${entry.path}\0${entry.message.uid}`;
 }
-async function fetchMailboxMatches(client, path, criteria, newestCount) {
-  const lock = await client.getMailboxLock(path);
+function isUnfiltered(criteria) {
+  const keys = Object.keys(criteria);
+  return keys.length === 1 && criteria.deleted === false;
+}
+async function statusMessageCount(client, path) {
   try {
-    const found = await client.search(criteria, { uid: true });
-    const uids = Array.isArray(found) ? found : [];
-    if (uids.length === 0 || newestCount === 0) return { messages: [], total: uids.length };
-    const status = await client.status(path, { messages: true });
-    if (typeof status.messages === "number" && uids.length > status.messages) {
+    const st = await client.status(path, { messages: true });
+    return typeof st.messages === "number" && st.messages >= 0 ? st.messages : void 0;
+  } catch {
+    return void 0;
+  }
+}
+async function searchUids(client, path, criteria, size) {
+  client.takeLastCommandError?.();
+  const found = await client.search(criteria, { uid: true });
+  if (Array.isArray(found)) return found;
+  const cause = client.takeLastCommandError?.();
+  const sized = size === void 0 ? "" : ` (${size.toLocaleString("en-US")} messages)`;
+  throw new Error(
+    `IMAP SEARCH on "${path}"${sized} failed: ` + (cause ? errText(cause) : "the server rejected it or the connection dropped before it answered (on a mailbox this size, usually a server-side timeout)")
+  );
+}
+async function fetchRows(client, uids) {
+  if (uids.length === 0) return [];
+  const byUid = /* @__PURE__ */ new Map();
+  for await (const msg of client.fetch(
+    uids.join(","),
+    // BODYSTRUCTURE rides along so `hasAttachments` is computed rather
+    // than assumed. Measured on 50 real messages: ~390ms -> ~465ms for
+    // the fetch (~17%), same single round trip, no extra request.
+    //
+    // INTERNALDATE rides along for the same reason, and is why `dateReceived`
+    // can finally mean what it says: imapflow's `envelope.date` is built from
+    // the header block, so it IS the `Date:` header, not arrival time.
+    //
+    // The `Date:` header itself (BODY.PEEK[HEADER.FIELDS (DATE)]) rides in the
+    // SAME FETCH command, so a date the server's ENVELOPE parser rejected can
+    // still be recovered (#234). Measured on 50 real messages, 6 alternating
+    // runs: median ~334ms without vs ~315ms with — inside the noise — for ~44
+    // bytes per message. Too cheap to hide behind an opt-in.
+    { envelope: true, flags: true, bodyStructure: true, internalDate: true, headers: ["date"] },
+    { uid: true }
+  )) {
+    byUid.set(msg.uid, msg);
+  }
+  return uids.map((uid) => byUid.get(uid)).filter((message) => message !== void 0);
+}
+async function walkWindows(exists, page, firstWindow, readWindow) {
+  const wanted = page.skip + page.take;
+  const uids = [];
+  let seen = 0;
+  let matched = 0;
+  let hi = exists;
+  let width = Math.max(1, Math.min(firstWindow, MAX_WINDOW));
+  while (hi >= 1 && seen < wanted) {
+    const lo = Math.max(1, hi - width + 1);
+    const live = (await readWindow(lo, hi === exists ? "*" : hi, hi - lo + 1)).slice().sort((a, b) => b - a);
+    matched += live.length;
+    for (const uid of live) {
+      if (seen >= wanted) break;
+      if (seen >= page.skip) uids.push(uid);
+      seen++;
+    }
+    hi = lo - 1;
+    width = Math.min(width * 4, MAX_WINDOW);
+  }
+  return { uids, matched, exhausted: hi < 1 };
+}
+async function listLargeMailbox(client, exists, page) {
+  let deletedSeen = 0;
+  const walk = await walkWindows(
+    exists,
+    page,
+    // Room for a few ghosts on the first read without a second round trip.
+    page.skip + page.take + 64,
+    async (lo, hi) => {
+      const live = [];
+      for await (const msg of client.fetch(`${lo}:${hi}`, { uid: true, flags: true })) {
+        if (msg.flags?.has("\\Deleted")) deletedSeen++;
+        else live.push(msg.uid);
+      }
+      return live;
+    }
+  );
+  return {
+    messages: await fetchRows(client, walk.uids),
+    total: Math.max(0, exists - deletedSeen),
+    totalExact: true
+  };
+}
+async function searchLargeMailbox(client, path, criteria, exists, page) {
+  const walk = await walkWindows(exists, page, FIRST_SEARCH_WINDOW, async (lo, hi, width) => {
+    const found = await searchUids(client, path, { ...criteria, seq: `${lo}:${hi}` }, exists);
+    if (found.length > width) {
       throw new Error(
-        `IMAP SEARCH on "${path}" reported ${uids.length} matches, more than the mailbox's own ${status.messages} messages \u2014 discarding as corrupted rather than trusting it (see #246).`
+        `IMAP SEARCH on "${path}" reported ${found.length} matches in a ${width}-message window \u2014 discarding as corrupted rather than trusting it (see #246).`
       );
     }
-    const newest = uids.slice().reverse().slice(0, newestCount);
-    const byUid = /* @__PURE__ */ new Map();
-    for await (const msg of client.fetch(
-      newest.join(","),
-      // BODYSTRUCTURE rides along so `hasAttachments` is computed rather
-      // than assumed. Measured on 50 real messages: ~390ms -> ~465ms for
-      // the fetch (~17%), same single round trip, no extra request.
-      //
-      // INTERNALDATE rides along for the same reason, and is why `dateReceived`
-      // can finally mean what it says: imapflow's `envelope.date` is built from
-      // the header block, so it IS the `Date:` header, not arrival time.
-      //
-      // The `Date:` header itself (BODY.PEEK[HEADER.FIELDS (DATE)]) rides in the
-      // SAME FETCH command, so a date the server's ENVELOPE parser rejected can
-      // still be recovered (#234). Measured on 50 real messages, 6 alternating
-      // runs: median ~334ms without vs ~315ms with — inside the noise — for ~44
-      // bytes per message. Too cheap to hide behind an opt-in.
-      { envelope: true, flags: true, bodyStructure: true, internalDate: true, headers: ["date"] },
-      { uid: true }
-    )) {
-      byUid.set(msg.uid, msg);
+    return found;
+  });
+  return {
+    messages: await fetchRows(client, walk.uids),
+    total: walk.matched,
+    totalExact: walk.exhausted
+  };
+}
+async function fetchMailboxMatches(client, path, criteria, page) {
+  const lock = await client.getMailboxLock(path);
+  try {
+    const exists = await statusMessageCount(client, path);
+    if (exists === 0) return { messages: [], total: 0, totalExact: true };
+    if (exists !== void 0 && exists > LARGE_MAILBOX_MESSAGES) {
+      try {
+        return isUnfiltered(criteria) ? await listLargeMailbox(client, exists, page) : await searchLargeMailbox(client, path, criteria, exists, page);
+      } catch (error) {
+        const detail = errText(error);
+        throw new Error(
+          detail.includes(`"${path}" (`) ? detail : `reading the newest messages of "${path}" (${exists.toLocaleString("en-US")} messages) failed: ${detail}`
+        );
+      }
     }
-    return {
-      messages: newest.map((uid) => byUid.get(uid)).filter((message) => message !== void 0),
-      total: uids.length
-    };
+    const uids = await searchUids(client, path, criteria, exists);
+    if (uids.length === 0 || page.take === 0) {
+      return { messages: [], total: uids.length, totalExact: true };
+    }
+    const messages = exists ?? (await client.status(path, { messages: true })).messages ?? void 0;
+    if (typeof messages === "number" && uids.length > messages) {
+      throw new Error(
+        `IMAP SEARCH on "${path}" reported ${uids.length} matches, more than the mailbox's own ${messages} messages \u2014 discarding as corrupted rather than trusting it (see #246).`
+      );
+    }
+    const newest = uids.slice().reverse().slice(page.skip, page.skip + page.take);
+    return { messages: await fetchRows(client, newest), total: uids.length, totalExact: true };
   } finally {
     lock.release();
   }
@@ -58495,15 +58590,17 @@ async function run(args, listMode, deps) {
       const limit = args.limit ?? 50;
       const offset = args.offset ?? 0;
       const criteria = buildCriteria(args, listMode);
-      const newestPerMailbox = offset + limit;
+      const page = unscopedSearch ? { skip: 0, take: offset + limit } : { skip: offset, take: limit };
       const fetched = [];
       const failedMailboxes = [];
       const failedMailboxReasons = {};
       let totalMatched = 0;
+      let totalExact = true;
       for (const path of paths) {
         try {
-          const result = await fetchMailboxMatches(client, path, criteria, newestPerMailbox);
+          const result = await fetchMailboxMatches(client, path, criteria, page);
           totalMatched += result.total;
+          totalExact &&= result.totalExact;
           fetched.push(...result.messages.map((message) => ({ message, path })));
         } catch (error) {
           failedMailboxes.push(path);
@@ -58528,8 +58625,6 @@ async function run(args, listMode, deps) {
           if (!unique.has(key)) unique.set(key, entry);
         }
         ordered = [...unique.values()].slice(offset, offset + limit);
-      } else {
-        ordered = fetched.slice(offset, offset + limit);
       }
       const rows = ordered.map(({ message, path }) => formatRow(message, cfg.accountLabel, path));
       const messages = ordered.map(
@@ -58540,6 +58635,7 @@ async function run(args, listMode, deps) {
 
 Partial result. Could not search mailbox(es): ${failedMailboxes.map((path) => `"${path}" (${failedMailboxReasons[path]})`).join(", ")}.` : "";
       const verb = listMode ? "listed" : "matched";
+      const totalText = totalExact ? `${totalMatched} total` : `at least ${totalMatched} total`;
       const scope = unscopedSearch ? allMailboxCount === 1 ? `mailbox "${paths[0]}"` : `${allMailboxCount} selectable mailboxes` : `mailbox "${paths[0]}"`;
       if (messages.length === 0) {
         return {
@@ -58551,7 +58647,7 @@ Partial result. Could not search mailbox(es): ${failedMailboxes.map((path) => `"
           failedMailboxReasons
         };
       }
-      const text = `Found ${rows.length} message(s) via IMAP (server-side, account ${cfg.accountLabel}, ${scope}; ${totalMatched} total ${verb}):
+      const text = `Found ${rows.length} message(s) via IMAP (server-side, account ${cfg.accountLabel}, ${scope}; ${totalText} ${verb}):
 ` + rows.join("\n") + `
 
 Note: these IMAP IDs (imap:\u2026) work with get-message and the message mutations (mark/flag/move/delete-message), which route back to IMAP.` + failureNote;
@@ -58629,7 +58725,10 @@ function imapMailStats(deps = {}) {
         try {
           const lock = await client.getMailboxLock("INBOX");
           try {
-            const found = await client.search({ since: since(days) }, { uid: true });
+            const found = await client.search(
+              { since: since(days), ...NOT_DELETED },
+              { uid: true }
+            );
             return Array.isArray(found) ? found.length : 0;
           } finally {
             lock.release();
@@ -59498,11 +59597,23 @@ async function imapThread(id, deps = {}, limit = 50) {
           if (Array.isArray(found)) found.forEach((u) => uidSet.add(u));
         };
         if (seedMsgId) {
-          addFound(await client.search({ header: { references: seedMsgId } }, { uid: true }));
-          addFound(await client.search({ header: { "in-reply-to": seedMsgId } }, { uid: true }));
+          addFound(
+            await client.search(
+              { header: { references: seedMsgId }, ...NOT_DELETED },
+              { uid: true }
+            )
+          );
+          addFound(
+            await client.search(
+              { header: { "in-reply-to": seedMsgId }, ...NOT_DELETED },
+              { uid: true }
+            )
+          );
         }
         for (const mid of [...refIds].slice(0, 20)) {
-          addFound(await client.search({ header: { "message-id": mid } }, { uid: true }));
+          addFound(
+            await client.search({ header: { "message-id": mid }, ...NOT_DELETED }, { uid: true })
+          );
         }
         if (uidSet.size <= 1) return null;
         const uids = [...uidSet].slice(0, limit);
@@ -59554,7 +59665,7 @@ async function imapThread(id, deps = {}, limit = 50) {
     true
   );
 }
-var import_imapflow, IMAP_ENV, defaultConnect, SPECIAL_USE_ALIASES, poolConnect, pools, connecting, MAX_COMPOSE_SOURCE_BYTES, MAX_RFC822_INLINE_BYTES, MAX_RFC822_FILE_BYTES, HEADER_WINDOW_BYTES, MAIL_FLAG_BITS, imapMarkRead, imapMarkUnread, FALLBACK_TRASH_PATH, imapBatchMarkRead, imapBatchMarkUnread, imapBatchFlag, imapBatchUnflag, imapBatchDelete;
+var import_imapflow, IMAP_ENV, defaultConnect, SPECIAL_USE_ALIASES, NOT_DELETED, LARGE_MAILBOX_MESSAGES, FIRST_SEARCH_WINDOW, MAX_WINDOW, poolConnect, pools, connecting, MAX_COMPOSE_SOURCE_BYTES, MAX_RFC822_INLINE_BYTES, MAX_RFC822_FILE_BYTES, HEADER_WINDOW_BYTES, MAIL_FLAG_BITS, imapMarkRead, imapMarkUnread, FALLBACK_TRASH_PATH, imapBatchMarkRead, imapBatchMarkUnread, imapBatchFlag, imapBatchUnflag, imapBatchDelete;
 var init_imapClient = __esm({
   "src/services/imapClient.ts"() {
     "use strict";
@@ -59580,7 +59691,24 @@ var init_imapClient = __esm({
       accounts: "APPLE_MAIL_MCP_IMAP_ACCOUNTS"
     };
     defaultConnect = async (cfg) => {
-      const client = new import_imapflow.ImapFlow(buildImapConnectionOptions(cfg));
+      let lastCommandError;
+      const keepErr = (entry) => {
+        if (entry && typeof entry === "object" && "err" in entry) {
+          lastCommandError = entry.err;
+        }
+      };
+      const noop = () => void 0;
+      const client = new import_imapflow.ImapFlow({
+        ...buildImapConnectionOptions(cfg),
+        logger: { trace: noop, debug: noop, info: noop, warn: keepErr, error: keepErr, fatal: keepErr }
+      });
+      Object.assign(client, {
+        takeLastCommandError: () => {
+          const err = lastCommandError;
+          lastCommandError = void 0;
+          return err;
+        }
+      });
       client.on("error", () => {
       });
       try {
@@ -59607,6 +59735,10 @@ var init_imapClient = __esm({
       junk: "\\junk",
       starred: "\\flagged"
     };
+    NOT_DELETED = { deleted: false };
+    LARGE_MAILBOX_MESSAGES = 1e4;
+    FIRST_SEARCH_WINDOW = 5e3;
+    MAX_WINDOW = 5e4;
     poolConnect = defaultConnect;
     pools = /* @__PURE__ */ new Map();
     connecting = /* @__PURE__ */ new Map();

package/build/index.js

@@ -65374,6 +65374,7 @@ var imapClient_exports = {};
 __export(imapClient_exports, {
   HEADER_WINDOW_BYTES: () => HEADER_WINDOW_BYTES,
   IMAP_ENV: () => IMAP_ENV,
+  LARGE_MAILBOX_MESSAGES: () => LARGE_MAILBOX_MESSAGES,
   MAX_COMPOSE_SOURCE_BYTES: () => MAX_COMPOSE_SOURCE_BYTES,
   MAX_RFC822_FILE_BYTES: () => MAX_RFC822_FILE_BYTES,
   MAX_RFC822_INLINE_BYTES: () => MAX_RFC822_INLINE_BYTES,
@@ -65652,7 +65653,7 @@ async function resolveMailboxPath(client, mailbox, _mode) {
   return staticMailboxAlias(mailbox);
 }
 function buildCriteria(a, listMode) {
-  const c = {};
+  const c = { ...NOT_DELETED };
   if (a.query) c.or = [{ subject: a.query }, { from: a.query }];
   if (a.body) c.body = a.body;
   if (a.from) c.from = a.from;
@@ -65664,7 +65665,6 @@ function buildCriteria(a, listMode) {
   if (a.isFlagged === false) c.unflagged = true;
   if (a.dateFrom) c.since = new Date(a.dateFrom);
   if (a.dateTo) c.before = new Date(a.dateTo);
-  if (Object.keys(c).length === 0) c.all = true;
   return c;
 }
 function validDate(d) {
@@ -65758,44 +65758,139 @@ function messageIdentity(entry) {
   const messageId = raw.replace(/^<+|>+$/g, "").trim().toLowerCase();
   return messageId ? `mid:${messageId}` : `${entry.path}\0${entry.message.uid}`;
 }
-async function fetchMailboxMatches(client, path, criteria, newestCount) {
-  const lock = await client.getMailboxLock(path);
+function isUnfiltered(criteria) {
+  const keys = Object.keys(criteria);
+  return keys.length === 1 && criteria.deleted === false;
+}
+async function statusMessageCount(client, path) {
   try {
-    const found = await client.search(criteria, { uid: true });
-    const uids = Array.isArray(found) ? found : [];
-    if (uids.length === 0 || newestCount === 0) return { messages: [], total: uids.length };
-    const status = await client.status(path, { messages: true });
-    if (typeof status.messages === "number" && uids.length > status.messages) {
+    const st = await client.status(path, { messages: true });
+    return typeof st.messages === "number" && st.messages >= 0 ? st.messages : void 0;
+  } catch {
+    return void 0;
+  }
+}
+async function searchUids(client, path, criteria, size) {
+  client.takeLastCommandError?.();
+  const found = await client.search(criteria, { uid: true });
+  if (Array.isArray(found)) return found;
+  const cause = client.takeLastCommandError?.();
+  const sized = size === void 0 ? "" : ` (${size.toLocaleString("en-US")} messages)`;
+  throw new Error(
+    `IMAP SEARCH on "${path}"${sized} failed: ` + (cause ? errText(cause) : "the server rejected it or the connection dropped before it answered (on a mailbox this size, usually a server-side timeout)")
+  );
+}
+async function fetchRows(client, uids) {
+  if (uids.length === 0) return [];
+  const byUid = /* @__PURE__ */ new Map();
+  for await (const msg of client.fetch(
+    uids.join(","),
+    // BODYSTRUCTURE rides along so `hasAttachments` is computed rather
+    // than assumed. Measured on 50 real messages: ~390ms -> ~465ms for
+    // the fetch (~17%), same single round trip, no extra request.
+    //
+    // INTERNALDATE rides along for the same reason, and is why `dateReceived`
+    // can finally mean what it says: imapflow's `envelope.date` is built from
+    // the header block, so it IS the `Date:` header, not arrival time.
+    //
+    // The `Date:` header itself (BODY.PEEK[HEADER.FIELDS (DATE)]) rides in the
+    // SAME FETCH command, so a date the server's ENVELOPE parser rejected can
+    // still be recovered (#234). Measured on 50 real messages, 6 alternating
+    // runs: median ~334ms without vs ~315ms with — inside the noise — for ~44
+    // bytes per message. Too cheap to hide behind an opt-in.
+    { envelope: true, flags: true, bodyStructure: true, internalDate: true, headers: ["date"] },
+    { uid: true }
+  )) {
+    byUid.set(msg.uid, msg);
+  }
+  return uids.map((uid) => byUid.get(uid)).filter((message) => message !== void 0);
+}
+async function walkWindows(exists, page, firstWindow, readWindow) {
+  const wanted = page.skip + page.take;
+  const uids = [];
+  let seen = 0;
+  let matched = 0;
+  let hi = exists;
+  let width = Math.max(1, Math.min(firstWindow, MAX_WINDOW));
+  while (hi >= 1 && seen < wanted) {
+    const lo = Math.max(1, hi - width + 1);
+    const live = (await readWindow(lo, hi === exists ? "*" : hi, hi - lo + 1)).slice().sort((a, b) => b - a);
+    matched += live.length;
+    for (const uid of live) {
+      if (seen >= wanted) break;
+      if (seen >= page.skip) uids.push(uid);
+      seen++;
+    }
+    hi = lo - 1;
+    width = Math.min(width * 4, MAX_WINDOW);
+  }
+  return { uids, matched, exhausted: hi < 1 };
+}
+async function listLargeMailbox(client, exists, page) {
+  let deletedSeen = 0;
+  const walk = await walkWindows(
+    exists,
+    page,
+    // Room for a few ghosts on the first read without a second round trip.
+    page.skip + page.take + 64,
+    async (lo, hi) => {
+      const live = [];
+      for await (const msg of client.fetch(`${lo}:${hi}`, { uid: true, flags: true })) {
+        if (msg.flags?.has("\\Deleted")) deletedSeen++;
+        else live.push(msg.uid);
+      }
+      return live;
+    }
+  );
+  return {
+    messages: await fetchRows(client, walk.uids),
+    total: Math.max(0, exists - deletedSeen),
+    totalExact: true
+  };
+}
+async function searchLargeMailbox(client, path, criteria, exists, page) {
+  const walk = await walkWindows(exists, page, FIRST_SEARCH_WINDOW, async (lo, hi, width) => {
+    const found = await searchUids(client, path, { ...criteria, seq: `${lo}:${hi}` }, exists);
+    if (found.length > width) {
       throw new Error(
-        `IMAP SEARCH on "${path}" reported ${uids.length} matches, more than the mailbox's own ${status.messages} messages \u2014 discarding as corrupted rather than trusting it (see #246).`
+        `IMAP SEARCH on "${path}" reported ${found.length} matches in a ${width}-message window \u2014 discarding as corrupted rather than trusting it (see #246).`
       );
     }
-    const newest = uids.slice().reverse().slice(0, newestCount);
-    const byUid = /* @__PURE__ */ new Map();
-    for await (const msg of client.fetch(
-      newest.join(","),
-      // BODYSTRUCTURE rides along so `hasAttachments` is computed rather
-      // than assumed. Measured on 50 real messages: ~390ms -> ~465ms for
-      // the fetch (~17%), same single round trip, no extra request.
-      //
-      // INTERNALDATE rides along for the same reason, and is why `dateReceived`
-      // can finally mean what it says: imapflow's `envelope.date` is built from
-      // the header block, so it IS the `Date:` header, not arrival time.
-      //
-      // The `Date:` header itself (BODY.PEEK[HEADER.FIELDS (DATE)]) rides in the
-      // SAME FETCH command, so a date the server's ENVELOPE parser rejected can
-      // still be recovered (#234). Measured on 50 real messages, 6 alternating
-      // runs: median ~334ms without vs ~315ms with — inside the noise — for ~44
-      // bytes per message. Too cheap to hide behind an opt-in.
-      { envelope: true, flags: true, bodyStructure: true, internalDate: true, headers: ["date"] },
-      { uid: true }
-    )) {
-      byUid.set(msg.uid, msg);
+    return found;
+  });
+  return {
+    messages: await fetchRows(client, walk.uids),
+    total: walk.matched,
+    totalExact: walk.exhausted
+  };
+}
+async function fetchMailboxMatches(client, path, criteria, page) {
+  const lock = await client.getMailboxLock(path);
+  try {
+    const exists = await statusMessageCount(client, path);
+    if (exists === 0) return { messages: [], total: 0, totalExact: true };
+    if (exists !== void 0 && exists > LARGE_MAILBOX_MESSAGES) {
+      try {
+        return isUnfiltered(criteria) ? await listLargeMailbox(client, exists, page) : await searchLargeMailbox(client, path, criteria, exists, page);
+      } catch (error2) {
+        const detail = errText(error2);
+        throw new Error(
+          detail.includes(`"${path}" (`) ? detail : `reading the newest messages of "${path}" (${exists.toLocaleString("en-US")} messages) failed: ${detail}`
+        );
+      }
     }
-    return {
-      messages: newest.map((uid) => byUid.get(uid)).filter((message) => message !== void 0),
-      total: uids.length
-    };
+    const uids = await searchUids(client, path, criteria, exists);
+    if (uids.length === 0 || page.take === 0) {
+      return { messages: [], total: uids.length, totalExact: true };
+    }
+    const messages = exists ?? (await client.status(path, { messages: true })).messages ?? void 0;
+    if (typeof messages === "number" && uids.length > messages) {
+      throw new Error(
+        `IMAP SEARCH on "${path}" reported ${uids.length} matches, more than the mailbox's own ${messages} messages \u2014 discarding as corrupted rather than trusting it (see #246).`
+      );
+    }
+    const newest = uids.slice().reverse().slice(page.skip, page.skip + page.take);
+    return { messages: await fetchRows(client, newest), total: uids.length, totalExact: true };
   } finally {
     lock.release();
   }
@@ -65824,15 +65919,17 @@ async function run(args, listMode, deps) {
       const limit = args.limit ?? 50;
       const offset = args.offset ?? 0;
       const criteria = buildCriteria(args, listMode);
-      const newestPerMailbox = offset + limit;
+      const page = unscopedSearch ? { skip: 0, take: offset + limit } : { skip: offset, take: limit };
       const fetched = [];
       const failedMailboxes = [];
       const failedMailboxReasons = {};
       let totalMatched = 0;
+      let totalExact = true;
       for (const path of paths) {
         try {
-          const result = await fetchMailboxMatches(client, path, criteria, newestPerMailbox);
+          const result = await fetchMailboxMatches(client, path, criteria, page);
           totalMatched += result.total;
+          totalExact &&= result.totalExact;
           fetched.push(...result.messages.map((message) => ({ message, path })));
         } catch (error2) {
           failedMailboxes.push(path);
@@ -65857,8 +65954,6 @@ async function run(args, listMode, deps) {
           if (!unique.has(key)) unique.set(key, entry);
         }
         ordered = [...unique.values()].slice(offset, offset + limit);
-      } else {
-        ordered = fetched.slice(offset, offset + limit);
       }
       const rows = ordered.map(({ message, path }) => formatRow(message, cfg.accountLabel, path));
       const messages = ordered.map(
@@ -65869,6 +65964,7 @@ async function run(args, listMode, deps) {
 
 Partial result. Could not search mailbox(es): ${failedMailboxes.map((path) => `"${path}" (${failedMailboxReasons[path]})`).join(", ")}.` : "";
       const verb = listMode ? "listed" : "matched";
+      const totalText = totalExact ? `${totalMatched} total` : `at least ${totalMatched} total`;
       const scope = unscopedSearch ? allMailboxCount === 1 ? `mailbox "${paths[0]}"` : `${allMailboxCount} selectable mailboxes` : `mailbox "${paths[0]}"`;
       if (messages.length === 0) {
         return {
@@ -65880,7 +65976,7 @@ Partial result. Could not search mailbox(es): ${failedMailboxes.map((path) => `"
           failedMailboxReasons
         };
       }
-      const text = `Found ${rows.length} message(s) via IMAP (server-side, account ${cfg.accountLabel}, ${scope}; ${totalMatched} total ${verb}):
+      const text = `Found ${rows.length} message(s) via IMAP (server-side, account ${cfg.accountLabel}, ${scope}; ${totalText} ${verb}):
 ` + rows.join("\n") + `
 
 Note: these IMAP IDs (imap:\u2026) work with get-message and the message mutations (mark/flag/move/delete-message), which route back to IMAP.` + failureNote;
@@ -65958,7 +66054,10 @@ function imapMailStats(deps = {}) {
         try {
           const lock = await client.getMailboxLock("INBOX");
           try {
-            const found = await client.search({ since: since(days) }, { uid: true });
+            const found = await client.search(
+              { since: since(days), ...NOT_DELETED },
+              { uid: true }
+            );
             return Array.isArray(found) ? found.length : 0;
           } finally {
             lock.release();
@@ -66827,11 +66926,23 @@ async function imapThread(id, deps = {}, limit = 50) {
           if (Array.isArray(found)) found.forEach((u) => uidSet.add(u));
         };
         if (seedMsgId) {
-          addFound(await client.search({ header: { references: seedMsgId } }, { uid: true }));
-          addFound(await client.search({ header: { "in-reply-to": seedMsgId } }, { uid: true }));
+          addFound(
+            await client.search(
+              { header: { references: seedMsgId }, ...NOT_DELETED },
+              { uid: true }
+            )
+          );
+          addFound(
+            await client.search(
+              { header: { "in-reply-to": seedMsgId }, ...NOT_DELETED },
+              { uid: true }
+            )
+          );
         }
         for (const mid of [...refIds].slice(0, 20)) {
-          addFound(await client.search({ header: { "message-id": mid } }, { uid: true }));
+          addFound(
+            await client.search({ header: { "message-id": mid }, ...NOT_DELETED }, { uid: true })
+          );
         }
         if (uidSet.size <= 1) return null;
         const uids = [...uidSet].slice(0, limit);
@@ -66883,7 +66994,7 @@ async function imapThread(id, deps = {}, limit = 50) {
     true
   );
 }
-var import_imapflow, IMAP_ENV, defaultConnect, SPECIAL_USE_ALIASES, poolConnect, pools, connecting, MAX_COMPOSE_SOURCE_BYTES, MAX_RFC822_INLINE_BYTES, MAX_RFC822_FILE_BYTES, HEADER_WINDOW_BYTES, MAIL_FLAG_BITS, imapMarkRead, imapMarkUnread, FALLBACK_TRASH_PATH, imapBatchMarkRead, imapBatchMarkUnread, imapBatchFlag, imapBatchUnflag, imapBatchDelete;
+var import_imapflow, IMAP_ENV, defaultConnect, SPECIAL_USE_ALIASES, NOT_DELETED, LARGE_MAILBOX_MESSAGES, FIRST_SEARCH_WINDOW, MAX_WINDOW, poolConnect, pools, connecting, MAX_COMPOSE_SOURCE_BYTES, MAX_RFC822_INLINE_BYTES, MAX_RFC822_FILE_BYTES, HEADER_WINDOW_BYTES, MAIL_FLAG_BITS, imapMarkRead, imapMarkUnread, FALLBACK_TRASH_PATH, imapBatchMarkRead, imapBatchMarkUnread, imapBatchFlag, imapBatchUnflag, imapBatchDelete;
 var init_imapClient = __esm({
   "src/services/imapClient.ts"() {
     "use strict";
@@ -66909,7 +67020,24 @@ var init_imapClient = __esm({
       accounts: "APPLE_MAIL_MCP_IMAP_ACCOUNTS"
     };
     defaultConnect = async (cfg) => {
-      const client = new import_imapflow.ImapFlow(buildImapConnectionOptions(cfg));
+      let lastCommandError;
+      const keepErr = (entry) => {
+        if (entry && typeof entry === "object" && "err" in entry) {
+          lastCommandError = entry.err;
+        }
+      };
+      const noop = () => void 0;
+      const client = new import_imapflow.ImapFlow({
+        ...buildImapConnectionOptions(cfg),
+        logger: { trace: noop, debug: noop, info: noop, warn: keepErr, error: keepErr, fatal: keepErr }
+      });
+      Object.assign(client, {
+        takeLastCommandError: () => {
+          const err = lastCommandError;
+          lastCommandError = void 0;
+          return err;
+        }
+      });
       client.on("error", () => {
       });
       try {
@@ -66936,6 +67064,10 @@ var init_imapClient = __esm({
       junk: "\\junk",
       starred: "\\flagged"
     };
+    NOT_DELETED = { deleted: false };
+    LARGE_MAILBOX_MESSAGES = 1e4;
+    FIRST_SEARCH_WINDOW = 5e3;
+    MAX_WINDOW = 5e4;
     poolConnect = defaultConnect;
     pools = /* @__PURE__ */ new Map();
     connecting = /* @__PURE__ */ new Map();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apple-mail-mcp",
-  "version": "2.19.15",
+  "version": "2.19.17",
   "description": "MCP server for Apple Mail - read, search, send, and manage emails via Claude and other AI assistants",
   "type": "module",
   "main": "build/index.js",