apple-mail-mcp 2.20.18 → 2.20.20

package/build/cli.js

@@ -58581,10 +58581,13 @@ async function searchUids(client, path3, criteria, size) {
 async function filterUidsByColor(client, uids, colorIndex) {
   if (uids.length === 0) return uids;
   const keep = /* @__PURE__ */ new Set();
-  for await (const msg of client.fetch(uids.join(","), { uid: true, flags: true }, { uid: true })) {
-    if (typeof msg?.uid !== "number") continue;
-    const idx = mailFlagColorIndex(msg.flags);
-    if (colorIndex === 0 ? idx === void 0 : idx === colorIndex) keep.add(msg.uid);
+  for (let i = 0; i < uids.length; i += COLOR_FETCH_CHUNK) {
+    const slice = uids.slice(i, i + COLOR_FETCH_CHUNK).join(",");
+    for await (const msg of client.fetch(slice, { uid: true, flags: true }, { uid: true })) {
+      if (typeof msg?.uid !== "number") continue;
+      const idx = mailFlagColorIndex(msg.flags);
+      if (colorIndex === 0 ? idx === void 0 : idx === colorIndex) keep.add(msg.uid);
+    }
   }
   return uids.filter((uid) => keep.has(uid));
 }
@@ -60075,7 +60078,7 @@ async function imapThread(id, deps = {}, limit = 50) {
     true
   );
 }
-var import_imapflow, IMAP_ENV, defaultConnect, SPECIAL_USE_ALIASES, NOT_DELETED, LARGE_MAILBOX_MESSAGES, FIRST_SEARCH_WINDOW, MAX_WINDOW, MAX_UNSCOPED_SEARCH_DEPTH, ROW_QUERY, ROW_QUERY_NO_STRUCTURE, ROW_QUERY_HEADERS_ONLY, DELETED_MARGIN, poolConnect, pools, connecting, MAX_COMPOSE_SOURCE_BYTES, MAX_RFC822_INLINE_BYTES, MAX_RFC822_FILE_BYTES, HEADER_WINDOW_BYTES, MAIL_FLAG_BITS, FLAG_COLOR_NAMES, imapMarkRead, imapMarkUnread, FALLBACK_TRASH_PATH, BASE64_TAIL_WINDOW, QP_EXACT_MAX_BYTES, imapBatchMarkRead, imapBatchMarkUnread, imapBatchFlag, imapBatchUnflag, imapBatchDelete;
+var import_imapflow, IMAP_ENV, defaultConnect, SPECIAL_USE_ALIASES, NOT_DELETED, LARGE_MAILBOX_MESSAGES, FIRST_SEARCH_WINDOW, MAX_WINDOW, MAX_UNSCOPED_SEARCH_DEPTH, COLOR_FETCH_CHUNK, ROW_QUERY, ROW_QUERY_NO_STRUCTURE, ROW_QUERY_HEADERS_ONLY, DELETED_MARGIN, poolConnect, pools, connecting, MAX_COMPOSE_SOURCE_BYTES, MAX_RFC822_INLINE_BYTES, MAX_RFC822_FILE_BYTES, HEADER_WINDOW_BYTES, MAIL_FLAG_BITS, FLAG_COLOR_NAMES, imapMarkRead, imapMarkUnread, FALLBACK_TRASH_PATH, BASE64_TAIL_WINDOW, QP_EXACT_MAX_BYTES, imapBatchMarkRead, imapBatchMarkUnread, imapBatchFlag, imapBatchUnflag, imapBatchDelete;
 var init_imapClient = __esm({
   "src/services/imapClient.ts"() {
     "use strict";
@@ -60151,6 +60154,7 @@ var init_imapClient = __esm({
     FIRST_SEARCH_WINDOW = 5e3;
     MAX_WINDOW = 5e4;
     MAX_UNSCOPED_SEARCH_DEPTH = 5e3;
+    COLOR_FETCH_CHUNK = 500;
     ROW_QUERY = {
       envelope: true,
       flags: true,

package/build/index.js

@@ -66334,10 +66334,13 @@ async function searchUids(client, path3, criteria, size) {
 async function filterUidsByColor(client, uids, colorIndex) {
   if (uids.length === 0) return uids;
   const keep = /* @__PURE__ */ new Set();
-  for await (const msg of client.fetch(uids.join(","), { uid: true, flags: true }, { uid: true })) {
-    if (typeof msg?.uid !== "number") continue;
-    const idx = mailFlagColorIndex(msg.flags);
-    if (colorIndex === 0 ? idx === void 0 : idx === colorIndex) keep.add(msg.uid);
+  for (let i = 0; i < uids.length; i += COLOR_FETCH_CHUNK) {
+    const slice = uids.slice(i, i + COLOR_FETCH_CHUNK).join(",");
+    for await (const msg of client.fetch(slice, { uid: true, flags: true }, { uid: true })) {
+      if (typeof msg?.uid !== "number") continue;
+      const idx = mailFlagColorIndex(msg.flags);
+      if (colorIndex === 0 ? idx === void 0 : idx === colorIndex) keep.add(msg.uid);
+    }
   }
   return uids.filter((uid) => keep.has(uid));
 }
@@ -67828,7 +67831,7 @@ async function imapThread(id, deps = {}, limit = 50) {
     true
   );
 }
-var import_imapflow, IMAP_ENV, defaultConnect, SPECIAL_USE_ALIASES, NOT_DELETED, LARGE_MAILBOX_MESSAGES, FIRST_SEARCH_WINDOW, MAX_WINDOW, MAX_UNSCOPED_SEARCH_DEPTH, ROW_QUERY, ROW_QUERY_NO_STRUCTURE, ROW_QUERY_HEADERS_ONLY, DELETED_MARGIN, poolConnect, pools, connecting, MAX_COMPOSE_SOURCE_BYTES, MAX_RFC822_INLINE_BYTES, MAX_RFC822_FILE_BYTES, HEADER_WINDOW_BYTES, MAIL_FLAG_BITS, FLAG_COLOR_NAMES, imapMarkRead, imapMarkUnread, FALLBACK_TRASH_PATH, BASE64_TAIL_WINDOW, QP_EXACT_MAX_BYTES, imapBatchMarkRead, imapBatchMarkUnread, imapBatchFlag, imapBatchUnflag, imapBatchDelete;
+var import_imapflow, IMAP_ENV, defaultConnect, SPECIAL_USE_ALIASES, NOT_DELETED, LARGE_MAILBOX_MESSAGES, FIRST_SEARCH_WINDOW, MAX_WINDOW, MAX_UNSCOPED_SEARCH_DEPTH, COLOR_FETCH_CHUNK, ROW_QUERY, ROW_QUERY_NO_STRUCTURE, ROW_QUERY_HEADERS_ONLY, DELETED_MARGIN, poolConnect, pools, connecting, MAX_COMPOSE_SOURCE_BYTES, MAX_RFC822_INLINE_BYTES, MAX_RFC822_FILE_BYTES, HEADER_WINDOW_BYTES, MAIL_FLAG_BITS, FLAG_COLOR_NAMES, imapMarkRead, imapMarkUnread, FALLBACK_TRASH_PATH, BASE64_TAIL_WINDOW, QP_EXACT_MAX_BYTES, imapBatchMarkRead, imapBatchMarkUnread, imapBatchFlag, imapBatchUnflag, imapBatchDelete;
 var init_imapClient = __esm({
   "src/services/imapClient.ts"() {
     "use strict";
@@ -67904,6 +67907,7 @@ var init_imapClient = __esm({
     FIRST_SEARCH_WINDOW = 5e3;
     MAX_WINDOW = 5e4;
     MAX_UNSCOPED_SEARCH_DEPTH = 5e3;
+    COLOR_FETCH_CHUNK = 500;
     ROW_QUERY = {
       envelope: true,
       flags: true,
@@ -83560,10 +83564,17 @@ function buildMessageRowLoop(opts) {
         set _dates to date received of _msgs
         set _reads to read status of _msgs
         set _flags to flagged status of _msgs
-        set _flagColors to flag index of _msgs
       on error
         set _bulkOK to false
       end try
+      -- Its own try, like the sent dates: a getter that fails on one account type must
+      -- not send every other property down the slow per-message path.
+      set _flagBulkOK to true
+      try
+        set _flagColors to flag index of _msgs
+      on error
+        set _flagBulkOK to false
+      end try
       set _sentBulkOK to true
       try
         set _sentDates to date sent of _msgs
@@ -83591,15 +83602,21 @@ function buildMessageRowLoop(opts) {
             set msgSender to item _i of _sndrs
             set msgRead to (item _i of _reads) as string
             set msgFlagged to (item _i of _flags) as string
-            set msgFlagColorRaw to (item _i of _flagColors) as string
           else
             set _m to item _i of _msgs
             set msgSubject to subject of _m
             set msgSender to sender of _m
             set msgRead to read status of _m as string
             set msgFlagged to flagged status of _m as string
-            set msgFlagColorRaw to flag index of _m as string
-          end if${attRow}
+          end if
+          set msgFlagColorRaw to "-1"
+          try
+            if _bulkOK and _flagBulkOK then
+              set msgFlagColorRaw to (item _i of _flagColors) as string
+            else
+              set msgFlagColorRaw to (flag index of (item _i of _msgs)) as string
+            end if
+          end try${attRow}
           set msgDateStr to ${AS_DATE_TO_STRING}
           set msgDateSentStr to ""
           try
@@ -85104,9 +85121,13 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
       if (scoped.kind === "hit") return scoped.output;
       if (scoped.kind === "done") return null;
     }
-    const result = executeAppleScript(this.unscopedByIdScript(id, innerAction, opts), {
-      timeoutMs: READ_ONLY_BYID_TIMEOUT_MS
-    });
+    const account = hint?.account && !hint?.mailbox ? hint.account : void 0;
+    const result = executeAppleScript(
+      this.unscopedByIdScript(id, innerAction, { ...opts, account }),
+      {
+        timeoutMs: READ_ONLY_BYID_TIMEOUT_MS
+      }
+    );
     if (!result.success || !result.output.trim()) {
       if (!result.success) {
         if (result.timedOut) this.lastMessageLookupError = timedOutScanningForId(id);
@@ -85223,6 +85244,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
    */
   unscopedByIdScript(id, innerAction, opts = {}) {
     const threshold = getByIdScanThreshold();
+    const scopeAcct = escapeForAppleScript(opts.account ?? "");
     const stalledKeys = threshold > 0 ? this.stalledMailboxes.keys() : [];
     const stalledList = `{${stalledKeys.map((key) => {
       const i = key.indexOf(STALLED_KEY_SEP);
@@ -85282,6 +85304,8 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
         set _probeStalled to false
         set _stopAt to 0
         set _stalledKeys to ${stalledList}
+        set _scopeAcct to "${scopeAcct}"
+        set _acctSeen to false
         set _startedAt to current date
         set _acctNames to {}
         try
@@ -85298,10 +85322,14 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
           set _acctName to ""
           if _ai <= (length of _acctNames) then set _acctName to item _ai of _acctNames
           if _acctName is "" then set _acctName to (name of acct)
-          if _budgetHit or _probeStalled then
+          if _scopeAcct is not "" and _acctName is not _scopeAcct then
+            -- Scoped to one account: leave the others alone.
+            set _ai to _ai + 0
+          else if _budgetHit or _probeStalled then
             -- Stopped early: name what is left without asking Mail.app.
             set _unreached to _unreached & _acctName & " (every mailbox)${DIAG_ITEM_SEP}"
           else
+            set _acctSeen to true
             set _mbNames to {}
             try
               set _mbNames to name of mailboxes of acct
@@ -85347,7 +85375,11 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
         -- reach them. Collect into the SAME _hits/_names, which means an id
         -- present both in an account and locally is now correctly reported as
         -- ambiguous rather than silently resolving to the account copy.
-        if _budgetHit or _probeStalled then
+        if _scopeAcct is not "" and not _acctSeen then return "${LOOKUP_ERROR_MARKER}Account \\"" & _scopeAcct & "\\" not found \u2014 check the name with list-accounts."
+        if _scopeAcct is not "" then
+          -- Local mailboxes belong to no account.
+          set _ai to _ai + 0
+        else if _budgetHit or _probeStalled then
           set _unreached to _unreached & "${LOCAL_STORE_LABEL} (any local mailboxes)${DIAG_ITEM_SEP}"
         else if not (${hitFound}) then${localMailboxBindingFragment()}
           set _mi to 0

package/package.json

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