proton-mail-bridge-client 2.0.3 → 2.0.5

package/dist/index.d.ts

@@ -26,6 +26,8 @@ export declare function getReplyRecipients(detail: EmailDetail, ownerEmail: stri
     to: string[];
     cc: string[];
 };
+export declare function getBulkMaxBatchSize(args: Record<string, unknown>): number;
+export declare function ensureBulkBatchSize(uidsLength: number, max: number): void;
 export declare function buildConfigFromEnv(): ProtonMailConfig;
 export declare function createServer(config: ProtonMailConfig, options?: {
     startBackgroundSync?: boolean;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AASA,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,EAA2H,iBAAiB,EAA+B,MAAM,mCAAmC,CAAC;AAC5N,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;AA2qD1B,eAAO,MAAM,eAAe,aAyB1B,CAAC;AAgGH,wBAAsB,SAAS,CAAC,CAAC,EAC/B,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAC1B,OAAO,CAAC,CAAC,CAAC,CAwBZ;AAmED,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;AAwzBD,wBAAgB,kBAAkB,IAAI,gBAAgB,CAkGrD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,gBAAgB,EACxB,OAAO,GAAE;IACP,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC1B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmhGP;AAED,wBAAsB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAmE1C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AASA,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,EAA2H,iBAAiB,EAA+B,MAAM,mCAAmC,CAAC;AAC5N,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;AA6qD1B,eAAO,MAAM,eAAe,aAyB1B,CAAC;AAgGH,wBAAsB,SAAS,CAAC,CAAC,EAC/B,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAC1B,OAAO,CAAC,CAAC,CAAC,CAwBZ;AAmED,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;AAoiBD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAEzE;AAED,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAOzE;AAyQD,wBAAgB,kBAAkB,IAAI,gBAAgB,CAkGrD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,gBAAgB,EACxB,OAAO,GAAE;IACP,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC1B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgjGP;AAED,wBAAsB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAmE1C"}

package/dist/index.js

@@ -1131,6 +1131,7 @@ const TOOLS = [
                     description: "Preview the impact without mutating the mailbox.",
                     default: false,
                 },
+                maxBatchSize: { type: "number", description: "Maximum number of messages to process. Defaults to 500. Use to prevent runaway operations." },
             },
             required: ["emailIds", "action"],
         },
@@ -1171,6 +1172,7 @@ const TOOLS = [
                     description: "Refresh the local mailbox index from IMAP before resolving the thread.",
                     default: false,
                 },
+                maxBatchSize: { type: "number", description: "Maximum number of messages to process. Defaults to 500. Use to prevent runaway operations." },
             },
             required: ["threadId", "action"],
         },
