apple-mail-mcp 1.0.0 → 1.1.1

package/README.md

@@ -77,24 +77,49 @@ On first use, macOS will ask for permission to automate Mail.app. Click "OK" to
 
 ## Features
 
+### Messages
+
 | Feature | Description |
 |---------|-------------|
-| **List Messages** | List messages in any mailbox |
-| **Search Messages** | Find emails by sender, subject, content |
-| **Read Messages** | Get full email content |
+| **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 |
 | **Reply** | Reply to messages (with reply-all support) |
 | **Forward** | Forward messages to new recipients |
-| **Mark Read/Unread** | Change read status |
-| **Flag/Unflag** | Flag or unflag messages |
-| **Delete Messages** | Move messages to trash |
-| **Move Messages** | Organize into mailboxes |
-| **List Mailboxes** | Show all folders with counts |
+| **Mark Read/Unread** | Change read status (single or batch) |
+| **Flag/Unflag** | Flag or unflag messages (single or batch) |
+| **Delete Messages** | Move messages to trash (single or batch) |
+| **Move Messages** | Organize into mailboxes (single or batch) |
+| **List Attachments** | View attachment metadata (name, type, size) |
+| **Save Attachment** | Save attachments to disk |
+
+### Mailbox & Account Management
+
+| Feature | Description |
+|---------|-------------|
+| **List Mailboxes** | Show all folders with message/unread counts |
+| **Create/Delete/Rename Mailbox** | Full mailbox lifecycle management |
 | **List Accounts** | Show configured accounts |
 | **Unread Count** | Get unread counts per mailbox |
+
+### Rules, Contacts & Templates
+
+| Feature | Description |
+|---------|-------------|
+| **List Rules** | View all mail rules and their enabled status |
+| **Enable/Disable Rules** | Toggle mail rules on or off |
+| **Search Contacts** | Look up contacts from Contacts.app by name |
+| **Email Templates** | Save, list, use, and delete reusable email templates |
+
+### Diagnostics
+
+| Feature | Description |
+|---------|-------------|
 | **Health Check** | Verify Mail.app connectivity |
-| **Statistics** | Message and unread counts |
+| **Statistics** | Message and unread counts per account, recently received stats |
+| **Sync Status** | Check if Mail.app is actively syncing |
 
 ---
 
@@ -106,13 +131,19 @@ This section documents all available tools. AI agents should use these tool name
 
 #### `search-messages`
 
-Search for messages matching criteria.
+Search for messages matching criteria. Searches all accounts by default.
 
 | Parameter | Type | Required | Description |
 |-----------|------|----------|-------------|
 | `query` | string | No | Text to search in subject/sender |
+| `from` | string | No | Filter by sender email address |
+| `subject` | string | No | Filter by subject line |
 | `mailbox` | string | No | Mailbox to search in (default: INBOX) |
-| `account` | string | No | Account to search in |
+| `account` | string | No | Account to search in (omit to search all accounts) |
+| `isRead` | boolean | No | Filter by read status |
+| `isFlagged` | boolean | No | Filter by flagged status |
+| `dateFrom` | string | No | Start date filter (e.g., "January 1, 2026") |
+| `dateTo` | string | No | End date filter (e.g., "March 1, 2026") |
 | `limit` | number | No | Max results (default: 50) |
 
 ---
@@ -124,8 +155,9 @@ Get the full content of a message.
 | Parameter | Type | Required | Description |
 |-----------|------|----------|-------------|
 | `id` | string | Yes | Message ID |
+| `preferHtml` | boolean | No | Return HTML source instead of plain text |
 
-**Returns:** Subject line and plain text body of the message.
+**Returns:** Subject line and message body (plain text by default, HTML if `preferHtml` is true and HTML content is available).
 
 ---
 
@@ -138,8 +170,11 @@ List messages in a mailbox.
 | `mailbox` | string | No | Mailbox name (default: INBOX) |
 | `account` | string | No | Account name |
 | `limit` | number | No | Max messages (default: 50) |
+| `offset` | number | No | Number of messages to skip (for pagination) |
+| `from` | string | No | Filter by sender email address or name |
+| `unreadOnly` | boolean | No | Only show unread messages |
 
