apple-mail-mcp 2.8.9 → 2.8.11

package/README.md

@@ -291,8 +291,8 @@ Send a new email immediately.
 | `body` | string | Yes | Email body (plain text) |
 | `cc` | string[] | No | CC recipients |
 | `bcc` | string[] | No | BCC recipients |
-| `account` | string | No | Send from specific account (with `transport: "smtp"`, overrides the From address) |
-| `attachments` | (string \| {filename, contentBase64})[] | No | Up to 20 attachments: absolute file paths (e.g., `"/Users/me/report.pdf"`) and/or inline `{filename, contentBase64}` objects for content not on disk |
+| `account` | string | No | Mail.app account label, or an email-form SMTP From override. An SMTP override must match `APPLE_MAIL_MCP_SMTP_USER`, `APPLE_MAIL_MCP_SMTP_FROM`, or an address in `APPLE_MAIL_MCP_SMTP_ALLOWED_FROM` |
+| `attachments` | (string \| {filename, contentBase64})[] | No | Up to 20 attachments: absolute file paths (e.g., `"/Users/me/report.pdf"`) and/or inline `{filename, contentBase64}` objects up to 25 MiB decoded each |
 | `transport` | `"applescript"` \| `"smtp"` | No | Send transport. If omitted, **SMTP is used automatically when configured** (otherwise AppleScript). Pass `"smtp"` to require clean MIME, or `"applescript"` to force the Mail.app path — see [SMTP transport](#smtp-transport) |
 
 **Example:**
@@ -326,7 +326,11 @@ Two differences to know when SMTP is auto-preferred:
   is used as the From address only when it is an email address; a Mail.app
   account *label* (e.g. `"Work"`) can't select an account over SMTP, so a call
   that passes one is left on the AppleScript path automatically. To force
-  account selection, pass `transport: "applescript"` explicitly.
+  account selection, pass `transport: "applescript"` explicitly. For sender
+  safety, an email-form override must match the SMTP login user, the configured
+  `APPLE_MAIL_MCP_SMTP_FROM`, or an address listed in the comma-separated
+  `APPLE_MAIL_MCP_SMTP_ALLOWED_FROM`; any other From address is rejected before
+  connecting.
 
 Both plain-text and HTML bodies are supported — over SMTP an HTML body (CLI
 `--html-body-file`) is sent as `multipart/alternative` with the plain-text
@@ -342,6 +346,7 @@ read from the macOS **Keychain** by default, so no secret goes in config:
 | `APPLE_MAIL_MCP_SMTP_PORT` | No | `465` if secure, else `587` | SMTP port |
 | `APPLE_MAIL_MCP_SMTP_SECURE` | No | `false` | `true` for implicit TLS (port 465); otherwise STARTTLS |
 | `APPLE_MAIL_MCP_SMTP_FROM` | No | = user | From address |
+| `APPLE_MAIL_MCP_SMTP_ALLOWED_FROM` | No | — | Comma-separated sender aliases permitted as per-message From overrides |
 | `APPLE_MAIL_MCP_SMTP_PASSWORD` | No | — | Password (if set, used instead of the Keychain) |
 | `APPLE_MAIL_MCP_SMTP_KEYCHAIN_SERVICE` | No | = host | Keychain item service/server name |
 | `APPLE_MAIL_MCP_SMTP_KEYCHAIN_ACCOUNT` | No | = user | Keychain item account |
@@ -625,7 +630,7 @@ Save an email to Drafts without sending.
 | `cc` | string[] | No | CC recipients |
 | `bcc` | string[] | No | BCC recipients |
 | `account` | string | No | Account for draft |
-| `attachments` | (string \| {filename, contentBase64})[] | No | Up to 20 attachments: absolute file paths and/or inline `{filename, contentBase64}` objects |
+| `attachments` | (string \| {filename, contentBase64})[] | No | Up to 20 attachments: absolute file paths and/or inline `{filename, contentBase64}` objects up to 25 MiB decoded each |
 
 **Returns:** Confirmation that draft was created.
 

package/build/cli.js

@@ -11869,6 +11869,29 @@ import { execFileSync } from "child_process";
 import { isAbsolute } from "path";
 import { existsSync } from "fs";
 
+// src/utils/attachmentLimits.ts
+var MAX_INLINE_ATTACHMENT_BYTES = 25 * 1024 * 1024;
+var MAX_INLINE_ATTACHMENT_BASE64_CHARS = Math.ceil(MAX_INLINE_ATTACHMENT_BYTES / 3) * 4;
+var MAX_INLINE_ATTACHMENT_BASE64_INPUT_CHARS = MAX_INLINE_ATTACHMENT_BASE64_CHARS * 2;
+function isInlineAttachmentBase64WithinLimit(contentBase64) {
+  if (contentBase64.length > MAX_INLINE_ATTACHMENT_BASE64_INPUT_CHARS) return false;
+  let encodedChars = 0;
+  for (const char of contentBase64) {
+    if (!/\s/u.test(char) && ++encodedChars > MAX_INLINE_ATTACHMENT_BASE64_CHARS) return false;
+  }
+  return true;
+}
+function decodeInlineAttachment(contentBase64) {
+  if (!isInlineAttachmentBase64WithinLimit(contentBase64)) {
+    throw new Error("Inline attachment exceeds the 25 MiB decoded size limit.");
+  }
+  const content = Buffer.from(contentBase64, "base64");
+  if (content.length > MAX_INLINE_ATTACHMENT_BYTES) {
+    throw new Error("Inline attachment exceeds the 25 MiB decoded size limit.");
+  }
+  return content;
+}
+
 // src/utils/docsUrls.ts
 var SETUP_GUIDE_URL = "https://github.com/sweetrb/apple-mail-mcp/blob/main/docs/IMAP-SETUP.md";
 var SETUP_HINT = `Setup guide: ${SETUP_GUIDE_URL} \u2014 run the "doctor" tool to check your setup.`;
@@ -11880,6 +11903,7 @@ var SMTP_ENV = {
   secure: "APPLE_MAIL_MCP_SMTP_SECURE",
   user: "APPLE_MAIL_MCP_SMTP_USER",
   from: "APPLE_MAIL_MCP_SMTP_FROM",
+  allowedFrom: "APPLE_MAIL_MCP_SMTP_ALLOWED_FROM",
   password: "APPLE_MAIL_MCP_SMTP_PASSWORD",
   keychainService: "APPLE_MAIL_MCP_SMTP_KEYCHAIN_SERVICE",
   keychainAccount: "APPLE_MAIL_MCP_SMTP_KEYCHAIN_ACCOUNT"
@@ -11915,6 +11939,7 @@ function resolveSmtpConfig(env = process.env) {
     throw new Error(`Invalid ${SMTP_ENV.port}: "${env[SMTP_ENV.port]}" is not a valid port.`);
   }
   const from = env[SMTP_ENV.from]?.trim() || user;
+  const allowedFrom = (env[SMTP_ENV.allowedFrom] ?? "").split(",").map((value) => value.trim()).filter(Boolean);
   let pass = env[SMTP_ENV.password];
   if (!pass) {
     const service = env[SMTP_ENV.keychainService]?.trim() || host;
@@ -11926,7 +11951,7 @@ function resolveSmtpConfig(env = process.env) {
       `No SMTP password found. Set ${SMTP_ENV.password}, or store an internet password in the Keychain for service "${env[SMTP_ENV.keychainService]?.trim() || host}" / account "${env[SMTP_ENV.keychainAccount]?.trim() || user}". ` + SETUP_HINT
     );
   }
-  return { host, port, secure, user, pass, from };
+  return { host, port, secure, user, pass, from, allowedFrom };
 }
 function buildAttachments(attachments) {
   if (!attachments || attachments.length === 0) return void 0;
@@ -11939,7 +11964,7 @@ function buildAttachments(attachments) {
     if (!a.filename || !a.contentBase64) {
       throw new Error("Inline attachment requires both filename and contentBase64.");
     }
-    return { filename: a.filename, content: Buffer.from(a.contentBase64, "base64") };
+    return { filename: a.filename, content: decodeInlineAttachment(a.contentBase64) };
   });
 }
 async function sendViaSmtp(opts, config, createTransport = import_nodemailer.default.createTransport) {
@@ -11949,6 +11974,16 @@ async function sendViaSmtp(opts, config, createTransport = import_nodemailer.def
   } catch (error) {
     return { success: false, error: error instanceof Error ? error.message : String(error) };
   }
+  const requestedFrom = opts.from?.trim();
+  const allowedFrom = new Set(
+    [cfg.user, cfg.from, ...cfg.allowedFrom ?? []].map((value) => value.trim().toLowerCase())
+  );
+  if (requestedFrom && !allowedFrom.has(requestedFrom.toLowerCase())) {
+    return {
+      success: false,
+      error: `SMTP From "${requestedFrom}" is not a configured sender identity.`
+    };
+  }
   let attachments;
   try {
     attachments = buildAttachments(opts.attachments);
@@ -11964,7 +11999,7 @@ async function sendViaSmtp(opts, config, createTransport = import_nodemailer.def
   const html = opts.htmlBody?.trim() ? opts.htmlBody : void 0;
   try {
     const info = await transporter.sendMail({
-      from: opts.from?.trim() || cfg.from,
+      from: requestedFrom || cfg.from,
       to: opts.to,
       cc: opts.cc,
       bcc: opts.bcc,
@@ -11995,7 +12030,8 @@ var EX_CONFIG = 78;
 var USAGE = `apple-mail-send \u2014 send a clean email via SMTP (no Mail.app blockquote wrapping).
 
 Required:
-  --from <addr>         Sender address (must be allowed by the SMTP server)
+  --from <addr>         Sender address (SMTP user/configured From, or an alias in
+                        ${SMTP_ENV.allowedFrom})
   --to <addr>           Recipient (repeatable)
   --subject <text>      Subject line
   --body-file <path>    UTF-8 file with the plain-text body

package/build/index.js

@@ -75678,7 +75678,15 @@ var StdioServerTransport = class {
 
 // src/services/appleMailManager.ts
 import { spawnSync as spawnSync2 } from "child_process";
-import { existsSync as existsSync3, writeFileSync as writeFileSync3, readFileSync as readFileSync2, mkdtempSync as mkdtempSync2, rmSync as rmSync2 } from "fs";
+import {
+  existsSync as existsSync3,
+  writeFileSync as writeFileSync3,
+  readFileSync as readFileSync2,
+  mkdtempSync as mkdtempSync2,
+  rmSync as rmSync2,
+  realpathSync,
+  lstatSync
+} from "fs";
 import { isAbsolute, resolve, sep, join as join4 } from "path";
 import { homedir as homedir3 } from "os";
 
@@ -76200,22 +76208,53 @@ var TemplateStore = class {
 import { writeFileSync as writeFileSync2, rmSync, mkdtempSync } from "fs";
 import { join as join2 } from "path";
 import { tmpdir } from "os";
+
+// src/utils/attachmentLimits.ts
+var MAX_INLINE_ATTACHMENT_BYTES = 25 * 1024 * 1024;
+var MAX_INLINE_ATTACHMENT_BASE64_CHARS = Math.ceil(MAX_INLINE_ATTACHMENT_BYTES / 3) * 4;
+var MAX_INLINE_ATTACHMENT_BASE64_INPUT_CHARS = MAX_INLINE_ATTACHMENT_BASE64_CHARS * 2;
+function isInlineAttachmentBase64WithinLimit(contentBase64) {
+  if (contentBase64.length > MAX_INLINE_ATTACHMENT_BASE64_INPUT_CHARS) return false;
+  let encodedChars = 0;
+  for (const char of contentBase64) {
+    if (!/\s/u.test(char) && ++encodedChars > MAX_INLINE_ATTACHMENT_BASE64_CHARS) return false;
+  }
+  return true;
+}
+function decodeInlineAttachment(contentBase64) {
+  if (!isInlineAttachmentBase64WithinLimit(contentBase64)) {
+    throw new Error("Inline attachment exceeds the 25 MiB decoded size limit.");
+  }
+  const content = Buffer.from(contentBase64, "base64");
+  if (content.length > MAX_INLINE_ATTACHMENT_BYTES) {
+    throw new Error("Inline attachment exceeds the 25 MiB decoded size limit.");
+  }
+  return content;
+}
+
+// src/utils/attachmentMaterialize.ts
 function materializeAttachments(attachments) {
   if (!attachments || attachments.length === 0) {
     return { paths: [], cleanup: () => void 0 };
   }
   let dir = null;
-  const paths = attachments.map((a) => {
-    if (typeof a === "string") return a;
-    if (!a.filename || !a.contentBase64) {
-      throw new Error("Inline attachment requires both filename and contentBase64.");
-    }
-    if (!dir) dir = mkdtempSync(join2(tmpdir(), "amcp-att-"));
-    const safeName = a.filename.replace(/[/\\]/g, "_");
-    const p = join2(dir, safeName);
-    writeFileSync2(p, Buffer.from(a.contentBase64, "base64"));
-    return p;
-  });
+  let paths;
+  try {
+    paths = attachments.map((a) => {
+      if (typeof a === "string") return a;
+      if (!a.filename || !a.contentBase64) {
+        throw new Error("Inline attachment requires both filename and contentBase64.");
+      }
+      if (!dir) dir = mkdtempSync(join2(tmpdir(), "amcp-att-"));
+      const safeName = a.filename.replace(/[/\\]/g, "_");
+      const p = join2(dir, safeName);
+      writeFileSync2(p, decodeInlineAttachment(a.contentBase64));
+      return p;
+    });
+  } catch (error2) {
+    if (dir) rmSync(dir, { recursive: true, force: true });
+    throw error2;
+  }
   return {
     paths,
     cleanup: () => {
@@ -76398,6 +76437,25 @@ function isPathWithinAllowedRoots(resolvedPath) {
     return resolvedPath === base || resolvedPath.startsWith(base + sep);
   });
 }
+function resolveAttachmentSaveTarget(savePath, attachmentName) {
+  let saveDirectory;
+  try {
+    saveDirectory = realpathSync(resolve(savePath));
+  } catch {
+    throw new Error(`Save directory "${savePath}" does not exist`);
+  }
+  if (!isPathWithinAllowedRoots(saveDirectory)) {
+    throw new Error(`Save path "${savePath}" is outside allowed directories`);
+  }
+  const savedPath = resolve(saveDirectory, attachmentName);
+  if (!isPathWithinAllowedRoots(savedPath)) {
+    throw new Error(`Output path "${savedPath}" is outside allowed directories`);
+  }
+  if (existsSync3(savedPath) && lstatSync(savedPath).isSymbolicLink()) {
+    throw new Error(`Refusing to overwrite symbolic link "${savedPath}"`);
+  }
+  return { saveDirectory, savedPath };
+}
 var UNSUPPORTED_APPLESCRIPT_OP = /AppleEvent handler failed|-10000/i;
 function describeMailboxOpError(op, raw) {
   const trimmed = (raw || "").trim();
@@ -77397,7 +77455,38 @@ var AppleMailManager = class {
     let listCommand;
     if (mailbox) {
       const targetMailbox = this.resolveMailbox(mailbox, targetAccount);
-      listCommand = `
+      const gmailInbox = isInboxScope(mailbox) ? gmailReceivingMailboxes(this.getCachedMailboxNames(targetAccount)) : null;
+      if (gmailInbox) {
+        const nameList = appleScriptLowerNameList(gmailInbox);
+        listCommand = `
+      set outputText to ""
+      set _timedOut to false
+      set _notSearched to ""
+      set _wantNames to ${nameList}
+      set msgCount to 0
+      set skipped to 0
+      set seenIds to {}
+      repeat with mb in mailboxes
+        if msgCount >= ${limit} then exit repeat
+        set mbName to ""
+        try
+          set mbName to name of mb
+        end try
+        ignoring case
+          if _wantNames contains mbName then
+            try
+              ${buildMessageRowLoop({ collection: `messages of mb ${fromFilter}`, limit, offset, dedup: true, withAttachments: true, trailing: ` & "${FIELD_SEP}" & mbName` })}
+            on error _errMsg number _errNum
+              set _timedOut to true
+              set _notSearched to _notSearched & mbName & "${DIAG_ITEM_SEP}"
+            end try
+          end if
+        end ignoring
+      end repeat
+      return outputText & "${DIAG_MARKER}timedOut=" & (_timedOut as string) & "${DIAG_FIELD_SEP}skipped=${DIAG_FIELD_SEP}notSearched=" & _notSearched
+    `;
+      } else {
+        listCommand = `
       set outputText to ""
       set _timedOut to false
       set _notSearched to ""
@@ -77412,6 +77501,7 @@ var AppleMailManager = class {
       end try
       return outputText & "${DIAG_MARKER}timedOut=" & (_timedOut as string) & "${DIAG_FIELD_SEP}skipped=${DIAG_FIELD_SEP}notSearched=" & _notSearched
     `;
+      }
     } else {
       const scanGuard = scanThreshold > 0 ? `mbCount > ${scanThreshold}` : "false";
       listCommand = `
@@ -77917,7 +78007,7 @@ var AppleMailManager = class {
   findNumericIdByMessageId(messageId, accountName) {
     const mid = messageId.trim().replace(/^<+/, "").replace(/>+$/, "").trim();
     if (!mid) return null;
-    const q = (s) => s.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+    const q = (s) => escapeForAppleScript(s);
     const midLit = `"${q(mid)}"`;
     const bracketedLit = `"${q(`<${mid}>`)}"`;
     const matchClause = (mbVar) => `(messages of ${mbVar} whose message id is ${midLit} or message id is ${bracketedLit})`;
@@ -78304,13 +78394,15 @@ var AppleMailManager = class {
       console.error(`Invalid attachment name: "${attachmentName}"`);
       return false;
     }
-    const resolvedPath = resolve(savePath);
-    if (!isPathWithinAllowedRoots(resolvedPath)) {
-      console.error(`Save path "${savePath}" is outside allowed directories`);
+    let target;
+    try {
+      target = resolveAttachmentSaveTarget(savePath, attachmentName);
+    } catch (error2) {
+      console.error(error2 instanceof Error ? error2.message : String(error2));
       return false;
     }
     const safeName = escapeForAppleScript(attachmentName);
-    const safePath = escapeForAppleScript(resolvedPath);
+    const safePath = escapeForAppleScript(target.saveDirectory);
     const numericId = Number(id);
     const script = buildAppLevelScript(`
       try
@@ -78352,12 +78444,7 @@ var AppleMailManager = class {
       return false;
     }
     try {
-      const outPath = resolve(resolvedPath, attachmentName);
-      if (!isPathWithinAllowedRoots(outPath)) {
-        console.error(`Output path "${outPath}" is outside allowed directories`);
-        return false;
-      }
-      writeFileSync3(outPath, attachment.data);
+      writeFileSync3(target.savedPath, attachment.data);
       return true;
     } catch (err) {
       console.error(`Failed to write attachment to disk: ${err}`);
@@ -78374,7 +78461,7 @@ var AppleMailManager = class {
     try {
       dir = mkdtempSync2("/private/tmp/amcp-fetch-");
       const dest = join4(dir, attachmentName.replace(/[/\\]/g, "_"));
-      const ok = this.saveAttachment(id, attachmentName, dest);
+      const ok = this.saveAttachment(id, attachmentName, dir);
       if (!ok) {
         return {
           success: false,
@@ -79125,7 +79212,7 @@ ${actionStmts.join("\n")}
 
 // src/index.ts
 import { writeFileSync as writeFileSync4 } from "fs";
-import { resolve as resolvePath, join as joinPath } from "path";
+import { join as joinPath } from "path";
 
 // src/services/smtpMailer.ts
 var import_nodemailer = __toESM(require_nodemailer(), 1);
@@ -79144,6 +79231,7 @@ var SMTP_ENV = {
   secure: "APPLE_MAIL_MCP_SMTP_SECURE",
   user: "APPLE_MAIL_MCP_SMTP_USER",
   from: "APPLE_MAIL_MCP_SMTP_FROM",
+  allowedFrom: "APPLE_MAIL_MCP_SMTP_ALLOWED_FROM",
   password: "APPLE_MAIL_MCP_SMTP_PASSWORD",
   keychainService: "APPLE_MAIL_MCP_SMTP_KEYCHAIN_SERVICE",
   keychainAccount: "APPLE_MAIL_MCP_SMTP_KEYCHAIN_ACCOUNT"
@@ -79189,6 +79277,7 @@ function resolveSmtpConfig(env = process.env) {
     throw new Error(`Invalid ${SMTP_ENV.port}: "${env[SMTP_ENV.port]}" is not a valid port.`);
   }
   const from = env[SMTP_ENV.from]?.trim() || user;
+  const allowedFrom = (env[SMTP_ENV.allowedFrom] ?? "").split(",").map((value) => value.trim()).filter(Boolean);
   let pass = env[SMTP_ENV.password];
   if (!pass) {
     const service = env[SMTP_ENV.keychainService]?.trim() || host;
@@ -79200,7 +79289,7 @@ function resolveSmtpConfig(env = process.env) {
       `No SMTP password found. Set ${SMTP_ENV.password}, or store an internet password in the Keychain for service "${env[SMTP_ENV.keychainService]?.trim() || host}" / account "${env[SMTP_ENV.keychainAccount]?.trim() || user}". ` + SETUP_HINT
     );
   }
-  return { host, port, secure, user, pass, from };
+  return { host, port, secure, user, pass, from, allowedFrom };
 }
 function buildAttachments(attachments) {
   if (!attachments || attachments.length === 0) return void 0;
@@ -79213,7 +79302,7 @@ function buildAttachments(attachments) {
     if (!a.filename || !a.contentBase64) {
       throw new Error("Inline attachment requires both filename and contentBase64.");
     }
-    return { filename: a.filename, content: Buffer.from(a.contentBase64, "base64") };
+    return { filename: a.filename, content: decodeInlineAttachment(a.contentBase64) };
   });
 }
 async function sendViaSmtp(opts, config2, createTransport = import_nodemailer.default.createTransport) {
@@ -79223,6 +79312,16 @@ async function sendViaSmtp(opts, config2, createTransport = import_nodemailer.de
   } catch (error2) {
     return { success: false, error: error2 instanceof Error ? error2.message : String(error2) };
   }
+  const requestedFrom = opts.from?.trim();
+  const allowedFrom = new Set(
+    [cfg.user, cfg.from, ...cfg.allowedFrom ?? []].map((value) => value.trim().toLowerCase())
+  );
+  if (requestedFrom && !allowedFrom.has(requestedFrom.toLowerCase())) {
+    return {
+      success: false,
+      error: `SMTP From "${requestedFrom}" is not a configured sender identity.`
+    };
+  }
   let attachments;
   try {
     attachments = buildAttachments(opts.attachments);
@@ -79238,7 +79337,7 @@ async function sendViaSmtp(opts, config2, createTransport = import_nodemailer.de
   const html = opts.htmlBody?.trim() ? opts.htmlBody : void 0;
   try {
     const info = await transporter.sendMail({
-      from: opts.from?.trim() || cfg.from,
+      from: requestedFrom || cfg.from,
       to: opts.to,
       cc: opts.cc,
       bcc: opts.bcc,
@@ -79448,6 +79547,27 @@ function decodeImapId(id) {
     return null;
   }
 }
+function sameImapAccount(left, right, deps) {
+  if (left === right) return true;
+  if (deps.config) {
+    const aliases = /* @__PURE__ */ new Set([deps.config.accountLabel, deps.config.user]);
+    if (aliases.has(left) && aliases.has(right)) return true;
+  }
+  const specs = listImapAccountSpecs();
+  const matches = (selector, spec) => spec.accountLabel === selector || spec.user === selector;
+  const leftSpec = specs.find((spec) => matches(left, spec));
+  const rightSpec = specs.find((spec) => matches(right, spec));
+  return leftSpec !== void 0 && leftSpec === rightSpec;
+}
+function depsForAccount(account, deps) {
+  if (deps.account && !sameImapAccount(account, deps.account, deps)) {
+    throw new Error(`IMAP message id belongs to account "${account}", not "${deps.account}".`);
+  }
+  return { ...deps, account };
+}
+function depsForMessageRef(ref, deps) {
+  return depsForAccount(ref.account, deps);
+}
 function str(v) {
   return typeof v === "string" && v.trim() ? v.trim() : void 0;
 }
@@ -79955,25 +80075,21 @@ async function withMailbox(path, deps, fn) {
 async function imapGetMessage(id, preferHtml, deps = {}) {
   const ref = decodeImapId(id);
   if (!ref) return { success: false, error: `Not an IMAP message id: "${id}".` };
-  return withMailbox(
-    ref.path,
-    { ...deps, account: deps.account ?? ref.account },
-    async (client) => {
-      const msg = await client.fetchOne(
-        String(ref.uid),
-        { envelope: true, source: true },
-        { uid: true }
-      );
-      if (!msg)
-        return { success: false, error: `IMAP message UID ${ref.uid} not found in "${ref.path}".` };
-      const subject = msg.envelope?.subject || "(no subject)";
-      const src = msg.source ? msg.source.toString() : "";
-      const body = (preferHtml ? extractHtmlBody(src) : extractTextBody(src)) ?? extractTextBody(src) ?? extractHtmlBody(src) ?? "(no readable body)";
-      return { success: true, info: `Subject: ${subject}
+  return withMailbox(ref.path, depsForMessageRef(ref, deps), async (client) => {
+    const msg = await client.fetchOne(
+      String(ref.uid),
+      { envelope: true, source: true },
+      { uid: true }
+    );
+    if (!msg)
+      return { success: false, error: `IMAP message UID ${ref.uid} not found in "${ref.path}".` };
+    const subject = msg.envelope?.subject || "(no subject)";
+    const src = msg.source ? msg.source.toString() : "";
+    const body = (preferHtml ? extractHtmlBody(src) : extractTextBody(src)) ?? extractTextBody(src) ?? extractHtmlBody(src) ?? "(no readable body)";
+    return { success: true, info: `Subject: ${subject}
 
 ${body}` };
-    }
-  );
+  });
 }
 function normalizeMessageId(mid) {
   return mid.trim().replace(/^<+/, "").replace(/>+$/, "").trim();
@@ -79982,15 +80098,11 @@ async function imapFetchMessageId(id, deps = {}) {
   const ref = decodeImapId(id);
   if (!ref) return null;
   try {
-    return await withMailbox(
-      ref.path,
-      { ...deps, account: deps.account ?? ref.account },
-      async (client) => {
-        const msg = await client.fetchOne(String(ref.uid), { envelope: true }, { uid: true });
-        const mid = msg && msg.envelope?.messageId;
-        return mid ? normalizeMessageId(mid) : null;
-      }
-    );
+    return await withMailbox(ref.path, depsForMessageRef(ref, deps), async (client) => {
+      const msg = await client.fetchOne(String(ref.uid), { envelope: true }, { uid: true });
+      const mid = msg && msg.envelope?.messageId;
+      return mid ? normalizeMessageId(mid) : null;
+    });
   } catch {
     return null;
   }
@@ -79998,23 +80110,19 @@ async function imapFetchMessageId(id, deps = {}) {
 function flagOp(id, flag, add, deps) {
   const ref = decodeImapId(id);
   if (!ref) return Promise.resolve({ success: false, error: `Not an IMAP message id: "${id}".` });
-  return withMailbox(
-    ref.path,
-    { ...deps, account: deps.account ?? ref.account },
-    async (client) => {
-      try {
-        const ok = add ? await client.messageFlagsAdd([ref.uid], [flag], { uid: true }) : await client.messageFlagsRemove([ref.uid], [flag], { uid: true });
-        if (!ok)
-          return { success: false, error: `IMAP flag update returned false for UID ${ref.uid}.` };
-        return { success: true };
-      } catch (e) {
-        return {
-          success: false,
-          error: `IMAP flag update failed for UID ${ref.uid}: ${errText(e)}`
-        };
-      }
+  return withMailbox(ref.path, depsForMessageRef(ref, deps), async (client) => {
+    try {
+      const ok = add ? await client.messageFlagsAdd([ref.uid], [flag], { uid: true }) : await client.messageFlagsRemove([ref.uid], [flag], { uid: true });
+      if (!ok)
+        return { success: false, error: `IMAP flag update returned false for UID ${ref.uid}.` };
+      return { success: true };
+    } catch (e) {
+      return {
+        success: false,
+        error: `IMAP flag update failed for UID ${ref.uid}: ${errText(e)}`
+      };
     }
-  );
+  });
 }
 var imapMarkRead = (id, deps = {}) => flagOp(id, "\\Seen", true, deps);
 var imapMarkUnread = (id, deps = {}) => flagOp(id, "\\Seen", false, deps);
@@ -80023,7 +80131,7 @@ var imapUnflagMessage = (id, deps = {}) => flagOp(id, "\\Flagged", false, deps);
 async function imapMoveMessageById(id, destMailbox, deps = {}) {
   const ref = decodeImapId(id);
   if (!ref) return { success: false, error: `Not an IMAP message id: "${id}".` };
-  return withClient({ ...deps, account: deps.account ?? ref.account }, async (client) => {
+  return withClient(depsForMessageRef(ref, deps), async (client) => {
     const destPath = await findMailboxPath(client, destMailbox) ?? resolveMailboxPath(destMailbox, "list");
     const lock = await client.getMailboxLock(ref.path);
     try {
@@ -80064,21 +80172,17 @@ async function trashUids(client, uids, srcPath) {
 async function imapDeleteMessageById(id, deps = {}) {
   const ref = decodeImapId(id);
   if (!ref) return { success: false, error: `Not an IMAP message id: "${id}".` };
-  return withMailbox(
-    ref.path,
-    { ...deps, account: deps.account ?? ref.account },
-    async (client) => {
-      try {
-        const { dest, expunged } = await trashUids(client, [ref.uid], ref.path);
-        return {
-          success: true,
-          info: expunged ? `Permanently deleted UID ${ref.uid} from Trash ("${ref.path}") via IMAP.` : `Moved UID ${ref.uid} to Trash ("${dest}") via IMAP.`
-        };
-      } catch (e) {
-        return { success: false, error: `IMAP delete failed for UID ${ref.uid}: ${errText(e)}` };
-      }
+  return withMailbox(ref.path, depsForMessageRef(ref, deps), async (client) => {
+    try {
+      const { dest, expunged } = await trashUids(client, [ref.uid], ref.path);
+      return {
+        success: true,
+        info: expunged ? `Permanently deleted UID ${ref.uid} from Trash ("${ref.path}") via IMAP.` : `Moved UID ${ref.uid} to Trash ("${dest}") via IMAP.`
+      };
+    } catch (e) {
+      return { success: false, error: `IMAP delete failed for UID ${ref.uid}: ${errText(e)}` };
     }
-  );
+  });
 }
 function collectAttachments(node, out = []) {
   if (!node) return out;
@@ -80104,54 +80208,46 @@ async function streamToBuffer(content) {
 async function imapListAttachments(id, deps = {}) {
   const ref = decodeImapId(id);
   if (!ref) return { success: false, error: `Not an IMAP message id: "${id}".` };
-  return withMailbox(
-    ref.path,
-    { ...deps, account: deps.account ?? ref.account },
-    async (client) => {
-      const msg = await client.fetchOne(String(ref.uid), { bodyStructure: true }, { uid: true });
-      if (!msg || !msg.bodyStructure) {
-        return { success: false, error: `IMAP message UID ${ref.uid} not found in "${ref.path}".` };
-      }
-      const attachments = collectAttachments(msg.bodyStructure).map((a) => ({
-        id: `${id}#${a.part}`,
-        name: a.filename,
-        mimeType: a.mimeType,
-        size: a.size
-      }));
-      return { success: true, attachments };
-    }
-  );
+  return withMailbox(ref.path, depsForMessageRef(ref, deps), async (client) => {
+    const msg = await client.fetchOne(String(ref.uid), { bodyStructure: true }, { uid: true });
+    if (!msg || !msg.bodyStructure) {
+      return { success: false, error: `IMAP message UID ${ref.uid} not found in "${ref.path}".` };
+    }
+    const attachments = collectAttachments(msg.bodyStructure).map((a) => ({
+      id: `${id}#${a.part}`,
+      name: a.filename,
+      mimeType: a.mimeType,
+      size: a.size
+    }));
+    return { success: true, attachments };
+  });
 }
 async function imapFetchAttachment(id, attachmentName, deps = {}) {
   const ref = decodeImapId(id);
   if (!ref) return { success: false, error: `Not an IMAP message id: "${id}".` };
-  return withMailbox(
-    ref.path,
-    { ...deps, account: deps.account ?? ref.account },
-    async (client) => {
-      const msg = await client.fetchOne(String(ref.uid), { bodyStructure: true }, { uid: true });
-      if (!msg || !msg.bodyStructure) {
-        return { success: false, error: `IMAP message UID ${ref.uid} not found in "${ref.path}".` };
-      }
-      const atts = collectAttachments(msg.bodyStructure);
-      const match = atts.find((a) => a.filename === attachmentName);
-      if (!match) {
-        const names = atts.map((a) => a.filename).join(", ") || "none";
-        return {
-          success: false,
-          error: `Attachment "${attachmentName}" not found on UID ${ref.uid}. Available: ${names}.`
-        };
-      }
-      const dl = await client.download(String(ref.uid), match.part, { uid: true });
-      const buf = await streamToBuffer(dl.content);
+  return withMailbox(ref.path, depsForMessageRef(ref, deps), async (client) => {
+    const msg = await client.fetchOne(String(ref.uid), { bodyStructure: true }, { uid: true });
+    if (!msg || !msg.bodyStructure) {
+      return { success: false, error: `IMAP message UID ${ref.uid} not found in "${ref.path}".` };
+    }
+    const atts = collectAttachments(msg.bodyStructure);
+    const match = atts.find((a) => a.filename === attachmentName);
+    if (!match) {
+      const names = atts.map((a) => a.filename).join(", ") || "none";
       return {
-        success: true,
-        base64: buf.toString("base64"),
-        bytes: buf.length,
-        mimeType: match.mimeType
+        success: false,
+        error: `Attachment "${attachmentName}" not found on UID ${ref.uid}. Available: ${names}.`
       };
     }
-  );
+    const dl = await client.download(String(ref.uid), match.part, { uid: true });
+    const buf = await streamToBuffer(dl.content);
+    return {
+      success: true,
+      base64: buf.toString("base64"),
+      bytes: buf.length,
+      mimeType: match.mimeType
+    };
+  });
 }
 async function imapBatch(ids, deps, op) {
   const groups = /* @__PURE__ */ new Map();
@@ -80172,7 +80268,7 @@ async function imapBatch(ids, deps, op) {
   let success = 0;
   for (const g of groups.values()) {
     try {
-      await useClient({ ...deps, account: deps.account ?? g.account }, async (client) => {
+      await useClient(depsForAccount(g.account, deps), async (client) => {
         const lock = await client.getMailboxLock(g.path);
         try {
           await op(client, g.uids, g.path);
@@ -80221,7 +80317,7 @@ async function imapThread(id, deps = {}, limit = 50) {
   const ref = decodeImapId(id);
   if (!ref) return null;
   return useClient(
-    { ...deps, account: deps.account ?? ref.account },
+    depsForMessageRef(ref, deps),
     async (client) => {
       const lock = await client.getMailboxLock(ref.path);
       try {
@@ -80860,12 +80956,18 @@ var ATTACHMENTS_SCHEMA = external_exports.array(
   external_exports.union([
     external_exports.string().describe("Absolute path to an existing file"),
     external_exports.object({
-      filename: external_exports.string().min(1).describe("Filename to give the attachment"),
-      contentBase64: external_exports.string().min(1).describe("Base64-encoded file content")
+      filename: external_exports.string().min(1).max(255).describe("Filename to give the attachment"),
+      contentBase64: external_exports.string().min(1).max(
+        MAX_INLINE_ATTACHMENT_BASE64_INPUT_CHARS,
+        "Inline attachment exceeds the 25 MiB decoded size limit"
+      ).refine(
+        isInlineAttachmentBase64WithinLimit,
+        "Inline attachment exceeds the 25 MiB decoded size limit"
+      ).describe("Base64-encoded file content (maximum 25 MiB decoded)")
     })
   ])
 ).max(20, "Cannot attach more than 20 files").optional().describe(
-  "Files to attach: absolute paths (e.g. '/Users/me/report.pdf') and/or inline {filename, contentBase64} objects for content not on disk."
+  "Files to attach: absolute paths (e.g. '/Users/me/report.pdf') and/or inline {filename, contentBase64} objects up to 25 MiB decoded each."
 );
 var MESSAGE_ROW_SCHEMA = external_exports.object({}).passthrough();
 var LIST_OUTPUT_SCHEMA = {
@@ -82009,20 +82111,21 @@ server.registerTool(
       if (/[/\\\0]/.test(attachmentName) || attachmentName.includes("..")) {
         return errorResponse(`Invalid attachment name: "${attachmentName}"`);
       }
-      const resolvedDir = resolvePath(savePath);
-      if (!isPathWithinAllowedRoots(resolvedDir)) {
-        return errorResponse(`Save path "${savePath}" is outside allowed directories`);
+      let target;
+      try {
+        target = resolveAttachmentSaveTarget(savePath, attachmentName);
+      } catch (error2) {
+        return errorResponse(error2 instanceof Error ? error2.message : String(error2));
       }
       const r = await imapFetchAttachment(id, attachmentName);
       if (!r.success || !r.base64) {
         return errorResponse(r.error || `Failed to fetch attachment "${attachmentName}"`);
       }
-      const savedPath = joinPath(resolvedDir, attachmentName);
-      writeFileSync4(savedPath, Buffer.from(r.base64, "base64"));
+      writeFileSync4(target.savedPath, Buffer.from(r.base64, "base64"));
       return successResponse(`Attachment "${attachmentName}" saved to ${savePath}`, {
         ok: true,
         attachmentName,
-        savedPath
+        savedPath: target.savedPath
       });
     }
     const success = mailManager.saveAttachment(id, attachmentName, savePath);

package/docs/IMAP-SETUP.md

@@ -199,6 +199,7 @@ the macOS 15+ blockquote wrapping. SMTP is single-account (the default sender):
   "APPLE_MAIL_MCP_SMTP_PORT": "587",
   "APPLE_MAIL_MCP_SMTP_USER": "you@gmail.com",
   "APPLE_MAIL_MCP_SMTP_FROM": "you@gmail.com",
+  "APPLE_MAIL_MCP_SMTP_ALLOWED_FROM": "alias@example.com",
   "APPLE_MAIL_MCP_SMTP_KEYCHAIN_SERVICE": "imap.gmail.com",
   "APPLE_MAIL_MCP_SMTP_KEYCHAIN_ACCOUNT": "you@gmail.com"
 }

package/package.json

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