apple-mail-mcp 1.6.8 → 1.6.10

package/README.md

@@ -800,6 +800,7 @@ The entrypoint is written as:
 | 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 |
 | Very large mailboxes not searchable | Apple Mail's AppleScript bridge times out on mailboxes with tens of thousands of messages, so unscoped `search-messages` skips mailboxes above `APPLE_MAIL_MAX_SEARCH_MAILBOX` (default 5000) and reports them as a partial result. Scope with `mailbox` + a date window to search inside one. ([#24](https://github.com/sweetrb/apple-mail-mcp/issues/24)) |
+| Can't delete/rename server-side mailboxes or mutate drafts | Mail.app's AppleScript bridge can only `delete`/`rename` **local "On My Mac"** mailboxes and cannot delete/move drafts — it throws `AppleEvent handler failed` for IMAP/Gmail/Workspace/iCloud/Exchange mailboxes and drafts (the GUI can do it). `delete-mailbox`/`rename-mailbox`/`delete-message`/`move-message` now return a clear "do it in Mail.app directly" error in that case instead of a generic failure. ([#42](https://github.com/sweetrb/apple-mail-mcp/issues/42)) |
 | 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 |

package/build/index.js

@@ -383,9 +383,9 @@ server.tool("unflag-message", {
 server.tool("delete-message", {
     id: MESSAGE_ID_SCHEMA,
 }, withErrorHandling(({ id }) => {
-    const success = mailManager.deleteMessage(id);
+    const { success, error } = mailManager.deleteMessage(id);
     if (!success) {
-        return errorResponse(`Failed to delete message "${id}"`);
+        return errorResponse(error || `Failed to delete message "${id}"`);
     }
     return successResponse("Message deleted");
 }, "Error deleting message"));
@@ -395,9 +395,9 @@ server.tool("move-message", {
     mailbox: z.string().min(1, "Destination mailbox is required"),
     account: z.string().optional().describe("Account containing the destination mailbox"),
 }, withErrorHandling(({ id, mailbox, account }) => {
-    const success = mailManager.moveMessage(id, mailbox, account);
+    const { success, error } = mailManager.moveMessage(id, mailbox, account);
     if (!success) {
-        return errorResponse(`Failed to move message to "${mailbox}"`);
+        return errorResponse(error || `Failed to move message to "${mailbox}"`);
     }
     return successResponse(`Message moved to "${mailbox}"`);
 }, "Error moving message"));
@@ -572,9 +572,9 @@ server.tool("delete-mailbox", {
     name: z.string().min(1, "Mailbox name is required"),
     account: z.string().optional().describe("Account containing the mailbox"),
 }, withErrorHandling(({ name, account }) => {
-    const success = mailManager.deleteMailbox(name, account);
+    const { success, error } = mailManager.deleteMailbox(name, account);
     if (!success) {
-        return errorResponse(`Failed to delete mailbox "${name}"`);
+        return errorResponse(error || `Failed to delete mailbox "${name}"`);
     }
     return successResponse(`Mailbox "${name}" deleted`);
 }, "Error deleting mailbox"));
@@ -584,9 +584,9 @@ server.tool("rename-mailbox", {
     newName: z.string().min(1, "New mailbox name is required"),
     account: z.string().optional().describe("Account containing the mailbox"),
 }, withErrorHandling(({ oldName, newName, account }) => {
-    const success = mailManager.renameMailbox(oldName, newName, account);
+    const { success, error } = mailManager.renameMailbox(oldName, newName, account);
     if (!success) {
-        return errorResponse(`Failed to rename mailbox "${oldName}" to "${newName}"`);
+        return errorResponse(error || `Failed to rename mailbox "${oldName}" to "${newName}"`);
     }
     return successResponse(`Mailbox renamed from "${oldName}" to "${newName}"`);
 }, "Error renaming mailbox"));

package/build/services/appleMailManager.d.ts

@@ -36,6 +36,25 @@ export declare function splitSearchDiagnostics(output: string, account: string):
     payload: string;
     diagnostics: SearchDiagnostics;
 };
+/**
+ * True if `resolvedPath` is one of the allowed roots or strictly inside one.
+ *
+ * Uses a path-segment boundary check rather than a bare `startsWith`, which
+ * would let a sibling whose name merely shares the prefix slip through —
+ * `/Volumes-evil` startsWith `/Volumes`, `/Users/robother` startsWith
+ * `/Users/rob` (audit finding #12). `resolvedPath` must already be absolute
+ * (caller passes `resolve(...)` output).
+ */
+export declare function isPathWithinAllowedRoots(resolvedPath: string): boolean;
+/**
+ * Turn a raw mailbox delete/rename failure into an actionable, non-retryable
+ * message when it's the known server-side-mailbox limitation (#42); otherwise
+ * return the raw error unchanged.
+ *
+ * Exported for unit testing.
+ */
+export declare function describeMailboxOpError(op: "delete" | "rename", raw: string): string;
+export declare function escapeForAppleScript(text: string): string;
 /**
  * Emits AppleScript that builds a date into the variable `varName` from numeric
  * components.
@@ -317,7 +336,21 @@ export declare class AppleMailManager {
     /**
      * Delete a message.
      */
-    deleteMessage(id: string): boolean;
+    deleteMessage(id: string): {
+        success: boolean;
+        error?: string;
+    };
+    /**
+     * Classify a failed message mutation (delete/move) into an actionable error.
+     *
+     * Mail.app's scripting bridge cannot delete or move drafts, and cannot mutate
+     * messages in some server-side special mailboxes — it throws `AppleEvent
+     * handler failed` rather than a useful message (#42). When that pattern is
+     * seen, look up the message's mailbox (cheap, indexed `whose id is`) to give a
+     * draft-specific or server-specific hint. Other errors (e.g. "Message not
+     * found", "ambiguous destination") pass through unchanged.
+     */
+    private classifyMessageMutationError;
     /**
      * Move a message to a different mailbox.
      */
@@ -340,7 +373,10 @@ export declare class AppleMailManager {
      * (destination not found / ambiguous / message not found).
      */
     private moveMessageInternal;
-    moveMessage(id: string, mailbox: string, account?: string): boolean;
+    moveMessage(id: string, mailbox: string, account?: string): {
+        success: boolean;
+        error?: string;
+    };
     /**
      * Run one operation over many message IDs in a SINGLE osascript invocation.
      *
@@ -413,11 +449,17 @@ export declare class AppleMailManager {
     /**
      * Delete a mailbox.
      */
-    deleteMailbox(name: string, account?: string): boolean;
+    deleteMailbox(name: string, account?: string): {
+        success: boolean;
+        error?: string;
+    };
     /**
      * Rename a mailbox by creating a new one, moving messages, and deleting the old one.
      */
-    renameMailbox(oldName: string, newName: string, account?: string): boolean;
+    renameMailbox(oldName: string, newName: string, account?: string): {
+        success: boolean;
+        error?: string;
+    };
     /**
      * List all mail accounts (uses cache).
      */

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

@@ -14,7 +14,7 @@
  */
 import { spawnSync } from "child_process";
 import { existsSync, writeFileSync } from "fs";
-import { isAbsolute, resolve } from "path";
+import { isAbsolute, resolve, sep } from "path";
 import { homedir } from "os";
 import { executeAppleScript } from "../utils/applescript.js";
 import { parseMimeAttachments, extractMimeAttachment, extractHtmlBody } from "../utils/mimeParse.js";
@@ -139,10 +139,61 @@ export function splitSearchDiagnostics(output, account) {
  * @param text - Raw text to escape
  * @returns Text safe for AppleScript string embedding
  */
-function escapeForAppleScript(text) {
+/**
+ * Roots under which `save-attachment` is permitted to write.
+ */
+const ALLOWED_SAVE_ROOTS = [homedir(), "/tmp", "/private/tmp", "/Volumes"];
+/**
+ * True if `resolvedPath` is one of the allowed roots or strictly inside one.
+ *
+ * Uses a path-segment boundary check rather than a bare `startsWith`, which
+ * would let a sibling whose name merely shares the prefix slip through —
+ * `/Volumes-evil` startsWith `/Volumes`, `/Users/robother` startsWith
+ * `/Users/rob` (audit finding #12). `resolvedPath` must already be absolute
+ * (caller passes `resolve(...)` output).
+ */
+export function isPathWithinAllowedRoots(resolvedPath) {
+    return ALLOWED_SAVE_ROOTS.some((root) => {
+        const base = root.endsWith(sep) ? root.slice(0, -1) : root;
+        return resolvedPath === base || resolvedPath.startsWith(base + sep);
+    });
+}
+/**
+ * Pattern in a raw AppleScript error that indicates an operation Mail.app's
+ * scripting interface simply cannot perform on this target — most often a
+ * server-side (IMAP / Gmail / Workspace / iCloud / Exchange) mailbox or a draft.
+ * Mail throws `AppleEvent handler failed` (-10000) for these; the GUI can do
+ * them, the scripting bridge cannot. See issue #42 and the audit doc.
+ */
+const UNSUPPORTED_APPLESCRIPT_OP = /AppleEvent handler failed|-10000/i;
+/**
+ * Turn a raw mailbox delete/rename failure into an actionable, non-retryable
+ * message when it's the known server-side-mailbox limitation (#42); otherwise
+ * return the raw error unchanged.
+ *
+ * Exported for unit testing.
+ */
+export function describeMailboxOpError(op, raw) {
+    const trimmed = (raw || "").trim();
+    if (UNSUPPORTED_APPLESCRIPT_OP.test(trimmed)) {
+        const verb = op === "delete" ? "Delete" : "Rename";
+        return `Mail.app cannot ${op} server-side (IMAP / Gmail / Workspace / iCloud / Exchange) mailboxes via AppleScript — only local "On My Mac" mailboxes support this. ${verb} it in Mail.app directly. (Mail.app error: ${trimmed})`;
+    }
+    return trimmed || `Failed to ${op} mailbox`;
+}
+export function escapeForAppleScript(text) {
     if (!text)
         return "";
-    return text.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+    // Escape backslash and double-quote for the AppleScript string literal, and
+    // strip ASCII control characters. An AppleScript double-quoted literal cannot
+    // contain a raw newline, so an interpolated value with a `\n` (or other
+    // control char) would terminate the literal early and could inject a
+    // statement; stripping them closes that gap (audit finding #10).
+    return (text
+        .replace(/\\/g, "\\\\")
+        .replace(/"/g, '\\"')
+        // eslint-disable-next-line no-control-regex
+        .replace(/[\x00-\x1f\x7f]/g, ""));
 }
 /**
  * Validates attachment file paths and builds AppleScript commands to attach them.
@@ -1397,11 +1448,41 @@ export class AppleMailManager {
     deleteMessage(id) {
         const script = this.findMessageScript(id, "delete msg");
         const result = executeAppleScript(script, { timeoutMs: 60000 });
-        if (!result.success || result.output.startsWith("error:")) {
-            console.error(`Failed to delete message: ${result.error || result.output}`);
-            return false;
+        if (result.success && !result.output.startsWith("error:")) {
+            return { success: true };
         }
-        return true;
+        const raw = result.success
+            ? result.output.replace(/^error:/, "")
+            : result.error || "Unknown error";
+        const error = this.classifyMessageMutationError(id, raw, "delete");
+        console.error(`Failed to delete message: ${error}`);
+        return { success: false, error };
+    }
+    /**
+     * Classify a failed message mutation (delete/move) into an actionable error.
+     *
+     * Mail.app's scripting bridge cannot delete or move drafts, and cannot mutate
+     * messages in some server-side special mailboxes — it throws `AppleEvent
+     * handler failed` rather than a useful message (#42). When that pattern is
+     * seen, look up the message's mailbox (cheap, indexed `whose id is`) to give a
+     * draft-specific or server-specific hint. Other errors (e.g. "Message not
+     * found", "ambiguous destination") pass through unchanged.
+     */
+    classifyMessageMutationError(id, raw, op) {
+        const trimmed = (raw || "").trim();
+        if (!UNSUPPORTED_APPLESCRIPT_OP.test(trimmed))
+            return trimmed || `Failed to ${op} message`;
+        let mailbox = "";
+        try {
+            mailbox = this.getMessageById(id)?.mailbox ?? "";
+        }
+        catch {
+            /* best-effort; fall through to the generic server-side message */
+        }
+        if (/draft/i.test(mailbox)) {
+            return `Mail.app cannot ${op} drafts via AppleScript; ${op} it in Mail.app directly. (Mail.app error: ${trimmed})`;
+        }
+        return `Mail.app cannot ${op} this message via AppleScript (server-side or special mailbox${mailbox ? ` "${mailbox}"` : ""}); ${op} it in Mail.app directly. (Mail.app error: ${trimmed})`;
     }
     /**
      * Move a message to a different mailbox.
@@ -1473,11 +1554,12 @@ export class AppleMailManager {
         return { success: true };
     }
     moveMessage(id, mailbox, account) {
-        const { success, error } = this.moveMessageInternal(id, mailbox, account);
-        if (!success) {
-            console.error(`Failed to move message: ${error}`);
-        }
-        return success;
+        const res = this.moveMessageInternal(id, mailbox, account);
+        if (res.success)
+            return { success: true };
+        const error = this.classifyMessageMutationError(id, res.error || "Failed to move message", "move");
+        console.error(`Failed to move message: ${error}`);
+        return { success: false, error };
     }
     // ===========================================================================
     // Batch Operations
@@ -1730,9 +1812,7 @@ export class AppleMailManager {
         }
         // 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) {
+        if (!isPathWithinAllowedRoots(resolvedPath)) {
             console.error(`Save path "${savePath}" is outside allowed directories`);
             return false;
         }
@@ -1783,8 +1863,7 @@ export class AppleMailManager {
         try {
             const outPath = resolve(resolvedPath, attachmentName);
             // Verify the resolved output path is still within allowed directories
-            const isOutAllowed = allowedPrefixes.some((prefix) => outPath.startsWith(prefix));
-            if (!isOutAllowed) {
+            if (!isPathWithinAllowedRoots(outPath)) {
                 console.error(`Output path "${outPath}" is outside allowed directories`);
                 return false;
             }
@@ -1816,7 +1895,10 @@ export class AppleMailManager {
       return mailboxList as text
     `;
         const script = buildAccountScopedScript(targetAccount, listCommand);
-        const result = executeAppleScript(script);
+        // Counts every mailbox's message total, so it needs more than the default
+        // 30s on accounts with many/large mailboxes; a timeout here silently
+        // returned an empty list (audit finding #8).
+        const result = executeAppleScript(script, { timeoutMs: 60000 });
         if (!result.success) {
             console.error(`Failed to list mailboxes: ${result.error}`);
             return [];
@@ -1860,7 +1942,9 @@ export class AppleMailManager {
       `;
         }
         const script = buildAccountScopedScript(targetAccount, command);
-        const result = executeAppleScript(script);
+        // Summing unread across every mailbox can exceed the default 30s; a timeout
+        // previously degraded silently to 0 ("all read") — audit finding #8.
+        const result = executeAppleScript(script, { timeoutMs: 60000 });
         if (!result.success) {
             console.error(`Failed to get unread count: ${result.error}`);
             return 0;
@@ -1908,11 +1992,15 @@ export class AppleMailManager {
     `);
         const result = executeAppleScript(script);
         if (!result.success || result.output.startsWith("error:")) {
-            console.error(`Failed to delete mailbox: ${result.error || result.output}`);
-            return false;
+            const raw = result.success
+                ? result.output.replace(/^error:/, "")
+                : result.error || "Unknown error";
+            const error = describeMailboxOpError("delete", raw);
+            console.error(`Failed to delete mailbox: ${error}`);
+            return { success: false, error };
         }
         this.invalidateCache();
-        return true;
+        return { success: true };
     }
     /**
      * Rename a mailbox by creating a new one, moving messages, and deleting the old one.
@@ -1921,7 +2009,10 @@ export class AppleMailManager {
         const targetAccount = this.resolveAccount(account);
         // Create the new mailbox
         if (!this.createMailbox(newName, targetAccount)) {
-            return false;
+            return {
+                success: false,
+                error: `Could not create the destination mailbox "${newName}" needed for the rename.`,
+            };
         }
         // Move all messages from old to new
         const resolvedOld = this.resolveMailbox(oldName, targetAccount);
@@ -1967,19 +2058,27 @@ export class AppleMailManager {
         // check), so a truncated move is recoverable rather than lossy.
         const result = executeAppleScript(moveScript, { timeoutMs: 120000 });
         if (!result.success || result.output.startsWith("error:")) {
-            console.error(`Failed to rename mailbox: ${result.error || result.output}`);
-            return false;
+            const raw = result.success
+                ? result.output.replace(/^error:/, "")
+                : result.error || "Unknown error";
+            // The empty destination mailbox we just created is now an orphan; the
+            // source is untouched (delete only runs after a verified-empty move).
+            const error = describeMailboxOpError("rename", raw);
+            console.error(`Failed to rename mailbox: ${error}`);
+            this.invalidateCache();
+            return { success: false, error };
         }
         if (result.output.startsWith("partial")) {
             const parts = result.output.split(FIELD_SEP);
             const remaining = parts[3] ?? "?";
             const total = parts[2] ?? "?";
-            console.error(`Failed to rename mailbox: only ${parts[1] ?? "?"} of ${total} messages moved, ${remaining} remain in "${resolvedOld}"; source was NOT deleted (both mailboxes left intact). Retry to move the rest.`);
+            const error = `Only ${parts[1] ?? "?"} of ${total} messages moved, ${remaining} remain in "${resolvedOld}"; the source was NOT deleted (both mailboxes left intact). Retry to move the rest.`;
+            console.error(`Failed to rename mailbox: ${error}`);
             this.invalidateCache(); // the new mailbox now exists and holds the moved messages
-            return false;
+            return { success: false, error };
         }
         this.invalidateCache();
-        return true;
+        return { success: true };
     }
     // ===========================================================================
     // Account Operations
@@ -2127,18 +2226,22 @@ export class AppleMailManager {
           set pid to id of p
           if seenIds does not contain pid then
             set end of seenIds to pid
-            set pName to name of p
-            set pEmails to ""
-            repeat with e in emails of p
-              if pEmails is not "" then set pEmails to pEmails & ","
-              set pEmails to pEmails & (value of e)
-            end repeat
-            set pPhones to ""
-            repeat with ph in phones of p
-              if pPhones is not "" then set pPhones to pPhones & ","
-              set pPhones to pPhones & (value of ph)
-            end repeat
-            set end of matchedContacts to pName & "${FIELD_SEP}" & pEmails & "${FIELD_SEP}" & pPhones
+            -- Per-person try: one malformed contact (e.g. no emails) must not
+            -- abort the whole search and return an empty list (audit finding #13).
+            try
+              set pName to name of p
+              set pEmails to ""
+              repeat with e in emails of p
+                if pEmails is not "" then set pEmails to pEmails & ","
+                set pEmails to pEmails & (value of e)
+              end repeat
+              set pPhones to ""
+              repeat with ph in phones of p
+                if pPhones is not "" then set pPhones to pPhones & ","
+                set pPhones to pPhones & (value of ph)
+              end repeat
+              set end of matchedContacts to pName & "${FIELD_SEP}" & pEmails & "${FIELD_SEP}" & pPhones
+            end try
           end if
         end repeat
 
@@ -2203,10 +2306,13 @@ export class AppleMailManager {
         const template = this.templates.get(id);
         if (!template)
             return false;
-        const to = overrides?.to || template.to || [];
-        const cc = overrides?.cc || template.cc;
-        const subject = overrides?.subject || template.subject;
-        const body = overrides?.body || template.body;
+        // Use `??` (not `||`) for subject/body so an intentional empty-string
+        // override is honored rather than falling back to the template value
+        // (audit finding #14).
+        const to = overrides?.to ?? template.to ?? [];
+        const cc = overrides?.cc ?? template.cc;
+        const subject = overrides?.subject ?? template.subject;
+        const body = overrides?.body ?? template.body;
         if (to.length === 0)
             return false;
         return this.createDraft(to, subject, body, cc);
@@ -2429,7 +2535,9 @@ export class AppleMailManager {
 
       return "running${FIELD_SEP}" & accountCount & "${FIELD_SEP}" & totalMailboxes
     `);
-        const result = executeAppleScript(script);
+        // Counts mailboxes across every account; give it headroom over the 30s
+        // default so a slow account doesn't silently report "not syncing" (#8).
+        const result = executeAppleScript(script, { timeoutMs: 60000 });
         if (!result.success) {
             return {
                 syncDetected: false,

package/package.json

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