Integrate template tools

AGENT.md

@@ -0,0 +1,25 @@
+# AGENT.md
+
+## Build/Lint/Test Commands
+- `npm run build` - Compile TypeScript to dist/
+- `npm run lint` - Run ESLint and TypeScript checks
+- `npm test` - Run all Jest tests
+- `npm run test:watch` - Run tests in watch mode
+- `jest src/tools/sendEmail/__tests__/sendEmail.test.ts` - Run single test file
+- `npm run dev` - Run MCP server with inspector for testing
+
+## Architecture
+- MCP (Model Context Protocol) server integrating with Mailtrap email service
+- Main entry point: `src/index.ts` registers tools and handles server lifecycle
+- Tools located in `src/tools/` with pattern: each tool has subdirectory with index.ts, schema.ts, implementation.ts, and __tests__/
+- Client configuration: `src/client.ts` handles Mailtrap API initialization
+- Configuration: `src/config/index.ts` for server constants
+
+## Code Style
+- Uses Airbnb TypeScript ESLint config with Prettier
+- TypeScript strict mode enabled, targeting ES2022 with CommonJS
+- Zod schemas for all tool input validation
+- Error handling: catch and re-throw with descriptive messages
+- Import style: ES modules syntax, grouped with external first
+- Naming: camelCase for functions/variables, PascalCase for types/interfaces
+- No console.log allowed in production code (use proper error handling)

CLAUDE.md

@@ -0,0 +1,69 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Development Commands
+
+### Build and Development
+- `npm run build` - Compile TypeScript to JavaScript in the `dist/` directory
+- `npm run dev` - Run the MCP server with the MCP Inspector for testing
+- `npm run prepublish` - Build the project and make the executable script executable
+
+### Code Quality
+- `npm run lint` - Run both ESLint and TypeScript checks
+- `npm run lint:eslint` - Run ESLint for code style checking
+- `npm run lint:tsc` - Run TypeScript compiler for type checking
+
+### Testing
+- `npm test` - Run all Jest tests
+- `npm run test:watch` - Run tests in watch mode during development
+- `npm run test:coverage` - Run tests with coverage reporting
+
+## Project Architecture
+
+This is an MCP (Model Context Protocol) server that integrates with Mailtrap's email service. The architecture follows a modular pattern:
+
+### Core Components
+- **src/index.ts**: Main MCP server entry point that registers all tools and handles the server lifecycle
+- **src/client.ts**: Mailtrap client configuration and initialization
+- **src/config/index.ts**: Server configuration constants
+
+### Tool Architecture
+All tools follow a consistent pattern in the `src/tools/` directory:
+- Each tool has its own subdirectory (e.g., `sendEmail/`, `templates/`)
+- Tools export both their implementation function and Zod schema for validation
+- Template operations are grouped under `templates/` with individual files for each CRUD operation
+
+### Tool Structure Pattern
+```
+src/tools/{toolName}/
+├── index.ts          # Main tool export
+├── schema.ts         # Zod validation schema
+├── {toolName}.ts     # Tool implementation
+└── __tests__/        # Jest test files
+```
+
+### Environment Variables Required
+- `MAILTRAP_API_TOKEN`: Required API token from Mailtrap
+- `DEFAULT_FROM_EMAIL`: Default sender email address
+- `MAILTRAP_ACCOUNT_ID`: Optional account ID for multi-account setups
+
+### Testing Setup
+- Uses Jest with TypeScript support via ts-jest
+- Test files are located in `__tests__/` directories within each tool
+- Environment variables are set up via `jest/setEnvVars.js`
+- Coverage reports exclude test files and type definitions
+
+### Build Configuration
+- TypeScript compilation targets ES2022 with CommonJS modules
+- Separate build config (`tsconfig.build.json`) excludes test files from distribution
+- Output goes to `dist/` directory with proper executable permissions
+
+### Available MCP Tools
+1. **send-email**: Send transactional emails through Mailtrap
+2. **create-template**: Create new email templates
+3. **list-templates**: List all email templates
+4. **update-template**: Update existing email templates
+5. **delete-template**: Delete email templates
+
+Each tool uses Zod schemas for input validation and follows the MCP protocol for response formatting.

README.md

@@ -4,15 +4,23 @@
 
 # MCP Mailtrap Server
 
