hypermail-mcp 0.7.14 → 0.7.16

package/dist/cli.js

@@ -15127,6 +15127,7 @@ var ImapClient = class {
   imap = null;
   transporter = null;
   connecting = null;
+  imapQueue = Promise.resolve();
   /** Get (or create) the ImapFlow instance. */
   async getImap() {
     if (this.imap) return this.imap;
@@ -15164,18 +15165,31 @@ var ImapClient = class {
     });
     return this.transporter;
   }
+  /** Run an IMAP operation serially on this account's shared connection. */
+  async run(fn) {
+    const run = this.imapQueue.catch(() => void 0).then(async () => {
+      const imap = await this.getImap();
+      return fn(imap);
+    });
+    this.imapQueue = run.then(
+      () => void 0,
+      () => void 0
+    );
+    return run;
+  }
   /**
    * Acquire a mailbox lock and run `fn` with the mailbox selected.
    * Releases the lock automatically after `fn` completes.
    */
   async withMailbox(mailbox, fn) {
-    const imap = await this.getImap();
-    const lock = await imap.getMailboxLock(mailbox);
-    try {
-      return await fn(imap);
-    } finally {
-      lock.release();
-    }
+    return this.run(async (imap) => {
+      const lock = await imap.getMailboxLock(mailbox);
+      try {
+        return await fn(imap);
+      } finally {
+        lock.release();
+      }
+    });
   }
   /** Disconnect IMAP and close the SMTP pool. */
   async disconnect() {
@@ -15250,6 +15264,17 @@ function resolveTrashMailbox(mailboxes) {
   }
   return "Trash";
 }
