proton-mail-bridge-client 2.1.4 → 2.1.6

package/dist/index.d.ts

@@ -8,7 +8,7 @@ import { LocalIndexService } from "./services/local-index-service.js";
 import { SimpleIMAPService } from "./services/simple-imap-service.js";
 import { SMTPService } from "./services/smtp-service.js";
 import { SnoozeService } from "./services/snooze-service.js";
-import type { BulkOperationResult, DraftRecord, EmailDetail, ProtonMailConfig } from "./types/index.js";
+import type { BulkOperationResult, DraftRecord, EmailDetail, ProtonMailConfig, SendEmailInput } from "./types/index.js";
 import { AccountManager, type AccountBundle } from "./services/account-manager.js";
 export declare const CORE_TOOL_NAMES: Set<string>;
 export declare function withAudit<T>(auditService: AuditService, tool: string, input: Record<string, unknown>, operation: () => Promise<T>): Promise<T>;
@@ -65,6 +65,9 @@ export declare function redactDraftAttachmentsForListing(draft: DraftRecord): {
     remoteDraft?: import("./types/index.js").RemoteDraftRef;
     lastSendResult?: import("./types/index.js").DraftSendResult;
 };
+export declare function redactQueueRecordAttachments<T extends {
+    payload: SendEmailInput;
+}>(record: T): T;
 export declare function paginateMergedAccountResults<T>(sortedMerged: T[], offset: number, limit: number): {
     page: T[];
     hasMore: boolean;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -408,12 +408,13 @@ const TOOLS = [
     },
     {
         name: "get_draft",
-        description: "Fetch the full content of a single locally saved draft by its draftId. Use to read or verify a draft before sending or updating. Prefer list_drafts to discover draftIds first. Does NOT fetch drafts from the Proton server — use list_remote_drafts for those.",
+        description: "Fetch the full content of a single locally saved draft by its draftId. Use to read or verify a draft before sending or updating. Prefer list_drafts to discover draftIds first. Does NOT fetch drafts from the Proton server — use list_remote_drafts for those. Attachments are metadata only (filename/contentType/size, no base64 content) by default — set includeAttachmentContent:true if you actually need the raw bytes back (e.g. to re-attach them elsewhere); a large attachment's base64 content can be hundreds of thousands of tokens.",
         annotations: { readOnlyHint: true },
         inputSchema: {
             type: "object",
             properties: {
                 draftId: { type: "string", description: "Draft id returned by create_draft, list_drafts, or a create_*_draft call." },
+                includeAttachmentContent: { type: "boolean", description: "Return each attachment's full base64 content instead of just its metadata. Off by default — see the tool description.", default: false },
             },
             required: ["draftId"],
         },
@@ -2276,6 +2277,32 @@ export function redactDraftAttachmentsForListing(draft) {
         })),
     };
 }