-**Returns:** List of messages with ID, subject, sender, date, read status, and flagged status.
+**Returns:** List of messages with ID, date, subject, and sender.
 
 ---
 
@@ -271,6 +306,62 @@ Move a message to a different mailbox.
 
 ---
 
+#### `list-attachments`
+
+List attachments on a message.
+
+| Parameter | Type | Required | Description |
+|-----------|------|----------|-------------|
+| `id` | string | Yes | Message ID |
+
+**Returns:** List of attachments with name, MIME type, and size.
+
+---
+
+#### `save-attachment`
+
+Save a message attachment to disk.
+
+| Parameter | Type | Required | Description |
+|-----------|------|----------|-------------|
+| `id` | string | Yes | Message ID |
+| `attachmentName` | string | Yes | Filename of the attachment |
+| `savePath` | string | Yes | Directory to save to |
+
+---
+
+### Batch Operations
+
+All batch operations accept an array of message IDs and return per-item success/failure results.
+
+#### `batch-delete-messages`
+
+| Parameter | Type | Required | Description |
+|-----------|------|----------|-------------|
+| `ids` | string[] | Yes | Message IDs to delete |
+
+#### `batch-move-messages`
+
+| Parameter | Type | Required | Description |
+|-----------|------|----------|-------------|
+| `ids` | string[] | Yes | Message IDs to move |
+| `mailbox` | string | Yes | Destination mailbox |
+| `account` | string | No | Account containing mailbox |
+
+#### `batch-mark-as-read` / `batch-mark-as-unread`
+
+| Parameter | Type | Required | Description |
+|-----------|------|----------|-------------|
+| `ids` | string[] | Yes | Message IDs |
+
+#### `batch-flag-messages` / `batch-unflag-messages`
+
+| Parameter | Type | Required | Description |
+|-----------|------|----------|-------------|
+| `ids` | string[] | Yes | Message IDs |
+
+---
+
 ### Mailbox Operations
 
 #### `list-mailboxes`
@@ -281,7 +372,7 @@ List all mailboxes for an account.
 |-----------|------|----------|-------------|
 | `account` | string | No | Account to list from |
 
-**Returns:** List of mailbox names with unread counts.
+**Returns:** List of mailbox names with message and unread counts.
 
 ---
 
@@ -296,6 +387,40 @@ Get unread message count.
 
 ---
 
+#### `create-mailbox`
+
+Create a new mailbox.
+
+| Parameter | Type | Required | Description |
+|-----------|------|----------|-------------|
+| `name` | string | Yes | Mailbox name |
+| `account` | string | No | Account to create in |
+
+---
+
+#### `delete-mailbox`
+
+Delete a mailbox.
+
+| Parameter | Type | Required | Description |
+|-----------|------|----------|-------------|
+| `name` | string | Yes | Mailbox name |
+| `account` | string | No | Account containing mailbox |
+
+---
+
+#### `rename-mailbox`
+
+Rename a mailbox (creates new, moves messages, deletes old).
+
+| Parameter | Type | Required | Description |
+|-----------|------|----------|-------------|
+| `oldName` | string | Yes | Current mailbox name |
+| `newName` | string | Yes | New mailbox name |
+| `account` | string | No | Account containing mailbox |
+
+---
+
 ### Account Operations
 
 #### `list-accounts`
@@ -304,7 +429,105 @@ List all configured Mail accounts.
 
 **Parameters:** None
 
