proton-mail-bridge-client 2.1.3 → 2.1.5

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>;
@@ -23,6 +23,8 @@ export declare function extractUnsubscribeInfo(detail: EmailDetail): {
     mailto?: string;
     url?: string;
 };
+export declare function buildReplyHtml(detail: EmailDetail, htmlBody: string): string;
+export declare function buildForwardHtml(detail: EmailDetail, htmlBody?: string): string;
 export declare function getReplyRecipients(detail: EmailDetail, ownerEmail: string, replyAll: boolean): {
     to: string[];
     cc: string[];
@@ -63,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

@@ -12,7 +12,7 @@ import { CallToolRequestSchema, ErrorCode, ListToolsRequestSchema, ListResources
 import { isMainModule } from "./is-main.js";
 import { AnalyticsService } from "./services/analytics-service.js";
 import { BULK_ITEM_TIMEOUT_MS, describeImapError, isLikelyAuthenticationError, isLikelyConnectionError, isLikelyTlsMismatchError, UID_VALIDITY_MISMATCH_ERROR } from "./services/simple-imap-service.js";
-import { applySignature } from "./services/smtp-service.js";
+import { applySignature, plainTextToHtml } from "./services/smtp-service.js";
 import { ensureValidEmails, foldQuotedHistory, isTextLikeMimeType, isValidEmail, lowerCaseAddress, normalizeBoolean, normalizeLimit, normalizeJsonValue, parseEmailId, parseEmails, projectFields, renderMarkdown, slugifyAccountAddress, splitAccountPrefix, stringifyForJson, withAccountPrefix, } from "./utils/helpers.js";
 import { AccountManager } from "./services/account-manager.js";
 import { logger } from "./utils/logger.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"],
         },
@@ -2069,6 +2070,53 @@ function buildForwardText(detail, body) {
         .filter((line, index, array) => line !== "" || (index > 0 && array[index - 1] !== ""))
         .join("\n");
 }