@@ -2498,10 +2500,10 @@ async function previewEmailAction(imapService, emailId, action, targetFolder) {
 async function verifySentCopy(imapService, messageId) {
     return imapService.sentCopyVerify(messageId, "Sent", 8_000);
 }
-function getBulkMaxBatchSize(args) {
+export function getBulkMaxBatchSize(args) {
     return typeof args.maxBatchSize === "number" ? Math.min(args.maxBatchSize, 2000) : 500;
 }
-function ensureBulkBatchSize(uidsLength, max) {
+export function ensureBulkBatchSize(uidsLength, max) {
     if (uidsLength > max) {
         throw new McpError(ErrorCode.InvalidParams, "Batch size " + uidsLength + " exceeds limit " + max + ". Use match criteria to narrow the scope, or increase maxBatchSize.");
     }
@@ -3850,6 +3852,15 @@ export function createServer(config, options = {}) {
                     // after an ambiguous response) sailed past the status check above
                     // and enqueued a second, independent delivery-queue record. Both
                     // fire independently later, delivering the same email twice.
+                    //
+                    // Found live: this list()-then-check was itself a non-atomic
+                    // TOCTOU race — two concurrent schedule_draft calls could both
+                    // observe no pending record here and both enqueue. The real
+                    // enforcement now lives inside deliveryQueueService.enqueue()
+                    // itself, under its lock, which is what actually prevents the
+                    // duplicate. This external check is kept only as an optional
+                    // early-exit optimization to avoid a wasted round-trip to the lock
+                    // in the common non-racing case.
                     const alreadyPendingScheduled = (await deliveryQueueService.list()).find((record) => record.sourceDraftId === draft.id && record.status === "pending");
                     if (alreadyPendingScheduled) {
                         throw new McpError(ErrorCode.InvalidParams, `This draft already has a pending scheduled send (id ${alreadyPendingScheduled.id}, sendAt ${alreadyPendingScheduled.sendAt}). Scheduling it again would deliver it twice. Cancel the existing one with cancel_send first if you want a different sendAt.`);
@@ -4121,15 +4132,23 @@ export function createServer(config, options = {}) {
                     // mailbox each time.
                     const currentUidValidity = emailIds ? await imapService.getMailboxUidValidity(folder) : undefined;
                     const notFoundEmailIds = getBulkNotFoundEmailIds(emailIds, folder, currentUidValidity);
-                    const preview = await imapService.bulkMove({
-                        emailIds,
-                        match,
-                        folder,
-                        targetFolder,
-                        dryRun: true,
-                    });
-                    ensureBulkBatchSize(preview.total, max);
+                    // Resolve the match/emailIds set exactly once and reuse it for both
+                    // the preview and the real run — see resolveUidsForBulkOp's
+                    // comment for why re-resolving `match` a second time (the old
+                    // dry-run-then-real-run pattern) could silently exceed maxBatchSize.
+                    // Also excludes any id whose embedded UIDVALIDITY is stale.
+                    const uids = await imapService.resolveUidsForBulkOp(folder, emailIds, match, currentUidValidity);
+                    ensureBulkBatchSize(uids.length, max);
                     if (normalizeBoolean(args.dryRun, false)) {
+                        const preview = await imapService.bulkMove({
+                            emailIds,
+                            match,
+                            folder,
+                            targetFolder,
+                            resolvedUids: uids,
+                            uidValidity: currentUidValidity,
+                            dryRun: true,
+                        });
                         return createTextResult(withBulkNotFound(preview, notFoundEmailIds));
                     }
                     const result = await withAudit(auditService, name, args, () => imapService.bulkMove({
@@ -4137,6 +4156,8 @@ export function createServer(config, options = {}) {
                         match,
                         folder,
                         targetFolder,
+                        resolvedUids: uids,
+                        uidValidity: currentUidValidity,
                         dryRun: false,
                     }));
                     return createTextResult(withBulkNotFound(result, notFoundEmailIds));
@@ -4182,6 +4203,7 @@ export function createServer(config, options = {}) {
                             folder,
                             permanent,
                             resolvedUids: uids,
+                            uidValidity: currentUidValidity,
                             dryRun: true,
                         });
                         return createTextResult(withBulkNotFound(preview, notFoundEmailIds));
@@ -4192,6 +4214,7 @@ export function createServer(config, options = {}) {
                         folder,
                         permanent,
                         resolvedUids: uids,
+                        uidValidity: currentUidValidity,
                         dryRun: false,
                     }));
                     return createTextResult(withBulkNotFound(result, notFoundEmailIds));
@@ -4226,10 +4249,10 @@ export function createServer(config, options = {}) {
                     const uids = await imapService.resolveUidsForBulkOp(folder, emailIds, match, currentUidValidity);
                     ensureBulkBatchSize(uids.length, max);
                     if (normalizeBoolean(args.dryRun, false)) {
-                        const preview = await imapService.bulkUpdateFlags({ emailIds, match, folder, flagsToAdd, flagsToRemove, resolvedUids: uids, dryRun: true });
+                        const preview = await imapService.bulkUpdateFlags({ emailIds, match, folder, flagsToAdd, flagsToRemove, resolvedUids: uids, uidValidity: currentUidValidity, dryRun: true });
                         return createTextResult(withBulkNotFound(preview, notFoundEmailIds));
                     }
-                    const result = await withAudit(auditService, name, args, () => imapService.bulkUpdateFlags({ emailIds, match, folder, flagsToAdd, flagsToRemove, resolvedUids: uids, dryRun: false }));
+                    const result = await withAudit(auditService, name, args, () => imapService.bulkUpdateFlags({ emailIds, match, folder, flagsToAdd, flagsToRemove, resolvedUids: uids, uidValidity: currentUidValidity, dryRun: false }));
                     return createTextResult(withBulkNotFound(result, notFoundEmailIds));
                 }
                 case "bulk_update_labels": {
@@ -4260,10 +4283,10 @@ export function createServer(config, options = {}) {
                     const uids = await imapService.resolveUidsForBulkOp(folder, emailIds, match, currentUidValidity);
                     ensureBulkBatchSize(uids.length, max);
                     if (normalizeBoolean(args.dryRun, false)) {
-                        const preview = await imapService.bulkUpdateLabels({ emailIds, match, folder, labelsToAdd, labelsToRemove, resolvedUids: uids, dryRun: true });
+                        const preview = await imapService.bulkUpdateLabels({ emailIds, match, folder, labelsToAdd, labelsToRemove, resolvedUids: uids, uidValidity: currentUidValidity, dryRun: true });
                         return createTextResult(withBulkNotFound(preview, notFoundEmailIds));
                     }
-                    const result = await withAudit(auditService, name, args, () => imapService.bulkUpdateLabels({ emailIds, match, folder, labelsToAdd, labelsToRemove, resolvedUids: uids, dryRun: false }));
+                    const result = await withAudit(auditService, name, args, () => imapService.bulkUpdateLabels({ emailIds, match, folder, labelsToAdd, labelsToRemove, resolvedUids: uids, uidValidity: currentUidValidity, dryRun: false }));
                     return createTextResult(withBulkNotFound(result, notFoundEmailIds));
                 }
                 case "top_senders": {
@@ -4532,6 +4555,10 @@ export function createServer(config, options = {}) {
                         if (emailIds.length === 0) {
                             throw new McpError(ErrorCode.InvalidParams, "emailIds must contain at least one email id.");
                         }
+                        // Same safety rail as the bulk_* tools (bulk_delete etc.) — without
+                        // it, an arbitrarily large emailIds array would be processed in
+                        // full with no size limit at all.
+                        ensureBulkBatchSize(emailIds.length, getBulkMaxBatchSize(args));
                         const action = requireEmailAction(args);
                         ensureEmailActionAllowed(config.runtime, action);
                         if (action === "delete") {
@@ -5114,6 +5141,10 @@ export function createServer(config, options = {}) {
                         const emailIds = [...new Set(thread.messages
                                 .filter((message) => !unreadOnly || !message.isRead)
                                 .map((message) => message.primaryEmailId))];
+                        // Same safety rail as the bulk_* tools (bulk_delete etc.) — without
+                        // it, a thread with an arbitrarily large message count would be
+                        // processed in full with no size limit at all.
+                        ensureBulkBatchSize(emailIds.length, getBulkMaxBatchSize(args));
                         if (action === "delete") {
                             ensureDestructiveConfirmed(config.runtime, normalizeBoolean(args.confirmed, false), `Permanently delete ${emailIds.length} email(s) in thread (cannot be recovered)`);
                         }