+function resolveDraftMailbox(mailboxes) {
+  for (const mailbox of mailboxes) {
+    const specialUse = mailbox.specialUse?.toLowerCase();
+    if (specialUse === "\\drafts") return mailbox.path;
+    const flags = mailbox.flags ? Array.from(mailbox.flags) : [];
+    if (flags.some((flag) => flag.toLowerCase() === "\\drafts")) {
+      return mailbox.path;
+    }
+  }
+  return "Drafts";
+}
 function clampLimit2(v, dflt, max) {
   if (!v || v <= 0) return dflt;
   return Math.min(v, max);
@@ -15473,10 +15498,11 @@ async function readAttachment2(clients, account, messageId, attachmentId) {
 }
 async function listFolders2(clients, account, opts) {
   const client = clients.get(account);
-  const imap = await client.getImap();
-  const mailboxes = await imap.list({
-    statusQuery: { messages: true, unseen: true, uidNext: true }
-  });
+  const mailboxes = await client.run(
+    (imap) => imap.list({
+      statusQuery: { messages: true, unseen: true, uidNext: true }
+    })
+  );
   let results = mailboxes.map(mapMailboxToListEntry);
   if (opts.parentFolderId) {
     const parentPath = opts.parentFolderId;
@@ -15615,59 +15641,11 @@ function removeMimePart(source, targetFilename, targetContentType) {
 async function sendEmail(clients, account, msg) {
   const client = clients.get(account);
   const transporter = client.getTransporter();
-  const mailOptions = {
-    from: `${account.displayName ?? ""} <${account.email}>`,
-    to: msg.to.map((a) => a.name ? `"${a.name}" <${a.address}>` : a.address).join(", "),
-    subject: msg.subject
-  };
-  if (msg.isHtml) {
-    mailOptions.html = msg.body;
-  } else {
-    mailOptions.text = msg.body;
-  }
-  mailOptions.attachDataUrls = true;
-  if (msg.cc && msg.cc.length > 0) {
-    mailOptions.cc = msg.cc.map((a) => a.name ? `"${a.name}" <${a.address}>` : a.address).join(", ");
-  }
-  if (msg.bcc && msg.bcc.length > 0) {
-    mailOptions.bcc = msg.bcc.map((a) => a.name ? `"${a.name}" <${a.address}>` : a.address).join(", ");
-  }
-  if (msg.inReplyTo || msg.forwardMessageId) {
-    const refId = msg.inReplyTo ?? msg.forwardMessageId;
-    if (refId) {
-      try {
-        const { folder: refFolder, uid: refUid } = decodeId(refId);
-        const refMsg = await client.withMailbox(refFolder, async (imap) => {
-          return imap.fetchOne(
-            refUid,
-            { envelope: true, source: true },
-            { uid: true }
-          );
-        });
-        if (refMsg?.envelope) {
-          const env = refMsg.envelope;
-          if (msg.inReplyTo && env.messageId && !msg.forwardMessageId) {
-            mailOptions.inReplyTo = env.messageId;
-            mailOptions.references = env.messageId;
-          }
-        }
-        if (msg.forwardMessageId && refMsg?.source) {
-          const sourceStr = typeof refMsg.source === "string" ? refMsg.source : Buffer.from(refMsg.source).toString("utf-8");
-          const divider = '\n\n<div style="line-height:12px"><br></div>\n\n<div style="border-left:2px solid #ccc; padding-left:8px; margin-left:0; color:#666">\n---------- Forwarded message ---------<br>' + sourceStr + "\n</div>";
-          if (mailOptions.html) {
-            mailOptions.html += divider;
-          } else if (mailOptions.text) {
-            mailOptions.text += "\n\n---------- Forwarded message ---------\n" + sourceStr;
-          }
-        }
-      } catch {
-      }
-    }
-  }
+  const mailOptions = await buildMailOptions(client, account, msg);
   const info = await transporter.sendMail(mailOptions);
   try {
-    const rawMsg = await buildRawMessage(account, msg, info.messageId);
-    await client.withMailbox("Sent", async (imap) => {
+    const rawMsg = await buildRawMessage(client, account, msg, info.messageId);
+    await client.run(async (imap) => {
       await imap.append("Sent", rawMsg, ["\\Seen"]);
     });
   } catch {
@@ -15676,48 +15654,58 @@ async function sendEmail(clients, account, msg) {
 }
 async function saveDraft(clients, account, msg) {
   const client = clients.get(account);
-  const rawMsg = await buildRawMessage(account, msg);
-  return client.withMailbox("Drafts", async (imap) => {
-    const result = await imap.append("Drafts", rawMsg, ["\\Draft"]);
-    return { id: encodeId("Drafts", result.uid) };
-  });
+  const rawMsg = await buildRawMessage(client, account, msg);
+  let folder = "Drafts";
+  try {
+    const result = await client.run(async (imap) => {
+      folder = resolveDraftMailbox(await imap.list());
+      return appendDraft(imap, folder, rawMsg);
+    });
+    return { id: encodeId(folder, appendUid(result, folder)) };
+  } catch (err) {
+    throw imapOperationError(`failed to save IMAP draft to ${folder}`, err);
+  }
 }
 async function updateDraft2(clients, account, id, update) {
   const client = clients.get(account);
   const { folder, uid } = decodeId(id);
-  return client.withMailbox(folder, async (imap) => {
-    const existing = await imap.fetchOne(
-      uid,
-      { source: true, envelope: true },
-      { uid: true }
-    );
-    if (!existing?.source) {
-      throw new Error(`draft not found: ${id}`);
-    }
-    const origSubject = existing.envelope ? existing.envelope.subject ?? "" : "";
-    const updatedMsg = {
-      from: `${account.displayName ?? ""} <${account.email}>`,
-      subject: update.subject ?? origSubject,
-      attachDataUrls: true
-    };
-    if (update.body !== void 0) {
-      if (update.isHtml) {
-        updatedMsg.html = update.body;
-      } else {
-        updatedMsg.text = update.body;
+  try {
+    return await client.withMailbox(folder, async (imap) => {
+      const existing = await imap.fetchOne(
+        uid,
+        { source: true, envelope: true },
+        { uid: true }
+      );
+      if (!existing?.source) {
+        throw new Error(`draft not found: ${id}`);
+      }
+      const origSubject = existing.envelope ? existing.envelope.subject ?? "" : "";
+      const updatedMsg = {
+        from: `${account.displayName ?? ""} <${account.email}>`,
+        subject: update.subject ?? origSubject,
+        attachDataUrls: true
+      };
+      if (update.body !== void 0) {
+        if (update.isHtml) {
+          updatedMsg.html = update.body;
+        } else {
+          updatedMsg.text = update.body;
+        }
       }
-    }
-    const raw = await new Promise((resolve, reject) => {
-      const mc = new MailComposer(updatedMsg);
-      mc.compile().build((err, buf) => {
-        if (err) reject(err);
-        else resolve(buf);
+      const raw = await new Promise((resolve, reject) => {
+        const mc = new MailComposer(updatedMsg);
+        mc.compile().build((err, buf) => {
+          if (err) reject(err);
+          else resolve(buf);
+        });
       });
+      const result = await appendDraft(imap, folder, raw.toString("utf-8"));
+      await imap.messageDelete(uid, { uid: true });
+      return { id: encodeId(folder, appendUid(result, folder)) };
     });
-    await imap.messageDelete(uid, { uid: true });
-    const result = await imap.append(folder, raw, ["\\Draft"]);
-    return { id: encodeId(folder, result.uid) };
-  });
+  } catch (err) {
+    throw imapOperationError(`failed to update IMAP draft ${id}`, err);
+  }
 }
 async function moveEmail2(clients, account, id, destinationId) {
   if (isTrashFolderAlias(destinationId)) {
@@ -15733,9 +15721,8 @@ async function moveEmail2(clients, account, id, destinationId) {
 async function trashEmail(clients, account, id) {
   const client = clients.get(account);
   const { folder, uid } = decodeId(id);
-  const imap = await client.getImap();
-  const dest = resolveTrashMailbox(
-    await imap.list()
+  const dest = await client.run(
+    async (imap) => resolveTrashMailbox(await imap.list())
   );
   return client.withMailbox(folder, async (lockedImap) => {
     await lockedImap.messageMove(uid, dest, { uid: true });
@@ -15766,43 +15753,47 @@ async function sendDraft2(clients, account, id) {
 async function addAttachmentToDraft2(clients, account, draftId, name, contentBytes, contentType) {
   const client = clients.get(account);
   const { folder, uid } = decodeId(draftId);
-  return client.withMailbox(folder, async (imap) => {
-    const existing = await imap.fetchOne(
-      uid,
-      { source: true },
-      { uid: true }
-    );
-    if (!existing?.source) {
-      throw new Error(`draft not found: ${draftId}`);
-    }
-    const sourceStr = typeof existing.source === "string" ? existing.source : Buffer.from(existing.source).toString("utf-8");
-    const built = await new Promise((resolve, reject) => {
-      const mc = new MailComposer({
-        raw: sourceStr,
-        attachments: [
-          {
-            filename: name,
-            content: Buffer.from(contentBytes, "base64"),
-            contentType: contentType ?? "application/octet-stream"
-          }
-        ]
-      });
-      mc.compile().build((err, buf) => {
-        if (err) reject(err);
-        else resolve(buf);
+  try {
+    return await client.withMailbox(folder, async (imap) => {
+      const existing = await imap.fetchOne(
+        uid,
+        { source: true },
+        { uid: true }
+      );
+      if (!existing?.source) {
+        throw new Error(`draft not found: ${draftId}`);
+      }
+      const sourceStr = typeof existing.source === "string" ? existing.source : Buffer.from(existing.source).toString("utf-8");
+      const built = await new Promise((resolve, reject) => {
+        const mc = new MailComposer({
+          raw: sourceStr,
+          attachments: [
+            {
+              filename: name,
+              content: Buffer.from(contentBytes, "base64"),
+              contentType: contentType ?? "application/octet-stream"
+            }
+          ]
+        });
+        mc.compile().build((err, buf) => {
+          if (err) reject(err);
+          else resolve(buf);
+        });
       });
+      const result = await appendDraft(imap, folder, built.toString("utf-8"));
+      await imap.messageDelete(uid, { uid: true });
+      return {
+        id: encodeId(folder, appendUid(result, folder)),
+        attachment: {
+          id: randomUUID3(),
+          name,
+          contentType: contentType ?? "application/octet-stream"
+        }
+      };
     });
-    await imap.messageDelete(uid, { uid: true });
-    const result = await imap.append(folder, built, ["\\Draft"]);
-    return {
-      id: encodeId(folder, result.uid),
-      attachment: {
-        id: randomUUID3(),
-        name,
-        contentType: contentType ?? "application/octet-stream"
-      }
-    };
-  });
+  } catch (err) {
+    throw imapOperationError(`failed to add attachment to IMAP draft ${draftId}`, err);
+  }
 }
 async function removeAttachmentFromDraft2(clients, account, draftId, attachmentId) {
   const client = clients.get(account);
@@ -15837,7 +15828,7 @@ async function markRead2(clients, account, id, isRead) {
     }
   });
 }
-async function buildRawMessage(account, msg, messageId) {
+async function buildMailOptions(client, account, msg, messageId) {
   const mailOptions = {
     from: `${account.displayName ?? ""} <${account.email}>`,
     to: msg.to.map((a) => a.name ? `"${a.name}" <${a.address}>` : a.address).join(", "),
@@ -15856,16 +15847,55 @@ async function buildRawMessage(account, msg, messageId) {
     mailOptions.bcc = msg.bcc.map((a) => a.name ? `"${a.name}" <${a.address}>` : a.address).join(", ");
   }
   if (msg.attachments && msg.attachments.length > 0) {
-    const fileAttachments = msg.attachments.map((att) => ({
+    mailOptions.attachments = msg.attachments.map((att) => ({
       filename: att.name,
       content: Buffer.from(att.contentBytes, "base64"),
       contentType: att.contentType
     }));
-    mailOptions.attachments = fileAttachments;
   }
   if (messageId) {
     mailOptions.messageId = messageId;
   }
+  await applyReferenceMessage(client, mailOptions, msg);
+  return mailOptions;
+}
+async function applyReferenceMessage(client, mailOptions, msg) {
+  if (!msg.inReplyTo && !msg.forwardMessageId) return;
+  const refId = msg.inReplyTo || msg.forwardMessageId;
+  if (!refId) return;
+  try {
+    const { folder: refFolder, uid: refUid } = decodeId(refId);
+    const refMsg = await client.withMailbox(refFolder, async (imap) => {
+      return imap.fetchOne(
+        refUid,
+        { envelope: true, source: true },
+        { uid: true }
+      );
+    });
+    if (refMsg?.envelope) {
+      const env = refMsg.envelope;
+      if (msg.inReplyTo && env.messageId && !msg.forwardMessageId) {
+        mailOptions.inReplyTo = env.messageId;
+        mailOptions.references = env.messageId;
+      }
+    }
+    if (msg.forwardMessageId && refMsg?.source) {
+      const sourceStr = typeof refMsg.source === "string" ? refMsg.source : Buffer.from(refMsg.source).toString("utf-8");
+      const divider = '\n\n<div style="line-height:12px"><br></div>\n\n<div style="border-left:2px solid #ccc; padding-left:8px; margin-left:0; color:#666">\n---------- Forwarded message ---------<br>' + sourceStr + "\n</div>";
+      if (mailOptions.html) {
+        mailOptions.html = `${mailOptions.html}${divider}`;
+      } else if (mailOptions.text) {
+        mailOptions.text = `${mailOptions.text}
+
+---------- Forwarded message ---------
+${sourceStr}`;
+      }
+    }
+  } catch {
+  }
+}
+async function buildRawMessage(client, account, msg, messageId) {
+  const mailOptions = await buildMailOptions(client, account, msg, messageId);
   return new Promise((resolve, reject) => {
     const mc = new MailComposer(mailOptions);
     mc.compile().build((err, buf) => {
@@ -15874,6 +15904,48 @@ async function buildRawMessage(account, msg, messageId) {
     });
   });
 }
+async function appendDraft(imap, folder, rawMsg) {
+  try {
+    return await imap.append(folder, rawMsg, ["\\Draft"]);
+  } catch (err) {
+    if (!isImapCommandFailure(err)) throw err;
+    return imap.append(folder, rawMsg);
+  }
+}
+function appendUid(result, folder) {
+  if (!result || typeof result !== "object") {
+    throw new Error(`IMAP append to ${folder} did not return a UID`);
+  }
+  const uid = Number(result.uid);
+  if (Number.isFinite(uid) && uid > 0) return uid;
+  throw new Error(`IMAP append to ${folder} did not return a UID`);
+}
+function isImapCommandFailure(err) {
+  const e = err;
+  return typeof e.responseStatus === "string" || typeof e.message === "string" && e.message.includes("Command failed");
+}
+function imapOperationError(message, err) {
+  const detail = formatImapError(err);
+  return new Error(`${message}: ${detail}`, { cause: err });
+}
+function formatImapError(err) {
+  const e = err;
+  const parts = [];
+  const message = err instanceof Error ? err.message : String(err);
+  if (message) parts.push(message);
+  for (const key of ["responseStatus", "responseText", "serverResponseCode", "response"]) {
+    const value = e[key];
+    if (value !== void 0 && value !== null) {
+      parts.push(`${key}=${safeErrorValue(value)}`);
+    }
+  }
+  return parts.join("; ");
+}
+function safeErrorValue(value) {
+  const raw = typeof value === "string" ? value : JSON.stringify(value);
+  const text = raw ?? String(value);
+  return text.length > 500 ? `${text.slice(0, 500)}\u2026` : text;
+}
 
 // src/providers/imap/folders.ts
 async function createFolder2(clients, account, input) {
@@ -17190,11 +17262,29 @@ var accountFullOutputSchema = z2.object({
   email: z2.string(),
   provider: providerIdEnum,
   displayName: z2.string().optional(),
-  tokens: z2.record(z2.string(), z2.unknown()),
   addedAt: z2.string(),
   signature: z2.string().optional(),
   style: styleOutputSchema.optional()
 });
+function publicAccount(account) {
+  return {
+    email: account.email,
+    provider: account.provider,
+    displayName: account.displayName,
+    addedAt: account.addedAt,
+    signature: account.signature,
+    style: account.style
+  };
+}
+function publicAccountResult(result) {
+  if (typeof result !== "object" || result === null) {
+    return { result };
+  }
+  const record2 = result;
+  const account = record2.account;
+  if (!account) return record2;
+  return { ...record2, account: publicAccount(account) };
+}
 var emailSummaryOutputSchema = z2.object({
   id: z2.string(),
   subject: z2.string(),
@@ -17220,8 +17310,17 @@ var folderInfoOutputSchema = z2.object({
   totalItemCount: z2.number(),
   unreadItemCount: z2.number()
 });
+var meaningfulHtmlTagRe = /<\/?(?:p|div|br|blockquote|table|thead|tbody|tfoot|tr|td|th|ul|ol|li|a|span|font|b|strong|em|i|u|img|hr|pre|h[1-6])\b/i;
+function isSuspiciousPlainTextHtml(body) {
+  return body.trim() !== "" && /\r\n|\r|\n/.test(body) && !meaningfulHtmlTagRe.test(body);
+}
 function composeBody(input) {
   const { body, format, signature, style, includeSignature } = input;
+  if (format === "html" && isSuspiciousPlainTextHtml(body)) {
+    throw new Error(
+      'format: "html" requires valid HTML for multiline bodies. Use format: "markdown" for plain text with paragraphs, or add HTML tags such as <p> or <br>.'
+    );
+  }
   const htmlBody = format === "markdown" ? markdownToHtml(body) : body;
   const hasSignature = includeSignature && !!signature;
   const hasStyle = !!(style && (style.fontFamily || style.fontSize || style.fontColor));
@@ -17332,7 +17431,8 @@ function registerAccountTools(server, ctx) {
             email: args.email,
             config: args.config
           });
-          return ok(res, res);
+          const data = publicAccountResult(res);
+          return ok(data, data);
         } catch (err) {
           return fail(errMsg(err));
         }
@@ -17377,7 +17477,8 @@ function registerAccountTools(server, ctx) {
             code: args.code,
             state: args.state
           });
-          return ok(res, res);
+          const data = publicAccountResult(res);
+          return ok(data, data);
         } catch (err) {
           return fail(errMsg(err));
         }
@@ -18377,7 +18478,7 @@ var sendEmailSchema = z8.object({
   subject: z8.string(),
   body: z8.string(),
   format: z8.enum(["html", "markdown"]).describe(
-    "Body format. 'html' sends the body as-is (must be valid HTML). 'markdown' converts the body from Markdown to HTML for clean rendering on the recipient side."
+    "Body format. 'html' sends the body as-is (must be valid HTML); multiline plain text with format='html' is rejected, so use 'markdown' for paragraphs or add tags like <p>/<br>. 'markdown' converts the body from Markdown to HTML for clean rendering on the recipient side."
   ),
   include_signature: z8.boolean().describe(
     "Whether to append the account's saved HTML signature to the email. If true, don't include a signature in the body param to avoid double signature. Returns an error if true but no signature is configured for this account."
@@ -18417,7 +18518,7 @@ var editDraftSchema = z8.object({
     "Deprecated alias for `new_text`. Body-only full replacement is not supported; provide `old_text` with this field."
   ),
   format: z8.enum(["html", "markdown"]).optional().describe(
-    "Replacement format. Only meaningful when `new_text` or deprecated `body` is also provided. 'html' inserts the replacement as-is (must be valid HTML). 'markdown' converts the replacement from Markdown to HTML."
+    "Replacement format. Only meaningful when `new_text` or deprecated `body` is also provided. 'html' inserts the replacement as-is (must be valid HTML); multiline plain text with format='html' is rejected, so use 'markdown' for paragraphs or add tags like <p>/<br>. 'markdown' converts the replacement from Markdown to HTML."
   ),
   include_signature: z8.boolean().optional().describe(
     "Whether to append the account's saved HTML signature to the replacement section. If true, don't include a signature in `new_text`/`body`. Only meaningful when replacement content is provided. Returns an error if true but no signature is configured for this account."
@@ -18435,10 +18536,21 @@ var editDraftSchema = z8.object({
 
 // src/tools/compose.ts
 function registerComposeTools(server, ctx) {
-  const { store, registry, tools } = ctx;
+  const { store, registry, tools, logger } = ctx;
   async function handleSendOrDraft(args, action, resultKey, toolName) {
     try {
       const { provider, account } = registry.resolveByEmail(args.account);
+      logger?.debug("compose", "start", {
+        tool: toolName,
+        account: account.email,
+        provider: provider.id,
+        toCount: args.to.length,
+        ccCount: args.cc?.length ?? 0,
+        bccCount: args.bcc?.length ?? 0,
+        hasReply: !!args.inReplyTo,
+        hasForward: !!args.forwardMessageId,
+        attachmentCount: args.attachments?.length ?? 0
+      });
       if (args.include_signature && !account.signature) {
         return fail(
           "include_signature is true but no signature is configured for this account. Set up a signature first with set_account_settings."
@@ -18451,6 +18563,14 @@ function registerComposeTools(server, ctx) {
         style: account.style,
         includeSignature: args.include_signature
       });
+      logger?.debug("compose", "composed", {
+        tool: toolName,
+        account: account.email,
+        provider: provider.id,
+        format: args.format,
+        isHtml: composed.isHtml,
+        includeSignature: args.include_signature
+      });
       if (args.inReplyTo && args.forwardMessageId) {
         return fail(
           "inReplyTo and forwardMessageId are mutually exclusive \u2014 use one or the other"
@@ -18468,6 +18588,12 @@ function registerComposeTools(server, ctx) {
           };
         });
       }
+      logger?.debug("compose", "attachmentsProcessed", {
+        tool: toolName,
+        account: account.email,
+        provider: provider.id,
+        attachmentCount: processedAttachments?.length ?? 0
+      });
       const res = await action(provider, account, {
         to: args.to,
         cc: args.cc,
@@ -18480,13 +18606,42 @@ function registerComposeTools(server, ctx) {
         forwardMessageId: args.forwardMessageId,
         attachments: processedAttachments
       });
+      logger?.debug("compose", "providerActionSuccess", {
+        tool: toolName,
+        account: account.email,
+        provider: provider.id,
+        hasId: !!res.id
+      });
       const result = { [resultKey]: true, ...res };
       if (toolName === "draft_email" && res.id) {
-        const draft = await provider.readEmail(account, res.id);
-        result.draftHtml = draft.bodyHtml;
+        try {
+          const draft = await provider.readEmail(account, res.id);
+          result.draftHtml = draft.bodyHtml;
+          logger?.debug("compose", "draftReadbackSuccess", {
+            tool: toolName,
+            account: account.email,
+            provider: provider.id,
+            hasDraftHtml: draft.bodyHtml !== void 0
+          });
+        } catch (readErr) {
+          const message = errMsg(readErr);
+          result.warning = "Draft was created, but reading it back for draftHtml failed. Use read_email with the returned id to inspect it, or continue with send_draft if appropriate.";
+          result.draftReadbackError = message;
+          logger?.debug("compose", "draftReadbackError", {
+            tool: toolName,
+            account: account.email,
+            provider: provider.id,
+            message
+          });
+        }
       }
       return ok(result, result);
     } catch (err) {
+      logger?.debug("compose", "error", {
+        tool: toolName,
+        account: args.account,
+        message: errMsg(err)
+      });
       return fail(errMsg(err));
     }
   }
@@ -18513,7 +18668,9 @@ function registerComposeTools(server, ctx) {
   const draftEmailOutputSchema = {
     draft: z9.literal(true),
     id: z9.string(),
-    draftHtml: z9.string().optional()
+    draftHtml: z9.string().optional(),
+    warning: z9.string().optional(),
+    draftReadbackError: z9.string().optional()
   };
   if (shouldRegister("draft_email", tools)) {
     server.registerTool(
@@ -18710,13 +18867,13 @@ function registerTools(server, opts) {
   registerBrowseTools(server, { store, registry, tools, logger });
   registerFolderTools(server, { registry, tools });
   registerOrganizeTools(server, { registry, tools });
-  registerComposeTools(server, { store, registry, tools });
+  registerComposeTools(server, { store, registry, tools, logger });
 }
 
 // package.json
 var package_default = {
   name: "hypermail-mcp",
-  version: "0.7.14",
+  version: "0.7.16",
   description: "Unified email MCP server \u2014 operate any inbox (Outlook now, IMAP/Gmail later) by passing an email address.",
   type: "module",
   bin: {
@@ -18726,7 +18883,8 @@ var package_default = {
   files: [
     "dist",
     "README.md",
-    "LICENSE"
+    "LICENSE",
+    "examples"
   ],
   scripts: {
     build: "tsup",
@@ -19122,10 +19280,16 @@ function parseArgs(argv) {
     if (argv.length > 1) {
       throw new Error(`Unknown argument for generate-key: ${argv[1]}`);
     }
-    return { command: "generate-key", help: false, overrides: {} };
+    return {
+      command: "generate-key",
+      help: false,
+      version: false,
+      overrides: {}
+    };
   }
   const out = {
     help: false,
+    version: false,
     overrides: {}
   };
   for (let i = 0; i < argv.length; i++) {
@@ -19156,6 +19320,9 @@ function parseArgs(argv) {
       case "--help":
         out.help = true;
         break;
+      case "--version":
+        out.version = true;
+        break;
       default:
         if (arg.startsWith("-")) {
           throw new Error(`Unknown option: ${arg}`);
@@ -19180,6 +19347,7 @@ Options:
   --port <n>          HTTP port (default: 3000)
   --host <addr>       HTTP bind address (default: 127.0.0.1)
   --data-dir <path>   Where to store the encrypted accounts file
+  --version           Show package version
   -h, --help          Show this help
 
 Configuration:
@@ -19223,6 +19391,11 @@ async function main() {
     process.stdout.write(helpText());
     return;
   }
+  if (opts.version) {
+    process.stdout.write(`${VERSION}
+`);
+    return;
+  }
   const { config, warnings } = loadConfig(opts.overrides);
   for (const warning of warnings) {
     process.stderr.write(`[hypermail-mcp] warning: ${warning}