+// Same fix as redactDraftAttachmentsForListing, for list_scheduled_sends — a
+// queued send's payload carries the same full base64 EmailAttachmentInput
+// content (found live: ~955k tokens for a single 1 MiB attachment on ONE
+// record, canceled records included, and list_scheduled_sends has no filter
+// or cap any more than list_drafts did). No explicit return-type annotation
+// for the same reason as the function above.
+export function redactQueueRecordAttachments(record) {
+    const attachments = record.payload.attachments;
+    if (!attachments || attachments.length === 0) {
+        return record;
+    }
+    return {
+        ...record,
+        payload: {
+            ...record.payload,
+            attachments: attachments.map((attachment) => ({
+                filename: attachment.filename,
+                contentType: attachment.contentType,
+                cid: attachment.cid,
+                contentDisposition: attachment.contentDisposition,
+                content: "",
+                size: Buffer.byteLength(attachment.content, "base64"),
+            })),
+        },
+    };
+}
 function draftSource(draft) {
     return {
         uri: buildDraftResourceUri(draft.id),
@@ -2414,10 +2441,24 @@ async function syncDraftToRemote(draftStore, smtpService, imapService, draft) {
             isHtml: draft.isHtml,
             priority: draft.priority,
             replyTo: draft.replyTo,
+            // Found live (external review): this never passed draft.from, so a draft
+            // saved under an alias (e.g. alias@example.com) previewed in the remote
+            // Drafts mailbox under the primary address instead — the remote preview
+            // and the eventual send_draft/schedule_draft sender didn't match.
+            from: draft.from,
             inReplyTo: draft.inReplyTo,
             references: draft.references,
             messageId: draft.draftMessageId,
             attachments: draft.attachments,
+            // Same reasoning as send_draft's identical appendSignature: false — draft
+            // content is already finalized and reviewed by the time it's synced here.
+            // Found live (external review): this used to omit appendSignature, so the
+            // remote preview auto-added PROTONMAIL_SIGNATURE while send_draft/
+            // schedule_draft never did — the actually-sent message either lacked the
+            // signature the remote preview showed, or, if the caller had also typed a
+            // signature into the draft body themselves, got it appended a second time
+            // on every remote sync.
+            appendSignature: false,
         });
         const remoteDraft = await imapService.upsertRemoteDraft({
             raw,
@@ -3561,9 +3602,14 @@ export function createServer(config, options = {}) {
                     // item's id with its owning account's slug — mirrors the read-tool fan-out
                     // pattern (get_emails etc.). Single-account guard keeps byte-identical output
                     // for the common case.
+                    // Each record's payload carries the same full base64 attachment content as
+                    // a draft — see redactQueueRecordAttachments' comment. Redacted for every
+                    // record regardless of status (including canceled ones, which otherwise
+                    // stayed just as bloated once queued).
                     if (accountManager.all().length === 1) {
                         const all = await withAudit(auditService, name, args, async () => deliveryQueueService.list());
-                        const filtered = statusFilter ? all.filter((item) => item.status === statusFilter) : all;
+                        const filtered = (statusFilter ? all.filter((item) => item.status === statusFilter) : all)
+                            .map(redactQueueRecordAttachments);
                         return createTextResult(filtered);
                     }
                     const perAccount = await withAudit(auditService, name, args, async () => Promise.all(accountManager.all().map(async (bundle) => ({
@@ -3571,7 +3617,8 @@ export function createServer(config, options = {}) {
                         items: await bundle.deliveryQueueService.list(),
                     }))));
                     const tagged = perAccount.flatMap(({ bundle, items }) => items.map((item) => ({ ...item, id: withAccountPrefix(responseSlug(bundle), item.id) })));
-                    const filtered = statusFilter ? tagged.filter((item) => item.status === statusFilter) : tagged;
+                    const filtered = (statusFilter ? tagged.filter((item) => item.status === statusFilter) : tagged)
+                        .map(redactQueueRecordAttachments);
                     return createTextResult(filtered);
                 }
                 case "get_unsubscribe_info": {
@@ -3993,7 +4040,10 @@ export function createServer(config, options = {}) {
                                 : undefined);
                         return presentDraft(createDraftBundle, remoteSync ? { ...synced.draft, remoteSync } : synced.draft);
                     });
-                    return createTextResult(result, false, [
+                    // Same fix as update_draft's identical bloat — see its comment. The
+                    // caller already knows what it attached; get_draft is the "let me see
+                    // the full attachment content" call, not this one.
+                    return createTextResult(redactDraftAttachmentsForListing(result), false, [
                         draftSource(result),
                         ...(result.remoteDraft?.emailId
                             ? [
@@ -4046,6 +4096,14 @@ export function createServer(config, options = {}) {
                             subject: prefixedSubject(detail.subject, "Re:"),
                             body: buildReplyText(detail, body),
                             isHtml,
+                            // Found live (external review): a `from` naming a real alias NOT
+                            // itself a separately-configured account (e.g. a genuine alias
+                            // reachable only via header override, same as send_email's own
+                            // fallback) picked the right draftStore bundle above but never
+                            // actually stored the address on the draft — draft.from came back
+                            // undefined, so a later send_draft used the account's default
+                            // sender instead of the alias the caller asked for.
+                            from: optionalString(args, "from"),
                             inReplyTo: detail.messageId,
                             references: detail.messageId ? [detail.messageId] : undefined,
                             attachments,
@@ -4067,7 +4125,8 @@ export function createServer(config, options = {}) {
                                 : undefined);
                         return presentDraft(createReplyDraftBundle, remoteSync ? { ...synced.draft, remoteSync } : synced.draft);
                     });
-                    return createTextResult(result, false, [
+                    // Same fix as create_draft/update_draft's identical bloat — see their comments.
+                    return createTextResult(redactDraftAttachmentsForListing(result), false, [
                         draftSource(result),
                         emailSource(detail),
                         ...(result.remoteDraft?.emailId
@@ -4120,6 +4179,8 @@ export function createServer(config, options = {}) {
                             subject: prefixedSubject(detail.subject, "Fwd:"),
                             body: buildForwardText(detail, optionalString(args, "body")),
                             isHtml: normalizeBoolean(args.isHtml, false),
+                            // Same fix as create_reply_draft — see its comment.
+                            from: optionalString(args, "from"),
                             attachments,
                             sourceEmailId: detail.id,
                             sourceMessageId: detail.messageId,
@@ -4139,7 +4200,8 @@ export function createServer(config, options = {}) {
                                 : undefined);
                         return presentDraft(createForwardDraftBundle, remoteSync ? { ...synced.draft, remoteSync } : synced.draft);
                     });
-                    return createTextResult(result, false, [
+                    // Same fix as create_draft/update_draft's identical bloat — see their comments.
+                    return createTextResult(redactDraftAttachmentsForListing(result), false, [
                         draftSource(result),
                         emailSource(detail),
                         ...(result.remoteDraft?.emailId
@@ -4172,7 +4234,16 @@ export function createServer(config, options = {}) {
                 case "get_draft": {
                     const { bundle: getDraftBundle, rest: getDraftIdRest } = resolveAccountForDraftId(requireString(args, "draftId"));
                     const draft = presentDraft(getDraftBundle, await getDraftBundle.draftStore.getDraft(getDraftIdRest));
-                    return createTextResult(draft, false, [
+                    // Found live (external review): this always echoed every attachment's
+                    // full base64 content — ~955k tokens for a single 1 MiB attachment,
+                    // serialized twice by createTextResult on top of that. Metadata only by
+                    // default now (same redaction as list_drafts/update_draft/create_draft),
+                    // with an explicit opt-in for the rare case the caller actually needs
+                    // the raw bytes back.
+                    const draftResponse = normalizeBoolean(args.includeAttachmentContent, false)
+                        ? draft
+                        : redactDraftAttachmentsForListing(draft);
+                    return createTextResult(draftResponse, false, [
                         draftSource(draft),
                         ...(draft.remoteDraft?.emailId
                             ? [
@@ -4265,7 +4336,8 @@ export function createServer(config, options = {}) {
                     const draft = await syncDraftBundle.draftStore.getDraft(syncDraftIdRest);
                     const synced = await withAudit(auditService, name, args, async () => syncDraftToRemote(syncDraftBundle.draftStore, syncDraftBundle.smtpService, syncDraftBundle.imapService, draft));
                     const presentedSynced = presentDraft(syncDraftBundle, synced.draft);
-                    return createTextResult({ ...presentedSynced, remoteSync: synced.remoteSync }, false, [
+                    // Same fix as create_draft/update_draft's identical bloat — see their comments.
+                    return createTextResult({ ...redactDraftAttachmentsForListing(presentedSynced), remoteSync: synced.remoteSync }, false, [
                         draftSource(presentedSynced),
                         ...(presentedSynced.remoteDraft?.emailId
                             ? [
@@ -4592,8 +4664,18 @@ export function createServer(config, options = {}) {
                     }));
                     const taggedEmails = perAccount.flatMap(({ bundle, result }) => result.emails.map((email) => ({ ...email, id: withAccountPrefix(accountSlugForTag(bundle, primarySlug), email.id) })));
                     const mergedAll = sortByDateDesc(taggedEmails, (email) => email.internalDate || email.date);
-                    const { page: merged, hasMore } = paginateMergedAccountResults(mergedAll, requestedOffset, effectiveLimit);
+                    const { page: merged } = paginateMergedAccountResults(mergedAll, requestedOffset, effectiveLimit);
                     const total = perAccount.reduce((sum, { result }) => sum + result.total, 0);
+                    // Found live (external review): paginateMergedAccountResults' own hasMore
+                    // only looks at what was actually FETCHED (mergedAll.length, capped at
+                    // perAccountFetchLimit per account) — with a lopsided distribution (e.g.
+                    // 300 messages in one account, 0 in another) and a small page near the
+                    // start, mergedAll.length can equal requestedOffset+limit exactly even
+                    // though the account's real total is far larger, reporting hasMore:false
+                    // while 275 more messages exist. `total` above is each account's real,
+                    // authoritative IMAP mailbox count (not bounded by what we fetched), so
+                    // it's the correct source for this instead.
+                    const hasMore = total > requestedOffset + effectiveLimit;
                     return createTextResult({
                         folder: getEmailsInput.folder?.trim() || "INBOX",
                         total,
@@ -6430,6 +6512,8 @@ export function createServer(config, options = {}) {
                                 subject: prefixedSubject(detail.subject, "Re:"),
                                 body: buildReplyText(detail, body),
                                 isHtml,
+                                // Same fix as create_reply_draft — see its comment.
+                                from: optionalString(args, "from"),
                                 inReplyTo: detail.messageId,
                                 references: detail.messageId ? [detail.messageId] : undefined,
                                 attachments,
@@ -6452,7 +6536,8 @@ export function createServer(config, options = {}) {
                             const presented = presentDraft(createThreadReplyDraftBundle, remoteSync ? { ...synced.draft, remoteSync } : synced.draft);
                             return { ...presented, threadId: thread.id };
                         });
-                        return createTextResult(result, false, [
+                        // Same fix as create_draft/update_draft's identical bloat — see their comments.
+                        return createTextResult(redactDraftAttachmentsForListing(result), false, [
                             draftSource(result),
                             threadSource(thread),
                             emailSource(detail),