proton-mail-bridge-client 1.18.4 → 1.18.6

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAQA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAYnE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAA2E,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC/I,OAAO,EAAkB,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,OAAO,KAAK,EAUV,WAAW,EAEX,gBAAgB,EAEjB,MAAM,kBAAkB,CAAC;AAmqD1B,eAAO,MAAM,eAAe,aAyB1B,CAAC;AAuLH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAK3G;AAKD,wBAAgB,0BAA0B,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAI1G;AASD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAa9E;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,WAAW,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAS7F;AA4KD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,WAAW,EACnB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,OAAO,GAChB;IAAE,EAAE,EAAE,MAAM,EAAE,CAAC;IAAC,EAAE,EAAE,MAAM,EAAE,CAAA;CAAE,CAyBhC;AAuuBD,wBAAgB,kBAAkB,IAAI,gBAAgB,CAgGrD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,gBAAgB,EACxB,OAAO,GAAE;IACP,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC1B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsuFP;AAED,wBAAsB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAqD1C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAQA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAYnE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAA2E,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC/I,OAAO,EAAkB,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,OAAO,KAAK,EAUV,WAAW,EAEX,gBAAgB,EAEjB,MAAM,kBAAkB,CAAC;AAoqD1B,eAAO,MAAM,eAAe,aAyB1B,CAAC;AAuLH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAK3G;AAKD,wBAAgB,0BAA0B,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAI1G;AASD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAa9E;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,WAAW,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAS7F;AA4KD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,WAAW,EACnB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,OAAO,GAChB;IAAE,EAAE,EAAE,MAAM,EAAE,CAAC;IAAC,EAAE,EAAE,MAAM,EAAE,CAAA;CAAE,CAyBhC;AAuuBD,wBAAgB,kBAAkB,IAAI,gBAAgB,CAgGrD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,gBAAgB,EACxB,OAAO,GAAE;IACP,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC1B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqwFP;AAED,wBAAsB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAqD1C"}

package/dist/index.js

@@ -342,7 +342,7 @@ const TOOLS = [
     },
     {
         name: "create_forward_draft",
-        description: "Create a forward draft for an existing email, pre-filling the original message as quoted body. Use when you have an emailId and want to stage a forward for review before sending. Prefer forward_email to send immediately without saving. Returns a draftId for later update or send via send_draft.",
+        description: "Create a forward draft for an existing email, pre-filling the original message as quoted body and preserving its attachments. Use when you have an emailId and want to stage a forward for review before sending. Prefer forward_email to send immediately without saving. Returns a draftId for later update or send via send_draft.",
         annotations: { destructiveHint: false },
         inputSchema: {
             type: "object",
@@ -359,6 +359,7 @@ const TOOLS = [
                     description: "Whether to sync the draft to the Proton Drafts mailbox when IMAP is available.",
                     default: true,
                 },
+                includeAttachments: { type: "boolean", description: "Include the original email's attachments in the draft.", default: true },
                 attachments: {
                     type: "array",
                     description: "Attachments with base64 encoded content.",
@@ -468,7 +469,7 @@ const TOOLS = [
     },
     {
         name: "send_draft",
-        description: "Send a previously saved local draft through Proton Bridge SMTP. Use as the final step in a draft-review-send workflow after create_draft and optional update_draft. Marks the draft as sent in the local store but does not delete it. Requires PROTONMAIL_ALLOW_SEND.",
+        description: "Send a previously saved local draft through Proton Bridge SMTP. Use as the final step in a draft-review-send workflow after create_draft and optional update_draft. Marks the draft as sent in the local store but does not delete it. Refuses if this draft has a still-pending scheduled send (from schedule_draft) — cancel that with cancel_send first, otherwise sending now would deliver the draft twice. Requires PROTONMAIL_ALLOW_SEND.",
         annotations: { destructiveHint: true },
         inputSchema: {
             type: "object",
@@ -3400,10 +3401,23 @@ export function createServer(config, options = {}) {
                     const to = parseEmails(requireString(args, "to"));
                     const cc = parseEmails(optionalString(args, "cc"));
                     const bcc = parseEmails(optionalString(args, "bcc"));
-                    const attachments = optionalAttachmentList(args.attachments);
+                    const callerAttachments = optionalAttachmentList(args.attachments) ?? [];
                     ensureValidEmails(to, "to");
                     ensureValidEmails(cc, "cc");
                     ensureValidEmails(bcc, "bcc");
+                    // Same bug fixed earlier this session in forward_email: only the
+                    // caller-supplied `attachments` (new attachments to add) were ever
+                    // used — the original email's own attachments were never fetched,
+                    // regardless of the tool's "preserving attachments" description.
+                    // Found live: forwarding a fixture with one attachment produced a
+                    // draft with zero attachments.
+                    const includeAttachments = normalizeBoolean(args.includeAttachments, true);
+                    const originalAttachments = includeAttachments
+                        ? await Promise.all(detail.attachments
+                            .filter((a) => a.id)
+                            .map((a) => imapService.getAttachmentForForward(detail.id, a.id)))
+                        : [];
+                    const attachments = [...originalAttachments, ...callerAttachments];
                     const result = await withAudit(auditService, name, args, async () => {
                         const draft = await draftStore.createDraft({
                             mode: "forward",
@@ -3555,6 +3569,15 @@ export function createServer(config, options = {}) {
                     ensureDestructiveConfirmed(config.runtime, normalizeBoolean(args.confirmed, false), `Send draft ${String(args.draftId ?? "?")}`);
                     ensureSendAllowed(config.runtime);
                     const draft = await draftStore.getDraft(requireString(args, "draftId"));
+                    // Found live: schedule_draft followed by send_draft on the same
+                    // draft sent it twice — two independent, successful SMTP
+                    // transactions, since nothing here knew about the still-pending
+                    // scheduled send. Refuse instead; cancel_send first if the
+                    // immediate send is actually what's wanted.
+                    const pendingScheduled = (await deliveryQueueService.list()).find((record) => record.sourceDraftId === draft.id && record.status === "pending");
+                    if (pendingScheduled) {
+                        throw new McpError(ErrorCode.InvalidParams, `This draft already has a pending scheduled send (id ${pendingScheduled.id}, sendAt ${pendingScheduled.sendAt}). Sending now would deliver it twice. Cancel that scheduled send with cancel_send first, or wait for it to fire.`);
+                    }
                     ensureValidEmails(draft.to, "to");
                     ensureValidEmails(draft.cc, "cc");
                     ensureValidEmails(draft.bcc, "bcc");
@@ -3680,7 +3703,7 @@ export function createServer(config, options = {}) {
                         // Draft content is already finalized and reviewed — see the
                         // identical note on send_draft.
                         appendSignature: false,
-                    }, new Date(sendAtTime).toISOString(), "scheduled_send"));
+                    }, new Date(sendAtTime).toISOString(), "scheduled_send", draft.id));
                     return createTextResult({
                         queued: true,
                         id: queued.id,