apple-mail-mcp 2.19.14 → 2.19.16

package/README.md

@@ -1077,6 +1077,21 @@ refused rather than guessed; pass the full path to disambiguate. This also
 means Gmail's nested special mailboxes now report their real path, e.g.
 `[Gmail]/All Mail` rather than `All Mail` — a visible change from before 2.17.0.
 
+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
+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.
+
 **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

@@ -57647,6 +57647,19 @@ var require_imap_flow = __commonJS({
   }
 });
 
+// src/utils/mailboxName.ts
+function mailboxNameKey(name) {
+  return name.trim().normalize("NFC").toLowerCase();
+}
+function nfc(name) {
+  return name.trim().normalize("NFC");
+}
+var init_mailboxName = __esm({
+  "src/utils/mailboxName.ts"() {
+    "use strict";
+  }
+});
+
 // src/utils/mimeParse.ts
 function extractBoundary(source) {
   const match = source.match(/boundary="?([^";\s\r\n]+)"?/i);
@@ -58076,6 +58089,7 @@ __export(imapClient_exports, {
   listImapAccountLabels: () => listImapAccountLabels,
   mailFlagBitsFor: () => mailFlagBitsFor,
   mailFlagColorIndex: () => mailFlagColorIndex,
+  matchMailbox: () => matchMailbox,
   normalizeMessageId: () => normalizeMessageId,
   resolveImapConfig: () => resolveImapConfig,
   resolveImapConfigs: () => resolveImapConfigs,
@@ -58290,21 +58304,26 @@ function staticMailboxAlias(mailbox) {
 }
 async function resolveMailboxPath(client, mailbox, _mode) {
   if (!mailbox) return "INBOX";
+  let boxes;
   try {
-    const resolved = await resolveMailbox(client, mailbox);
-    if (resolved.kind === "found") return resolved.path;
-    const flag = SPECIAL_USE_ALIASES[mailbox.trim().toLowerCase()];
-    if (flag) {
-      const boxes = await client.list();
-      const special = boxes.find((b) => b.specialUse?.toLowerCase() === flag);
-      if (special) return special.path;
-    }
+    boxes = await client.list();
   } catch {
+    return staticMailboxAlias(mailbox);
+  }
+  const resolved = matchMailbox(boxes, mailbox);
+  if (resolved.kind === "found") return resolved.path;
+  const flag = SPECIAL_USE_ALIASES[mailbox.trim().toLowerCase()];
+  if (flag) {
+    const special = boxes.find((b) => b.specialUse?.toLowerCase() === flag);
+    if (special) return special.path;
+  }
+  if (resolved.kind === "ambiguous") {
+    throw new Error(ambiguousMailboxError(mailbox, resolved.candidates));
   }
   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;
@@ -58316,7 +58335,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) {
@@ -58392,7 +58410,7 @@ function structuredRow(m, account, path) {
   };
 }
 function describeMailboxFailure(error) {
-  const raw = error instanceof Error ? error.message : String(error);
+  const raw = errText(error);
   const oneLine = raw.split("\n")[0].trim();
   const looksSensitive = /pass(word)?\s*[:=]|authorization:\s*\S|bearer\s+\S{10,}/i.test(oneLine);
   const safe = looksSensitive ? "IMAP error (detail redacted \u2014 response text looked like it might contain a credential)" : oneLine || "unknown error";
@@ -58610,7 +58628,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();
@@ -58630,7 +58651,13 @@ function imapMailStats(deps = {}) {
   );
 }
 function errText(e) {
-  return e instanceof Error ? e.message : String(e);
+  if (!(e instanceof Error)) return String(e);
+  const x = e;
+  if (typeof x.responseStatus !== "string" || !x.responseStatus) return e.message;
+  const code = typeof x.serverResponseCode === "string" && x.serverResponseCode;
+  const text = typeof x.responseText === "string" ? x.responseText.trim() : "";
+  const server = [x.responseStatus, code ? `[${code}]` : "", text].filter(Boolean).join(" ");
+  return e.message && e.message !== "Command failed" ? `${e.message}: ${server}` : server;
 }
 function assertMutated(result, what) {
   if (!result) throw new Error(`${what}: server rejected the command (IMAP NO/BAD)`);
@@ -58782,20 +58809,30 @@ function withClient(deps, fn) {
   return useClient(deps, fn);
 }
 async function resolveMailbox(client, name) {
-  const wanted = name.trim().toLowerCase();
   const boxes = await client.list();
-  const byPath = boxes.find((b) => b.path.toLowerCase() === wanted);
-  if (byPath) return { kind: "found", path: byPath.path };
-  const byName = boxes.filter((b) => b.name.toLowerCase() === wanted);
-  if (byName.length === 1) return { kind: "found", path: byName[0].path };
-  if (byName.length > 1) {
-    return { kind: "ambiguous", candidates: byName.map((b) => b.path).sort() };
+  return matchMailbox(boxes, name);
+}
+function matchMailbox(boxes, name) {
+  const exact = boxes.find((b) => b.path === name || b.path === name.trim());
+  if (exact) return { kind: "found", path: exact.path };
+  const wanted = mailboxNameKey(name);
+  const tiers = [
+    boxes.filter((b) => mailboxNameKey(b.path) === wanted),
+    boxes.filter((b) => mailboxNameKey(b.name) === wanted)
+  ];
+  for (const hits of tiers) {
+    const paths = [...new Set(hits.map((b) => b.path))];
+    if (paths.length === 1) return { kind: "found", path: paths[0] };
+    if (paths.length > 1) return { kind: "ambiguous", candidates: paths.sort() };
   }
   return { kind: "none" };
 }
 function ambiguousMailboxError(name, candidates, accountLabel) {
   const where = accountLabel ? ` on IMAP account ${accountLabel}` : "";
-  return `Mailbox "${name}" is ambiguous${where} \u2014 it matches ${candidates.map((c) => `"${c}"`).join(" and ")}. Pass the full path.`;
+  const listed = candidates.map((c) => `"${c}"`).join(" and ");
+  const indistinguishable = new Set(candidates.map(mailboxNameKey)).size === 1;
+  const hint = indistinguishable ? " They differ only in letter case or Unicode normalization (precomposed vs decomposed accents), so no typed name can tell them apart. Rename one of them." : " Pass the full path.";
+  return `Mailbox "${name}" is ambiguous${where} \u2014 it matches ${listed}.${hint}`;
 }
 async function findMailboxPathOrThrow(client, name) {
   const res = await resolveMailbox(client, name);
@@ -58804,6 +58841,15 @@ async function findMailboxPathOrThrow(client, name) {
 }
 function imapCreateMailbox(name, deps = {}) {
   return withClient(deps, async (client) => {
+    let twin;
+    try {
+      const wanted = nfc(name);
+      twin = (await client.list()).find((b) => nfc(b.path) === wanted)?.path;
+    } catch {
+    }
+    if (twin !== void 0) {
+      return { success: true, info: `Mailbox "${twin}" already existed.` };
+    }
     try {
       const res = await client.mailboxCreate(name);
       return res.created ? { success: true, info: `Created mailbox "${res.path}".` } : { success: true, info: `Mailbox "${res.path}" already existed.` };
@@ -58855,6 +58901,14 @@ function imapRenameMailbox(oldName, newName, deps = {}) {
       };
     }
     const path = found.path;
+    const wantedNew = nfc(newName);
+    const clash = (await client.list()).find((b) => b.path !== path && nfc(b.path) === wantedNew);
+    if (clash) {
+      return {
+        success: false,
+        error: `Cannot rename "${path}" to "${newName}": mailbox "${clash.path}" already exists on IMAP account ${cfg.accountLabel} (the same name, differing only in how its accents are encoded).`
+      };
+    }
     try {
       const res = await client.mailboxRename(path, newName);
       return { success: true, info: `Renamed "${res.path}" to "${res.newPath}" via IMAP.` };
@@ -59446,11 +59500,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);
@@ -59502,13 +59568,14 @@ 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, 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";
     import_imapflow = __toESM(require_imap_flow(), 1);
     init_smtpMailer();
     init_docsUrls();
+    init_mailboxName();
     init_mimeParse();
     init_headers();
     init_auditLog();
@@ -59554,6 +59621,7 @@ var init_imapClient = __esm({
       junk: "\\junk",
       starred: "\\flagged"
     };
+    NOT_DELETED = { deleted: false };
     poolConnect = defaultConnect;
     pools = /* @__PURE__ */ new Map();
     connecting = /* @__PURE__ */ new Map();

package/build/index.js

@@ -7681,6 +7681,19 @@ var init_headers = __esm({
   }
 });
 
+// src/utils/mailboxName.ts
+function mailboxNameKey(name) {
+  return name.trim().normalize("NFC").toLowerCase();
+}
+function nfc(name) {
+  return name.trim().normalize("NFC");
+}
+var init_mailboxName = __esm({
+  "src/utils/mailboxName.ts"() {
+    "use strict";
+  }
+});
+
 // src/utils/attachmentLimits.ts
 function isInlineAttachmentBase64WithinLimit(contentBase64) {
   if (contentBase64.length > MAX_INLINE_ATTACHMENT_BASE64_INPUT_CHARS) return false;
@@ -65405,6 +65418,7 @@ __export(imapClient_exports, {
   listImapAccountLabels: () => listImapAccountLabels,
   mailFlagBitsFor: () => mailFlagBitsFor,
   mailFlagColorIndex: () => mailFlagColorIndex,
+  matchMailbox: () => matchMailbox,
   normalizeMessageId: () => normalizeMessageId,
   resolveImapConfig: () => resolveImapConfig,
   resolveImapConfigs: () => resolveImapConfigs,
@@ -65619,21 +65633,26 @@ function staticMailboxAlias(mailbox) {
 }
 async function resolveMailboxPath(client, mailbox, _mode) {
   if (!mailbox) return "INBOX";
+  let boxes;
   try {
-    const resolved = await resolveMailbox(client, mailbox);
-    if (resolved.kind === "found") return resolved.path;
-    const flag = SPECIAL_USE_ALIASES[mailbox.trim().toLowerCase()];
-    if (flag) {
-      const boxes = await client.list();
-      const special = boxes.find((b) => b.specialUse?.toLowerCase() === flag);
-      if (special) return special.path;
-    }
+    boxes = await client.list();
   } catch {
+    return staticMailboxAlias(mailbox);
+  }
+  const resolved = matchMailbox(boxes, mailbox);
+  if (resolved.kind === "found") return resolved.path;
+  const flag = SPECIAL_USE_ALIASES[mailbox.trim().toLowerCase()];
+  if (flag) {
+    const special = boxes.find((b) => b.specialUse?.toLowerCase() === flag);
+    if (special) return special.path;
+  }
+  if (resolved.kind === "ambiguous") {
+    throw new Error(ambiguousMailboxError(mailbox, resolved.candidates));
   }
   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;
@@ -65645,7 +65664,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) {
@@ -65721,7 +65739,7 @@ function structuredRow(m, account, path) {
   };
 }
 function describeMailboxFailure(error2) {
-  const raw = error2 instanceof Error ? error2.message : String(error2);
+  const raw = errText(error2);
   const oneLine = raw.split("\n")[0].trim();
   const looksSensitive = /pass(word)?\s*[:=]|authorization:\s*\S|bearer\s+\S{10,}/i.test(oneLine);
   const safe = looksSensitive ? "IMAP error (detail redacted \u2014 response text looked like it might contain a credential)" : oneLine || "unknown error";
@@ -65939,7 +65957,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();
@@ -65959,7 +65980,13 @@ function imapMailStats(deps = {}) {
   );
 }
 function errText(e) {
-  return e instanceof Error ? e.message : String(e);
+  if (!(e instanceof Error)) return String(e);
+  const x = e;
+  if (typeof x.responseStatus !== "string" || !x.responseStatus) return e.message;
+  const code = typeof x.serverResponseCode === "string" && x.serverResponseCode;
+  const text = typeof x.responseText === "string" ? x.responseText.trim() : "";
+  const server2 = [x.responseStatus, code ? `[${code}]` : "", text].filter(Boolean).join(" ");
+  return e.message && e.message !== "Command failed" ? `${e.message}: ${server2}` : server2;
 }
 function assertMutated(result, what) {
   if (!result) throw new Error(`${what}: server rejected the command (IMAP NO/BAD)`);
@@ -66111,20 +66138,30 @@ function withClient(deps, fn) {
   return useClient(deps, fn);
 }
 async function resolveMailbox(client, name) {
-  const wanted = name.trim().toLowerCase();
   const boxes = await client.list();
-  const byPath = boxes.find((b) => b.path.toLowerCase() === wanted);
-  if (byPath) return { kind: "found", path: byPath.path };
-  const byName = boxes.filter((b) => b.name.toLowerCase() === wanted);
-  if (byName.length === 1) return { kind: "found", path: byName[0].path };
-  if (byName.length > 1) {
-    return { kind: "ambiguous", candidates: byName.map((b) => b.path).sort() };
+  return matchMailbox(boxes, name);
+}
+function matchMailbox(boxes, name) {
+  const exact = boxes.find((b) => b.path === name || b.path === name.trim());
+  if (exact) return { kind: "found", path: exact.path };
+  const wanted = mailboxNameKey(name);
+  const tiers = [
+    boxes.filter((b) => mailboxNameKey(b.path) === wanted),
+    boxes.filter((b) => mailboxNameKey(b.name) === wanted)
+  ];
+  for (const hits of tiers) {
+    const paths = [...new Set(hits.map((b) => b.path))];
+    if (paths.length === 1) return { kind: "found", path: paths[0] };
+    if (paths.length > 1) return { kind: "ambiguous", candidates: paths.sort() };
   }
   return { kind: "none" };
 }
 function ambiguousMailboxError(name, candidates, accountLabel) {
   const where = accountLabel ? ` on IMAP account ${accountLabel}` : "";
-  return `Mailbox "${name}" is ambiguous${where} \u2014 it matches ${candidates.map((c) => `"${c}"`).join(" and ")}. Pass the full path.`;
+  const listed = candidates.map((c) => `"${c}"`).join(" and ");
+  const indistinguishable = new Set(candidates.map(mailboxNameKey)).size === 1;
+  const hint = indistinguishable ? " They differ only in letter case or Unicode normalization (precomposed vs decomposed accents), so no typed name can tell them apart. Rename one of them." : " Pass the full path.";
+  return `Mailbox "${name}" is ambiguous${where} \u2014 it matches ${listed}.${hint}`;
 }
 async function findMailboxPathOrThrow(client, name) {
   const res = await resolveMailbox(client, name);
@@ -66133,6 +66170,15 @@ async function findMailboxPathOrThrow(client, name) {
 }
 function imapCreateMailbox(name, deps = {}) {
   return withClient(deps, async (client) => {
+    let twin;
+    try {
+      const wanted = nfc(name);
+      twin = (await client.list()).find((b) => nfc(b.path) === wanted)?.path;
+    } catch {
+    }
+    if (twin !== void 0) {
+      return { success: true, info: `Mailbox "${twin}" already existed.` };
+    }
     try {
       const res = await client.mailboxCreate(name);
       return res.created ? { success: true, info: `Created mailbox "${res.path}".` } : { success: true, info: `Mailbox "${res.path}" already existed.` };
@@ -66184,6 +66230,14 @@ function imapRenameMailbox(oldName, newName, deps = {}) {
       };
     }
     const path = found.path;
+    const wantedNew = nfc(newName);
+    const clash = (await client.list()).find((b) => b.path !== path && nfc(b.path) === wantedNew);
+    if (clash) {
+      return {
+        success: false,
+        error: `Cannot rename "${path}" to "${newName}": mailbox "${clash.path}" already exists on IMAP account ${cfg.accountLabel} (the same name, differing only in how its accents are encoded).`
+      };
+    }
     try {
       const res = await client.mailboxRename(path, newName);
       return { success: true, info: `Renamed "${res.path}" to "${res.newPath}" via IMAP.` };
@@ -66775,11 +66829,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);
@@ -66831,13 +66897,14 @@ 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, 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";
     import_imapflow = __toESM(require_imap_flow(), 1);
     init_smtpMailer();
     init_docsUrls();
+    init_mailboxName();
     init_mimeParse();
     init_headers();
     init_auditLog();
@@ -66883,6 +66950,7 @@ var init_imapClient = __esm({
       junk: "\\junk",
       starred: "\\flagged"
     };
+    NOT_DELETED = { deleted: false };
     poolConnect = defaultConnect;
     pools = /* @__PURE__ */ new Map();
     connecting = /* @__PURE__ */ new Map();
@@ -81931,6 +81999,7 @@ function executeAppleScript(script, options = {}) {
 init_docsUrls();
 init_mimeParse();
 init_headers();
+init_mailboxName();
 
 // src/services/templateStore.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
@@ -82566,23 +82635,28 @@ function mailboxLeaf(path) {
 function resolveAppleMailboxPath(mailbox, actualPaths) {
   if (actualPaths.length === 0) return mailbox;
   const candidates = [mailbox, ...MAILBOX_ALIASES[mailbox.toLowerCase()] ?? []];
+  const ambiguous = (matches) => {
+    const sorted = [...new Set(matches)].sort();
+    const paths = sorted.map((path) => `"${path}"`).join(" and ");
+    const twins = new Set(sorted.map(mailboxNameKey)).size === 1;
+    const hint = twins ? " They differ only in letter case or Unicode normalization (precomposed vs decomposed accents), so no typed name can tell them apart. Rename one of them." : " Pass the full path.";
+    return new Error(`Mailbox "${mailbox}" is ambiguous \u2014 it matches ${paths}.${hint}`);
+  };
   for (const candidate of candidates) {
     const exact = actualPaths.find((path) => path === candidate);
     if (exact) return exact;
-    const folded = actualPaths.find((path) => path.toLowerCase() === candidate.toLowerCase());
-    if (folded) return folded;
+    const key = mailboxNameKey(candidate);
+    const folded = [...new Set(actualPaths.filter((path) => mailboxNameKey(path) === key))];
+    if (folded.length === 1) return folded[0];
+    if (folded.length > 1) throw ambiguous(folded);
   }
   for (const candidate of candidates) {
-    const leafMatches = actualPaths.filter(
-      (path) => mailboxLeaf(path).toLowerCase() === candidate.toLowerCase()
-    );
+    const key = mailboxNameKey(candidate);
+    const leafMatches = [
+      ...new Set(actualPaths.filter((path) => mailboxNameKey(mailboxLeaf(path)) === key))
+    ];
     if (leafMatches.length === 1) return leafMatches[0];
-    if (leafMatches.length > 1) {
-      const paths = [...leafMatches].sort().map((path) => `"${path}"`).join(" and ");
-      throw new Error(
-        `Mailbox "${mailbox}" is ambiguous \u2014 it matches ${paths}. Pass the full path.`
-      );
-    }
+    if (leafMatches.length > 1) throw ambiguous(leafMatches);
   }
   return mailbox;
 }

package/package.json

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