apple-mail-mcp 1.1.1 → 1.2.1

package/README.md

@@ -84,8 +84,9 @@ On first use, macOS will ask for permission to automate Mail.app. Click "OK" to
 | **List Messages** | List messages with pagination, sender filter, date display |
 | **Search Messages** | Search by sender, subject, content, date range, read/flagged status — across all accounts |
 | **Read Messages** | Get full email content (plain text or HTML) |
-| **Send Email** | Compose and send new emails |
-| **Create Draft** | Save emails to Drafts folder |
+| **Send Email** | Compose and send new emails (with optional file attachments) |
+| **Send Serial Email** | Mail merge — send personalized emails to a list of recipients with {{placeholder}} support |
+| **Create Draft** | Save emails to Drafts folder (with optional file attachments) |
 | **Reply** | Reply to messages (with reply-all support) |
 | **Forward** | Forward messages to new recipients |
 | **Mark Read/Unread** | Change read status (single or batch) |
@@ -190,6 +191,7 @@ Send a new email immediately.
 | `cc` | string[] | No | CC recipients |
 | `bcc` | string[] | No | BCC recipients |
 | `account` | string | No | Send from specific account |
+| `attachments` | string[] | No | Absolute file paths to attach, max 20 files (e.g., `["/Users/me/report.pdf"]`) |
 
 **Example:**
 ```json
@@ -197,12 +199,48 @@ Send a new email immediately.
   "to": ["colleague@company.com"],
   "subject": "Meeting Tomorrow",
   "body": "Hi, just confirming our meeting at 2pm tomorrow.",
-  "account": "Work"
+  "account": "Work",
+  "attachments": ["/Users/me/Documents/agenda.pdf"]
 }
 ```
 
 ---
 
+#### `send-serial-email`
+
+Send individual personalized emails to a list of recipients (mail merge). Each recipient receives their own email — recipients don't see each other. Supports `{{placeholder}}` tokens in both subject and body.
+
+| Parameter | Type | Required | Description |
+|-----------|------|----------|-------------|
+| `recipients` | object[] | Yes | List of recipients, max 100 (see below) |
+| `subject` | string | Yes | Email subject — use `{{Key}}` for placeholders |
+| `body` | string | Yes | Email body — use `{{Key}}` for placeholders |
+| `account` | string | No | Send from specific account |
+| `delayMs` | number | No | Delay between sends in ms (default: 500, max 10000) |
+
+Each recipient object:
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| `email` | string | Yes | Recipient email address |
+| `variables` | object | Yes | Key-value pairs for placeholder replacement |
+
+**Example:**
+```json
+{
+  "recipients": [
+    { "email": "alice@example.com", "variables": { "Name": "Alice", "Company": "Acme" } },
+    { "email": "bob@example.com", "variables": { "Name": "Bob", "Company": "Globex" } }
+  ],
+  "subject": "Hello {{Name}}!",
+  "body": "Dear {{Name}},\n\nGreat to connect about {{Company}}.\n\nBest regards"
+}
+```
+
+**Returns:** Per-recipient success/failure results with a summary count.
+
+---
+
 #### `create-draft`
 
 Save an email to Drafts without sending.
@@ -215,6 +253,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[] | No | Absolute file paths to attach, max 20 files |
 
 **Returns:** Confirmation that draft was created.
 
@@ -332,19 +371,19 @@ Save a message attachment to disk.
 
 ### Batch Operations
 
-All batch operations accept an array of message IDs and return per-item success/failure results.
+All batch operations accept an array of message IDs (max 100 per batch) and return per-item success/failure results.
 
 #### `batch-delete-messages`
 
 | Parameter | Type | Required | Description |
 |-----------|------|----------|-------------|
-| `ids` | string[] | Yes | Message IDs to delete |
+| `ids` | string[] | Yes | Message IDs to delete (max 100) |
 
 #### `batch-move-messages`
 
 | Parameter | Type | Required | Description |
 |-----------|------|----------|-------------|
-| `ids` | string[] | Yes | Message IDs to move |
+| `ids` | string[] | Yes | Message IDs to move (max 100) |
 | `mailbox` | string | Yes | Destination mailbox |
 | `account` | string | No | Account containing mailbox |
 
@@ -352,13 +391,13 @@ All batch operations accept an array of message IDs and return per-item success/
 
 | Parameter | Type | Required | Description |
 |-----------|------|----------|-------------|
-| `ids` | string[] | Yes | Message IDs |
+| `ids` | string[] | Yes | Message IDs (max 100) |
 
 #### `batch-flag-messages` / `batch-unflag-messages`
 
 | Parameter | Type | Required | Description |
 |-----------|------|----------|-------------|
-| `ids` | string[] | Yes | Message IDs |
+| `ids` | string[] | Yes | Message IDs (max 100) |
 
 ---
 
@@ -606,6 +645,19 @@ User: "Send it"
 AI: [User opens Mail.app and sends manually, or AI calls send-email]
 ```
 
+### Sending Personalized Emails (Mail Merge)
+
+```
+User: "Send a personalized email to Alice (alice@acme.com), Bob (bob@globex.com),
+       and Carol (carol@initech.com). Subject: 'Project Update for {{Company}}',
+       Body: 'Hi {{Name}}, here is the latest update for {{Company}}.'"
+AI: [calls send-serial-email with recipients, subject template, and body template]
+    "Successfully sent 3 email(s):
+      - alice@acme.com: sent
+      - bob@globex.com: sent
+      - carol@initech.com: sent"
+```
+
 ### Organizing Messages
 
 ```