-**Returns:** List of account names (e.g., "iCloud", "Gmail", "Exchange").
+**Returns:** List of account names and email addresses.
+
+---
+
+### Rules
+
+#### `list-rules`
+
+List all mail rules.
+
+**Parameters:** None
+
+**Returns:** List of rule names and enabled status.
+
+---
+
+#### `enable-rule` / `disable-rule`
+
+Enable or disable a mail rule.
+
+| Parameter | Type | Required | Description |
+|-----------|------|----------|-------------|
+| `name` | string | Yes | Rule name |
+
+---
+
+### Contacts
+
+#### `search-contacts`
+
+Search contacts in Contacts.app.
+
+| Parameter | Type | Required | Description |
+|-----------|------|----------|-------------|
+| `query` | string | Yes | Name to search for |
+| `limit` | number | No | Max results (default: 10) |
+
+**Returns:** List of contacts with name, email addresses, and phone numbers.
+
+---
+
+### Templates
+
+Email templates are stored in memory for the duration of the server session.
+
+#### `save-template`
+
+Save or update an email template.
+
+| Parameter | Type | Required | Description |
+|-----------|------|----------|-------------|
+| `name` | string | Yes | Template name |
+| `subject` | string | Yes | Default subject line |
+| `body` | string | Yes | Template body |
+| `to` | string[] | No | Default recipients |
+| `cc` | string[] | No | Default CC recipients |
+| `id` | string | No | Template ID (for updating) |
+
+---
+
+#### `list-templates`
+
+List all saved templates.
+
+**Parameters:** None
+
+---
+
+#### `get-template`
+
+Get a template by ID.
+
+| Parameter | Type | Required | Description |
+|-----------|------|----------|-------------|
+| `id` | string | Yes | Template ID |
+
+---
+
+#### `delete-template`
+
+Delete a template.
+
+| Parameter | Type | Required | Description |
+|-----------|------|----------|-------------|
+| `id` | string | Yes | Template ID |
+
+---
+
+#### `use-template`
+
+Create a draft from a template, with optional overrides.
+
+| Parameter | Type | Required | Description |
+|-----------|------|----------|-------------|
+| `id` | string | Yes | Template ID |
+| `to` | string[] | No | Override recipients |
+| `cc` | string[] | No | Override CC |
+| `subject` | string | No | Override subject |
+| `body` | string | No | Override body |
 
 ---
 
@@ -322,11 +545,21 @@ Verify Mail.app connectivity and permissions.
 
 #### `get-mail-stats`
 
-Get mail statistics (total messages, unread counts per account).
+Get mail statistics.
+
+**Parameters:** None
+
+**Returns:** Total and per-account message/unread counts, plus recently received stats (24h, 7d, 30d).
+
+---
+
+#### `get-sync-status`
+
+Check Mail.app sync activity.
 
 **Parameters:** None
 
-**Returns:** Total counts and per-account breakdown.
+**Returns:** Whether sync is detected, pending uploads, recent activity, and seconds since last change.
 
 ---
 
@@ -350,7 +583,7 @@ AI: [calls get-message with id="..."]
 
 ### Working with Accounts
 
