gmail-workspace-mcp-server 0.1.1 → 0.2.0

package/README.md

@@ -48,24 +48,22 @@ Use this for personal `@gmail.com` accounts or any Google account without Worksp
 
 #### Getting a Refresh Token
 
-Run the one-time setup script from a clone of the repository:
+Run the built-in setup command:
 
 ```bash
-git clone https://github.com/pulsemcp/mcp-servers.git
-cd mcp-servers/experimental/gmail
-npx tsx scripts/oauth-setup.ts <client_id> <client_secret>
+npx gmail-workspace-mcp-server oauth-setup <client_id> <client_secret>
 ```
 
 You can also pass credentials via environment variables:
 
 ```bash
-GMAIL_OAUTH_CLIENT_ID=... GMAIL_OAUTH_CLIENT_SECRET=... npx tsx scripts/oauth-setup.ts
+GMAIL_OAUTH_CLIENT_ID=... GMAIL_OAUTH_CLIENT_SECRET=... npx gmail-workspace-mcp-server oauth-setup
 ```
 
 **Port conflict?** If port 3000 is already in use, specify a different port:
 
 ```bash
-PORT=3001 npx tsx scripts/oauth-setup.ts <client_id> <client_secret>
+PORT=3001 npx gmail-workspace-mcp-server oauth-setup <client_id> <client_secret>
 ```
 
 Desktop app credentials automatically allow `http://localhost` redirects on any port, so no additional Google Cloud Console configuration is needed.
@@ -264,17 +262,32 @@ Create a draft email, optionally as a reply to an existing conversation.
 
 - `to` (string, required): Recipient email address
 - `subject` (string, required): Email subject
-- `body` (string, required): Email body (plain text)
+- `plaintext_body` (string): Plain text body content (at least one of plaintext_body or html_body required)
+- `html_body` (string): HTML body content for rich text formatting (at least one of plaintext_body or html_body required)
+- `cc` (string, optional): CC recipients
+- `bcc` (string, optional): BCC recipients
 - `thread_id` (string, optional): Thread ID for replies
 - `reply_to_email_id` (string, optional): Email ID to reply to (sets References/In-Reply-To headers)
 
-**Example:**
+At least one of `plaintext_body` or `html_body` must be provided. If both are provided, a multipart email is sent with both versions.
+
+**Example (plain text):**
+
+```json
+{
+  "to": "recipient@example.com",
+  "subject": "Meeting Follow-up",
+  "plaintext_body": "Thanks for the meeting today!"
+}
+```
+
+**Example (HTML):**
 
 ```json
 {
   "to": "recipient@example.com",
   "subject": "Meeting Follow-up",
-  "body": "Thanks for the meeting today!"
+  "html_body": "<p>Thanks for the meeting today! Check out <a href=\"https://example.com/notes\">the notes</a>.</p>"
 }
 ```
 
@@ -286,18 +299,31 @@ Send an email directly or from an existing draft.
 
 - `to` (string, conditional): Recipient email (required unless sending from draft)
 - `subject` (string, conditional): Email subject (required unless sending from draft)
-- `body` (string, conditional): Email body (required unless sending from draft)
+- `plaintext_body` (string): Plain text body content (at least one of plaintext_body or html_body required, unless sending a draft)
+- `html_body` (string): HTML body content for rich text formatting (at least one of plaintext_body or html_body required, unless sending a draft)
+- `cc` (string, optional): CC recipients
+- `bcc` (string, optional): BCC recipients
 - `from_draft_id` (string, optional): Send an existing draft by ID
 - `thread_id` (string, optional): Thread ID for replies
 - `reply_to_email_id` (string, optional): Email ID to reply to
 
-**Example (new email):**
+**Example (plain text email):**
+
+```json
+{
+  "to": "recipient@example.com",
+  "subject": "Hello",
+  "plaintext_body": "This is a test email."
+}
+```
+
+**Example (HTML email):**
 
 ```json
 {
   "to": "recipient@example.com",
   "subject": "Hello",
-  "body": "This is a test email."
+  "html_body": "<p>Check out <a href=\"https://example.com\">our website</a> for more details.</p>"
 }
 ```
 

package/build/index.integration-with-mock.js

