proton-mail-bridge-client 2.1.6 → 2.1.7

package/dist/index.d.ts

@@ -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 truncateDraftBodyForResponse<T extends {
+    body: string;
+}>(draft: T): T;
 export declare function redactQueueRecordAttachments<T extends {
     payload: SendEmailInput;
 }>(record: T): T;

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

@@ -385,12 +385,14 @@ const TOOLS = [
     },
     {
         name: "list_drafts",
-        description: "List all locally saved drafts with their status, subject, and timestamps. Attachment content is omitted here (filename/type/size only) to keep this unbounded listing from blowing up on large attachments — use get_draft for the full attachment content of one draft. Use to review in-progress or unsent messages. Does NOT list drafts stored only on the Proton server — use list_remote_drafts for those. Prefer get_draft when you already have a draftId and need the full content.",
+        description: "List all locally saved drafts with their status, subject, and timestamps. Attachment content is omitted here (filename/type/size only) — use get_draft for the full attachment content of one draft. Each draft's body is also truncated to a short preview (bodyTruncated:true, bodyLength gives the real size) — use get_draft for the full body of one draft. Use to review in-progress or unsent messages. Does NOT list drafts stored only on the Proton server — use list_remote_drafts for those. Prefer get_draft when you already have a draftId and need the full content.",
         annotations: { readOnlyHint: true },
         inputSchema: {
             type: "object",
             properties: {
                 includeSent: { type: "boolean", description: "Include drafts already sent.", default: false },
+                limit: { type: "number", description: "Maximum drafts to return. Omit to return every draft (still with truncated bodies/attachments) — set this when you only need a bounded page." },
+                offset: { type: "number", description: "Number of drafts to skip, newest-updated first.", default: 0 },
             },
         },
     },
@@ -2277,6 +2279,34 @@ export function redactDraftAttachmentsForListing(draft) {
         })),
     };
 }
+// How much of a draft's body survives into a mutation/listing response before
+// it's truncated — long enough to recognize the draft at a glance, short
+// enough that a large body (a long thread quoted into a reply, a big pasted
+// table) doesn't dominate the response the way redactDraftAttachmentsForListing
+// already stops a base64 attachment from doing.
+const DRAFT_BODY_PREVIEW_LENGTH = 500;
+// Found live (external review, repeated across three rounds): create_draft,
+// update_draft, create_reply_draft, create_forward_draft,
+// create_thread_reply_draft, sync_draft_to_remote, and list_drafts all echoed
+// the draft's COMPLETE body back — confirmed live at ~40k tokens for a single
+// update_draft call that only changed the subject of a ~202 KB draft, and
+// ~261k tokens for list_drafts with 107 drafts. The caller supplied the body
+// itself (create/update) or already has it from a prior call (list) — same
+// "caller already knows what it sent" reasoning as attachment redaction, just
+// for the text body instead of base64. get_draft deliberately keeps the full
+// body — it's the "let me look at this one draft" call, not a repeated-edit
+// or bulk-listing one.
+export function truncateDraftBodyForResponse(draft) {
+    if (draft.body.length <= DRAFT_BODY_PREVIEW_LENGTH) {
+        return draft;
+    }
+    return {
+        ...draft,
+        body: `${draft.body.slice(0, DRAFT_BODY_PREVIEW_LENGTH)}…`,
+        bodyLength: draft.body.length,
+        bodyTruncated: true,
+    };
+}
 // 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
@@ -4041,9 +4071,9 @@ export function createServer(config, options = {}) {
                         return presentDraft(createDraftBundle, remoteSync ? { ...synced.draft, remoteSync } : synced.draft);
                     });
                     // 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, [
