apple-mail-mcp 2.1.5 → 2.2.0

package/README.md

@@ -62,11 +62,14 @@ codex plugin marketplace add sweetrb/apple-mail-mcp
 codex plugin add apple-mail@apple-mail-mcp
 ```
 
-The Codex package registers the same `apple-mail` MCP server through `npx -y github:sweetrb/apple-mail-mcp` and includes the Apple Mail skill guidance.
+The Codex package registers the same `apple-mail` MCP server through `npx -y apple-mail-mcp` and includes the Apple Mail skill guidance.
 
 ### Other Hosts (Hermes, Antigravity)
 
-Plugin packaging for the Hermes and Antigravity hosts is also included (`.hermes-plugin/` and `.antigravity-plugin/`). Each registers the same `apple-mail` MCP server (launched via `npx -y github:sweetrb/apple-mail-mcp`) and bundles the Apple Mail skill, so behavior matches the Claude Code and Codex plugins. Install them through each host's plugin/marketplace mechanism pointed at this repository.
+Configuration for two more hosts is included — each registers the same `apple-mail` MCP server (`npx -y apple-mail-mcp`):
+
+- **[Hermes Agent](https://hermes-agent.nousresearch.com/)** (NousResearch) — Hermes has no plugin/marketplace drop-in. Add the server with `hermes mcp add apple-mail --command npx --args -y apple-mail-mcp`, or merge [`.hermes-plugin/config.yaml`](.hermes-plugin/config.yaml) into `~/.hermes/config.yaml`. Details: [`.hermes-plugin/README.md`](.hermes-plugin/README.md).
+- **[Antigravity](https://antigravity.google/)** (Google) — add the server entry from [`.antigravity-plugin/mcp_config.json`](.antigravity-plugin/mcp_config.json) to `~/.gemini/config/mcp_config.json` (or via Antigravity's MCP settings).
 
 ### Manual Installation
 

package/build/index.js

@@ -153,7 +153,7 @@ server.tool("search-messages", "Use when: finding messages by query/sender/subje
     // IMAP backend (issue #43): server-side search when this account is
     // explicitly configured for IMAP; otherwise fall through to AppleScript.
     if (isImapAccount(account)) {
-        return successResponse(await imapSearchMessages({
+        const r = await imapSearchMessages({
             query,
             mailbox,
             account,
@@ -164,7 +164,12 @@ server.tool("search-messages", "Use when: finding messages by query/sender/subje
             subject,
             isRead,
             isFlagged,
-        }));
+        });
+        return successResponse(r.text, {
+            messages: r.messages,
+            count: r.count,
+            partial: r.partial,
+        });
     }
     const { messages, diagnostics } = mailManager.searchMessagesWithDiagnostics(query, mailbox, account, limit, dateFrom, dateTo, from, subject, isRead, isFlagged);
     const coverageBlock = partialCoverageBlock(diagnostics);
@@ -197,6 +202,19 @@ server.tool("get-message", "Use when: reading the full body of one message whose
 }, withErrorHandling(({ id, preferHtml }) => routeMessage(id, {
     // IMAP id (imap:…) → fetch via IMAP (#43 Phase 3); else AppleScript.
     imap: () => imapGetMessage(id, preferHtml === true),
+    // IMAP path: parse subject/body out of the returned source so the
+    // structuredContent matches the AppleScript branch's shape.
+    structuredFromResult: (r) => {
+        if (!r.info)
+            return undefined;
+        const sep = r.info.indexOf("\n\n");
+        return {
+            id,
+            subject: subjectFromGetMessage(r.info),
+            body: sep >= 0 ? r.info.slice(sep + 2) : r.info,
+            isHtml: preferHtml === true,
+        };
+    },
     apple: () => {
         // Only fetch/parse the raw source when HTML is actually requested (#32).
         const content = mailManager.getMessageContent(id, preferHtml === true);
@@ -249,8 +267,13 @@ server.tool("get-thread", "Use when: you have one message id and want the whole
     const base = normalizeSubject(seedSubject);
     // IMAP backend: server-side subject search.
     if (isImapAccount(account)) {
-        const text = await imapSearchMessages({ subject: base, mailbox, account, limit });
-        return successResponse(`Thread "${base}":\n${text}`, { subject: base });
+        const r = await imapSearchMessages({ subject: base, mailbox, account, limit });
+        return successResponse(`Thread "${base}":\n${r.text}`, {
+            subject: base,
+            messages: r.messages,
+            count: r.count,
+            partial: r.partial,
+        });
     }
     const { messages, diagnostics } = mailManager.searchMessagesWithDiagnostics(undefined, mailbox, account, limit, undefined, undefined, undefined, base);
     // Oldest-first is the natural reading order for a conversation.
@@ -287,7 +310,12 @@ server.tool("list-messages", "Use when: browsing a mailbox's recent messages (op
     // IMAP backend (issue #43): server-side listing when this account is
     // explicitly configured for IMAP; otherwise fall through to AppleScript.
     if (isImapAccount(account)) {
-        return successResponse(await imapListMessages({ mailbox, account, limit, offset, from, unreadOnly }));
+        const r = await imapListMessages({ mailbox, account, limit, offset, from, unreadOnly });
+        return successResponse(r.text, {
+            messages: r.messages,
+            count: r.count,
+            partial: r.partial,
+        });
     }
     const { messages, diagnostics } = mailManager.listMessagesWithDiagnostics(mailbox, account, limit, from, offset);
     const coverageBlock = partialCoverageBlock(diagnostics);
@@ -327,18 +355,29 @@ server.tool("send-email", "Use when: the user has explicitly confirmed they want
         "Mail.app <blockquote> wrapping (issue #12); requires APPLE_MAIL_MCP_SMTP_* env config."),
 }, withErrorHandling(async ({ to, subject, body, cc, bcc, account, attachments, transport }) => {
     const attachInfo = attachments?.length ? ` with ${attachments.length} attachment(s)` : "";
+    const attachmentCount = attachments?.length ?? 0;
     if (transport === "smtp") {
         const result = await sendViaSmtp({ to, subject, body, cc, bcc, from: account, attachments });
         if (!result.success) {
             return errorResponse(result.error ?? "Failed to send email via SMTP.");
         }
-        return successResponse(`Email sent via SMTP to ${to.join(", ")}${attachInfo}`);
+        return successResponse(`Email sent via SMTP to ${to.join(", ")}${attachInfo}`, {
+            ok: true,
+            recipients: to,
+            attachmentCount,
+            transport: "smtp",
+        });
     }
     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(", ")}${attachInfo}`);