@@ -663,9 +715,14 @@ If installed from source, use this configuration:
 |------------|--------|
 | macOS only | Apple Mail and AppleScript are macOS-specific |
 | No sending HTML email | Emails are sent as plain text; reading HTML content is supported |
-| No adding attachments | Can list and save existing attachments, but cannot attach files to outgoing emails |
+| Attachments require absolute paths | File attachments must use full absolute paths (e.g., `/Users/me/file.pdf`) |
 | No smart mailboxes | Cannot access Smart Mailboxes via AppleScript |
 | In-memory templates | Email templates are not persisted across server restarts |
+| Numeric-only message IDs | Message IDs must contain only digits (validated by schema) |
+| Batch size cap | Batch operations are limited to 100 messages per request |
+| Date filter format | Date filters accept alphanumeric characters and safe punctuation only |
+| Attachment save path restrictions | `save-attachment` only allows saving to home directory, `/tmp`, `/private/tmp`, and `/Volumes`; path traversal is blocked |
+| Attachment count limit | `send-email` and `create-draft` accept a maximum of 20 file attachments |
 
 ### Backslash Escaping (Important for AI Agents)
 
@@ -724,11 +781,13 @@ The `\\\\` in JSON becomes `\\` in the actual string, which represents a single
 ## Development
 
 ```bash
-npm install      # Install dependencies
-npm run build    # Compile TypeScript
-npm test         # Run test suite (28 tests)
-npm run lint     # Check code style
-npm run format   # Format code
+npm install            # Install dependencies
+npm run build          # Compile TypeScript
+npm test               # Run unit tests
+npm run test:integration  # Run integration tests (requires Mail.app)
+npm run test:all       # Run all tests (unit + integration)
+npm run lint           # Check code style
+npm run format         # Format code
 ```
 
 ---

package/build/index.js

@@ -24,6 +24,23 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z } from "zod";
 import { AppleMailManager } from "./services/appleMailManager.js";
+// =============================================================================
+// Shared Validation Schemas
+// =============================================================================
+/** Message IDs in Apple Mail are always numeric. Enforce this at the schema level
+ *  to prevent AppleScript injection via the `whose id is ${id}` interpolation. */
+const MESSAGE_ID_SCHEMA = z.string().regex(/^\d+$/, "Message ID must be numeric");
+/** Batch operations are capped to prevent unbounded loops / DoS. */
+const BATCH_IDS_SCHEMA = z
+    .array(MESSAGE_ID_SCHEMA)
+    .min(1, "At least one message ID is required")
+    .max(100, "Cannot process more than 100 messages in a single batch");
+/** Date filter strings must look like natural-language dates (e.g. "March 1, 2026").
+ *  Block characters that could escape an AppleScript `date "..."` literal. */
+const DATE_FILTER_SCHEMA = z
+    .string()
+    .regex(/^[a-zA-Z0-9 ,/\-:]+$/, "Date must contain only alphanumeric characters, spaces, commas, slashes, hyphens, and colons")
+    .optional();
 // Read version from package.json to keep it in sync
 const require = createRequire(import.meta.url);
 const { version } = require("../package.json");
