icloud-mcp 2.5.0 → 2.5.1

package/index.js

@@ -88,7 +88,7 @@ function resolveMailbox(name, creds) {
 
 async function main() {
   const server = new Server(
-    { name: 'icloud-mail', version: '2.5.0' },
+    { name: 'icloud-mail', version: '2.5.1' },
     { capabilities: { tools: {} } }
   );
 
@@ -728,7 +728,10 @@ async function main() {
             body: { type: 'string', description: 'Plain text body (used as fallback when html is also provided)' },
             html: { type: 'string', description: 'HTML body. If provided without body, plain text is auto-generated. If provided with body, saves multipart/alternative.' },
             cc: { type: 'string', description: 'CC recipient(s)' },
-            bcc: { type: 'string', description: 'BCC recipient(s)' }
+            bcc: { type: 'string', description: 'BCC recipient(s)' },
+            inReplyTo: { type: 'string', description: 'Message-ID of the email being replied to — sets In-Reply-To header for threading' },
+            references: { type: 'string', description: 'Space-separated Message-IDs for the References header — enables full thread linking' },
+            account: { type: 'string', description: 'Account whose Drafts folder to save into (e.g. "umd", "personal", "alt"). Defaults to iCloud.' }
           },
           required: ['to', 'subject']
         }
@@ -1147,7 +1150,7 @@ async function main() {
       } else if (name === 'save_draft') {
         const creds = resolveCreds(args.account);
         result = await withTimeout('save_draft', TIMEOUT.FETCH, () =>
-          saveDraft(args.to, args.subject, args.body, { html: args.html, cc: args.cc, bcc: args.bcc }, creds)
+          saveDraft(args.to, args.subject, args.body, { html: args.html, cc: args.cc, bcc: args.bcc, inReplyTo: args.inReplyTo, references: args.references }, creds)
         );
       // ── CardDAV / Contacts (FETCH tier 30s) ──
       } else if (name === 'list_contacts') {
@@ -1219,6 +1222,7 @@ async function main() {
       }
       return { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] };
     } catch (error) {
+      process.stderr.write(`[tool-error] ${name}: ${error.responseText ?? error.message}\n`);
       return { content: [{ type: 'text', text: `Error: ${friendlyError(error)}` }], isError: true };
     }
   });

package/lib/smtp.js

@@ -178,8 +178,12 @@ export async function saveDraft(to, subject, body, opts = {}, creds = null) {
 
   const mailOptions = { from: user, to: normalizeAddresses(to), subject };
   applyBody(mailOptions, body, opts.html);
-  if (opts.cc)  mailOptions.cc  = normalizeAddresses(opts.cc);
-  if (opts.bcc) mailOptions.bcc = normalizeAddresses(opts.bcc);
+  if (opts.cc)        mailOptions.cc        = normalizeAddresses(opts.cc);
+  if (opts.bcc)       mailOptions.bcc       = normalizeAddresses(opts.bcc);
+  if (opts.inReplyTo) mailOptions.inReplyTo = opts.inReplyTo;
+  if (opts.references) mailOptions.references = Array.isArray(opts.references)
+    ? opts.references.join(' ')
+    : opts.references;
 
   // Use nodemailer stream transport to produce raw MIME bytes without sending
   const streamTransport = nodemailer.createTransport({ streamTransport: true, buffer: true });
@@ -204,7 +208,8 @@ export async function saveDraft(to, subject, body, opts = {}, creds = null) {
     await client.append(draftMailbox, rawMessage, ['\\Draft', '\\Seen']);
   } catch (err) {
     // Folder might have a different name — scan the list for the \Drafts attribute
-    if (err.message?.includes('NONEXISTENT') || err.message?.includes('does not exist') || err.message?.includes('NO ')) {
+    const r = err.responseText ?? err.message ?? '';
+    if (r.includes('NONEXISTENT') || r.includes('does not exist') || r.includes("doesn't exist") || r.includes('TRYCREATE') || r.includes('NO ') || r.includes('Failure')) {
       const mailboxes = await client.list();
       const draftMb = mailboxes.find(mb => mb.flags?.has('\\Drafts'));
       draftMailbox = draftMb?.path ?? 'Drafts';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "icloud-mcp",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "A Model Context Protocol (MCP) server for iCloud Mail",
   "main": "index.js",
   "bin": {