+    return successResponse(`Email sent to ${to.join(", ")}${attachInfo}`, {
+        ok: true,
+        recipients: to,
+        attachmentCount,
+        transport: "applescript",
+    });
 }, "Error sending email"));
 // --- send-serial-email ---
 server.tool("send-serial-email", "Use when: the user has confirmed a mail-merge — sending individually personalized copies to many recipients (max 100), with {{Key}} placeholders in subject/body replaced per-recipient from each recipient's variables. Recipients do not see each other.\nReturns: a per-recipient sent/failed report with counts.\nDo not use when: sending one message to a shared recipient list (use send-email) or saving for review (use create-draft).\nSafety: this SENDS many real emails immediately and they cannot be unsent — require explicit user confirmation of the recipient list, the subject/body template, and the placeholder substitutions before calling.", {
@@ -374,14 +413,20 @@ server.tool("send-serial-email", "Use when: the user has confirmed a mail-merge
     const details = results
         .map((r) => `  - ${r.email}: ${r.success ? "sent" : `FAILED (${r.error})`}`)
         .join("\n");
+    const structured = {
+        ok: failCount === 0,
+        sent: successCount,
+        failed: failCount,
+        results: results.map((r) => ({ email: r.email, success: r.success, error: r.error })),
+    };
     if (failCount === 0) {
-        return successResponse(`Successfully sent ${successCount} email(s):\n${details}`);
+        return successResponse(`Successfully sent ${successCount} email(s):\n${details}`, structured);
     }
     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}`);
+        return successResponse(`Sent ${successCount} of ${results.length} email(s), ${failCount} failed:\n${details}`, structured);
     }
 }, "Error sending serial emails"));
 // --- create-draft ---
@@ -398,8 +443,13 @@ server.tool("create-draft", "Use when: composing an email the user should review
     if (!success) {
         return errorResponse("Failed to create draft. Check Mail.app configuration.");
     }
-    const attachInfo = attachments?.length ? ` with ${attachments.length} attachment(s)` : "";
-    return successResponse(`Draft created for ${to.join(", ")}${attachInfo}`);
+    const attachmentCount = attachments?.length ?? 0;
+    const attachInfo = attachmentCount ? ` with ${attachmentCount} attachment(s)` : "";
+    return successResponse(`Draft created for ${to.join(", ")}${attachInfo}`, {
+        ok: true,
+        recipients: to,
+        attachmentCount,
+    });
 }, "Error creating draft"));
 // --- reply-to-message ---
 server.tool("reply-to-message", "Use when: replying to an existing message by id, preserving its threading headers. Set replyAll for all recipients; set send=false to save as a draft instead of sending.\nReturns: a confirmation that the reply was sent or saved as a draft.\nDo not use when: composing a brand-new message (use send-email / create-draft) or forwarding to new recipients (use forward-message).\nSafety: with the default send=true this SENDS real email immediately and cannot be unsent — require explicit user confirmation of the recipients and body, or pass send=false to let the user review.", {
@@ -412,7 +462,11 @@ server.tool("reply-to-message", "Use when: replying to an existing message by id
     if (!success) {
         return errorResponse(`Failed to reply to message "${id}"`);
     }
-    return successResponse(send ? "Reply sent" : "Reply saved as draft");
+    return successResponse(send ? "Reply sent" : "Reply saved as draft", {
+        ok: true,
+        sent: send,
+        id,
+    });
 }, "Error replying to message"));
 // --- forward-message ---
 server.tool("forward-message", "Use when: forwarding an existing message (by id) to new recipients (to is an array), with an optional body to prepend. Set send=false to save as a draft.\nReturns: a confirmation that the message was forwarded or saved as a draft.\nDo not use when: replying to the sender/recipients (use reply-to-message) or composing a new message (use send-email / create-draft).\nSafety: with the default send=true this SENDS real email immediately and cannot be unsent — require explicit user confirmation of the recipients and any prepended body, or pass send=false to let the user review.", {
@@ -425,7 +479,7 @@ server.tool("forward-message", "Use when: forwarding an existing message (by id)
     if (!success) {
         return errorResponse(`Failed to forward message "${id}"`);
     }
-    return successResponse(send ? `Message forwarded to ${to.join(", ")}` : "Forward saved as draft");
+    return successResponse(send ? `Message forwarded to ${to.join(", ")}` : "Forward saved as draft", { ok: true, sent: send, recipients: to, id });
 }, "Error forwarding message"));
 // --- mark-as-read ---
 server.tool("mark-as-read", "Use when: marking a single message (by id) as read.\nReturns: a confirmation that the message was marked read.\nDo not use when: marking several at once (use batch-mark-as-read) or marking unread (use mark-as-unread). Get the id from search-messages or list-messages first.", {
@@ -433,10 +487,11 @@ server.tool("mark-as-read", "Use when: marking a single message (by id) as read.
 }, withErrorHandling(({ id }) => routeMessage(id, {
     imap: () => imapMarkRead(id),
     apple: () => mailManager.markAsRead(id)
-        ? successResponse("Message marked as read")
+        ? successResponse("Message marked as read", { ok: true, id })
         : errorResponse(`Failed to mark message "${id}" as read`),
     ok: "Message marked as read",
     fail: `Failed to mark message "${id}" as read`,
+    structured: { ok: true, id },
 }), "Error marking message as read"));
 // --- mark-as-unread ---
 server.tool("mark-as-unread", "Use when: marking a single message (by id) as unread.\nReturns: a confirmation that the message was marked unread.\nDo not use when: marking several at once (use batch-mark-as-unread) or marking read (use mark-as-read). Get the id from search-messages or list-messages first.", {
@@ -444,10 +499,11 @@ server.tool("mark-as-unread", "Use when: marking a single message (by id) as unr
 }, withErrorHandling(({ id }) => routeMessage(id, {
     imap: () => imapMarkUnread(id),
     apple: () => mailManager.markAsUnread(id)
-        ? successResponse("Message marked as unread")
+        ? successResponse("Message marked as unread", { ok: true, id })
         : errorResponse(`Failed to mark message "${id}" as unread`),
     ok: "Message marked as unread",
     fail: `Failed to mark message "${id}" as unread`,
+    structured: { ok: true, id },
 }), "Error marking message as unread"));
 // --- flag-message ---
 server.tool("flag-message", "Use when: flagging a single message (by id).\nReturns: a confirmation that the message was flagged.\nDo not use when: flagging several at once (use batch-flag-messages) or removing a flag (use unflag-message). Get the id from search-messages or list-messages first.", {
@@ -455,10 +511,11 @@ server.tool("flag-message", "Use when: flagging a single message (by id).\nRetur
 }, withErrorHandling(({ id }) => routeMessage(id, {
     imap: () => imapFlagMessage(id),
     apple: () => mailManager.flagMessage(id)
-        ? successResponse("Message flagged")
+        ? successResponse("Message flagged", { ok: true, id })
         : errorResponse(`Failed to flag message "${id}"`),
     ok: "Message flagged",
     fail: `Failed to flag message "${id}"`,
+    structured: { ok: true, id },
 }), "Error flagging message"));
 // --- unflag-message ---
 server.tool("unflag-message", "Use when: removing the flag from a single message (by id).\nReturns: a confirmation that the message was unflagged.\nDo not use when: unflagging several at once (use batch-unflag-messages) or adding a flag (use flag-message). Get the id from search-messages or list-messages first.", {
@@ -466,10 +523,11 @@ server.tool("unflag-message", "Use when: removing the flag from a single message
 }, withErrorHandling(({ id }) => routeMessage(id, {
     imap: () => imapUnflagMessage(id),
     apple: () => mailManager.unflagMessage(id)
-        ? successResponse("Message unflagged")
+        ? successResponse("Message unflagged", { ok: true, id })
         : errorResponse(`Failed to unflag message "${id}"`),
     ok: "Message unflagged",
     fail: `Failed to unflag message "${id}"`,
+    structured: { ok: true, id },
 }), "Error unflagging message"));
 // --- delete-message ---
 server.tool("delete-message", "Use when: deleting a single message by id (moves it to Trash).\nReturns: a confirmation that the message was deleted.\nDo not use when: deleting several at once (use batch-delete-messages) or just filing it away (use move-message).\nSafety: destructive — require explicit user confirmation, and search-messages/list-messages first to confirm you have the right id before deleting.", {
@@ -479,11 +537,12 @@ server.tool("delete-message", "Use when: deleting a single message by id (moves
     apple: () => {
         const { success, error } = mailManager.deleteMessage(id);
         return success
-            ? successResponse("Message deleted")
+            ? successResponse("Message deleted", { ok: true, id })
             : errorResponse(error || `Failed to delete message "${id}"`);
     },
     ok: "Message deleted",
     fail: `Failed to delete message "${id}"`,
+    structured: { ok: true, id },
 }), "Error deleting message"));
 // --- move-message ---
 server.tool("move-message", "Use when: moving a single message (by id) into another mailbox/folder, e.g. archiving or filing.\nReturns: a confirmation naming the destination mailbox.\nDo not use when: moving several at once (use batch-move-messages) or deleting (use delete-message). Use list-mailboxes to confirm the destination name exists.\nSafety: moves a real message between folders — confirm the destination mailbox, and search-messages/list-messages first to confirm the id.", {
@@ -495,25 +554,27 @@ server.tool("move-message", "Use when: moving a single message (by id) into anot
     apple: () => {
         const { success, error } = mailManager.moveMessage(id, mailbox, account);
         return success
-            ? successResponse(`Message moved to "${mailbox}"`)
+            ? successResponse(`Message moved to "${mailbox}"`, { ok: true, id, mailbox })
             : errorResponse(error || `Failed to move message to "${mailbox}"`);
     },
     ok: `Message moved to "${mailbox}"`,
     fail: `Failed to move message to "${mailbox}"`,
+    structured: { ok: true, id, mailbox },
 }), "Error moving message"));
 // --- batch-delete-messages ---
 server.tool("batch-delete-messages", "Use when: deleting multiple messages in one call (1–100 ids; moves them to Trash).\nReturns: counts of how many were deleted and how many failed.\nDo not use when: deleting just one (use delete-message) or filing messages away (use batch-move-messages).\nSafety: destructive and applies to many messages at once — require explicit user confirmation, and search-messages/list-messages first to confirm every id is correct before deleting.", {
     ids: BATCH_IDS_SCHEMA,
 }, withErrorHandling(async ({ ids }) => {
     const { success: successCount, fail: failCount } = await hybridBatchCounts(ids, (n) => mailManager.batchDeleteMessages(n), (im) => imapBatchDelete(im));
+    const structured = { ok: failCount === 0, success: successCount, failed: failCount };
     if (failCount === 0) {
-        return successResponse(`Successfully deleted ${successCount} message(s)`);
+        return successResponse(`Successfully deleted ${successCount} message(s)`, structured);
     }
     else if (successCount === 0) {
         return errorResponse(`Failed to delete all ${failCount} message(s)`);
     }
     else {
-        return successResponse(`Deleted ${successCount} message(s), ${failCount} failed`);
+        return successResponse(`Deleted ${successCount} message(s), ${failCount} failed`, structured);
     }
 }, "Error batch deleting messages"));
 // --- batch-move-messages ---
@@ -523,14 +584,15 @@ server.tool("batch-move-messages", "Use when: moving multiple messages (1–100
     account: z.string().optional().describe("Account containing the destination mailbox"),
 }, withErrorHandling(async ({ ids, mailbox, account }) => {
     const { success: successCount, fail: failCount } = await hybridBatchCounts(ids, (n) => mailManager.batchMoveMessages(n, mailbox, account), (im) => imapBatchMove(im, mailbox, { account }));
+    const structured = { ok: failCount === 0, success: successCount, failed: failCount, mailbox };
     if (failCount === 0) {
-        return successResponse(`Successfully moved ${successCount} message(s) to "${mailbox}"`);
+        return successResponse(`Successfully moved ${successCount} message(s) to "${mailbox}"`, structured);
     }
     else if (successCount === 0) {
         return errorResponse(`Failed to move all ${failCount} message(s)`);
     }
     else {
-        return successResponse(`Moved ${successCount} message(s) to "${mailbox}", ${failCount} failed`);
+        return successResponse(`Moved ${successCount} message(s) to "${mailbox}", ${failCount} failed`, structured);
     }
 }, "Error batch moving messages"));
 // --- batch-mark-as-read ---
@@ -538,14 +600,15 @@ server.tool("batch-mark-as-read", "Use when: marking multiple messages (1–100
     ids: BATCH_IDS_SCHEMA,
 }, withErrorHandling(async ({ ids }) => {
     const { success: successCount, fail: failCount } = await hybridBatchCounts(ids, (n) => mailManager.batchMarkAsRead(n), (im) => imapBatchMarkRead(im));
+    const structured = { ok: failCount === 0, success: successCount, failed: failCount };
     if (failCount === 0) {
-        return successResponse(`Successfully marked ${successCount} message(s) as read`);
+        return successResponse(`Successfully marked ${successCount} message(s) as read`, structured);
     }
     else if (successCount === 0) {
         return errorResponse(`Failed to mark all ${failCount} message(s) as read`);
     }
     else {
-        return successResponse(`Marked ${successCount} message(s) as read, ${failCount} failed`);
+        return successResponse(`Marked ${successCount} message(s) as read, ${failCount} failed`, structured);
     }
 }, "Error batch marking messages as read"));
 // --- batch-mark-as-unread ---
@@ -553,14 +616,15 @@ server.tool("batch-mark-as-unread", "Use when: marking multiple messages (1–10
     ids: BATCH_IDS_SCHEMA,
 }, withErrorHandling(async ({ ids }) => {
     const { success: successCount, fail: failCount } = await hybridBatchCounts(ids, (n) => mailManager.batchMarkAsUnread(n), (im) => imapBatchMarkUnread(im));
+    const structured = { ok: failCount === 0, success: successCount, failed: failCount };
     if (failCount === 0) {
-        return successResponse(`Successfully marked ${successCount} message(s) as unread`);
+        return successResponse(`Successfully marked ${successCount} message(s) as unread`, structured);
     }
     else if (successCount === 0) {
         return errorResponse(`Failed to mark all ${failCount} message(s) as unread`);
     }
     else {
-        return successResponse(`Marked ${successCount} message(s) as unread, ${failCount} failed`);
+        return successResponse(`Marked ${successCount} message(s) as unread, ${failCount} failed`, structured);
     }
 }, "Error batch marking messages as unread"));
 // --- batch-flag-messages ---
@@ -568,14 +632,15 @@ server.tool("batch-flag-messages", "Use when: flagging multiple messages (1–10
     ids: BATCH_IDS_SCHEMA,
 }, withErrorHandling(async ({ ids }) => {
     const { success: successCount, fail: failCount } = await hybridBatchCounts(ids, (n) => mailManager.batchFlagMessages(n), (im) => imapBatchFlag(im));
+    const structured = { ok: failCount === 0, success: successCount, failed: failCount };
     if (failCount === 0) {
-        return successResponse(`Successfully flagged ${successCount} message(s)`);
+        return successResponse(`Successfully flagged ${successCount} message(s)`, structured);
     }
     else if (successCount === 0) {
         return errorResponse(`Failed to flag all ${failCount} message(s)`);
     }
     else {
-        return successResponse(`Flagged ${successCount} message(s), ${failCount} failed`);
+        return successResponse(`Flagged ${successCount} message(s), ${failCount} failed`, structured);
     }
 }, "Error batch flagging messages"));
 // --- batch-unflag-messages ---
@@ -583,14 +648,15 @@ server.tool("batch-unflag-messages", "Use when: removing flags from multiple mes
     ids: BATCH_IDS_SCHEMA,
 }, withErrorHandling(async ({ ids }) => {
     const { success: successCount, fail: failCount } = await hybridBatchCounts(ids, (n) => mailManager.batchUnflagMessages(n), (im) => imapBatchUnflag(im));
+    const structured = { ok: failCount === 0, success: successCount, failed: failCount };
     if (failCount === 0) {
-        return successResponse(`Successfully unflagged ${successCount} message(s)`);
+        return successResponse(`Successfully unflagged ${successCount} message(s)`, structured);
     }
     else if (successCount === 0) {
         return errorResponse(`Failed to unflag all ${failCount} message(s)`);
     }
     else {
-        return successResponse(`Unflagged ${successCount} message(s), ${failCount} failed`);
+        return successResponse(`Unflagged ${successCount} message(s), ${failCount} failed`, structured);
     }
 }, "Error batch unflagging messages"));
 // --- list-attachments ---
@@ -640,14 +706,23 @@ server.tool("save-attachment", "Use when: writing one of a message's attachments
         if (!r.success || !r.base64) {
             return errorResponse(r.error || `Failed to fetch attachment "${attachmentName}"`);
         }
-        writeFileSync(joinPath(resolvedDir, attachmentName), Buffer.from(r.base64, "base64"));
-        return successResponse(`Attachment "${attachmentName}" saved to ${savePath}`);
+        const savedPath = joinPath(resolvedDir, attachmentName);
+        writeFileSync(savedPath, Buffer.from(r.base64, "base64"));
+        return successResponse(`Attachment "${attachmentName}" saved to ${savePath}`, {
+            ok: true,
+            attachmentName,
+            savedPath,
+        });
     }
     const success = mailManager.saveAttachment(id, attachmentName, savePath);
     if (!success) {
         return errorResponse(`Failed to save attachment "${attachmentName}"`);
     }
-    return successResponse(`Attachment "${attachmentName}" saved to ${savePath}`);
+    return successResponse(`Attachment "${attachmentName}" saved to ${savePath}`, {
+        ok: true,
+        attachmentName,
+        savedPath: joinPath(savePath, attachmentName),
+    });
 }, "Error saving attachment"));
 // --- fetch-attachment ---
 server.tool("fetch-attachment", "Use when: retrieving an attachment's raw bytes inline as base64 (by message id and attachmentName), e.g. to process its contents without touching disk.\nReturns: the attachment's bytes base64-encoded, with its size and (for IMAP) MIME type.\nDo not use when: you don't know the attachment name (use list-attachments first) or you just want it saved to disk (use save-attachment).", {
@@ -730,13 +805,13 @@ server.tool("create-mailbox", "Use when: creating a new mailbox/folder in an acc
         const r = await imapCreateMailbox(name, { account });
         if (!r.success)
             return errorResponse(r.error || `Failed to create mailbox "${name}"`);
-        return successResponse(r.info || `Mailbox "${name}" created`);
+        return successResponse(r.info || `Mailbox "${name}" created`, { ok: true, name });
     }
     const success = mailManager.createMailbox(name, account);
     if (!success) {
         return errorResponse(`Failed to create mailbox "${name}"`);
     }
-    return successResponse(`Mailbox "${name}" created`);
+    return successResponse(`Mailbox "${name}" created`, { ok: true, name });
 }, "Error creating mailbox"));
 // --- delete-mailbox ---
 server.tool("delete-mailbox", "Use when: deleting a mailbox/folder from an account.\nReturns: a confirmation that the mailbox was deleted.\nDo not use when: renaming it (use rename-mailbox) or deleting messages within it (use delete-message / batch-delete-messages).\nSafety: destructive — deleting a mailbox removes the folder and any messages it contains. Require explicit user confirmation and use list-mailboxes first to confirm the exact name.", {
@@ -747,13 +822,13 @@ server.tool("delete-mailbox", "Use when: deleting a mailbox/folder from an accou
         const r = await imapDeleteMailbox(name, { account });
         if (!r.success)
             return errorResponse(r.error || `Failed to delete mailbox "${name}"`);
-        return successResponse(r.info || `Mailbox "${name}" deleted`);
+        return successResponse(r.info || `Mailbox "${name}" deleted`, { ok: true, name });
     }
     const { success, error } = mailManager.deleteMailbox(name, account);
     if (!success) {
         return errorResponse(error || `Failed to delete mailbox "${name}"`);
     }
-    return successResponse(`Mailbox "${name}" deleted`);
+    return successResponse(`Mailbox "${name}" deleted`, { ok: true, name });
 }, "Error deleting mailbox"));
 // --- rename-mailbox ---
 server.tool("rename-mailbox", "Use when: renaming an existing mailbox/folder from oldName to newName within an account.\nReturns: a confirmation naming the old and new mailbox names.\nDo not use when: creating a new folder (use create-mailbox) or deleting one (use delete-mailbox). Use list-mailboxes to confirm the current name.\nSafety: renames a real folder in the mail account — confirm oldName matches exactly (case-sensitive) before calling.", {
@@ -766,13 +841,21 @@ server.tool("rename-mailbox", "Use when: renaming an existing mailbox/folder fro
         if (!r.success) {
             return errorResponse(r.error || `Failed to rename mailbox "${oldName}" to "${newName}"`);
         }
-        return successResponse(r.info || `Mailbox renamed from "${oldName}" to "${newName}"`);
+        return successResponse(r.info || `Mailbox renamed from "${oldName}" to "${newName}"`, {
+            ok: true,
+            oldName,
+            newName,
+        });
     }
     const { success, error } = mailManager.renameMailbox(oldName, newName, account);
     if (!success) {
         return errorResponse(error || `Failed to rename mailbox "${oldName}" to "${newName}"`);
     }
-    return successResponse(`Mailbox renamed from "${oldName}" to "${newName}"`);
+    return successResponse(`Mailbox renamed from "${oldName}" to "${newName}"`, {
+        ok: true,
+        oldName,
+        newName,
+    });
 }, "Error renaming mailbox"));
 // =============================================================================
 // Account Tools
@@ -793,13 +876,17 @@ server.tool("list-accounts", "Use when: discovering the configured Mail accounts
 // --- list-rules ---
 server.tool("list-rules", "Use when: discovering the Mail rules that exist and whether each is enabled or disabled, e.g. before enabling/disabling/deleting one.\nReturns: each rule's name and enabled/disabled state.\nDo not use when: you want to change a rule (use enable-rule / disable-rule / create-rule / delete-rule).", {}, withErrorHandling(() => {
     const rules = mailManager.listRules();
+    const structured = {
+        rules: rules.map((r) => ({ name: r.name, enabled: r.enabled })),
+        count: rules.length,
+    };
     if (rules.length === 0) {
-        return successResponse("No mail rules found");
+        return successResponse("No mail rules found", structured);
     }
     const ruleList = rules
         .map((r) => `  - ${r.name} [${r.enabled ? "enabled" : "disabled"}]`)
         .join("\n");
-    return successResponse(`Found ${rules.length} rule(s):\n${ruleList}`);
+    return successResponse(`Found ${rules.length} rule(s):\n${ruleList}`, structured);
 }, "Error listing rules"));
 // --- enable-rule ---
 server.tool("enable-rule", "Use when: turning on an existing Mail rule by name.\nReturns: a confirmation that the rule was enabled.\nDo not use when: turning a rule off (use disable-rule), creating one (use create-rule), or deleting one (use delete-rule). Use list-rules to confirm the exact rule name.", {
@@ -809,7 +896,7 @@ server.tool("enable-rule", "Use when: turning on an existing Mail rule by name.\
     if (!success) {
         return errorResponse(`Failed to enable rule "${name}"`);
     }
-    return successResponse(`Rule "${name}" enabled`);
+    return successResponse(`Rule "${name}" enabled`, { ok: true, name, enabled: true });
 }, "Error enabling rule"));
 // --- disable-rule ---
 server.tool("disable-rule", "Use when: turning off an existing Mail rule by name (without deleting it).\nReturns: a confirmation that the rule was disabled.\nDo not use when: turning a rule on (use enable-rule), creating one (use create-rule), or removing it permanently (use delete-rule). Use list-rules to confirm the exact rule name.", {
@@ -819,7 +906,7 @@ server.tool("disable-rule", "Use when: turning off an existing Mail rule by name
     if (!success) {
         return errorResponse(`Failed to disable rule "${name}"`);
     }
-    return successResponse(`Rule "${name}" disabled`);
+    return successResponse(`Rule "${name}" disabled`, { ok: true, name, enabled: false });
 }, "Error disabling rule"));
 // --- create-rule ---
 server.tool("create-rule", "Use when: creating a new Mail rule with one or more conditions (field/operator/value) and at least one action (markRead, markFlagged, delete, or moveTo). Set matchAll to require all conditions vs. any.\nReturns: a confirmation naming the rule and its condition count.\nDo not use when: toggling an existing rule (use enable-rule / disable-rule) or removing one (use delete-rule). Use list-rules to avoid duplicating an existing rule.\nSafety: creates a rule that automatically acts on real mail (including delete/move actions) on an ongoing basis — confirm the conditions and actions with the user before calling.", {
@@ -869,8 +956,12 @@ server.tool("search-contacts", "Use when: looking up a person in Contacts.app by
     query: z.string().min(1, "Search query is required"),
 }, withErrorHandling(({ query }) => {
     const contacts = mailManager.searchContacts(query);
+    const structured = {
+        contacts: contacts.map((c) => ({ name: c.name, emails: c.emails })),
+        count: contacts.length,
+    };
     if (contacts.length === 0) {
-        return successResponse("No contacts found");
+        return successResponse("No contacts found", structured);
     }
     const contactList = contacts
         .map((c) => {
@@ -878,7 +969,7 @@ server.tool("search-contacts", "Use when: looking up a person in Contacts.app by
         return `  - ${c.name} (${emails})`;
     })
         .join("\n");
-    return successResponse(`Found ${contacts.length} contact(s):\n${contactList}`);
+    return successResponse(`Found ${contacts.length} contact(s):\n${contactList}`, structured);
 }, "Error searching contacts"));
 // =============================================================================
 // Email Template Tools
@@ -893,18 +984,26 @@ server.tool("save-template", "Use when: creating a reusable email template (name
     id: z.string().optional().describe("Template ID (for updating existing template)"),
 }, withErrorHandling(({ name, subject, body, to, cc, id }) => {
     const template = mailManager.saveTemplate(name, subject, body, to, cc, id);
-    return successResponse(`Template "${template.name}" saved with ID: ${template.id}`);
+    return successResponse(`Template "${template.name}" saved with ID: ${template.id}`, {
+        ok: true,
+        id: template.id,
+        name: template.name,
+    });
 }, "Error saving template"));
 // --- list-templates ---
 server.tool("list-templates", "Use when: discovering the saved email templates and their ids, e.g. before using or editing one.\nReturns: each template's id, name, and subject.\nDo not use when: you want a single template's full body (use get-template) or want to apply one (use use-template).", {}, withErrorHandling(() => {
     const templates = mailManager.listTemplates();
+    const structured = {
+        templates: templates.map((t) => ({ id: t.id, name: t.name, subject: t.subject })),
+        count: templates.length,
+    };
     if (templates.length === 0) {
-        return successResponse("No templates saved");
+        return successResponse("No templates saved", structured);
     }
     const templateList = templates
         .map((t) => `  - [${t.id}] ${t.name} — "${t.subject}"`)
         .join("\n");
-    return successResponse(`Found ${templates.length} template(s):\n${templateList}`);
+    return successResponse(`Found ${templates.length} template(s):\n${templateList}`, structured);
 }, "Error listing templates"));
 // --- get-template ---
 server.tool("get-template", "Use when: reading the full contents of one saved template by id — its name, subject, default to/cc, and body.\nReturns: the template's name, subject, default recipients, and body text.\nDo not use when: you don't have the id (use list-templates first) or want to apply the template into a draft (use use-template).", {
@@ -923,7 +1022,14 @@ server.tool("get-template", "Use when: reading the full contents of one saved te
     ]
         .filter(Boolean)
         .join("\n");
-    return successResponse(lines);
+    return successResponse(lines, {
+        id: template.id,
+        name: template.name,
+        subject: template.subject,
+        to: template.to ?? [],
+        cc: template.cc ?? [],
+        body: template.body,
+    });
 }, "Error getting template"));
 // --- delete-template ---
 server.tool("delete-template", "Use when: permanently removing a saved email template by id.\nReturns: a confirmation that the template was deleted.\nDo not use when: you only want to view it (use get-template) or update it (use save-template with the existing id).\nSafety: destructive — removes the template from the on-disk store permanently. Require explicit user confirmation and use list-templates first to confirm the id.", {
@@ -933,7 +1039,7 @@ server.tool("delete-template", "Use when: permanently removing a saved email tem
     if (!success) {
         return errorResponse(`Template "${id}" not found`);
     }
-    return successResponse(`Template "${id}" deleted`);
+    return successResponse(`Template "${id}" deleted`, { ok: true, id });
 }, "Error deleting template"));
 // --- use-template ---
 server.tool("use-template", "Use when: composing a new draft from a saved template (by id), optionally overriding the recipients, subject, or body. Creates a draft in Mail.app for the user to review and send.\nReturns: a confirmation that a draft was created from the template.\nDo not use when: you want to inspect the template without composing (use get-template) or send immediately without a draft (use send-email).", {
@@ -947,7 +1053,7 @@ server.tool("use-template", "Use when: composing a new draft from a saved templa
     if (!success) {
         return errorResponse(`Failed to use template "${id}". Template not found or no recipients.`);
     }
-    return successResponse(`Draft created from template "${id}"`);
+    return successResponse(`Draft created from template "${id}"`, { ok: true, id });
 }, "Error using template"));
 // =============================================================================
 // Diagnostics Tools
@@ -963,7 +1069,7 @@ server.tool("health-check", "Use when: doing a quick check that Mail.app is reac
         return `  ${icon} ${c.name}: ${c.message}`;
     })
         .join("\n");
-    return successResponse(`${statusIcon} ${statusText}\n\n${checkLines}`);
+    return successResponse(`${statusIcon} ${statusText}\n\n${checkLines}`, { ...result });
 }, "Error running health check"));
 // --- doctor ---
 server.tool("doctor", "Use when: troubleshooting setup problems — diagnoses Mail.app automation permissions, account state, and the IMAP/SMTP backends with actionable remediation messages.\nReturns: a detailed diagnostic report (formatted text plus structured checks).\nDo not use when: you just want a quick up/down status (use health-check) or message counts (use get-mail-stats).", {}, withErrorHandling(async () => {

package/build/services/imapClient.d.ts

@@ -155,8 +155,20 @@ export declare function resolveImapConfigs(env?: NodeJS.ProcessEnv): ImapConfig[
 export declare function resolveImapConfig(env?: NodeJS.ProcessEnv, account?: string): ImapConfig;
 /** Map common (Gmail) mailbox names to their IMAP paths. */
 export declare function resolveMailboxPath(mailbox: string | undefined, mode: "search" | "list"): string;
-export declare function imapSearchMessages(args: ImapSearchArgs, deps?: ImapDeps): Promise<string>;
-export declare function imapListMessages(args: ImapSearchArgs, deps?: ImapDeps): Promise<string>;
+/**
+ * Result of an IMAP search/list: the human text identical to before, plus the
+ * structured payload (messages + count) so callers can pass it straight to
+ * `successResponse(text, structured)` and emit `structuredContent` on the IMAP
+ * path the same way the AppleScript path does.
+ */
+export interface ImapListResult {
+    text: string;
+    messages: Record<string, unknown>[];
+    count: number;
+    partial: boolean;
+}
+export declare function imapSearchMessages(args: ImapSearchArgs, deps?: ImapDeps): Promise<ImapListResult>;
+export declare function imapListMessages(args: ImapSearchArgs, deps?: ImapDeps): Promise<ImapListResult>;
 /** Unread count via IMAP STATUS (UNSEEN). No mailbox → sum across all mailboxes. */
 export declare function imapUnreadCount(mailbox: string | undefined, deps?: ImapDeps): Promise<number>;
 export interface ImapMailboxInfo {

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

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

package/build/services/imapClient.js

@@ -254,6 +254,25 @@ function formatRow(m, account, path) {
     // can route this row back to IMAP (Phase 3).
     return `  - ID: ${encodeImapId(account, path, m.uid)} | ${date} | ${subject} (from: ${from}) [${read}]`;
 }
+/**
+ * JSON-friendly summary of an IMAP message for `structuredContent`, mirroring the
+ * AppleScript path's `messageSummary` shape so the search/list/thread tools emit
+ * the same structured payload regardless of backend (A1).
+ */
+function structuredRow(m, account, path) {
+    const env = m.envelope ?? {};
+    return {
+        id: encodeImapId(account, path, m.uid),
+        subject: env.subject || "(no subject)",
+        sender: senderName(env.from),
+        dateReceived: env.date ? new Date(env.date).toISOString() : "",
+        isRead: m.flags?.has("\\Seen") ?? false,
+        isFlagged: m.flags?.has("\\Flagged") ?? false,
+        mailbox: path,
+        account,
+        hasAttachments: false,
+    };
+}
 async function run(args, listMode, deps) {
     // Reads are idempotent → safe to retry once if a pooled connection is dead.
     // Route to the account named in the search args (C2 multi-account).
@@ -264,7 +283,12 @@ async function run(args, listMode, deps) {
             const found = await client.search(buildCriteria(args, listMode), { uid: true });
             const uids = Array.isArray(found) ? found : [];
             if (uids.length === 0) {
-                return `No messages found via IMAP in "${path}" (account ${cfg.accountLabel}).`;
+                return {
+                    text: `No messages found via IMAP in "${path}" (account ${cfg.accountLabel}).`,
+                    messages: [],
+                    count: 0,
+                    partial: false,
+                };
             }
             const limit = args.limit ?? 50;
             const offset = args.offset ?? 0;
@@ -275,13 +299,18 @@ async function run(args, listMode, deps) {
                 .slice(offset, offset + limit);
             const byUid = new Map();
             for await (const msg of client.fetch(newest.join(","), { envelope: true, flags: true }, { uid: true })) {
-                byUid.set(msg.uid, formatRow(msg, cfg.accountLabel, path));
+                byUid.set(msg.uid, msg);
             }
-            const rows = newest.map((u) => byUid.get(u)).filter((r) => Boolean(r));
+            const ordered = newest
+                .map((u) => byUid.get(u))
+                .filter((m) => m !== undefined);
+            const rows = ordered.map((m) => formatRow(m, cfg.accountLabel, path));
+            const messages = ordered.map((m) => structuredRow(m, cfg.accountLabel, path));
             const verb = listMode ? "listed" : "matched";
-            return (`Found ${rows.length} message(s) via IMAP (server-side, account ${cfg.accountLabel}, mailbox "${path}"; ${uids.length} total ${verb}):\n` +
+            const text = `Found ${rows.length} message(s) via IMAP (server-side, account ${cfg.accountLabel}, mailbox "${path}"; ${uids.length} total ${verb}):\n` +
                 rows.join("\n") +
-                `\n\nNote: these IMAP IDs (imap:…) work with get-message and the message mutations (mark/flag/move/delete-message), which route back to IMAP.`);
+                `\n\nNote: these IMAP IDs (imap:…) work with get-message and the message mutations (mark/flag/move/delete-message), which route back to IMAP.`;
+            return { text, messages, count: messages.length, partial: false };
         }
         finally {
             lock.release();

package/build/services/messageRouter.d.ts

@@ -12,5 +12,13 @@ export declare function routeMessage(id: string, opts: {
     apple: () => ToolResponse | Promise<ToolResponse>;
     ok: string;
     fail: string;
+    /** Optional ack payload attached as `structuredContent` on the IMAP success
+     *  path, so a caller can verify the mutation programmatically regardless of
+     *  backend (A1). The AppleScript path supplies its own via `apple`. */
+    structured?: Record<string, unknown>;
+    /** Derive `structuredContent` from the IMAP result on success (e.g. parse
+     *  subject/body from `info`). Takes precedence over `structured`; return
+     *  undefined to attach none. */
+    structuredFromResult?: (r: ImapOpResult) => Record<string, unknown> | undefined;
 }): Promise<ToolResponse>;
 //# sourceMappingURL=messageRouter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"messageRouter.d.ts","sourceRoot":"","sources":["../../src/services/messageRouter.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAkC,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvF,oEAAoE;AACpE,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAE5C;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAChC,EAAE,EAAE,MAAM,EACV,IAAI,EAAE;IACJ,IAAI,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC;IAClC,KAAK,EAAE,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAClD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,GACA,OAAO,CAAC,YAAY,CAAC,CAMvB"}
+{"version":3,"file":"messageRouter.d.ts","sourceRoot":"","sources":["../../src/services/messageRouter.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAkC,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvF,oEAAoE;AACpE,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAE5C;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAChC,EAAE,EAAE,MAAM,EACV,IAAI,EAAE;IACJ,IAAI,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC;IAClC,KAAK,EAAE,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAClD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb;;2EAEuE;IACvE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC;;oCAEgC;IAChC,oBAAoB,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;CACjF,GACA,OAAO,CAAC,YAAY,CAAC,CAWvB"}

package/build/services/messageRouter.js

@@ -23,7 +23,9 @@ export function isImapId(id) {
 export async function routeMessage(id, opts) {
     if (decodeImapId(id)) {
         const r = await opts.imap();
-        return r.success ? successResponse(r.info ?? opts.ok) : errorResponse(r.error ?? opts.fail);
+        return r.success
+            ? successResponse(r.info ?? opts.ok, opts.structuredFromResult ? opts.structuredFromResult(r) : opts.structured)
+            : errorResponse(r.error ?? opts.fail);
     }
     return opts.apple();
 }

package/package.json

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