-By default, operations use the first configured account. To work with specific accounts:
+By default, operations use Mail.app's configured default send account. Search operations check all accounts when no account is specified. To work with specific accounts:
 
 ```
 User: "What email accounts do I have?"
@@ -429,10 +662,10 @@ If installed from source, use this configuration:
 | Limitation | Reason |
 |------------|--------|
 | macOS only | Apple Mail and AppleScript are macOS-specific |
-| Plain text only | Email body is plain text; HTML formatting not supported |
-| No attachments | Cannot add or read attachments via AppleScript |
-| Message ID scope | Message IDs are searched across all mailboxes (may be slow with large mailboxes) |
+| 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 |
 | No smart mailboxes | Cannot access Smart Mailboxes via AppleScript |
+| In-memory templates | Email templates are not persisted across server restarts |
 
 ### Backslash Escaping (Important for AI Agents)
 

package/build/index.js

@@ -86,28 +86,34 @@ server.tool("search-messages", {
     from: z.string().optional().describe("Filter by sender email address"),
     subject: z.string().optional().describe("Filter by subject line"),
     mailbox: z.string().optional().describe("Mailbox to search in (e.g., 'INBOX')"),
-    account: z.string().optional().describe("Account to search in"),
+    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')"),
     limit: z.number().optional().describe("Maximum number of results (default: 50)"),
-}, withErrorHandling(({ query, mailbox, account, limit = 50 }) => {
-    const messages = mailManager.searchMessages(query, mailbox, account, limit);
+}, withErrorHandling(({ query, mailbox, account, limit = 50, dateFrom, dateTo }) => {
+    const messages = mailManager.searchMessages(query, mailbox, account, limit, dateFrom, dateTo);
     if (messages.length === 0) {
         return successResponse("No messages found matching criteria");
     }
     const messageList = messages
-        .map((m) => `  - ${m.subject} (from: ${m.sender}) [${m.isRead ? "read" : "unread"}]`)
+        .map((m) => `  - ID: ${m.id} | ${m.dateReceived.toLocaleDateString()} | ${m.subject} (from: ${m.sender}) [${m.isRead ? "read" : "unread"}]`)
         .join("\n");
     return successResponse(`Found ${messages.length} message(s):\n${messageList}`);
 }, "Error searching messages"));
 // --- get-message ---
 server.tool("get-message", {
     id: z.string().min(1, "Message ID is required"),
-}, withErrorHandling(({ id }) => {
+    preferHtml: z.boolean().optional().describe("Return HTML source instead of plain text"),
+}, withErrorHandling(({ id, preferHtml }) => {
     const content = mailManager.getMessageContent(id);
     if (!content) {
         return errorResponse(`Message with ID "${id}" not found`);
     }
+    if (preferHtml && content.htmlContent) {
+        return successResponse(`Subject: ${content.subject}\n\n${content.htmlContent}`);
+    }
     return successResponse(`Subject: ${content.subject}\n\n${content.plainText}`);
 }, "Error retrieving message"));
 // --- list-messages ---
@@ -115,13 +121,17 @@ server.tool("list-messages", {
     mailbox: z.string().optional().describe("Mailbox to list messages from (default: INBOX)"),
     account: z.string().optional().describe("Account to list messages from"),
     limit: z.number().optional().describe("Maximum number of messages (default: 50)"),
+    offset: z.number().optional().describe("Number of messages to skip (for pagination)"),
+    from: z.string().optional().describe("Filter by sender email address or name"),
     unreadOnly: z.boolean().optional().describe("Only show unread messages"),
-}, withErrorHandling(({ mailbox, account, limit = 50 }) => {
-    const messages = mailManager.listMessages(mailbox, account, limit);
+}, withErrorHandling(({ mailbox, account, limit = 50, offset = 0, from }) => {
+    const messages = mailManager.listMessages(mailbox, account, limit, from, offset);
     if (messages.length === 0) {
         return successResponse("No messages found");
     }
-    const messageList = messages.map((m) => `  - ${m.subject} (from: ${m.sender})`).join("\n");
+    const messageList = messages
+        .map((m) => `  - ID: ${m.id} | ${m.dateReceived.toLocaleDateString()} | ${m.subject} (from: ${m.sender})`)
+        .join("\n");
     return successResponse(`Found ${messages.length} message(s):\n${messageList}`);
 }, "Error listing messages"));
 // --- send-email ---
@@ -210,6 +220,16 @@ server.tool("flag-message", {
     }
     return successResponse("Message flagged");
 }, "Error flagging message"));
+// --- unflag-message ---
+server.tool("unflag-message", {
+    id: z.string().min(1, "Message ID is required"),
+}, withErrorHandling(({ id }) => {
+    const success = mailManager.unflagMessage(id);
+    if (!success) {
+        return errorResponse(`Failed to unflag message "${id}"`);
+    }
+    return successResponse("Message unflagged");
+}, "Error unflagging message"));
 // --- delete-message ---
 server.tool("delete-message", {
     id: z.string().min(1, "Message ID is required"),
@@ -285,6 +305,57 @@ server.tool("batch-mark-as-read", {
         return successResponse(`Marked ${successCount} message(s) as read, ${failCount} failed`);
     }
 }, "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"),
+}, withErrorHandling(({ ids }) => {
+    const results = mailManager.batchMarkAsUnread(ids);
+    const successCount = results.filter((r) => r.success).length;
+    const failCount = results.length - successCount;
+    if (failCount === 0) {
+        return successResponse(`Successfully marked ${successCount} message(s) as unread`);
+    }
+    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`);
+    }
+}, "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"),
+}, withErrorHandling(({ ids }) => {
+    const results = mailManager.batchFlagMessages(ids);
+    const successCount = results.filter((r) => r.success).length;
+    const failCount = results.length - successCount;
+    if (failCount === 0) {
+        return successResponse(`Successfully flagged ${successCount} message(s)`);
+    }
+    else if (successCount === 0) {
+        return errorResponse(`Failed to flag all ${failCount} message(s)`);
+    }
+    else {
+        return successResponse(`Flagged ${successCount} message(s), ${failCount} failed`);
+    }
+}, "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"),
+}, withErrorHandling(({ ids }) => {
+    const results = mailManager.batchUnflagMessages(ids);
+    const successCount = results.filter((r) => r.success).length;
+    const failCount = results.length - successCount;
+    if (failCount === 0) {
+        return successResponse(`Successfully unflagged ${successCount} message(s)`);
+    }
+    else if (successCount === 0) {
+        return errorResponse(`Failed to unflag all ${failCount} message(s)`);
+    }
+    else {
+        return successResponse(`Unflagged ${successCount} message(s), ${failCount} failed`);
+    }
+}, "Error batch unflagging messages"));
 // --- list-attachments ---
 server.tool("list-attachments", {
     id: z.string().min(1, "Message ID is required"),
@@ -301,6 +372,18 @@ server.tool("list-attachments", {
         .join("\n");
     return successResponse(`Found ${attachments.length} attachment(s):\n${attachmentList}`);
 }, "Error listing attachments"));
+// --- save-attachment ---
+server.tool("save-attachment", {
+    id: z.string().min(1, "Message ID is required"),
+    attachmentName: z.string().min(1, "Attachment name is required"),
+    savePath: z.string().min(1, "Save directory path is required"),
+}, withErrorHandling(({ id, attachmentName, savePath }) => {
+    const success = mailManager.saveAttachment(id, attachmentName, savePath);
+    if (!success) {
+        return errorResponse(`Failed to save attachment "${attachmentName}"`);
+    }
+    return successResponse(`Attachment "${attachmentName}" saved to ${savePath}`);
+}, "Error saving attachment"));
 // =============================================================================
 // Mailbox Tools
 // =============================================================================
@@ -324,6 +407,40 @@ server.tool("get-unread-count", {
     const location = mailbox ? ` in "${mailbox}"` : "";
     return successResponse(`${count} unread message(s)${location}`);
 }, "Error getting unread count"));