@@ -89,8 +106,8 @@ server.tool("search-messages", {
     account: z.string().optional().describe("Account to search in (omit to search all accounts)"),
     isRead: z.boolean().optional().describe("Filter by read status"),
     isFlagged: z.boolean().optional().describe("Filter by flagged status"),
-    dateFrom: z.string().optional().describe("Start date filter (e.g., 'January 1, 2026')"),
-    dateTo: z.string().optional().describe("End date filter (e.g., 'March 1, 2026')"),
+    dateFrom: DATE_FILTER_SCHEMA.describe("Start date filter (e.g., 'January 1, 2026')"),
+    dateTo: DATE_FILTER_SCHEMA.describe("End date filter (e.g., 'March 1, 2026')"),
     limit: z.number().optional().describe("Maximum number of results (default: 50)"),
 }, withErrorHandling(({ query, mailbox, account, limit = 50, dateFrom, dateTo }) => {
     const messages = mailManager.searchMessages(query, mailbox, account, limit, dateFrom, dateTo);
@@ -104,7 +121,7 @@ server.tool("search-messages", {
 }, "Error searching messages"));
 // --- get-message ---
 server.tool("get-message", {
-    id: z.string().min(1, "Message ID is required"),
+    id: MESSAGE_ID_SCHEMA,
     preferHtml: z.boolean().optional().describe("Return HTML source instead of plain text"),
 }, withErrorHandling(({ id, preferHtml }) => {
     const content = mailManager.getMessageContent(id);
@@ -142,13 +159,63 @@ server.tool("send-email", {
     cc: z.array(z.string()).optional().describe("CC recipients"),
     bcc: z.array(z.string()).optional().describe("BCC recipients"),
     account: z.string().optional().describe("Account to send from"),
-}, withErrorHandling(({ to, subject, body, cc, bcc, account }) => {
-    const success = mailManager.sendEmail(to, subject, body, cc, bcc, account);
+    attachments: z
+        .array(z.string())
+        .max(20, "Cannot attach more than 20 files")
+        .optional()
+        .describe("Absolute file paths to attach (e.g., ['/Users/me/report.pdf'])"),
+}, withErrorHandling(({ to, subject, body, cc, bcc, account, attachments }) => {
+    const success = mailManager.sendEmail(to, subject, body, cc, bcc, account, attachments);
     if (!success) {
         return errorResponse("Failed to send email. Check Mail.app configuration.");
     }
-    return successResponse(`Email sent to ${to.join(", ")}`);
+    const attachInfo = attachments?.length ? ` with ${attachments.length} attachment(s)` : "";
+    return successResponse(`Email sent to ${to.join(", ")}${attachInfo}`);
 }, "Error sending email"));
+// --- send-serial-email ---
+server.tool("send-serial-email", {
+    recipients: z
+        .array(z.object({
+        email: z.string().min(1, "Recipient email is required"),
+        variables: z
+            .record(z.string())
+            .describe("Placeholder values, e.g. { Name: 'Alice', Company: 'Acme' }"),
+    }))
+        .min(1, "At least one recipient is required")
+        .max(100, "Cannot send to more than 100 recipients in a single batch")
+        .describe("List of recipients with personalization variables (max 100)"),
+    subject: z
+        .string()
+        .min(1, "Subject is required")
+        .describe("Subject line — use {{Key}} for placeholders"),
+    body: z
+        .string()
+        .min(1, "Body is required")
+        .describe("Email body — use {{Key}} for placeholders"),
+    account: z.string().optional().describe("Account to send from"),
+    delayMs: z
+        .number()
+        .min(0)
+        .max(10000)
+        .optional()
+        .describe("Delay between sends in ms (default: 500, max: 10000)"),
+}, withErrorHandling(({ recipients, subject, body, account, delayMs }) => {
+    const results = mailManager.sendSerialEmail(recipients, subject, body, account, delayMs);
+    const successCount = results.filter((r) => r.success).length;
+    const failCount = results.length - successCount;
+    const details = results
+        .map((r) => `  - ${r.email}: ${r.success ? "sent" : `FAILED (${r.error})`}`)
+        .join("\n");
+    if (failCount === 0) {
+        return successResponse(`Successfully sent ${successCount} email(s):\n${details}`);
+    }
+    else if (successCount === 0) {
+        return errorResponse(`Failed to send all ${failCount} email(s):\n${details}`);
+    }
+    else {
+        return successResponse(`Sent ${successCount} of ${results.length} email(s), ${failCount} failed:\n${details}`);
+    }
+}, "Error sending serial emails"));
 // --- create-draft ---
 server.tool("create-draft", {
     to: z.array(z.string()).min(1, "At least one recipient is required"),
@@ -157,16 +224,22 @@ server.tool("create-draft", {
     cc: z.array(z.string()).optional().describe("CC recipients"),
     bcc: z.array(z.string()).optional().describe("BCC recipients"),
     account: z.string().optional().describe("Account to create draft in"),
-}, withErrorHandling(({ to, subject, body, cc, bcc, account }) => {
-    const success = mailManager.createDraft(to, subject, body, cc, bcc, account);
+    attachments: z
+        .array(z.string())
+        .max(20, "Cannot attach more than 20 files")
+        .optional()
+        .describe("Absolute file paths to attach (e.g., ['/Users/me/report.pdf'])"),
+}, withErrorHandling(({ to, subject, body, cc, bcc, account, attachments }) => {
+    const success = mailManager.createDraft(to, subject, body, cc, bcc, account, attachments);
     if (!success) {
         return errorResponse("Failed to create draft. Check Mail.app configuration.");
     }
-    return successResponse(`Draft created for ${to.join(", ")}`);
+    const attachInfo = attachments?.length ? ` with ${attachments.length} attachment(s)` : "";
+    return successResponse(`Draft created for ${to.join(", ")}${attachInfo}`);
 }, "Error creating draft"));
 // --- reply-to-message ---
 server.tool("reply-to-message", {
-    id: z.string().min(1, "Message ID is required"),
+    id: MESSAGE_ID_SCHEMA,
     body: z.string().min(1, "Reply body is required"),
     replyAll: z.boolean().optional().default(false).describe("Reply to all recipients"),
     send: z.boolean().optional().default(true).describe("Send immediately (false = save as draft)"),
@@ -179,7 +252,7 @@ server.tool("reply-to-message", {
 }, "Error replying to message"));
 // --- forward-message ---
 server.tool("forward-message", {
-    id: z.string().min(1, "Message ID is required"),
+    id: MESSAGE_ID_SCHEMA,
     to: z.array(z.string()).min(1, "At least one recipient is required"),
     body: z.string().optional().describe("Optional message to prepend"),
     send: z.boolean().optional().default(true).describe("Send immediately (false = save as draft)"),
@@ -192,7 +265,7 @@ server.tool("forward-message", {
 }, "Error forwarding message"));
 // --- mark-as-read ---
 server.tool("mark-as-read", {
-    id: z.string().min(1, "Message ID is required"),
+    id: MESSAGE_ID_SCHEMA,
 }, withErrorHandling(({ id }) => {
     const success = mailManager.markAsRead(id);
     if (!success) {
@@ -202,7 +275,7 @@ server.tool("mark-as-read", {
 }, "Error marking message as read"));
 // --- mark-as-unread ---
 server.tool("mark-as-unread", {
-    id: z.string().min(1, "Message ID is required"),
+    id: MESSAGE_ID_SCHEMA,
 }, withErrorHandling(({ id }) => {
     const success = mailManager.markAsUnread(id);
     if (!success) {
@@ -212,7 +285,7 @@ server.tool("mark-as-unread", {
 }, "Error marking message as unread"));
 // --- flag-message ---
 server.tool("flag-message", {
-    id: z.string().min(1, "Message ID is required"),
+    id: MESSAGE_ID_SCHEMA,
 }, withErrorHandling(({ id }) => {
     const success = mailManager.flagMessage(id);
     if (!success) {
@@ -222,7 +295,7 @@ server.tool("flag-message", {
 }, "Error flagging message"));
 // --- unflag-message ---
 server.tool("unflag-message", {
-    id: z.string().min(1, "Message ID is required"),
+    id: MESSAGE_ID_SCHEMA,
 }, withErrorHandling(({ id }) => {
     const success = mailManager.unflagMessage(id);
     if (!success) {
@@ -232,7 +305,7 @@ server.tool("unflag-message", {
 }, "Error unflagging message"));
 // --- delete-message ---
 server.tool("delete-message", {
-    id: z.string().min(1, "Message ID is required"),
+    id: MESSAGE_ID_SCHEMA,
 }, withErrorHandling(({ id }) => {
     const success = mailManager.deleteMessage(id);
     if (!success) {
@@ -242,7 +315,7 @@ server.tool("delete-message", {
 }, "Error deleting message"));
 // --- move-message ---
 server.tool("move-message", {
-    id: z.string().min(1, "Message ID is required"),
+    id: MESSAGE_ID_SCHEMA,
     mailbox: z.string().min(1, "Destination mailbox is required"),
     account: z.string().optional().describe("Account containing the destination mailbox"),
 }, withErrorHandling(({ id, mailbox, account }) => {
@@ -254,7 +327,7 @@ server.tool("move-message", {
 }, "Error moving message"));
 // --- batch-delete-messages ---
 server.tool("batch-delete-messages", {
-    ids: z.array(z.string()).min(1, "At least one message ID is required"),
+    ids: BATCH_IDS_SCHEMA,
 }, withErrorHandling(({ ids }) => {
     const results = mailManager.batchDeleteMessages(ids);
     const successCount = results.filter((r) => r.success).length;
@@ -271,7 +344,7 @@ server.tool("batch-delete-messages", {
 }, "Error batch deleting messages"));
 // --- batch-move-messages ---
 server.tool("batch-move-messages", {
-    ids: z.array(z.string()).min(1, "At least one message ID is required"),
+    ids: BATCH_IDS_SCHEMA,
     mailbox: z.string().min(1, "Destination mailbox is required"),
     account: z.string().optional().describe("Account containing the destination mailbox"),
 }, withErrorHandling(({ ids, mailbox, account }) => {
@@ -290,7 +363,7 @@ server.tool("batch-move-messages", {
 }, "Error batch moving messages"));
 // --- batch-mark-as-read ---
 server.tool("batch-mark-as-read", {
-    ids: z.array(z.string()).min(1, "At least one message ID is required"),
+    ids: BATCH_IDS_SCHEMA,
 }, withErrorHandling(({ ids }) => {
     const results = mailManager.batchMarkAsRead(ids);
     const successCount = results.filter((r) => r.success).length;
@@ -307,7 +380,7 @@ server.tool("batch-mark-as-read", {
 }, "Error batch marking messages as read"));
 // --- batch-mark-as-unread ---
 server.tool("batch-mark-as-unread", {
-    ids: z.array(z.string()).min(1, "At least one message ID is required"),
+    ids: BATCH_IDS_SCHEMA,
 }, withErrorHandling(({ ids }) => {
     const results = mailManager.batchMarkAsUnread(ids);
     const successCount = results.filter((r) => r.success).length;
@@ -324,7 +397,7 @@ server.tool("batch-mark-as-unread", {
 }, "Error batch marking messages as unread"));
 // --- batch-flag-messages ---
 server.tool("batch-flag-messages", {
-    ids: z.array(z.string()).min(1, "At least one message ID is required"),
+    ids: BATCH_IDS_SCHEMA,
 }, withErrorHandling(({ ids }) => {
     const results = mailManager.batchFlagMessages(ids);
     const successCount = results.filter((r) => r.success).length;
@@ -341,7 +414,7 @@ server.tool("batch-flag-messages", {
 }, "Error batch flagging messages"));
 // --- batch-unflag-messages ---
 server.tool("batch-unflag-messages", {
-    ids: z.array(z.string()).min(1, "At least one message ID is required"),
+    ids: BATCH_IDS_SCHEMA,
 }, withErrorHandling(({ ids }) => {
     const results = mailManager.batchUnflagMessages(ids);
     const successCount = results.filter((r) => r.success).length;
@@ -358,7 +431,7 @@ server.tool("batch-unflag-messages", {
 }, "Error batch unflagging messages"));
 // --- list-attachments ---
 server.tool("list-attachments", {
-    id: z.string().min(1, "Message ID is required"),
+    id: MESSAGE_ID_SCHEMA,
 }, withErrorHandling(({ id }) => {
     const attachments = mailManager.listAttachments(id);
     if (attachments.length === 0) {
@@ -374,7 +447,7 @@ server.tool("list-attachments", {
 }, "Error listing attachments"));
 // --- save-attachment ---
 server.tool("save-attachment", {
-    id: z.string().min(1, "Message ID is required"),
+    id: MESSAGE_ID_SCHEMA,
     attachmentName: z.string().min(1, "Attachment name is required"),
     savePath: z.string().min(1, "Save directory path is required"),
 }, withErrorHandling(({ id, attachmentName, savePath }) => {

package/build/services/appleMailManager.d.ts

@@ -12,7 +12,7 @@
  *
  * @module services/appleMailManager
  */
-import type { Message, MessageContent, Mailbox, Account, Attachment, HealthCheckResult, MailStats, BatchOperationResult, SyncStatus, RecentlyReceivedStats, MailRule, Contact, EmailTemplate } from "../types.js";
+import type { Message, MessageContent, Mailbox, Account, Attachment, HealthCheckResult, MailStats, BatchOperationResult, SyncStatus, RecentlyReceivedStats, MailRule, Contact, EmailTemplate, SerialEmailRecipient, SerialEmailResult } from "../types.js";
 /**
  * Manager class for Apple Mail operations.
  *
@@ -124,7 +124,21 @@ export declare class AppleMailManager {
      * @param account - Account to send from
      * @returns true if sent successfully
      */
-    sendEmail(to: string[], subject: string, body: string, cc?: string[], bcc?: string[], account?: string): boolean;
+    sendEmail(to: string[], subject: string, body: string, cc?: string[], bcc?: string[], account?: string, attachments?: string[]): boolean;
+    /**
+     * Send individual personalized emails to a list of recipients (mail merge).
+     *
+     * Replaces {{placeholder}} tokens in subject and body with per-recipient values.
+     * Each recipient receives their own individual email.
+     *
+     * @param recipients - List of recipient objects with email and variable values
+     * @param subject - Email subject (may contain {{placeholders}})
+     * @param body - Email body (may contain {{placeholders}})
+     * @param account - Account to send from
+     * @param delayMs - Delay between sends in milliseconds (default: 500, max: 10000)
+     * @returns Array of per-recipient results
+     */
+    sendSerialEmail(recipients: SerialEmailRecipient[], subject: string, body: string, account?: string, delayMs?: number): SerialEmailResult[];
     /**
      * Create a draft email (saved to Drafts folder, not sent).
      *
@@ -136,7 +150,7 @@ export declare class AppleMailManager {
      * @param account - Account to create draft in
      * @returns true if draft created successfully
      */
-    createDraft(to: string[], subject: string, body: string, cc?: string[], bcc?: string[], account?: string): boolean;
+    createDraft(to: string[], subject: string, body: string, cc?: string[], bcc?: string[], account?: string, attachments?: string[]): boolean;
     /**
      * Reply to a message.
      *

package/build/services/appleMailManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"appleMailManager.d.ts","sourceRoot":"","sources":["../../src/services/appleMailManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"appleMailManager.d.ts","sourceRoot":"","sources":["../../src/services/appleMailManager.ts"],"names":[],"mappings":"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"}

package/build/services/appleMailManager.js

@@ -12,6 +12,10 @@
  *
  * @module services/appleMailManager
  */
+import { spawnSync } from "child_process";
+import { existsSync } from "fs";
+import { isAbsolute, resolve } from "path";
+import { homedir } from "os";
 import { executeAppleScript } from "../utils/applescript.js";
 // =============================================================================
 // Text Processing Utilities
@@ -32,16 +36,54 @@ function escapeForAppleScript(text) {
     return text.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
 /**
- * Parses AppleScript date representation to JavaScript Date.
+ * Validates attachment file paths and builds AppleScript commands to attach them.
  *
- * AppleScript returns dates in a verbose format like:
- * "date Saturday, December 27, 2025 at 3:44:02 PM"
+ * @param attachments - Absolute file paths to attach
+ * @returns AppleScript commands to add attachments, or empty string if none
+ * @throws Error if any path is not absolute or does not exist
+ */
+function buildAttachmentCommands(attachments) {
+    if (!attachments || attachments.length === 0)
+        return "";
+    for (const filePath of attachments) {
+        if (!isAbsolute(filePath)) {
+            throw new Error(`Attachment path must be absolute: "${filePath}"`);
+        }
+        if (!existsSync(filePath)) {
+            throw new Error(`Attachment file not found: "${filePath}"`);
+        }
+    }
+    let commands = "";
+    for (const filePath of attachments) {
+        const safePath = escapeForAppleScript(filePath);
+        commands += `make new attachment with properties {file name:POSIX file "${safePath}"} at after the last paragraph\n`;
+    }
+    return commands;
+}
+/**
+ * AppleScript snippet that converts a date variable `d` into a
+ * locale-independent numeric string: "YYYY-M-D-H-m-s".
+ * Use: set d to date received of msg, then inline this snippet.
+ */
+const AS_DATE_TO_STRING = `((year of d) as string) & "-" & ((month of d as integer) as string) & "-" & ((day of d) as string) & "-" & ((hours of d) as string) & "-" & ((minutes of d) as string) & "-" & ((seconds of d) as string)`;
+/**
+ * Parses a locale-independent date string "YYYY-M-D-H-m-s"
+ * produced by the AppleScript snippet above.
  *
- * @param appleScriptDate - Date string from AppleScript
+ * Falls back to the locale-dependent `as string` format for
+ * backwards compatibility, and finally to current date.
+ *
+ * @param dateStr - Date string from AppleScript
  * @returns Parsed Date, or current date if parsing fails
  */
-function parseAppleScriptDate(appleScriptDate) {
-    const withoutPrefix = appleScriptDate.replace(/^date\s+/, "");
+function parseAppleScriptDate(dateStr) {
+    // Try locale-independent numeric format first: "YYYY-M-D-H-m-s"
+    const numParts = dateStr.split("-").map(Number);
+    if (numParts.length === 6 && numParts.every((n) => !isNaN(n))) {
+        return new Date(numParts[0], numParts[1] - 1, numParts[2], numParts[3], numParts[4], numParts[5]);
+    }
+    // Fallback: try legacy locale-dependent format
+    const withoutPrefix = dateStr.replace(/^date\s+/, "");
     const normalized = withoutPrefix.replace(" at ", " ");
     const parsed = new Date(normalized);
     return isNaN(parsed.getTime()) ? new Date() : parsed;
@@ -269,15 +311,18 @@ export class AppleMailManager {
             const safeQuery = escapeForAppleScript(query);
             searchCondition = `whose subject contains "${safeQuery}" or sender contains "${safeQuery}"`;
         }
-        // Build date filter AppleScript
+        // Build date filter AppleScript.
+        // Note: dateFrom/dateTo are already validated by DATE_FILTER_SCHEMA (alphanumeric + safe
+        // punctuation only), so escapeForAppleScript() below is belt-and-suspenders — it won't
+        // alter valid date strings but guards against future schema changes.
         let dateFilter = "";
         if (dateFrom || dateTo) {
             const dateChecks = [];
             if (dateFrom) {
-                dateChecks.push(`date received of msg >= date "${dateFrom}"`);
+                dateChecks.push(`date received of msg >= date "${escapeForAppleScript(dateFrom)}"`);
             }
             if (dateTo) {
-                dateChecks.push(`date received of msg <= date "${dateTo}"`);
+                dateChecks.push(`date received of msg <= date "${escapeForAppleScript(dateTo)}"`);
             }
             dateFilter = dateChecks.join(" and ");
         }
@@ -293,7 +338,8 @@ export class AppleMailManager {
           set msgId to id of msg as string
           set msgSubject to subject of msg
           set msgSender to sender of msg
-          set msgDateStr to date received of msg as string
+          set d to date received of msg
+          set msgDateStr to ${AS_DATE_TO_STRING}
           set msgRead to read status of msg as string
           set msgFlagged to flagged status of msg as string
           if msgCount > 0 then set outputText to outputText & "|||ITEM|||"
@@ -326,12 +372,13 @@ export class AppleMailManager {
         repeat with acct in accounts
           repeat with mb in mailboxes of acct
             try
-              set matchingMsgs to (messages of mb whose id is ${id})
+              set matchingMsgs to (messages of mb whose id is ${Number(id)})
               if (count of matchingMsgs) > 0 then
                 set msg to item 1 of matchingMsgs
                 set msgSubject to subject of msg
                 set msgSender to sender of msg
-                set msgDate to date received of msg as string
+                set d to date received of msg
+                set msgDate to ${AS_DATE_TO_STRING}
                 set msgRead to read status of msg as string
                 set msgFlagged to flagged status of msg as string
                 set msgJunk to junk mail status of msg as string
@@ -380,7 +427,7 @@ export class AppleMailManager {
         repeat with acct in accounts
           repeat with mb in mailboxes of acct
             try
-              set matchingMsgs to (messages of mb whose id is ${id})
+              set matchingMsgs to (messages of mb whose id is ${Number(id)})
               if (count of matchingMsgs) > 0 then
                 set msg to item 1 of matchingMsgs
                 set msgSubject to subject of msg
@@ -445,7 +492,8 @@ export class AppleMailManager {
             set msgId to id of msg as string
             set msgSubject to subject of msg
             set msgSender to sender of msg
-            set msgDate to date received of msg as string
+            set d to date received of msg
+            set msgDate to ${AS_DATE_TO_STRING}
             set msgRead to read status of msg as string
             set msgFlagged to flagged status of msg as string
             if msgCount > 0 then set outputText to outputText & "|||ITEM|||"
@@ -504,7 +552,7 @@ export class AppleMailManager {
      * @param account - Account to send from
      * @returns true if sent successfully
      */
-    sendEmail(to, subject, body, cc, bcc, account) {
+    sendEmail(to, subject, body, cc, bcc, account, attachments) {
         const safeSubject = escapeForAppleScript(subject);
         const safeBody = escapeForAppleScript(body);
         // Build recipient additions
@@ -522,6 +570,7 @@ export class AppleMailManager {
                 recipientCommands += `make new bcc recipient at end of bcc recipients with properties {address:"${escapeForAppleScript(addr)}"}\n`;
             }
         }
+        const attachmentCommands = buildAttachmentCommands(attachments);
         let sendCommand;
         if (account) {
             const safeAccount = escapeForAppleScript(account);
@@ -530,6 +579,7 @@ export class AppleMailManager {
         tell newMessage
           ${recipientCommands}
           set sender to "${safeAccount}"
+          ${attachmentCommands}
         end tell
         send newMessage
         return "sent"
@@ -540,19 +590,69 @@ export class AppleMailManager {
         set newMessage to make new outgoing message with properties {subject:"${safeSubject}", content:"${safeBody}", visible:true}
         tell newMessage
           ${recipientCommands}
+          ${attachmentCommands}
         end tell
         send newMessage
         return "sent"
       `;
         }
         const script = buildAppLevelScript(sendCommand);
-        const result = executeAppleScript(script);
+        const result = executeAppleScript(script, { timeoutMs: 60000, maxRetries: 2 });
         if (!result.success) {
             console.error(`Failed to send email: ${result.error}`);
             return false;
         }
         return result.output.includes("sent");
     }
+    /**
+     * Send individual personalized emails to a list of recipients (mail merge).
+     *
+     * Replaces {{placeholder}} tokens in subject and body with per-recipient values.
+     * Each recipient receives their own individual email.
+     *
+     * @param recipients - List of recipient objects with email and variable values
+     * @param subject - Email subject (may contain {{placeholders}})
+     * @param body - Email body (may contain {{placeholders}})
+     * @param account - Account to send from
+     * @param delayMs - Delay between sends in milliseconds (default: 500, max: 10000)
+     * @returns Array of per-recipient results
+     */
+    sendSerialEmail(recipients, subject, body, account, delayMs = 500) {
+        const effectiveDelay = Math.min(Math.max(delayMs, 0), 10000);
+        const results = [];
+        for (let i = 0; i < recipients.length; i++) {
+            const recipient = recipients[i];
+            try {
+                // Replace all {{Key}} placeholders with recipient's values
+                let personalizedSubject = subject;
+                let personalizedBody = body;
+                for (const [key, value] of Object.entries(recipient.variables)) {
+                    const safeKey = key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+                    const placeholder = new RegExp(`\\{\\{${safeKey}\\}\\}`, "g");
+                    personalizedSubject = personalizedSubject.replace(placeholder, value);
+                    personalizedBody = personalizedBody.replace(placeholder, value);
+                }
+                const success = this.sendEmail([recipient.email], personalizedSubject, personalizedBody, undefined, undefined, account);
+                results.push({
+                    email: recipient.email,
+                    success,
+                    error: success ? undefined : "Failed to send email",
+                });
+            }
+            catch (error) {
+                results.push({
+                    email: recipient.email,
+                    success: false,
+                    error: error instanceof Error ? error.message : "Unknown error",
+                });
+            }
+            // Brief delay between sends to avoid overwhelming Mail.app
+            if (effectiveDelay > 0 && i < recipients.length - 1) {
+                spawnSync("sleep", [(effectiveDelay / 1000).toString()], { stdio: "ignore" });
+            }
+        }
+        return results;
+    }
     /**
      * Create a draft email (saved to Drafts folder, not sent).
      *
@@ -564,7 +664,7 @@ export class AppleMailManager {
      * @param account - Account to create draft in
      * @returns true if draft created successfully
      */
-    createDraft(to, subject, body, cc, bcc, account) {
+    createDraft(to, subject, body, cc, bcc, account, attachments) {
         const safeSubject = escapeForAppleScript(subject);
         const safeBody = escapeForAppleScript(body);
         // Build recipient additions
@@ -582,6 +682,7 @@ export class AppleMailManager {
                 recipientCommands += `make new bcc recipient at end of bcc recipients with properties {address:"${escapeForAppleScript(addr)}"}\n`;
             }
         }
+        const attachmentCommands = buildAttachmentCommands(attachments);
         let draftCommand;
         if (account) {
             const safeAccount = escapeForAppleScript(account);
@@ -590,6 +691,7 @@ export class AppleMailManager {
         tell newMessage
           ${recipientCommands}
           set sender to "${safeAccount}"
+          ${attachmentCommands}
         end tell
         return "draft created"
       `;
@@ -599,12 +701,13 @@ export class AppleMailManager {
         set newMessage to make new outgoing message with properties {subject:"${safeSubject}", content:"${safeBody}", visible:false}
         tell newMessage
           ${recipientCommands}
+          ${attachmentCommands}
         end tell
         return "draft created"
       `;
         }
         const script = buildAppLevelScript(draftCommand);
-        const result = executeAppleScript(script);
+        const result = executeAppleScript(script, { timeoutMs: 60000, maxRetries: 2 });
         if (!result.success) {
             console.error(`Failed to create draft: ${result.error}`);
             return false;
@@ -629,7 +732,7 @@ export class AppleMailManager {
         repeat with acct in accounts
           repeat with mb in mailboxes of acct
             try
-              set matchingMsgs to (messages of mb whose id is ${id})
+              set matchingMsgs to (messages of mb whose id is ${Number(id)})
               if (count of matchingMsgs) > 0 then
                 set msg to item 1 of matchingMsgs
                 set theReply to reply msg with opening window${replyAllClause}
@@ -674,7 +777,7 @@ export class AppleMailManager {
         repeat with acct in accounts
           repeat with mb in mailboxes of acct
             try
-              set matchingMsgs to (messages of mb whose id is ${id})
+              set matchingMsgs to (messages of mb whose id is ${Number(id)})
               if (count of matchingMsgs) > 0 then
                 set msg to item 1 of matchingMsgs
                 set theForward to forward msg with opening window
@@ -707,7 +810,7 @@ export class AppleMailManager {
         repeat with acct in accounts
           repeat with mb in mailboxes of acct
             try
-              set matchingMsgs to (messages of mb whose id is ${id})
+              set matchingMsgs to (messages of mb whose id is ${Number(id)})
               if (count of matchingMsgs) > 0 then
                 set msg to item 1 of matchingMsgs
                 ${operation}
@@ -795,7 +898,7 @@ export class AppleMailManager {
         repeat with acct in accounts
           repeat with mb in mailboxes of acct
             try
-              set matchingMsgs to (messages of mb whose id is ${id})
+              set matchingMsgs to (messages of mb whose id is ${Number(id)})
               if (count of matchingMsgs) > 0 then
                 set msg to item 1 of matchingMsgs
                 set destMailbox to mailbox "${safeMailbox}" of account "${safeAccount}"
@@ -915,7 +1018,7 @@ export class AppleMailManager {
         repeat with acct in accounts
           repeat with mb in mailboxes of acct
             try
-              set matchingMsgs to (messages of mb whose id is ${id})
+              set matchingMsgs to (messages of mb whose id is ${Number(id)})
               if (count of matchingMsgs) > 0 then
                 set msg to item 1 of matchingMsgs
                 set outputText to ""
@@ -961,14 +1064,30 @@ export class AppleMailManager {
      * Save an attachment from a message to disk.
      */
     saveAttachment(id, attachmentName, savePath) {
+        // Validate attachment name: block path separators, traversal, null bytes, and backslashes
+        if (/[/\\\0]/.test(attachmentName) || attachmentName.includes("..")) {
+            console.error(`Invalid attachment name: "${attachmentName}"`);
+            return false;
+        }
+        // Resolve the save path to prevent symlink / ".." traversal bypass
+        const resolvedPath = resolve(savePath);
+        const allowedPrefixes = [homedir(), "/tmp", "/private/tmp", "/Volumes"];
+        const isAllowed = allowedPrefixes.some((prefix) => resolvedPath.startsWith(prefix));
+        if (!isAllowed) {
+            console.error(`Save path "${savePath}" is outside allowed directories`);
+            return false;
+        }
         const safeName = escapeForAppleScript(attachmentName);
-        const safePath = escapeForAppleScript(savePath);
+        const safePath = escapeForAppleScript(resolvedPath);
+        // Use Number(id) as defense-in-depth — the Zod schema already enforces numeric IDs,
+        // but this ensures raw interpolation into AppleScript is safe even if validation changes.
+        const numericId = Number(id);
         const script = buildAppLevelScript(`
       try
         repeat with acct in accounts
           repeat with mb in mailboxes of acct
             try
-              set matchingMsgs to (messages of mb whose id is ${id})
+              set matchingMsgs to (messages of mb whose id is ${numericId})
               if (count of matchingMsgs) > 0 then
                 set msg to item 1 of matchingMsgs
                 repeat with att in mail attachments of msg

package/build/types.d.ts

@@ -207,6 +207,26 @@ export interface MoveMessageParams {
     /** Account containing the destination mailbox */
     account?: string;
 }
+/**
+ * A single recipient in a serial email (mail merge) operation.
+ */
+export interface SerialEmailRecipient {
+    /** Recipient email address */
+    email: string;
+    /** Variable values for placeholder replacement (e.g., { Name: "Alice", Company: "Acme" }) */
+    variables: Record<string, string>;
+}
+/**
+ * Result of sending a serial email to a single recipient.
+ */
+export interface SerialEmailResult {
+    /** Recipient email address */
+    email: string;
+    /** Whether the email was sent successfully */
+    success: boolean;
+    /** Error message if sending failed */
+    error?: string;
+}
 /**
  * Individual check result in a health check.
  */

package/build/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apple-mail-mcp",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "MCP server for Apple Mail - read, search, send, and manage emails via Claude",
   "type": "module",
   "main": "build/index.js",
@@ -18,6 +18,8 @@
     "start": "node build/index.js",
     "dev": "tsc --watch",
     "test": "vitest run",
+    "test:integration": "vitest run --config vitest.integration.config.ts",
+    "test:all": "vitest run && vitest run --config vitest.integration.config.ts",
     "test:watch": "vitest",
     "test:coverage": "vitest run --coverage",
     "lint": "eslint src",