apple-mail-mcp 2.20.21 → 2.20.23

package/build/cli.js

@@ -12265,44 +12265,77 @@ function sensitiveRoots() {
     }
   });
 }
+function homeCanonical() {
+  try {
+    return canonicalize(homedir());
+  } catch {
+    return void 0;
+  }
+}
 function isWithinRoot(candidate, root) {
   return candidate === root || candidate.startsWith(root + sep);
 }
 function hasHiddenPathSegment(candidate) {
   return candidate.split(sep).some((segment) => segment.startsWith(".") && segment.length > 1);
 }
-function isProtectedPath(candidate) {
+function userLibraryTail(candidate) {
+  const segments = candidate.split(sep).filter(Boolean);
+  const lower = segments.map((segment) => segment.toLowerCase());
+  const volumeTops = [
+    0,
+    lower[0] === "volumes" ? 2 : -1,
+    lower.slice(0, 3).join("/") === "system/volumes/data" ? 3 : -1
+  ];
+  for (const i of volumeTops) {
+    if (i >= 0 && lower[i] === "users" && lower[i + 2] === "library") return lower.slice(i + 3);
+  }
+  const home = homeCanonical() ?? resolve3(homedir());
+  if (home === sep || !isWithinRoot(candidate, home)) return void 0;
+  const relative = candidate.slice(home.length).split(sep).filter(Boolean);
+  if (relative[0]?.toLowerCase() !== "library") return void 0;
+  return relative.slice(1).map((segment) => segment.toLowerCase());
+}
+function isLibraryDocument(tail) {
+  return LIBRARY_DOCUMENT_FOLDERS.some((folder) => folder.every((name2, i) => tail[i] === name2));
+}
+function isProtectedPath(candidate, exemptRoots = []) {
   if (hasHiddenPathSegment(candidate)) return true;
   if (sensitiveRoots().some((root) => isWithinRoot(candidate, root))) return true;
-  let home;
+  const tail = userLibraryTail(candidate);
+  if (!tail || isLibraryDocument(tail)) return false;
+  const home = homeCanonical();
+  return !exemptRoots.some(
+    (root) => isWithinRoot(candidate, root) && !(home && isWithinRoot(home, root))
+  );
+}
+function canonicalTmpdir() {
   try {
-    home = canonicalize(homedir());
+    return [canonicalize(tmpdir())];
   } catch {
-    home = resolve3(homedir());
+    return [];
   }
-  if (!isWithinRoot(candidate, home)) return false;
-  const relative = candidate.slice(home.length).split(sep).filter(Boolean);
-  return relative.length >= 4 && relative[0].toLowerCase() === "library" && relative[1].toLowerCase() === "application support" && relative.at(-1)?.toLowerCase() === "config.json";
 }
-function configuredRoots(env) {
-  const raw = env[ATTACHMENT_READ_ROOTS_ENV];
-  const extraRoots = raw === void 0 ? [] : raw.split(delimiter2).map((root) => root.trim()).filter(Boolean);
-  const requested = [...DEFAULT_ATTACHMENT_READ_ROOTS, ...extraRoots];
-  for (const root of requested) {
-    if (!isAbsolute(root)) {
-      throw new Error(`${ATTACHMENT_READ_ROOTS_ENV} entries must be absolute paths.`);
-    }
-  }
+function canonicalRoots(requested) {
   const resolved = [];
   for (const root of requested) {
     try {
       const canonical = canonicalize(resolve3(root));
-      if (!resolved.includes(canonical)) resolved.push(canonical);
+      if (canonical !== sep && !resolved.includes(canonical)) resolved.push(canonical);
     } catch {
     }
   }
   return resolved;
 }
+function explicitRoots(env) {
+  const raw = env[ATTACHMENT_READ_ROOTS_ENV];
+  const extraRoots = raw === void 0 ? [] : raw.split(delimiter2).map((root) => root.trim()).filter(Boolean);
+  for (const root of extraRoots) {
+    if (!isAbsolute(root)) {
+      throw new Error(`${ATTACHMENT_READ_ROOTS_ENV} entries must be absolute paths.`);
+    }
+  }
+  return canonicalRoots(extraRoots);
+}
 function resolveAttachmentReadPath(filePath, env = process.env) {
   if (!isAbsolute(filePath)) {
     throw new Error(`Attachment path must be absolute: "${filePath}"`);
@@ -12321,19 +12354,22 @@ function resolveAttachmentReadPath(filePath, env = process.env) {
     if (error2 instanceof Error && error2.message.includes("not a regular file")) throw error2;
     throw new Error(`Attachment file not found: "${filePath}"`);
   }
-  if (isProtectedPath(canonical)) {
+  const explicit = explicitRoots(env);
+  const exempt = [...explicit, ...canonicalTmpdir()];
+  if (isProtectedPath(canonical, exempt) || isProtectedPath(resolve3(filePath), exempt)) {
     throw new Error(
-      `Attachment path is in a protected location: "${filePath}". Hidden files and credential/configuration locations cannot be sent as attachments.`
+      `Attachment path is in a protected location: "${filePath}". Hidden files, credential locations and user Library folders (except iCloud Drive and CloudStorage) cannot be sent as attachments unless ${ATTACHMENT_READ_ROOTS_ENV} names a root for them.`
     );
   }
-  if (!configuredRoots(env).some((root) => isWithinRoot(canonical, root))) {
+  const roots = [...canonicalRoots(DEFAULT_ATTACHMENT_READ_ROOTS), ...explicit];
+  if (!roots.some((root) => isWithinRoot(canonical, root))) {
     throw new Error(
       `Attachment path is outside the allowed read roots: "${filePath}". Use an ordinary home-directory, /Volumes, or temporary path, or configure ${ATTACHMENT_READ_ROOTS_ENV} for an additional explicit root.`
     );
   }
   return canonical;
 }
-var ATTACHMENT_READ_ROOTS_ENV, DEFAULT_ATTACHMENT_READ_ROOTS, SENSITIVE_HOME_ROOTS;
+var ATTACHMENT_READ_ROOTS_ENV, DEFAULT_ATTACHMENT_READ_ROOTS, SENSITIVE_HOME_ROOTS, LIBRARY_DOCUMENT_FOLDERS;
 var init_attachmentReadPolicy = __esm({
   "src/utils/attachmentReadPolicy.ts"() {
     "use strict";
@@ -12345,6 +12381,7 @@ var init_attachmentReadPolicy = __esm({
       join(homedir(), ".config", "gh"),
       join(homedir(), "Library", "Keychains")
     ];
+    LIBRARY_DOCUMENT_FOLDERS = [["mobile documents", "com~apple~clouddocs"], ["cloudstorage"]];
   }
 });
 

package/build/index.js

@@ -64830,44 +64830,77 @@ function sensitiveRoots() {
     }
   });
 }
+function homeCanonical() {
+  try {
+    return canonicalize(homedir());
+  } catch {
+    return void 0;
+  }
+}
 function isWithinRoot(candidate, root) {
   return candidate === root || candidate.startsWith(root + sep);
 }
 function hasHiddenPathSegment(candidate) {
   return candidate.split(sep).some((segment) => segment.startsWith(".") && segment.length > 1);
 }
-function isProtectedPath(candidate) {
+function userLibraryTail(candidate) {
+  const segments = candidate.split(sep).filter(Boolean);
+  const lower = segments.map((segment) => segment.toLowerCase());
+  const volumeTops = [
+    0,
+    lower[0] === "volumes" ? 2 : -1,
+    lower.slice(0, 3).join("/") === "system/volumes/data" ? 3 : -1
+  ];
+  for (const i of volumeTops) {
+    if (i >= 0 && lower[i] === "users" && lower[i + 2] === "library") return lower.slice(i + 3);
+  }
+  const home = homeCanonical() ?? resolve3(homedir());
+  if (home === sep || !isWithinRoot(candidate, home)) return void 0;
+  const relative = candidate.slice(home.length).split(sep).filter(Boolean);
+  if (relative[0]?.toLowerCase() !== "library") return void 0;
+  return relative.slice(1).map((segment) => segment.toLowerCase());
+}
+function isLibraryDocument(tail) {
+  return LIBRARY_DOCUMENT_FOLDERS.some((folder) => folder.every((name2, i) => tail[i] === name2));
+}
+function isProtectedPath(candidate, exemptRoots = []) {
   if (hasHiddenPathSegment(candidate)) return true;
   if (sensitiveRoots().some((root) => isWithinRoot(candidate, root))) return true;
-  let home;
+  const tail = userLibraryTail(candidate);
+  if (!tail || isLibraryDocument(tail)) return false;
+  const home = homeCanonical();
+  return !exemptRoots.some(
+    (root) => isWithinRoot(candidate, root) && !(home && isWithinRoot(home, root))
+  );
+}
+function canonicalTmpdir() {
   try {
-    home = canonicalize(homedir());
+    return [canonicalize(tmpdir())];
   } catch {
-    home = resolve3(homedir());
+    return [];
   }
-  if (!isWithinRoot(candidate, home)) return false;
-  const relative = candidate.slice(home.length).split(sep).filter(Boolean);
-  return relative.length >= 4 && relative[0].toLowerCase() === "library" && relative[1].toLowerCase() === "application support" && relative.at(-1)?.toLowerCase() === "config.json";
 }
-function configuredRoots(env) {
-  const raw = env[ATTACHMENT_READ_ROOTS_ENV];
-  const extraRoots = raw === void 0 ? [] : raw.split(delimiter2).map((root) => root.trim()).filter(Boolean);
-  const requested = [...DEFAULT_ATTACHMENT_READ_ROOTS, ...extraRoots];
-  for (const root of requested) {
-    if (!isAbsolute(root)) {
-      throw new Error(`${ATTACHMENT_READ_ROOTS_ENV} entries must be absolute paths.`);
-    }
-  }
+function canonicalRoots(requested) {
   const resolved = [];
   for (const root of requested) {
     try {
       const canonical = canonicalize(resolve3(root));
-      if (!resolved.includes(canonical)) resolved.push(canonical);
+      if (canonical !== sep && !resolved.includes(canonical)) resolved.push(canonical);
     } catch {
     }
   }
   return resolved;
 }
+function explicitRoots(env) {
+  const raw = env[ATTACHMENT_READ_ROOTS_ENV];
+  const extraRoots = raw === void 0 ? [] : raw.split(delimiter2).map((root) => root.trim()).filter(Boolean);
+  for (const root of extraRoots) {
+    if (!isAbsolute(root)) {
+      throw new Error(`${ATTACHMENT_READ_ROOTS_ENV} entries must be absolute paths.`);
+    }
+  }
+  return canonicalRoots(extraRoots);
+}
 function resolveAttachmentReadPath(filePath, env = process.env) {
   if (!isAbsolute(filePath)) {
     throw new Error(`Attachment path must be absolute: "${filePath}"`);
@@ -64886,19 +64919,22 @@ function resolveAttachmentReadPath(filePath, env = process.env) {
     if (error3 instanceof Error && error3.message.includes("not a regular file")) throw error3;
     throw new Error(`Attachment file not found: "${filePath}"`);
   }
-  if (isProtectedPath(canonical)) {
+  const explicit = explicitRoots(env);
+  const exempt = [...explicit, ...canonicalTmpdir()];
+  if (isProtectedPath(canonical, exempt) || isProtectedPath(resolve3(filePath), exempt)) {
     throw new Error(
-      `Attachment path is in a protected location: "${filePath}". Hidden files and credential/configuration locations cannot be sent as attachments.`
+      `Attachment path is in a protected location: "${filePath}". Hidden files, credential locations and user Library folders (except iCloud Drive and CloudStorage) cannot be sent as attachments unless ${ATTACHMENT_READ_ROOTS_ENV} names a root for them.`
     );
   }
-  if (!configuredRoots(env).some((root) => isWithinRoot(canonical, root))) {
+  const roots = [...canonicalRoots(DEFAULT_ATTACHMENT_READ_ROOTS), ...explicit];
+  if (!roots.some((root) => isWithinRoot(canonical, root))) {
     throw new Error(
       `Attachment path is outside the allowed read roots: "${filePath}". Use an ordinary home-directory, /Volumes, or temporary path, or configure ${ATTACHMENT_READ_ROOTS_ENV} for an additional explicit root.`
     );
   }
   return canonical;
 }
-var ATTACHMENT_READ_ROOTS_ENV, DEFAULT_ATTACHMENT_READ_ROOTS, SENSITIVE_HOME_ROOTS;
+var ATTACHMENT_READ_ROOTS_ENV, DEFAULT_ATTACHMENT_READ_ROOTS, SENSITIVE_HOME_ROOTS, LIBRARY_DOCUMENT_FOLDERS;
 var init_attachmentReadPolicy = __esm({
   "src/utils/attachmentReadPolicy.ts"() {
     "use strict";
@@ -64910,6 +64946,7 @@ var init_attachmentReadPolicy = __esm({
       join(homedir(), ".config", "gh"),
       join(homedir(), "Library", "Keychains")
     ];
+    LIBRARY_DOCUMENT_FOLDERS = [["mobile documents", "com~apple~clouddocs"], ["cloudstorage"]];
   }
 });
 
@@ -83781,19 +83818,32 @@ function mailboxPathFragment(mailboxVar, outputVar) {
           set _pathParent to _pathNext
         end repeat`;
 }
-function mailboxLookupFragment(collExpr, path3, outputVar) {
-  return `
-        set ${outputVar} to missing value
+function mailboxLookupFragment(collExpr, path3, outputVar, hintIndex) {
+  const safePath = escapeForAppleScript(path3);
+  const hint = hintIndex === void 0 ? "" : `
+        try
+          set _mbc to item ${hintIndex} of (${collExpr})
+          set _mbcPath to ""
+          ${mailboxPathFragment("_mbc", "_mbcPath")}
+          ignoring case
+            if _mbcPath is "${safePath}" then set ${outputVar} to _mbc
+          end ignoring
+        end try`;
+  const walk = `
         repeat with _mbc in (${collExpr})
           set _mbcPath to ""
           ${mailboxPathFragment("_mbc", "_mbcPath")}
           ignoring case
-            if _mbcPath is "${escapeForAppleScript(path3)}" then
+            if _mbcPath is "${safePath}" then
               set ${outputVar} to _mbc
               exit repeat
             end if
           end ignoring
         end repeat`;
+  return `
+        set ${outputVar} to missing value${hint}${hintIndex === void 0 ? walk : `
+        if ${outputVar} is missing value then${walk}
+        end if`}`;
 }
 var MAILBOX_ALIASES = {
   inbox: ["INBOX", "Inbox", "inbox"],
@@ -84789,6 +84839,17 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
   resolveMailbox(mailbox, account) {
     return resolveAppleMailboxPath(mailbox, this.getCachedMailboxNames(account));
   }
+  /**
+   * The 1-based position of `path` in the account's cached mailbox list, which is
+   * built by walking the account's `mailboxes` in order. `mailboxLookupFragment`
+   * checks that one mailbox first instead of working out the path of every one.
+   * Undefined when the path is not in the list; a stale position is harmless, the
+   * fragment verifies the path and falls back to the full walk.
+   */
+  mailboxIndexHint(account, path3) {
+    const index = this.getCachedMailboxNames(account).indexOf(path3);
+    return index >= 0 ? index + 1 : void 0;
+  }
   /**
    * Non-throwing `resolveMailbox`, for callers comparing mailbox names AFTER
    * a destructive op already ran (the forensics `sameMailbox` closures). An
@@ -84955,7 +85016,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
       ${dateSetup}set outputText to ""
       set _timedOut to false
       set _notSearched to ""
-      ${mailboxLookupFragment(mbIter, targetMailbox, "theMailbox")}
+      ${mailboxLookupFragment(mbIter, targetMailbox, "theMailbox", this.mailboxIndexHint(targetAccount, targetMailbox))}
       set msgCount to 0
       if theMailbox is missing value then
         set _timedOut to true
@@ -85687,7 +85748,7 @@ ${indent}end try${this.sanitizeFragment("_uacct", indent)}${this.sanitizeFragmen
       set outputText to ""
       set _timedOut to false
       set _notSearched to ""
-      ${mailboxLookupFragment(mbIter, targetMailbox, "theMailbox")}
+      ${mailboxLookupFragment(mbIter, targetMailbox, "theMailbox", this.mailboxIndexHint(targetAccount, targetMailbox))}
       set msgCount to 0
       set skipped to 0
       if theMailbox is missing value then
@@ -87183,7 +87244,7 @@ ${this.errorEmit("              ")}
     const targetAccount = this.resolveAccount(account);
     const targetMailbox = this.resolveMailbox(mailbox || "INBOX", targetAccount);
     const command = `
-      ${mailboxLookupFragment("mailboxes", targetMailbox, "theMailbox")}
+      ${mailboxLookupFragment("mailboxes", targetMailbox, "theMailbox", this.mailboxIndexHint(targetAccount, targetMailbox))}
       if theMailbox is missing value then error "Mailbox \\"${escapeForAppleScript(targetMailbox)}\\" not found"
       return unread count of theMailbox`;
     const script = buildAccountScopedScript(targetAccount, command);

package/package.json

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