+// --- create-mailbox ---
+server.tool("create-mailbox", {
+    name: z.string().min(1, "Mailbox name is required"),
+    account: z.string().optional().describe("Account to create the mailbox in"),
+}, withErrorHandling(({ name, account }) => {
+    const success = mailManager.createMailbox(name, account);
+    if (!success) {
+        return errorResponse(`Failed to create mailbox "${name}"`);
+    }
+    return successResponse(`Mailbox "${name}" created`);
+}, "Error creating mailbox"));
+// --- delete-mailbox ---
+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);
+    if (!success) {
+        return errorResponse(`Failed to delete mailbox "${name}"`);
+    }
+    return successResponse(`Mailbox "${name}" deleted`);
+}, "Error deleting mailbox"));
+// --- rename-mailbox ---
+server.tool("rename-mailbox", {
+    oldName: z.string().min(1, "Current mailbox name is required"),
+    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);
+    if (!success) {
+        return errorResponse(`Failed to rename mailbox "${oldName}" to "${newName}"`);
+    }
+    return successResponse(`Mailbox renamed from "${oldName}" to "${newName}"`);
+}, "Error renaming mailbox"));
 // =============================================================================
 // Account Tools
 // =============================================================================
@@ -337,6 +454,128 @@ server.tool("list-accounts", {}, withErrorHandling(() => {
     return successResponse(`Found ${accounts.length} account(s):\n${accountList}`);
 }, "Error listing accounts"));
 // =============================================================================