@@ -165,17 +165,18 @@ function createMockClient() {
             return { ...email, labelIds: labels };
         },
         async createDraft(options) {
+            const bodyContent = options.plaintextBody || options.htmlBody || '';
             const draft = {
                 id: `draft_${draftIdCounter++}`,
                 message: {
                     id: `msg_${messageIdCounter++}`,
                     threadId: options.threadId || `thread_${messageIdCounter}`,
                     labelIds: ['DRAFT'],
-                    snippet: options.body.substring(0, 100),
+                    snippet: bodyContent.substring(0, 100),
                     historyId: '12347',
                     internalDate: String(Date.now()),
                     payload: {
-                        mimeType: 'text/plain',
+                        mimeType: options.htmlBody ? 'text/html' : 'text/plain',
                         headers: [
                             { name: 'Subject', value: options.subject },
                             { name: 'From', value: 'me@example.com' },
@@ -183,8 +184,8 @@ function createMockClient() {
                             { name: 'Date', value: new Date().toISOString() },
                         ],
                         body: {
-                            size: options.body.length,
-                            data: Buffer.from(options.body).toString('base64url'),
+                            size: bodyContent.length,
+                            data: Buffer.from(bodyContent).toString('base64url'),
                         },
                     },
                 },
@@ -221,15 +222,16 @@ function createMockClient() {
             mockDrafts.splice(index, 1);
         },
         async sendMessage(options) {
+            const bodyContent = options.plaintextBody || options.htmlBody || '';
             const sentMessage = {
                 id: `msg_${messageIdCounter++}`,
                 threadId: options.threadId || `thread_${messageIdCounter}`,
                 labelIds: ['SENT'],
-                snippet: options.body.substring(0, 100),
+                snippet: bodyContent.substring(0, 100),
                 historyId: '12348',
                 internalDate: String(Date.now()),
                 payload: {
-                    mimeType: 'text/plain',
+                    mimeType: options.htmlBody ? 'text/html' : 'text/plain',
                     headers: [
                         { name: 'Subject', value: options.subject },
                         { name: 'From', value: 'me@example.com' },
@@ -237,8 +239,8 @@ function createMockClient() {
                         { name: 'Date', value: new Date().toISOString() },
                     ],
                     body: {
-                        size: options.body.length,
-                        data: Buffer.from(options.body).toString('base64url'),
+                        size: bodyContent.length,
+                        data: Buffer.from(bodyContent).toString('base64url'),
                     },
                 },
             };

package/build/index.js

@@ -5,12 +5,31 @@ import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import { createMCPServer } from '../shared/index.js';
 import { logServerStart, logError, logWarning } from '../shared/logging.js';
+import { runOAuthSetup } from './oauth-setup.js';
 // Read version from package.json
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const packageJsonPath = join(__dirname, '..', 'package.json');
 const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
 const VERSION = packageJson.version;
 // =============================================================================
+// CLI SUBCOMMAND HANDLING
+// =============================================================================
+// Check for subcommands before env validation (e.g., "oauth-setup")
+const subcommand = process.argv[2];
+if (subcommand === 'oauth-setup') {
+    runOAuthSetup(process.argv.slice(3)).catch((error) => {
+        console.error('Error:', error.message);
+        process.exit(1);
+    });
+}
+else {
+    // Run the MCP server (default behavior)
+    main().catch((error) => {
+        logError('main', error);
+        process.exit(1);
+    });
+}
+// =============================================================================
 // ENVIRONMENT VALIDATION
 // =============================================================================
 function validateEnvironment() {
@@ -45,7 +64,7 @@ function validateEnvironment() {
         console.error('  GMAIL_OAUTH_CLIENT_SECRET: OAuth2 client secret');
         console.error('  GMAIL_OAUTH_REFRESH_TOKEN: Refresh token from one-time consent flow');
         console.error('\nRun the setup script to obtain a refresh token:');
-        console.error('  npx tsx scripts/oauth-setup.ts <client_id> <client_secret>');
+        console.error('  npx gmail-workspace-mcp-server oauth-setup <client_id> <client_secret>');
         console.error('\n======================================================\n');
         process.exit(1);
     }
@@ -83,7 +102,7 @@ function validateEnvironment() {
     console.error('  GMAIL_OAUTH_CLIENT_ID: OAuth2 client ID from Google Cloud Console');
     console.error('  GMAIL_OAUTH_CLIENT_SECRET: OAuth2 client secret');
     console.error('  GMAIL_OAUTH_REFRESH_TOKEN: Refresh token from one-time consent flow');
-    console.error('\n  Setup: Run `npx tsx scripts/oauth-setup.ts <client_id> <client_secret>`');
+    console.error('\n  Setup: Run `npx gmail-workspace-mcp-server oauth-setup <client_id> <client_secret>`');
     console.error('\n--- Option 2: Service Account (for Google Workspace) ---');
     console.error('  GMAIL_SERVICE_ACCOUNT_CLIENT_EMAIL: Service account email address');
     console.error('    Example: my-service-account@my-project.iam.gserviceaccount.com');
@@ -123,8 +142,3 @@ async function main() {
     await server.connect(transport);
     logServerStart('Gmail');
 }
-// Run the server
-main().catch((error) => {
-    logError('main', error);
-    process.exit(1);
-});

package/build/oauth-setup.d.ts

@@ -0,0 +1,14 @@
+/**
+ * OAuth2 setup flow for obtaining a Gmail refresh token.
+ *
+ * This module is invoked as a CLI subcommand:
+ *   npx gmail-workspace-mcp-server oauth-setup <client_id> <client_secret>
+ *
+ * It starts a local HTTP server, opens the Google OAuth consent flow,
+ * and prints the resulting refresh token for use in MCP server configuration.
+ */
+/**
+ * Run the OAuth2 setup flow.
+ * @param args - CLI arguments after "oauth-setup" (i.e., [client_id, client_secret])
+ */
+export declare function runOAuthSetup(args: string[]): Promise<void>;

package/build/oauth-setup.js

@@ -0,0 +1,135 @@
+/**
+ * OAuth2 setup flow for obtaining a Gmail refresh token.
+ *
+ * This module is invoked as a CLI subcommand:
+ *   npx gmail-workspace-mcp-server oauth-setup <client_id> <client_secret>
+ *
+ * It starts a local HTTP server, opens the Google OAuth consent flow,
+ * and prints the resulting refresh token for use in MCP server configuration.
+ */
+import http from 'node:http';
+import { OAuth2Client } from 'google-auth-library';
+const CALLBACK_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes
+const SCOPES = [
+    'https://www.googleapis.com/auth/gmail.readonly',
+    'https://www.googleapis.com/auth/gmail.modify',
+    'https://www.googleapis.com/auth/gmail.compose',
+    'https://www.googleapis.com/auth/gmail.send',
+];
+function waitForCallback(port) {
+    return new Promise((resolve, reject) => {
+        const server = http.createServer((req, res) => {
+            if (!req.url?.startsWith('/callback')) {
+                res.writeHead(404);
+                res.end('Not found');
+                return;
+            }
+            const url = new URL(req.url, `http://localhost:${port}`);
+            const code = url.searchParams.get('code');
+            const error = url.searchParams.get('error');
+            if (error) {
+                res.writeHead(200, { 'Content-Type': 'text/html' });
+                res.end('<html><body><h1>Authorization Failed</h1><p>You can close this window.</p></body></html>');
+                server.close();
+                reject(new Error(`OAuth error: ${error}`));
+                return;
+            }
+            if (!code) {
+                res.writeHead(400, { 'Content-Type': 'text/html' });
+                res.end('<html><body><h1>Missing Code</h1><p>No authorization code received.</p></body></html>');
+                return;
+            }
+            res.writeHead(200, { 'Content-Type': 'text/html' });
+            res.end('<html><body><h1>Authorization Successful!</h1><p>You can close this window and return to the terminal.</p></body></html>');
+            clearTimeout(timeout);
+            server.close();
+            resolve(code);
+        });
+        const timeout = setTimeout(() => {
+            console.error('\nTimeout: No callback received within 5 minutes. Exiting.');
+            server.close();
+            reject(new Error('OAuth callback timeout - no response within 5 minutes'));
+        }, CALLBACK_TIMEOUT_MS);
+        server.listen(port, () => {
+            // Server is listening
+        });
+        server.on('error', (err) => {
+            clearTimeout(timeout);
+            if (err.code === 'EADDRINUSE') {
+                reject(new Error(`Port ${port} is already in use. Please free it or set PORT env var.`));
+            }
+            else {
+                reject(err);
+            }
+        });
+    });
+}
+/**
+ * Run the OAuth2 setup flow.
+ * @param args - CLI arguments after "oauth-setup" (i.e., [client_id, client_secret])
+ */
+export async function runOAuthSetup(args) {
+    const clientId = args[0] || process.env.GMAIL_OAUTH_CLIENT_ID;
+    const clientSecret = args[1] || process.env.GMAIL_OAUTH_CLIENT_SECRET;
+    if (!clientId || !clientSecret) {
+        console.error('Usage: npx gmail-workspace-mcp-server oauth-setup <client_id> <client_secret>');
+        console.error('');
+        console.error('Or set environment variables:');
+        console.error('  GMAIL_OAUTH_CLIENT_ID=... GMAIL_OAUTH_CLIENT_SECRET=... npx gmail-workspace-mcp-server oauth-setup');
+        console.error('');
+        console.error('Get your OAuth2 credentials from:');
+        console.error('  https://console.cloud.google.com/apis/credentials');
+        process.exit(1);
+    }
+    const port = parseInt(process.env.PORT || '3000', 10);
+    const redirectUri = `http://localhost:${port}/callback`;
+    const oauth2Client = new OAuth2Client(clientId, clientSecret, redirectUri);
+    const authorizeUrl = oauth2Client.generateAuthUrl({
+        access_type: 'offline',
+        scope: SCOPES,
+        prompt: 'consent', // Force consent to ensure refresh token is returned
+    });
+    console.log('\n=== Gmail OAuth2 Setup ===\n');
+    console.log('1. Open this URL in your browser:\n');
+    console.log(`   ${authorizeUrl}\n`);
+    console.log('2. Sign in and authorize the application');
+    console.log(`3. You will be redirected to localhost:${port}/callback\n`);
+    console.log('Waiting for callback (5 minute timeout)...\n');
+    const code = await waitForCallback(port);
+    console.log('Authorization code received! Exchanging for tokens...\n');
+    const { tokens } = await oauth2Client.getToken(code);
+    if (!tokens.refresh_token) {
+        console.error('ERROR: No refresh token received.');
+        console.error('');
+        console.error('This can happen if:');
+        console.error('  - You previously authorized this app (revoke access at https://myaccount.google.com/permissions)');
+        console.error('  - The OAuth consent screen is still in "Testing" mode');
+        console.error('');
+        console.error('Try revoking access and running this script again.');
+        process.exit(1);
+    }
+    console.log('=== Setup Complete ===\n');
+    console.log('Add these environment variables to your MCP server configuration:\n');
+    console.log(`  GMAIL_OAUTH_CLIENT_ID=${clientId}`);
+    console.log(`  GMAIL_OAUTH_CLIENT_SECRET=${clientSecret}`);
+    console.log(`  GMAIL_OAUTH_REFRESH_TOKEN=${tokens.refresh_token}`);
+    console.log('');
+    console.log('SECURITY NOTE: Keep your refresh token secure. Anyone with this token and your');
+    console.log('client credentials can access your Gmail account.\n');
+    console.log('Example Claude Desktop config:\n');
+    console.log(JSON.stringify({
+        mcpServers: {
+            gmail: {
+                command: 'npx',
+                args: ['gmail-workspace-mcp-server'],
+                env: {
+                    GMAIL_OAUTH_CLIENT_ID: clientId,
+                    GMAIL_OAUTH_CLIENT_SECRET: clientSecret,
+                    GMAIL_OAUTH_REFRESH_TOKEN: tokens.refresh_token,
+                },
+            },
+        },
+    }, null, 2));
+    console.log('');
+    process.exit(0);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gmail-workspace-mcp-server",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "MCP server for Gmail integration with OAuth2 and service account support",
   "main": "build/index.js",
   "type": "module",

package/shared/gmail-client/lib/drafts.d.ts

@@ -13,7 +13,8 @@ interface DraftListItem {
 export declare function createDraft(baseUrl: string, headers: Record<string, string>, from: string, options: {
     to: string;
     subject: string;
-    body: string;
+    plaintextBody?: string;
+    htmlBody?: string;
     cc?: string;
     bcc?: string;
     threadId?: string;

package/shared/gmail-client/lib/mime-utils.d.ts

@@ -4,14 +4,17 @@
 export interface MimeMessageOptions {
     to: string;
     subject: string;
-    body: string;
+    plaintextBody?: string;
+    htmlBody?: string;
     cc?: string;
     bcc?: string;
     inReplyTo?: string;
     references?: string;
 }
 /**
- * Builds a MIME message from email options
+ * Builds a MIME message from email options.
+ * If both plaintextBody and htmlBody are provided, creates a multipart/alternative message.
+ * If only one is provided, creates a single-part message with the appropriate content type.
  */
 export declare function buildMimeMessage(from: string, options: MimeMessageOptions): string;
 /**

package/shared/gmail-client/lib/mime-utils.js

@@ -2,7 +2,9 @@
  * MIME message utilities for building and encoding email messages
  */
 /**
- * Builds a MIME message from email options
+ * Builds a MIME message from email options.
+ * If both plaintextBody and htmlBody are provided, creates a multipart/alternative message.
+ * If only one is provided, creates a single-part message with the appropriate content type.
  */
 export function buildMimeMessage(from, options) {
     const headers = [
@@ -10,7 +12,6 @@ export function buildMimeMessage(from, options) {
         `To: ${options.to}`,
         `Subject: ${options.subject}`,
         'MIME-Version: 1.0',
-        'Content-Type: text/plain; charset=utf-8',
     ];
     if (options.cc) {
         headers.push(`Cc: ${options.cc}`);
@@ -24,7 +25,24 @@ export function buildMimeMessage(from, options) {
     if (options.references) {
         headers.push(`References: ${options.references}`);
     }
-    return headers.join('\r\n') + '\r\n\r\n' + options.body;
+    // If both plain text and HTML are provided, use multipart/alternative
+    if (options.plaintextBody && options.htmlBody) {
+        const boundary = `boundary_${Date.now()}_${Math.random().toString(36).substring(2)}`;
+        headers.push(`Content-Type: multipart/alternative; boundary="${boundary}"`);
+        const parts = [
+            `--${boundary}\r\nContent-Type: text/plain; charset=utf-8\r\n\r\n${options.plaintextBody}`,
+            `--${boundary}\r\nContent-Type: text/html; charset=utf-8\r\n\r\n${options.htmlBody}`,
+            `--${boundary}--`,
+        ];
+        return headers.join('\r\n') + '\r\n\r\n' + parts.join('\r\n');
+    }
+    // Single content type
+    if (options.htmlBody) {
+        headers.push('Content-Type: text/html; charset=utf-8');
+        return headers.join('\r\n') + '\r\n\r\n' + options.htmlBody;
+    }
+    headers.push('Content-Type: text/plain; charset=utf-8');
+    return headers.join('\r\n') + '\r\n\r\n' + (options.plaintextBody ?? '');
 }
 /**
  * Converts a string to base64url encoding (RFC 4648)

package/shared/gmail-client/lib/send-message.d.ts

@@ -5,7 +5,8 @@ import type { Email } from '../../types.js';
 export declare function sendMessage(baseUrl: string, headers: Record<string, string>, from: string, options: {
     to: string;
     subject: string;
-    body: string;
+    plaintextBody?: string;
+    htmlBody?: string;
     cc?: string;
     bcc?: string;
     threadId?: string;

package/shared/server.d.ts

@@ -50,7 +50,8 @@ export interface IGmailClient {
     createDraft(options: {
         to: string;
         subject: string;
-        body: string;
+        plaintextBody?: string;
+        htmlBody?: string;
         cc?: string;
         bcc?: string;
         threadId?: string;
@@ -85,7 +86,8 @@ export interface IGmailClient {
     sendMessage(options: {
         to: string;
         subject: string;
-        body: string;
+        plaintextBody?: string;
+        htmlBody?: string;
         cc?: string;
         bcc?: string;
         threadId?: string;
@@ -167,7 +169,8 @@ declare abstract class BaseGmailClient implements IGmailClient {
     createDraft(options: {
         to: string;
         subject: string;
-        body: string;
+        plaintextBody?: string;
+        htmlBody?: string;
         cc?: string;
         bcc?: string;
         threadId?: string;
@@ -190,7 +193,8 @@ declare abstract class BaseGmailClient implements IGmailClient {
     sendMessage(options: {
         to: string;
         subject: string;
-        body: string;
+        plaintextBody?: string;
+        htmlBody?: string;
         cc?: string;
         bcc?: string;
         threadId?: string;

package/shared/tools/draft-email.d.ts

@@ -1,26 +1,47 @@
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { z } from 'zod';
 import type { ClientFactory } from '../server.js';
-export declare const DraftEmailSchema: z.ZodObject<{
+export declare const DraftEmailSchema: z.ZodEffects<z.ZodObject<{
     to: z.ZodString;
     subject: z.ZodString;
-    body: z.ZodString;
+    plaintext_body: z.ZodOptional<z.ZodString>;
+    html_body: z.ZodOptional<z.ZodString>;
     cc: z.ZodOptional<z.ZodString>;
     bcc: z.ZodOptional<z.ZodString>;
     thread_id: z.ZodOptional<z.ZodString>;
     reply_to_email_id: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    body: string;
     to: string;
     subject: string;
+    plaintext_body?: string | undefined;
+    html_body?: string | undefined;
     cc?: string | undefined;
     bcc?: string | undefined;
     thread_id?: string | undefined;
     reply_to_email_id?: string | undefined;
 }, {
-    body: string;
     to: string;
     subject: string;
+    plaintext_body?: string | undefined;
+    html_body?: string | undefined;
+    cc?: string | undefined;
+    bcc?: string | undefined;
+    thread_id?: string | undefined;
+    reply_to_email_id?: string | undefined;
+}>, {
+    to: string;
+    subject: string;
+    plaintext_body?: string | undefined;
+    html_body?: string | undefined;
+    cc?: string | undefined;
+    bcc?: string | undefined;
+    thread_id?: string | undefined;
+    reply_to_email_id?: string | undefined;
+}, {
+    to: string;
+    subject: string;
+    plaintext_body?: string | undefined;
+    html_body?: string | undefined;
     cc?: string | undefined;
     bcc?: string | undefined;
     thread_id?: string | undefined;
@@ -40,9 +61,13 @@ export declare function draftEmailTool(server: Server, clientFactory: ClientFact
                 type: string;
                 description: "Subject line of the email.";
             };
-            body: {
+            plaintext_body: {
+                type: string;
+                description: "Plain text body content of the email. At least one of plaintext_body or html_body must be provided. If both are provided, a multipart email is sent with both versions.";
+            };
+            html_body: {
                 type: string;
-                description: "Plain text body content of the email.";
+                description: "HTML body content of the email for rich text formatting (links, bold, lists, etc.). At least one of plaintext_body or html_body must be provided. If both are provided, a multipart email is sent with both versions.";
             };
             cc: {
                 type: string;

package/shared/tools/draft-email.js

@@ -3,7 +3,8 @@ import { getHeader } from '../utils/email-helpers.js';
 const PARAM_DESCRIPTIONS = {
     to: 'Recipient email address(es). For multiple recipients, separate with commas.',
     subject: 'Subject line of the email.',
-    body: 'Plain text body content of the email.',
+    plaintext_body: 'Plain text body content of the email. At least one of plaintext_body or html_body must be provided. If both are provided, a multipart email is sent with both versions.',
+    html_body: 'HTML body content of the email for rich text formatting (links, bold, lists, etc.). At least one of plaintext_body or html_body must be provided. If both are provided, a multipart email is sent with both versions.',
     cc: 'CC recipient email address(es). For multiple, separate with commas.',
     bcc: 'BCC recipient email address(es). For multiple, separate with commas.',
     thread_id: 'Thread ID to add this draft to an existing conversation. ' +
@@ -11,26 +12,37 @@ const PARAM_DESCRIPTIONS = {
     reply_to_email_id: 'Email ID to reply to. If provided, the draft will be formatted as a reply ' +
         'with proper In-Reply-To and References headers. Also requires thread_id.',
 };
-export const DraftEmailSchema = z.object({
+export const DraftEmailSchema = z
+    .object({
     to: z.string().min(1).describe(PARAM_DESCRIPTIONS.to),
     subject: z.string().min(1).describe(PARAM_DESCRIPTIONS.subject),
-    body: z.string().min(1).describe(PARAM_DESCRIPTIONS.body),
+    plaintext_body: z.string().min(1).optional().describe(PARAM_DESCRIPTIONS.plaintext_body),
+    html_body: z.string().min(1).optional().describe(PARAM_DESCRIPTIONS.html_body),
     cc: z.string().optional().describe(PARAM_DESCRIPTIONS.cc),
     bcc: z.string().optional().describe(PARAM_DESCRIPTIONS.bcc),
     thread_id: z.string().optional().describe(PARAM_DESCRIPTIONS.thread_id),
     reply_to_email_id: z.string().optional().describe(PARAM_DESCRIPTIONS.reply_to_email_id),
+})
+    .refine((data) => {
+    return Boolean(data.plaintext_body) || Boolean(data.html_body);
+}, {
+    message: 'At least one of plaintext_body or html_body must be provided.',
 });
 const TOOL_DESCRIPTION = `Create a draft email that can be reviewed and sent later.
 
 **Parameters:**
 - to: Recipient email address(es) (required)
 - subject: Email subject line (required)
-- body: Plain text body content (required)
+- plaintext_body: Plain text body content (at least one of plaintext_body or html_body required)
+- html_body: HTML body content for rich text formatting (at least one of plaintext_body or html_body required)
 - cc: CC recipients (optional)
 - bcc: BCC recipients (optional)
 - thread_id: Thread ID to reply to an existing conversation (optional)
 - reply_to_email_id: Email ID to reply to, sets proper reply headers (optional)
 
+**Body content:**
+At least one of plaintext_body or html_body must be provided. If both are provided, a multipart email is sent with both plain text and HTML versions. Use html_body for rich formatting like hyperlinks, bold text, or lists.
+
 **Creating a reply:**
 To create a draft reply to an existing email:
 1. Get the thread_id and email_id from get_email_conversation
@@ -57,9 +69,13 @@ export function draftEmailTool(server, clientFactory) {
                     type: 'string',
                     description: PARAM_DESCRIPTIONS.subject,
                 },
-                body: {
+                plaintext_body: {
+                    type: 'string',
+                    description: PARAM_DESCRIPTIONS.plaintext_body,
+                },
+                html_body: {
                     type: 'string',
-                    description: PARAM_DESCRIPTIONS.body,
+                    description: PARAM_DESCRIPTIONS.html_body,
                 },
                 cc: {
                     type: 'string',
@@ -78,7 +94,7 @@ export function draftEmailTool(server, clientFactory) {
                     description: PARAM_DESCRIPTIONS.reply_to_email_id,
                 },
             },
-            required: ['to', 'subject', 'body'],
+            required: ['to', 'subject'],
         },
         handler: async (args) => {
             try {
@@ -103,7 +119,8 @@ export function draftEmailTool(server, clientFactory) {
                 const draft = await client.createDraft({
                     to: parsed.to,
                     subject: parsed.subject,
-                    body: parsed.body,
+                    plaintextBody: parsed.plaintext_body,
+                    htmlBody: parsed.html_body,
                     cc: parsed.cc,
                     bcc: parsed.bcc,
                     threadId: parsed.thread_id,
@@ -117,6 +134,12 @@ export function draftEmailTool(server, clientFactory) {
                 }
                 responseText += `\n\n**To:** ${parsed.to}`;
                 responseText += `\n**Subject:** ${parsed.subject}`;
+                const format = parsed.plaintext_body && parsed.html_body
+                    ? 'Multipart (plain text + HTML)'
+                    : parsed.html_body
+                        ? 'HTML'
+                        : 'Plain text';
+                responseText += `\n**Format:** ${format}`;
                 if (parsed.cc) {
                     responseText += `\n**CC:** ${parsed.cc}`;
                 }

package/shared/tools/send-email.d.ts

@@ -4,43 +4,48 @@ import type { ClientFactory } from '../server.js';
 export declare const SendEmailSchema: z.ZodEffects<z.ZodObject<{
     to: z.ZodOptional<z.ZodString>;
     subject: z.ZodOptional<z.ZodString>;
-    body: z.ZodOptional<z.ZodString>;
+    plaintext_body: z.ZodOptional<z.ZodString>;
+    html_body: z.ZodOptional<z.ZodString>;
     cc: z.ZodOptional<z.ZodString>;
     bcc: z.ZodOptional<z.ZodString>;
     thread_id: z.ZodOptional<z.ZodString>;
     reply_to_email_id: z.ZodOptional<z.ZodString>;
     from_draft_id: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    body?: string | undefined;
     to?: string | undefined;
     subject?: string | undefined;
+    plaintext_body?: string | undefined;
+    html_body?: string | undefined;
     cc?: string | undefined;
     bcc?: string | undefined;
     thread_id?: string | undefined;
     reply_to_email_id?: string | undefined;
     from_draft_id?: string | undefined;
 }, {
-    body?: string | undefined;
     to?: string | undefined;
     subject?: string | undefined;
+    plaintext_body?: string | undefined;
+    html_body?: string | undefined;
     cc?: string | undefined;
     bcc?: string | undefined;
     thread_id?: string | undefined;
     reply_to_email_id?: string | undefined;
     from_draft_id?: string | undefined;
 }>, {
-    body?: string | undefined;
     to?: string | undefined;
     subject?: string | undefined;
+    plaintext_body?: string | undefined;
+    html_body?: string | undefined;
     cc?: string | undefined;
     bcc?: string | undefined;
     thread_id?: string | undefined;
     reply_to_email_id?: string | undefined;
     from_draft_id?: string | undefined;
 }, {
-    body?: string | undefined;
     to?: string | undefined;
     subject?: string | undefined;
+    plaintext_body?: string | undefined;
+    html_body?: string | undefined;
     cc?: string | undefined;
     bcc?: string | undefined;
     thread_id?: string | undefined;
@@ -61,9 +66,13 @@ export declare function sendEmailTool(server: Server, clientFactory: ClientFacto
                 type: string;
                 description: "Subject line of the email.";
             };
-            body: {
+            plaintext_body: {
                 type: string;
-                description: "Plain text body content of the email.";
+                description: "Plain text body content of the email. At least one of plaintext_body or html_body must be provided (unless sending a draft). If both are provided, a multipart email is sent with both versions.";
+            };
+            html_body: {
+                type: string;
+                description: "HTML body content of the email for rich text formatting (links, bold, lists, etc.). At least one of plaintext_body or html_body must be provided (unless sending a draft). If both are provided, a multipart email is sent with both versions.";
             };
             cc: {
                 type: string;

package/shared/tools/send-email.js

@@ -3,7 +3,8 @@ import { getHeader } from '../utils/email-helpers.js';
 const PARAM_DESCRIPTIONS = {
     to: 'Recipient email address(es). For multiple recipients, separate with commas.',
     subject: 'Subject line of the email.',
-    body: 'Plain text body content of the email.',
+    plaintext_body: 'Plain text body content of the email. At least one of plaintext_body or html_body must be provided (unless sending a draft). If both are provided, a multipart email is sent with both versions.',
+    html_body: 'HTML body content of the email for rich text formatting (links, bold, lists, etc.). At least one of plaintext_body or html_body must be provided (unless sending a draft). If both are provided, a multipart email is sent with both versions.',
     cc: 'CC recipient email address(es). For multiple, separate with commas.',
     bcc: 'BCC recipient email address(es). For multiple, separate with commas.',
     thread_id: 'Thread ID to add this email to an existing conversation. ' +
@@ -11,13 +12,14 @@ const PARAM_DESCRIPTIONS = {
     reply_to_email_id: 'Email ID to reply to. If provided, the email will be formatted as a reply ' +
         'with proper In-Reply-To and References headers. Also requires thread_id.',
     from_draft_id: 'Draft ID to send. If provided, sends the specified draft instead of composing a new email. ' +
-        'When using this, other parameters (to, subject, body, etc.) are ignored.',
+        'When using this, other parameters (to, subject, plaintext_body, etc.) are ignored.',
 };
 export const SendEmailSchema = z
     .object({
     to: z.string().optional().describe(PARAM_DESCRIPTIONS.to),
     subject: z.string().optional().describe(PARAM_DESCRIPTIONS.subject),
-    body: z.string().optional().describe(PARAM_DESCRIPTIONS.body),
+    plaintext_body: z.string().min(1).optional().describe(PARAM_DESCRIPTIONS.plaintext_body),
+    html_body: z.string().min(1).optional().describe(PARAM_DESCRIPTIONS.html_body),
     cc: z.string().optional().describe(PARAM_DESCRIPTIONS.cc),
     bcc: z.string().optional().describe(PARAM_DESCRIPTIONS.bcc),
     thread_id: z.string().optional().describe(PARAM_DESCRIPTIONS.thread_id),
@@ -25,20 +27,21 @@ export const SendEmailSchema = z
     from_draft_id: z.string().optional().describe(PARAM_DESCRIPTIONS.from_draft_id),
 })
     .refine((data) => {
-    // Either from_draft_id is provided, OR to, subject, and body are all provided
+    // Either from_draft_id is provided, OR to, subject, and one of plaintext_body/html_body are all provided
     if (data.from_draft_id) {
         return true;
     }
-    return data.to && data.subject && data.body;
+    return data.to && data.subject && (data.plaintext_body || data.html_body);
 }, {
-    message: 'Either provide from_draft_id to send a draft, or provide to, subject, and body to send a new email.',
+    message: 'Either provide from_draft_id to send a draft, or provide to, subject, and at least one of plaintext_body or html_body to send a new email.',
 });
 const TOOL_DESCRIPTION = `Send an email immediately or send a previously created draft.
 
 **Option 1: Send a new email**
 - to: Recipient email address(es) (required)
 - subject: Email subject line (required)
-- body: Plain text body content (required)
+- plaintext_body: Plain text body content (at least one of plaintext_body or html_body required)
+- html_body: HTML body content for rich text formatting (at least one of plaintext_body or html_body required)
 - cc: CC recipients (optional)
 - bcc: BCC recipients (optional)
 - thread_id: Thread ID to reply to an existing conversation (optional)
@@ -47,6 +50,9 @@ const TOOL_DESCRIPTION = `Send an email immediately or send a previously created
 **Option 2: Send a draft**
 - from_draft_id: ID of the draft to send (all other parameters are ignored)
 
+**Body content:**
+At least one of plaintext_body or html_body must be provided. If both are provided, a multipart email is sent with both plain text and HTML versions. Use html_body for rich formatting like hyperlinks, bold text, or lists.
+
 **Sending a reply:**
 To send a reply to an existing email:
 1. Get the thread_id and email_id from get_email_conversation
@@ -73,9 +79,13 @@ export function sendEmailTool(server, clientFactory) {
                     type: 'string',
                     description: PARAM_DESCRIPTIONS.subject,
                 },
-                body: {
+                plaintext_body: {
+                    type: 'string',
+                    description: PARAM_DESCRIPTIONS.plaintext_body,
+                },
+                html_body: {
                     type: 'string',
-                    description: PARAM_DESCRIPTIONS.body,
+                    description: PARAM_DESCRIPTIONS.html_body,
                 },
                 cc: {
                     type: 'string',
@@ -120,7 +130,6 @@ export function sendEmailTool(server, clientFactory) {
                 // TypeScript knows these are defined due to the refine check
                 const to = parsed.to;
                 const subject = parsed.subject;
-                const body = parsed.body;
                 let inReplyTo;
                 let references;
                 // If replying to an email, get the Message-ID for proper threading
@@ -140,7 +149,8 @@ export function sendEmailTool(server, clientFactory) {
                 const sentEmail = await client.sendMessage({
                     to,
                     subject,
-                    body,
+                    plaintextBody: parsed.plaintext_body,
+                    htmlBody: parsed.html_body,
                     cc: parsed.cc,
                     bcc: parsed.bcc,
                     threadId: parsed.thread_id,
@@ -153,6 +163,12 @@ export function sendEmailTool(server, clientFactory) {
                 }
                 responseText += `\n\n**To:** ${to}`;
                 responseText += `\n**Subject:** ${subject}`;
+                const format = parsed.plaintext_body && parsed.html_body
+                    ? 'Multipart (plain text + HTML)'
+                    : parsed.html_body
+                        ? 'HTML'
+                        : 'Plain text';
+                responseText += `\n**Format:** ${format}`;
                 if (parsed.cc) {
                     responseText += `\n**CC:** ${parsed.cc}`;
                 }