+// HTML counterparts of buildReplyText/buildForwardText — needed because a
+// markdown-authored reply/forward (markdownBody) renders its OWN new text to a
+// real, separate htmlBody, but buildReplyText/buildForwardText only ever wrapped
+// the PLAIN TEXT `body` with the quoted/forwarded original. That original never
+// made it into htmlBody at all — an HTML-viewing recipient of a markdown reply
+// saw only the new text and signature, with the entire original message missing
+// (confirmed on generated MIME messages), while the text/plain part had it via
+// buildReplyText. Uses the original message's own detail.html when present
+// (real markup, not reconstructed); falls back to escaping detail.text/preview
+// through plainTextToHtml otherwise, same as a plain-text send's own html
+// alternative (see smtp-service.ts's plainTextToHtml comment).
+export function buildReplyHtml(detail, htmlBody) {
+    const originalHtml = typeof detail.html === "string" && detail.html
+        ? detail.html
+        : plainTextToHtml(detail.text || detail.preview || "");
+    const fromText = formatAddressList(detail.from);
+    const dateText = detail.date || detail.internalDate || "an unknown date";
+    return [
+        htmlBody,
+        `<p>On ${escapeHtmlForQuote(dateText)}, ${escapeHtmlForQuote(fromText || "the sender")} wrote:</p>`,
+        `<blockquote>${originalHtml}</blockquote>`,
+    ].join("\n");
+}
+export function buildForwardHtml(detail, htmlBody) {
+    const originalHtml = typeof detail.html === "string" && detail.html
+        ? detail.html
+        : plainTextToHtml(detail.text || detail.preview || "");
+    return [
+        htmlBody?.trim() || "",
+        "<p>---------- Forwarded message ---------</p>",
+        `<p>From: ${escapeHtmlForQuote(formatAddressList(detail.from))}<br>`,
+        `Date: ${escapeHtmlForQuote(detail.date || detail.internalDate || "")}<br>`,
+        `Subject: ${escapeHtmlForQuote(detail.subject)}<br>`,
+        `To: ${escapeHtmlForQuote(formatAddressList(detail.to))}${detail.cc.length > 0 ? `<br>Cc: ${escapeHtmlForQuote(formatAddressList(detail.cc))}` : ""}</p>`,
+        originalHtml,
+    ]
+        .filter((part) => part !== "")
+        .join("\n");
+}
+function escapeHtmlForQuote(value) {
+    return value
+        .replace(/&/g, "&amp;")
+        .replace(/</g, "&lt;")
+        .replace(/>/g, "&gt;")
+        .replace(/"/g, "&quot;")
+        .replace(/'/g, "&#39;");
+}
 export function getReplyRecipients(detail, ownerEmail, replyAll) {
     const owner = lowerCaseAddress(ownerEmail);
     const primary = addressValues(detail.replyTo).length > 0 ? detail.replyTo : detail.from;
@@ -2229,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),
@@ -2367,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,
@@ -3514,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) => ({
@@ -3524,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": {
@@ -3634,8 +3728,14 @@ export function createServer(config, options = {}) {
                     const includeQuoteReply = normalizeBoolean(args.includeQuote, true);
                     // Signature goes right after the user's own reply text, before the
                     // quoted original — not at the very end, after the quote.
-                    const signedReply = applySignature(body, htmlBody, normalizeBoolean(args.appendSignature, true));
+                    const signedReply = applySignature(body, htmlBody, normalizeBoolean(args.appendSignature, true), isHtml);
                     const replyBody = includeQuoteReply ? buildReplyText(detail, signedReply.body) : signedReply.body;
+                    // A separate htmlBody (the markdown-rendered case) needs the SAME quoted
+                    // original merged in — see buildReplyHtml's comment for why this was
+                    // previously missing entirely from the html part.
+                    const replyHtmlBody = includeQuoteReply && signedReply.htmlBody !== undefined
+                        ? buildReplyHtml(detail, signedReply.htmlBody)
+                        : signedReply.htmlBody;
                     if (config.runtime.restrictOutboundToSelf) {
                         const selfAddr = config.smtp.username.toLowerCase();
                         const allR = [...to, ...cc, ...extraBcc];
@@ -3654,7 +3754,7 @@ export function createServer(config, options = {}) {
                         subject: prefixedSubject(detail.subject, "Re:"),
                         body: replyBody,
                         isHtml,
-                        htmlBody: signedReply.htmlBody,
+                        htmlBody: replyHtmlBody,
                         fromName: fromNameReply,
                         from: fromReply,
                         sanitizeHtml: sanitizeHtmlReply,
@@ -3730,8 +3830,12 @@ export function createServer(config, options = {}) {
                     const includeQuoteRa = normalizeBoolean(args.includeQuote, true);
                     // Signature goes right after the user's own reply text, before the
                     // quoted original — not at the very end, after the quote.
-                    const signedReplyRa = applySignature(bodyRa, htmlBodyRa, normalizeBoolean(args.appendSignature, true));
+                    const signedReplyRa = applySignature(bodyRa, htmlBodyRa, normalizeBoolean(args.appendSignature, true), isHtmlRa);
                     const replyBodyRa = includeQuoteRa ? buildReplyText(detailRa, signedReplyRa.body) : signedReplyRa.body;
+                    // Same fix as reply_to_email — see buildReplyHtml's comment.
+                    const replyHtmlBodyRa = includeQuoteRa && signedReplyRa.htmlBody !== undefined
+                        ? buildReplyHtml(detailRa, signedReplyRa.htmlBody)
+                        : signedReplyRa.htmlBody;
                     const resultRa = await withAudit(auditService, name, args, async () => sendBundleForRa.smtpService.sendEmail({
                         to: toRa,
                         cc: ccRa,
@@ -3739,7 +3843,7 @@ export function createServer(config, options = {}) {
                         subject: prefixedSubject(detailRa.subject, "Re:"),
                         body: replyBodyRa,
                         isHtml: isHtmlRa,
-                        htmlBody: signedReplyRa.htmlBody,
+                        htmlBody: replyHtmlBodyRa,
                         fromName: fromNameRa,
                         from: fromRa,
                         sanitizeHtml: sanitizeHtmlRa,
@@ -3838,7 +3942,13 @@ export function createServer(config, options = {}) {
                     // Signature goes right after the user's own note, before the
                     // "---------- Forwarded message ---------" block — not at the very
                     // end, after the forwarded content.
-                    const signedFwd = applySignature(body ?? "", htmlBody, normalizeBoolean(args.appendSignature, true));
+                    const signedFwd = applySignature(body ?? "", htmlBody, normalizeBoolean(args.appendSignature, true), isHtml);
+                    // Same fix as reply_to_email/reply_all_email — see buildReplyHtml's
+                    // comment (applies equally to a markdown-authored forward's separate
+                    // htmlBody, which buildForwardText never touches).
+                    const forwardHtmlBody = signedFwd.htmlBody !== undefined
+                        ? buildForwardHtml(detail, signedFwd.htmlBody)
+                        : signedFwd.htmlBody;
                     const result = await withAudit(auditService, name, args, async () => sendBundleForFwd.smtpService.sendEmail({
                         to,
                         cc,
@@ -3846,7 +3956,7 @@ export function createServer(config, options = {}) {
                         subject: prefixedSubject(detail.subject, "Fwd:"),
                         body: buildForwardText(detail, signedFwd.body),
                         isHtml,
-                        htmlBody: signedFwd.htmlBody,
+                        htmlBody: forwardHtmlBody,
                         fromName: fromNameFwd,
                         from: fromFwd,
                         sanitizeHtml: sanitizeHtmlFwd,
@@ -3930,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
                             ? [
@@ -3944,14 +4057,19 @@ export function createServer(config, options = {}) {
                     ]);
                 }
                 case "create_reply_draft": {
-                    const detail = await imapService.getEmailById(requireString(args, "emailId"));
+                    // emailId carries the same "<slug>::" account prefix as everywhere else —
+                    // this previously always read via the PRIMARY account's imapService
+                    // regardless of that prefix, so replying to a non-primary account's email
+                    // either resolved the wrong message or threw not-found.
+                    const { bundle: createReplyReadBundle, rest: createReplyEmailIdRest } = resolveAccountForEmailId(requireString(args, "emailId"));
+                    const detail = await createReplyReadBundle.imapService.getEmailById(createReplyEmailIdRest);
                     const body = requireString(args, "body");
                     const isHtml = normalizeBoolean(args.isHtml, false);
                     const replyAll = normalizeBoolean(args.replyAll, false);
                     const attachments = optionalAttachmentList(args.attachments);
                     const extraCc = parseEmails(optionalString(args, "cc"));
                     const extraBcc = parseEmails(optionalString(args, "bcc"));
-                    const recipients = getReplyRecipients(detail, config.smtp.username, replyAll);
+                    const recipients = getReplyRecipients(detail, createReplyReadBundle.config.smtp.username, replyAll);
                     const cc = uniqueAddresses([...recipients.cc, ...extraCc]);
                     const to = uniqueAddresses(recipients.to);
                     ensureValidEmails(to, "to");
@@ -3960,10 +4078,15 @@ export function createServer(config, options = {}) {
                     if (to.length === 0) {
                         throw new McpError(ErrorCode.InvalidParams, "Unable to infer reply recipient.");
                     }
-                    // Same from-based draftStore routing as create_draft — see its comment.
+                    // Same from-based draftStore routing as create_draft — see its comment —
+                    // except the no-`from` default is the ACCOUNT THE ORIGINAL MESSAGE BELONGS
+                    // TO, not always the primary: a reply drafted against a non-primary
+                    // account's email with no explicit `from` should default to replying as
+                    // that same account, not silently switch to primary. `from` still wins
+                    // when it names a different configured account.
                     const createReplyDraftBundle = optionalString(args, "from") !== undefined
-                        ? accountManager.byAddress(optionalString(args, "from")) ?? primaryBundle
-                        : primaryBundle;
+                        ? accountManager.byAddress(optionalString(args, "from")) ?? createReplyReadBundle
+                        : createReplyReadBundle;
                     const result = await withAudit(auditService, name, args, async () => {
                         const draft = await createReplyDraftBundle.draftStore.createDraft({
                             mode: "reply",
@@ -3994,7 +4117,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
@@ -4009,7 +4133,9 @@ export function createServer(config, options = {}) {
                     ]);
                 }
                 case "create_forward_draft": {
-                    const detail = await imapService.getEmailById(requireString(args, "emailId"));
+                    // Same emailId account resolution as create_reply_draft — see its comment.
+                    const { bundle: createForwardReadBundle, rest: createForwardEmailIdRest } = resolveAccountForEmailId(requireString(args, "emailId"));
+                    const detail = await createForwardReadBundle.imapService.getEmailById(createForwardEmailIdRest);
                     const to = parseEmails(requireString(args, "to"));
                     const cc = parseEmails(optionalString(args, "cc"));
                     const bcc = parseEmails(optionalString(args, "bcc"));
@@ -4027,13 +4153,15 @@ export function createServer(config, options = {}) {
                     const originalAttachments = includeAttachments
                         ? await Promise.all(detail.attachments
                             .filter((a) => a.id)
-                            .map((a) => imapService.getAttachmentForForward(detail.id, a.id)))
+                            .map((a) => createForwardReadBundle.imapService.getAttachmentForForward(detail.id, a.id)))
                         : [];
                     const attachments = [...originalAttachments, ...callerAttachments];
-                    // Same from-based draftStore routing as create_draft — see its comment.
+                    // Same from-based draftStore routing as create_reply_draft — defaults to
+                    // the ORIGINAL MESSAGE's own account, not always primary, when `from`
+                    // isn't given.
                     const createForwardDraftBundle = optionalString(args, "from") !== undefined
-                        ? accountManager.byAddress(optionalString(args, "from")) ?? primaryBundle
-                        : primaryBundle;
+                        ? accountManager.byAddress(optionalString(args, "from")) ?? createForwardReadBundle
+                        : createForwardReadBundle;
                     const result = await withAudit(auditService, name, args, async () => {
                         const draft = await createForwardDraftBundle.draftStore.createDraft({
                             mode: "forward",
@@ -4062,7 +4190,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
@@ -4095,7 +4224,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
                             ? [
@@ -4188,7 +4326,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
                             ? [
@@ -6335,10 +6474,15 @@ export function createServer(config, options = {}) {
                         if (to.length === 0) {
                             throw new McpError(ErrorCode.InvalidParams, "Unable to infer reply recipient.");
                         }
-                        // Same from-based draftStore routing as create_draft — see its comment.
+                        // Same from-based draftStore routing as create_reply_draft — defaults to
+                        // the THREAD's own account (threadReplyBundle, already resolved above from
+                        // the threadId's own prefix), not always primary, when `from` isn't given.
+                        // Previously always defaulted to primary regardless of which account the
+                        // thread actually belonged to — a reply drafted with no explicit `from`
+                        // against a non-primary account's thread silently switched accounts.
                         const createThreadReplyDraftBundle = optionalString(args, "from") !== undefined
-                            ? accountManager.byAddress(optionalString(args, "from")) ?? primaryBundle
-                            : primaryBundle;
+                            ? accountManager.byAddress(optionalString(args, "from")) ?? threadReplyBundle
+                            : threadReplyBundle;
                         const result = await withAudit(auditService, name, args, async () => {
                             const draft = await createThreadReplyDraftBundle.draftStore.createDraft({
                                 mode: "reply",
@@ -6370,7 +6514,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),