+                    // caller already knows what it attached (and what body it just sent);
+                    // get_draft is the "let me see the full content" call, not this one.
+                    return createTextResult(truncateDraftBodyForResponse(redactDraftAttachmentsForListing(result)), false, [
                         draftSource(result),
                         ...(result.remoteDraft?.emailId
                             ? [
@@ -4126,7 +4156,7 @@ export function createServer(config, options = {}) {
                         return presentDraft(createReplyDraftBundle, remoteSync ? { ...synced.draft, remoteSync } : synced.draft);
                     });
                     // Same fix as create_draft/update_draft's identical bloat — see their comments.
-                    return createTextResult(redactDraftAttachmentsForListing(result), false, [
+                    return createTextResult(truncateDraftBodyForResponse(redactDraftAttachmentsForListing(result)), false, [
                         draftSource(result),
                         emailSource(detail),
                         ...(result.remoteDraft?.emailId
@@ -4201,7 +4231,7 @@ export function createServer(config, options = {}) {
                         return presentDraft(createForwardDraftBundle, remoteSync ? { ...synced.draft, remoteSync } : synced.draft);
                     });
                     // Same fix as create_draft/update_draft's identical bloat — see their comments.
-                    return createTextResult(redactDraftAttachmentsForListing(result), false, [
+                    return createTextResult(truncateDraftBodyForResponse(redactDraftAttachmentsForListing(result)), false, [
                         draftSource(result),
                         emailSource(detail),
                         ...(result.remoteDraft?.emailId
@@ -4220,10 +4250,23 @@ export function createServer(config, options = {}) {
                     // drafts only — a non-primary account's drafts aren't listed here yet. Use
                     // get_draft with that account's prefixed draftId if you already have one.
                     const drafts = await draftStore.listDrafts(normalizeBoolean(args.includeSent, false));
+                    // Found live (external review): every draft's full body was returned
+                    // alongside the already-redacted attachments — confirmed live at ~261k
+                    // tokens for 107 drafts. Bodies are now truncated the same way a
+                    // mutation response's body is (see truncateDraftBodyForResponse). limit/
+                    // offset are optional and additive — omitting them still returns every
+                    // draft (just with truncated bodies/attachments), so this doesn't change
+                    // behavior for a caller not using the new params.
+                    const offset = normalizeLimit(args.offset, 0, 0, 10_000);
+                    const limit = typeof args.limit === "number" ? normalizeLimit(args.limit, drafts.length, 1, 10_000) : undefined;
+                    const page = limit !== undefined ? drafts.slice(offset, offset + limit) : drafts.slice(offset);
                     return createTextResult({
                         total: drafts.length,
-                        drafts: drafts.map(redactDraftAttachmentsForListing),
-                    }, false, drafts.map(draftSource));
+                        offset,
+                        returned: page.length,
+                        hasMore: offset + page.length < drafts.length,
+                        drafts: page.map((draft) => truncateDraftBodyForResponse(redactDraftAttachmentsForListing(draft))),
+                    }, false, page.map(draftSource));
                 }
                 case "list_remote_drafts": {
                     // Scope limitation (follow-up round): stays scoped to the primary account's
@@ -4314,10 +4357,13 @@ export function createServer(config, options = {}) {
                     // subject/body — the attachments usually aren't touched by this call at all, so
                     // re-echoing their full base64 `content` (serialized twice by createTextResult,
                     // same issue redactDraftAttachmentsForListing already fixed for list_drafts)
-                    // burns tokens on every single edit for a draft that has any attachment. The
-                    // caller already knows what it attached; get_draft remains full-content for the
-                    // "let me look at this draft" case, which is a single call rather than a loop.
-                    return createTextResult(redactDraftAttachmentsForListing(result), false, [
+                    // burns tokens on every single edit for a draft that has any attachment. Same
+                    // reasoning for the body itself — confirmed live at ~40k tokens for a single
+                    // subject-only edit of a ~202 KB draft (see truncateDraftBodyForResponse). The
+                    // caller already knows what it attached and what body it just sent; get_draft
+                    // remains full-content for the "let me look at this draft" case, which is a
+                    // single call rather than a loop.
+                    return createTextResult(truncateDraftBodyForResponse(redactDraftAttachmentsForListing(result)), false, [
                         draftSource(result),
                         ...(result.remoteDraft?.emailId
                             ? [
@@ -4337,7 +4383,7 @@ export function createServer(config, options = {}) {
                     const synced = await withAudit(auditService, name, args, async () => syncDraftToRemote(syncDraftBundle.draftStore, syncDraftBundle.smtpService, syncDraftBundle.imapService, draft));
                     const presentedSynced = presentDraft(syncDraftBundle, synced.draft);
                     // Same fix as create_draft/update_draft's identical bloat — see their comments.
-                    return createTextResult({ ...redactDraftAttachmentsForListing(presentedSynced), remoteSync: synced.remoteSync }, false, [
+                    return createTextResult({ ...truncateDraftBodyForResponse(redactDraftAttachmentsForListing(presentedSynced)), remoteSync: synced.remoteSync }, false, [
                         draftSource(presentedSynced),
                         ...(presentedSynced.remoteDraft?.emailId
                             ? [
@@ -4657,25 +4703,34 @@ export function createServer(config, options = {}) {
                     // requested offset/limit to that merged superset instead of per account.
                     const primarySlug = accountManager.primary().account.slug;
                     const requestedOffset = getEmailsInput.offset ?? 0;
-                    const perAccountFetchLimit = requestedOffset + effectiveLimit;
+                    // +1 beyond what's strictly needed to fill the page: whether that extra
+                    // item actually comes back is what tells us hasMore, independent of any
+                    // filter (beforeUid etc.) or of how the raw mailbox total compares to the
+                    // page window. Two things were tried and each broke a different case:
+                    // (1) using mergedAll.length > offset+limit as hasMore, with NO extra
+                    // overfetch — a lopsided distribution (e.g. 300 messages in one account,
+                    // 0 in another) fetches exactly offset+limit from the big account, so
+                    // mergedAll.length can never exceed that window even though hundreds
+                    // more exist, reporting hasMore:false wrongly.
+                    // (2) using the raw summed mailbox `total` for hasMore instead — correct
+                    // for that case, but wrong under a restrictive filter like beforeUid:
+                    // `total` is the UNFILTERED mailbox message count, not the count of
+                    // messages actually matching the filter, so a beforeUid narrowing 300
+                    // messages down to 2 matches still compared against total=300 and
+                    // reported hasMore:true with nothing left to page to.
+                    // Fetching one extra item fixes both: it directly observes whether a
+                    // NEXT matching item exists, under whatever filter is active, rather
+                    // than inferring it from a count that can be either capped-by-fetch or
+                    // filter-blind depending on which one you pick.
+                    const perAccountFetchLimit = requestedOffset + effectiveLimit + 1;
                     const perAccount = await Promise.all(accountManager.all().map(async (bundle) => {
                         const result = await bundle.imapService.getEmails({ ...getEmailsInput, offset: 0, limit: perAccountFetchLimit });
                         return { bundle, result };
                     }));
                     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 } = paginateMergedAccountResults(mergedAll, requestedOffset, effectiveLimit);
+                    const { page: merged, hasMore } = 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,
@@ -6537,7 +6592,7 @@ export function createServer(config, options = {}) {
                             return { ...presented, threadId: thread.id };
                         });
                         // Same fix as create_draft/update_draft's identical bloat — see their comments.
-                        return createTextResult(redactDraftAttachmentsForListing(result), false, [
+                        return createTextResult(truncateDraftBodyForResponse(redactDraftAttachmentsForListing(result)), false, [
                             draftSource(result),
                             threadSource(thread),
                             emailSource(detail),