-An MCP server that provides a tool for sending transactional emails via Mailtrap
+An MCP server that provides tools for sending transactional emails and managing email templates via Mailtrap
+
+## Prerequisites
+
+Before using this MCP server, you need to:
+
+1. [Create a Mailtrap account](https://mailtrap.io/signup)
+2. [Verify your domain](https://mailtrap.io/sending/domains)
+3. Get your API token from [Mailtrap API settings](https://mailtrap.io/api-tokens)
+4. Get your Account ID from [Mailtrap account management](https://mailtrap.io/account-management)
 
 ## Quick Install
 
-[![Install in Cursor](https://cursor.com/deeplink/mcp-install-dark.svg)](https://cursor.com/install-mcp?name=mailtrap&config=eyJjb21tYW5kIjoibnB4IC15IG1jcC1tYWlsdHJhcCIsImVudiI6eyJNQUlMVFJBUF9BUElfVE9LRU4iOiJ5b3VyX21haWx0cmFwX2FwaV90b2tlbiIsIkRFRkFVTFRfRlJPTV9FTUFJTCI6InlvdXJfc2VuZGVyQGV4YW1wbGUuY29tIn19)
+[![Install in Cursor](https://cursor.com/deeplink/mcp-install-dark.svg)](https://cursor.com/en/install-mcp?name=mailtrap&config=eyJjb21tYW5kIjoibnB4IC15IG1jcC1tYWlsdHJhcCIsImVudiI6eyJNQUlMVFJBUF9BUElfVE9LRU4iOiJ5b3VyX21haWx0cmFwX2FwaV90b2tlbiIsIkRFRkFVTFRfRlJPTV9FTUFJTCI6InlvdXJfc2VuZGVyQGV4YW1wbGUuY29tIiwiTUFJTFRSQVBfQUNDT1VOVF9JRCI6InlvdXJfYWNjb3VudF9pZCJ9fQ%3D%3D)
 
-[![Install with Node in VS Code](https://img.shields.io/badge/VS_Code-Node-0098FF?style=flat-square&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/redirect/mcp/install?name=mailtrap-email&config=%7B%22command%22%3A%22npx%22%2C%22args%22%3A%5B%22-y%22%2C%22mcp-mailtrap%22%5D%2C%22env%22%3A%7B%22MAILTRAP_API_TOKEN%22%3A%22%24%7Binput%3AmailtrapApiToken%7D%22%2C%22DEFAULT_FROM_EMAIL%22%3A%22%24%7Binput%3AsenderEmail%7D%22%7D%7D&inputs=%5B%7B%22type%22%3A%22promptString%22%2C%22id%22%3A%22mailtrapApiToken%22%2C%22description%22%3A%22Mailtrap+API+Token%22%2C%22password%22%3Atrue%7D%2C%7B%22type%22%3A%22promptString%22%2C%22id%22%3A%22senderEmail%22%2C%22description%22%3A%22Sender+Email+Address%22%7D%5D)
+[![Install with Node in VS Code](https://img.shields.io/badge/VS_Code-Node-0098FF?style=flat-square&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/redirect/mcp/install?name=mailtrap&config=%7B%22command%22%3A%22npx%22%2C%22args%22%3A%5B%22-y%22%2C%22mcp-mailtrap%22%5D%2C%22env%22%3A%7B%22MAILTRAP_API_TOKEN%22%3A%22%24%7Binput%3AmailtrapApiToken%7D%22%2C%22DEFAULT_FROM_EMAIL%22%3A%22%24%7Binput%3AsenderEmail%7D%22%2C%22MAILTRAP_ACCOUNT_ID%22%3A%22%24%7Binput%3AmailtrapAccountId%7D%22%7D%7D&inputs=%5B%7B%22type%22%3A%22promptString%22%2C%22id%22%3A%22mailtrapApiToken%22%2C%22description%22%3A%22Mailtrap+API+Token%22%2C%22password%22%3Atrue%7D%2C%7B%22type%22%3A%22promptString%22%2C%22id%22%3A%22senderEmail%22%2C%22description%22%3A%22Sender+Email+Address%22%7D%2C%7B%22type%22%3A%22promptString%22%2C%22id%22%3A%22mailtrapAccountId%22%2C%22description%22%3A%22Mailtrap+Account+ID%22%7D%5D)
 
-[![Install with Node in VS Code Insiders](https://img.shields.io/badge/VS_Code_Insiders-Node-24bfa5?style=flat-square&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/redirect/mcp/install?name=mailtrap-email&config=%7B%22command%22%3A%22npx%22%2C%22args%22%3A%5B%22-y%22%2C%22mcp-mailtrap%22%5D%2C%22env%22%3A%7B%22MAILTRAP_API_TOKEN%22%3A%22%24%7Binput%3AmailtrapApiToken%7D%22%2C%22DEFAULT_FROM_EMAIL%22%3A%22%24%7Binput%3AsenderEmail%7D%22%7D%7D&inputs=%5B%7B%22type%22%3A%22promptString%22%2C%22id%22%3A%22mailtrapApiToken%22%2C%22description%22%3A%22Mailtrap+API+Token%22%2C%22password%22%3Atrue%7D%2C%7B%22type%22%3A%22promptString%22%2C%22id%22%3A%22senderEmail%22%2C%22description%22%3A%22Sender+Email+Address%22%7D%5D&quality=insiders)
 
 
 ## Setup
@@ -29,7 +37,8 @@ Add the following configuration:
       "args": ["-y", "mcp-mailtrap"],
       "env": {
         "MAILTRAP_API_TOKEN": "your_mailtrap_api_token",
-        "DEFAULT_FROM_EMAIL": "your_sender@example.com"
+        "DEFAULT_FROM_EMAIL": "your_sender@example.com",
+        "MAILTRAP_ACCOUNT_ID": "your_account_id"
       }
     }
   }
@@ -50,7 +59,8 @@ If you are using `asdf` for managing Node.js you must use absolute path to execu
         "ASDF_DATA_DIR": "/Users/<username>/.asdf",
         "ASDF_NODEJS_VERSION": "20.6.1",
         "MAILTRAP_API_TOKEN": "your_mailtrap_api_token",
-        "DEFAULT_FROM_EMAIL": "your_sender@example.com"
+        "DEFAULT_FROM_EMAIL": "your_sender@example.com",
+        "MAILTRAP_ACCOUNT_ID": "your_account_id"
       }
     }
   }
@@ -89,7 +99,8 @@ Then, in the settings file, add the following configuration:
         "args": ["-y", "mcp-mailtrap"],
         "env": {
           "MAILTRAP_API_TOKEN": "your_mailtrap_api_token",
-          "DEFAULT_FROM_EMAIL": "your_sender@example.com"
+          "DEFAULT_FROM_EMAIL": "your_sender@example.com",
+          "MAILTRAP_ACCOUNT_ID": "your_account_id"
         }
       }
     }
@@ -102,11 +113,20 @@ Then, in the settings file, add the following configuration:
 
 ## Usage
 
-Once configured, you can ask agent to send emails, for example:
+Once configured, you can ask agent to send emails and manage templates, for example:
+
+**Email Operations:**
 
 - "Send an email to john.doe@example.com with the subject 'Meeting Tomorrow' and a friendly reminder about our upcoming meeting."
 - "Email sarah@example.com about the project update, and CC the team at team@example.com"
 
+**Template Operations:**
+
+- "List all email templates in my Mailtrap account"
+- "Create a new email template called 'Welcome Email' with subject 'Welcome to our platform!'"
+- "Update the template with ID 12345 to change the subject to 'Updated Welcome Message'"
+- "Delete the template with ID 67890"
+
 ## Available Tools
 
 ### send-email
@@ -118,12 +138,56 @@ Sends a transactional email through Mailtrap.
 - `to` (required): Email address of the recipient
 - `subject` (required): Email subject line
 - `from` (optional): Email address of the sender, if not provided "DEFAULT_FROM_EMAIL" will be used
-- `text` (optional): Email body text, require if "html" is empty
+- `text` (optional): Email body text, required if "html" is empty
 - `html` (optional): HTML version of the email body, required if "text" is empty
 - `cc` (optional): Array of CC recipient email addresses
 - `bcc` (optional): Array of BCC recipient email addresses
 - `category` (optional): Email category for tracking
 
+### create-template
+
+Creates a new email template in your Mailtrap account.
+
+**Parameters:**
+
+- `name` (required): Name of the template
+- `subject` (required): Email subject line
+- `html` (or `text` is required): HTML content of the template
+- `text` (or `html` is required): Plain text version of the template
+- `category` (optional): Template category (defaults to "General")
+
+### list-templates
+
+Lists all email templates in your Mailtrap account.
+
+**Parameters:**
+
+- No parameters required
+
+### update-template
+
+Updates an existing email template.
+
+**Parameters:**
+
+- `template_id` (required): ID of the template to update
+- `name` (optional): New name for the template
+- `subject` (optional): New email subject line
+- `html` (optional): New HTML content of the template
+- `text` (optional): New plain text version of the template
+- `category` (optional): New category for the template
+
+> [!NOTE]
+> At least one updatable field (name, subject, html, text, or category) must be provided when calling update-template to perform an update.
+
+### delete-template
+
+Deletes an existing email template.
+
+**Parameters:**
+
+- `template_id` (required): ID of the template to delete
+
 ## Development
 
 1. Clone the repository:
@@ -154,7 +218,8 @@ Add the following configuration:
       "args": ["/path/to/mailtrap-mcp/dist/index.js"],
       "env": {
         "MAILTRAP_API_TOKEN": "your_mailtrap_api_token",
-        "DEFAULT_FROM_EMAIL": "your_sender@example.com"
+        "DEFAULT_FROM_EMAIL": "your_sender@example.com",
+        "MAILTRAP_ACCOUNT_ID": "your_account_id"
       }
     }
   }
@@ -177,7 +242,8 @@ If you are using `asdf` for managing Node.js you should use absolute path to exe
         "ASDF_DATA_DIR": "/Users/<username>/.asdf",
         "ASDF_NODEJS_VERSION": "20.6.1",
         "MAILTRAP_API_TOKEN": "your_mailtrap_api_token",
-        "DEFAULT_FROM_EMAIL": "your_sender@example.com"
+        "DEFAULT_FROM_EMAIL": "your_sender@example.com",
+        "MAILTRAP_ACCOUNT_ID": "your_account_id"
       }
     }
   }
@@ -198,7 +264,8 @@ If you are using `asdf` for managing Node.js you should use absolute path to exe
         "args": ["/path/to/mailtrap-mcp/dist/index.js"],
         "env": {
           "MAILTRAP_API_TOKEN": "your_mailtrap_api_token",
-          "DEFAULT_FROM_EMAIL": "your_sender@example.com"
+          "DEFAULT_FROM_EMAIL": "your_sender@example.com",
+          "MAILTRAP_ACCOUNT_ID": "your_account_id"
         }
       }
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-mailtrap",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Official MCP Server for Mailtrap",
   "license": "MIT",
   "author": "Railsware Products Studio LLC",
@@ -31,7 +31,7 @@
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.8.0",
     "dotenv": "^16.4.7",
-    "mailtrap": "^4.0.0",
+    "mailtrap": "^4.2.0",
     "zod": "^3.24.2"
   },
   "devDependencies": {

src/client.ts

@@ -9,6 +9,10 @@ if (!MAILTRAP_API_TOKEN) {
 
 const client = new MailtrapClient({
   token: MAILTRAP_API_TOKEN,
+  // conditionally set accountId if it's a valid number
+  ...(process.env.MAILTRAP_ACCOUNT_ID && !isNaN(Number(process.env.MAILTRAP_ACCOUNT_ID))
+    ? { accountId: Number(process.env.MAILTRAP_ACCOUNT_ID) }
+    : {}),
 });
 
 // eslint-disable-next-line import/prefer-default-export

src/index.ts

@@ -6,6 +6,16 @@ import dotenv from "dotenv";
 import CONFIG from "./config";
 
 import { sendEmailSchema, sendEmail } from "./tools/sendEmail";
+import {
+  createTemplate,
+  createTemplateSchema,
+  deleteTemplate,
+  deleteTemplateSchema,
+  listTemplates,
+  listTemplatesSchema,
+  updateTemplate,
+  updateTemplateSchema,
+} from "./tools/templates";
 
 dotenv.config();
 
@@ -14,13 +24,44 @@ const server = new McpServer({
   version: CONFIG.MCP_SERVER_VERSION,
 });
 
+/**
+ * Sending operations.
+ */
 server.tool(
   "send-email",
   "Send transactional email using Mailtrap",
   sendEmailSchema,
   sendEmail
 );
 
+/**
+ * Templates operations.
+ */
+server.tool(
+  "create-template",
+  "Create a new email template",
+  createTemplateSchema,
+  createTemplate
+);
+server.tool(
+  "list-templates",
+  "List all email templates",
+  listTemplatesSchema,
+  listTemplates
+);
+server.tool(
+  "update-template",
+  "Update an existing email template",
+  updateTemplateSchema,
+  updateTemplate
+);
+server.tool(
+  "delete-template",
+  "Delete an existing email template",
+  deleteTemplateSchema,
+  deleteTemplate
+);
+
 async function main() {
   const transport = new StdioServerTransport();
 

src/tools/sendEmail/schema.ts

@@ -17,10 +17,7 @@ const sendEmailSchema = {
     .array(z.string().email())
     .optional()
     .describe("Optional BCC recipients"),
-  category: z
-    .string()
-    .optional()
-    .describe("Optional email category for tracking"),
+  category: z.string().describe("Email category for tracking"),
   text: z.string().optional().describe("Email body text"),
   html: z
     .string()