+// Mail Rules Tools
+// =============================================================================
+// --- list-rules ---
+server.tool("list-rules", {}, withErrorHandling(() => {
+    const rules = mailManager.listRules();
+    if (rules.length === 0) {
+        return successResponse("No mail rules found");
+    }
+    const ruleList = rules
+        .map((r) => `  - ${r.name} [${r.enabled ? "enabled" : "disabled"}]`)
+        .join("\n");
+    return successResponse(`Found ${rules.length} rule(s):\n${ruleList}`);
+}, "Error listing rules"));
+// --- enable-rule ---
+server.tool("enable-rule", {
+    name: z.string().min(1, "Rule name is required"),
+}, withErrorHandling(({ name }) => {
+    const success = mailManager.setRuleEnabled(name, true);
+    if (!success) {
+        return errorResponse(`Failed to enable rule "${name}"`);
+    }
+    return successResponse(`Rule "${name}" enabled`);
+}, "Error enabling rule"));
+// --- disable-rule ---
+server.tool("disable-rule", {
+    name: z.string().min(1, "Rule name is required"),
+}, withErrorHandling(({ name }) => {
+    const success = mailManager.setRuleEnabled(name, false);
+    if (!success) {
+        return errorResponse(`Failed to disable rule "${name}"`);
+    }
+    return successResponse(`Rule "${name}" disabled`);
+}, "Error disabling rule"));
+// =============================================================================
+// Contacts Tools
+// =============================================================================
+// --- search-contacts ---
+server.tool("search-contacts", {
+    query: z.string().min(1, "Search query is required"),
+}, withErrorHandling(({ query }) => {
+    const contacts = mailManager.searchContacts(query);
+    if (contacts.length === 0) {
+        return successResponse("No contacts found");
+    }
+    const contactList = contacts
+        .map((c) => {
+        const emails = c.emails.length > 0 ? c.emails.join(", ") : "no email";
+        return `  - ${c.name} (${emails})`;
+    })
+        .join("\n");
+    return successResponse(`Found ${contacts.length} contact(s):\n${contactList}`);
+}, "Error searching contacts"));
+// =============================================================================
+// Email Template Tools
+// =============================================================================
+// --- save-template ---
+server.tool("save-template", {
+    name: z.string().min(1, "Template name is required"),
+    subject: z.string().min(1, "Subject is required"),
+    body: z.string().min(1, "Body is required"),
+    to: z.array(z.string()).optional().describe("Default recipients"),
+    cc: z.array(z.string()).optional().describe("Default CC recipients"),
+    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}`);
+}, "Error saving template"));
+// --- list-templates ---
+server.tool("list-templates", {}, withErrorHandling(() => {
+    const templates = mailManager.listTemplates();
+    if (templates.length === 0) {
+        return successResponse("No templates saved");
+    }
+    const templateList = templates
+        .map((t) => `  - [${t.id}] ${t.name} — "${t.subject}"`)
+        .join("\n");
+    return successResponse(`Found ${templates.length} template(s):\n${templateList}`);
+}, "Error listing templates"));
+// --- get-template ---
+server.tool("get-template", {
+    id: z.string().min(1, "Template ID is required"),
+}, withErrorHandling(({ id }) => {
+    const template = mailManager.getTemplate(id);
+    if (!template) {
+        return errorResponse(`Template "${id}" not found`);
+    }
+    const lines = [
+        `Name: ${template.name}`,
+        `Subject: ${template.subject}`,
+        template.to ? `To: ${template.to.join(", ")}` : null,
+        template.cc ? `CC: ${template.cc.join(", ")}` : null,
+        `\n${template.body}`,
+    ]
+        .filter(Boolean)
+        .join("\n");
+    return successResponse(lines);
+}, "Error getting template"));
+// --- delete-template ---
+server.tool("delete-template", {
+    id: z.string().min(1, "Template ID is required"),
+}, withErrorHandling(({ id }) => {
+    const success = mailManager.deleteTemplate(id);
+    if (!success) {
+        return errorResponse(`Template "${id}" not found`);
+    }
+    return successResponse(`Template "${id}" deleted`);
+}, "Error deleting template"));
+// --- use-template ---
+server.tool("use-template", {
+    id: z.string().min(1, "Template ID is required"),
+    to: z.array(z.string()).optional().describe("Override recipients"),
+    cc: z.array(z.string()).optional().describe("Override CC recipients"),
+    subject: z.string().optional().describe("Override subject"),
+    body: z.string().optional().describe("Override body"),
+}, withErrorHandling(({ id, to, cc, subject, body }) => {
+    const success = mailManager.useTemplate(id, { to, cc, subject, body });
+    if (!success) {
+        return errorResponse(`Failed to use template "${id}". Template not found or no recipients.`);
+    }
+    return successResponse(`Draft created from template "${id}"`);
+}, "Error using template"));
+// =============================================================================
 // Diagnostics Tools
 // =============================================================================
 // --- health-check ---