proton-mail-bridge-client 1.19.2 → 1.19.4

package/README.md

@@ -325,7 +325,7 @@ All commands support `--json` for machine-readable output, and any MCP tool is d
 All flags work in both the MCP server and CLI:
 
 ```bash
-PROTONMAIL_TOOL_TIER=core            # expose 20 core tools instead of all 95 — saves context window
+PROTONMAIL_TOOL_TIER=core            # expose 19 core tools instead of all 95 — saves context window
 PROTONMAIL_READ_ONLY=true            # disable all write operations
 PROTONMAIL_ALLOW_SEND=false          # disable SMTP sends only (other writes still work)
 PROTONMAIL_CONFIRM_DESTRUCTIVE=true  # require confirmed:true on send, reply, forward, delete
@@ -359,13 +359,13 @@ PROTONMAIL_PASSWORD_COMMAND='pass proton/password'
 PROTONMAIL_DATA_DIR="$HOME/.proton-mail-bridge-client"
 
 # Tools
-PROTONMAIL_TOOL_TIER='full'          # 'core' exposes 20 essential tools (saves context window); 'full' exposes all 95
+PROTONMAIL_TOOL_TIER='full'          # 'core' exposes 19 essential tools (saves context window); 'full' exposes all 95
 
 # Safety
 PROTONMAIL_READ_ONLY='false'
 PROTONMAIL_ALLOW_SEND='true'
 PROTONMAIL_ALLOW_REMOTE_DRAFT_SYNC='true'
-PROTONMAIL_ALLOWED_ACTIONS='mark_read,mark_unread,star,unstar,archive,trash,restore'
+PROTONMAIL_ALLOWED_ACTIONS='mark_read,mark_unread,star,unstar,archive,trash,restore,move,delete'
 PROTONMAIL_CONFIRM_DESTRUCTIVE='false'
 PROTONMAIL_SEND_DELAY_SECONDS='0'    # >0: send_email queues instead of sending immediately, cancelable via cancel_send. Only fires while this server stays running.
 PROTONMAIL_SIGNATURE=''              # Plain text, appended to send_email/reply_to_email/reply_all_email/forward_email bodies (text + HTML), after your own text and before any quoted/forwarded content. Opt out per-message with appendSignature: false. Never applied to send_draft/schedule_draft — draft content is already finalized.

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,EAAiG,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACrK,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;AAsqD1B,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;AA6vBD,wBAAgB,kBAAkB,IAAI,gBAAgB,CAgGrD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,gBAAgB,EACxB,OAAO,GAAE;IACP,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC1B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgzFP;AAED,wBAAsB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAqD1C"}
+{"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,EAAE,MAAM,mCAAmC,CAAC;AAC/L,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;AA0qD1B,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;AA4wBD,wBAAgB,kBAAkB,IAAI,gBAAgB,CAkGrD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,gBAAgB,EACxB,OAAO,GAAE;IACP,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC1B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAg2FP;AAED,wBAAsB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAmE1C"}

package/dist/index.js

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
 import { execFileSync } from "node:child_process";
 import { readFileSync } from "node:fs";
+import { chmod, mkdir } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { homedir } from "node:os";
-import { isAbsolute, join, resolve as pathResolve } from "node:path";
+import { isAbsolute, join, resolve as pathResolve, sep as pathSep } from "node:path";
 import { fileURLToPath } from "node:url";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
@@ -15,7 +16,7 @@ import { BackgroundSyncService } from "./services/background-sync-service.js";
 import { DeliveryQueueService } from "./services/delivery-queue-service.js";
 import { DraftStoreService } from "./services/draft-store-service.js";
 import { LocalIndexService } from "./services/local-index-service.js";
-import { BULK_ITEM_TIMEOUT_MS, describeImapError, isLikelyAuthenticationError, isLikelyConnectionError, SimpleIMAPService } from "./services/simple-imap-service.js";
+import { BULK_ITEM_TIMEOUT_MS, describeImapError, isLikelyAuthenticationError, isLikelyConnectionError, isLikelyTlsMismatchError, SimpleIMAPService } from "./services/simple-imap-service.js";
 import { applySignature, SMTPService } from "./services/smtp-service.js";
 import { SnoozeService } from "./services/snooze-service.js";
 import { TemplateService } from "./services/template-service.js";
@@ -497,12 +498,13 @@ const TOOLS = [
     },
     {
         name: "delete_draft",
-        description: "Permanently delete a locally saved draft from SQLite. Use to discard a draft you no longer need. Does NOT remove a matching draft from the Proton Drafts IMAP folder — that requires a separate mailbox action. Irreversible.",
+        description: "Permanently delete a locally saved draft from SQLite. Use to discard a draft you no longer need. Does NOT remove a matching draft from the Proton Drafts IMAP folder — that requires a separate mailbox action. Irreversible; requires confirmed:true when PROTONMAIL_CONFIRM_DESTRUCTIVE is enabled.",
         annotations: { destructiveHint: true },
         inputSchema: {
             type: "object",
             properties: {
                 draftId: { type: "string", description: "Draft id returned by create_draft, list_drafts, or a create_*_draft call." },
+                confirmed: { type: "boolean", description: "Pass true to confirm permanent deletion of the draft. Required when PROTONMAIL_CONFIRM_DESTRUCTIVE is enabled." },
             },
             required: ["draftId"],
         },
@@ -788,11 +790,14 @@ const TOOLS = [
     },
     {
         name: "delete_template",
-        description: "Delete a saved email template.",
+        description: "Delete a saved email template. Irreversible; requires confirmed:true when PROTONMAIL_CONFIRM_DESTRUCTIVE is enabled.",
         annotations: { destructiveHint: true },
         inputSchema: {
             type: "object",
-            properties: { id: { type: "string", description: "The template id." } },
+            properties: {
+                id: { type: "string", description: "The template id." },
+                confirmed: { type: "boolean", description: "Pass true to confirm permanent deletion of the template. Required when PROTONMAIL_CONFIRM_DESTRUCTIVE is enabled." },
+            },
             required: ["id"],
         },
     },
@@ -2640,6 +2645,20 @@ function parseIntegerEnv(name, defaultValue, min = 1, max = 10_000) {
     }
     return Math.min(max, Math.max(min, parsed));
 }
+// Ports need a hard failure, not the silent clamping parseIntegerEnv applies
+// for its other (non-port) callers — a typo like PROTONMAIL_IMAP_PORT=99999
+// should abort startup with a clear message instead of quietly becoming 65535
+// and failing later with a confusing connection error.
+function validatePortEnv(name) {
+    const raw = process.env[name]?.trim();
+    if (!raw) {
+        return;
+    }
+    const parsed = Number.parseInt(raw, 10);
+    if (!Number.isInteger(parsed) || parsed < 1 || parsed > 65_535) {
+        throw new Error(`${name} must be an integer between 1 and 65535, got: ${raw}`);
+    }
+}
 function parseAllowedActionsEnv(name) {
     const configured = parseListValues(process.env[name]);
     if (configured.length === 0) {
@@ -2665,11 +2684,13 @@ export function buildConfigFromEnv() {
     if (!username || !password) {
         throw new Error("Missing required environment variables or secret sources: PROTONMAIL_USERNAME and PROTONMAIL_PASSWORD.");
     }
+    validatePortEnv("PROTONMAIL_SMTP_PORT");
     const smtpPort = parseIntegerEnv("PROTONMAIL_SMTP_PORT", 1025, 1, 65_535);
     // Bridge's local SMTP port requires implicit TLS from the first byte (no
     // plaintext greeting, no STARTTLS) — confirmed against a live Bridge
     // instance. Overridable for non-Bridge SMTP setups.
     const smtpSecure = parseBooleanEnv("PROTONMAIL_SMTP_SECURE", true);
+    validatePortEnv("PROTONMAIL_IMAP_PORT");
     const imapPort = parseIntegerEnv("PROTONMAIL_IMAP_PORT", 1143, 1, 65_535);
     const debug = parseBooleanEnv("DEBUG", false);
     const readOnly = parseBooleanEnv("PROTONMAIL_READ_ONLY", false);
@@ -2759,7 +2780,18 @@ export function createServer(config, options = {}) {
     const templateService = new TemplateService(config, logger);
     if (options.startBackgroundSync) {
         backgroundSyncService.start();
-        void deliveryQueueService.start();
+        // start()'s first real work is awaiting recoverInterruptedSends(), which
+        // can throw a lock-acquisition-timeout error (see file-lock.ts). Bare
+        // `void` here would turn that into an unhandled rejection, and the
+        // process-wide unhandledRejection handler below calls process.exit(1) —
+        // crashing the whole server before it serves a single request over
+        // nothing worse than startup lock contention. Log and degrade instead:
+        // the delivery queue just won't be running yet.
+        deliveryQueueService.start().catch((error) => {
+            logger.error("deliveryQueueService.start() failed", "MCPServer", error);
+        });
+        // snoozeService.start() is synchronous (returns void, not a Promise) —
+        // nothing to catch here.
         snoozeService.start();
     }
     const server = new Server({
@@ -3718,6 +3750,17 @@ export function createServer(config, options = {}) {
                     if (draft.status === "sent") {
                         throw new McpError(ErrorCode.InvalidParams, `Draft ${draft.id} was already sent — scheduling it again would deliver it twice. Use create_draft to compose a new message instead.`);
                     }
+                    // Mirrors the check above but for the same-ordering case: a draft
+                    // has no "scheduled" status (only "draft"/"sent" — see
+                    // DraftStoreService), so calling schedule_draft twice on the same
+                    // still-"draft" draft (e.g. to change sendAt, or a client retry
+                    // 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.
+                    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.`);
+                    }
                     const sendAt = requireString(args, "sendAt");
                     const sendAtTime = new Date(sendAt).getTime();
                     if (Number.isNaN(sendAtTime)) {
@@ -3766,6 +3809,7 @@ export function createServer(config, options = {}) {
                 }
                 case "delete_draft": {
                     const draft = await draftStore.getDraft(requireString(args, "draftId"));
+                    ensureDestructiveConfirmed(config.runtime, normalizeBoolean(args?.confirmed, false), "Permanently delete draft: " + draft.id);
                     const deleted = await withAudit(auditService, name, args, async () => {
                         const remoteCleanup = resolveRemoteDraftSync(config.runtime, true).enabled
                             ? await clearRemoteDraft(draftStore, imapService, draft)
@@ -4313,7 +4357,9 @@ export function createServer(config, options = {}) {
                     return createTextResult(result);
                 }
                 case "delete_template": {
-                    const result = await withAudit(auditService, name, args, async () => templateService.delete(requireString(args, "id")));
+                    const templateId = requireString(args, "id");
+                    ensureDestructiveConfirmed(config.runtime, normalizeBoolean(args?.confirmed, false), "Permanently delete template: " + templateId);
+                    const result = await withAudit(auditService, name, args, async () => templateService.delete(templateId));
                     return createTextResult(result);
                 }
                 case "render_template": {
@@ -4450,10 +4496,19 @@ export function createServer(config, options = {}) {
                                 suggestion: "PROTONMAIL_PASSWORD must be the Proton Bridge password (Bridge app -> account -> Mailbox details), not your Proton account password. Confirm you're signed in inside the Bridge app.",
                             };
                         }
+                        // Checked before the generic connection-error case: an EPROTO/
+                        // "wrong version number" is unambiguous evidence of a TLS-mode
+                        // mismatch, distinct from Bridge simply being unreachable.
+                        if (isLikelyTlsMismatchError(reason)) {
+                            return {
+                                cause: "tls_mismatch",
+                                suggestion: "TLS handshake failed against a plaintext/STARTTLS port. PROTONMAIL_IMAP_SECURE/PROTONMAIL_SMTP_SECURE likely doesn't match the security mode of the port in Bridge's Mailbox details (implicit TLS vs STARTTLS) — check both against Bridge's IMAP/SMTP port settings.",
+                            };
+                        }
                         if (isLikelyConnectionError(reason)) {
                             return {
                                 cause: "bridge_unreachable",
-                                suggestion: "Proton Bridge isn't reachable on the configured host/port. Make sure the Bridge app is running, and that PROTONMAIL_IMAP_HOST/PORT and PROTONMAIL_SMTP_HOST/PORT match Bridge's Mailbox details.",
+                                suggestion: "Proton Bridge isn't reachable on the configured host/port, OR (if this is ECONNRESET) a TLS-mode mismatch in the other direction — plaintext attempted against an implicit-TLS port. Make sure the Bridge app is running, that PROTONMAIL_IMAP_HOST/PORT and PROTONMAIL_SMTP_HOST/PORT match Bridge's Mailbox details, and that PROTONMAIL_IMAP_SECURE/PROTONMAIL_SMTP_SECURE match the security mode shown there.",
                             };
                         }
                         return undefined;
@@ -4925,7 +4980,13 @@ export function createServer(config, options = {}) {
                             const { writeFile: wf, mkdir: mkd } = await import("node:fs/promises");
                             const absDir = pathResolve(downloadDir);
                             const absTarget = pathJoin(absDir, saveTo);
-                            if (!absTarget.startsWith(absDir + "/") && absTarget !== absDir) {
+                            // Hardcoded "/" here never matched on win32 (path.resolve/join
+                            // produce backslash-separated paths there), so every subdirectory
+                            // save failed with a false "escapes the allowed directory" —
+                            // fails safe/closed, not a security bypass, but breaks a normal
+                            // save on the Windows deployment this codebase explicitly
+                            // supports (see install-claude-desktop.ts's win32 branches).
+                            if (!absTarget.startsWith(absDir + sep) && absTarget !== absDir) {
                                 throw new McpError(ErrorCode.InvalidParams, "saveTo path escapes the allowed directory.");
                             }
                             await mkd(pathResolve(absTarget, ".."), { recursive: true });
@@ -4944,7 +5005,7 @@ export function createServer(config, options = {}) {
                                     throw error;
                                 }
                             }
-                            if (!realTarget.startsWith(absDir + "/") && realTarget !== absDir) {
+                            if (!realTarget.startsWith(absDir + sep) && realTarget !== absDir) {
                                 throw new McpError(ErrorCode.InvalidParams, "saveTo path escapes the allowed directory.");
                             }
                             const buf = Buffer.from(result.base64, "base64");
@@ -4968,7 +5029,9 @@ export function createServer(config, options = {}) {
                                 throw new McpError(ErrorCode.InvalidParams, "PROTONMAIL_ALLOW_FILE_DOWNLOAD_DIR must be set to use saveTo.");
                             const absDir = pathResolve(allowDir);
                             const absTarget = pathResolve(join(absDir, saveTo));
-                            if (!absTarget.startsWith(absDir + "/") && absTarget !== absDir) {
+                            // See the identical fix/comment in get_attachment_content above —
+                            // hardcoded "/" never matched a real subdirectory path on win32.
+                            if (!absTarget.startsWith(absDir + pathSep) && absTarget !== absDir) {
                                 throw new McpError(ErrorCode.InvalidParams, "saveTo path escapes the allowed directory.");
                             }
                             resolvedPath = absTarget;
@@ -5094,6 +5157,20 @@ export function createServer(config, options = {}) {
 }
 export async function main() {
     const config = buildConfigFromEnv();
+    // Create the data directory explicitly with a restrictive mode as its very
+    // first creation, before any service (draft store, template store, audit
+    // log, local index, ...) does its own mkdir(dirname(...)) as a side effect
+    // and inherits whatever the process umask happens to be. mkdir with
+    // recursive:true is a safe no-op on an already-existing directory — it
+    // will not change that directory's existing mode.
+    await mkdir(config.dataDir, { recursive: true, mode: 0o700 });
+    // mkdir's `mode` only applies when the directory doesn't already exist —
+    // on every real upgrade of an existing install (the common case, not a
+    // fresh one), this directory already existed at 0755 from before this fix,
+    // and mkdir on an existing directory is a silent no-op for its mode.
+    // Explicitly chmod it too so the restriction actually takes effect on
+    // upgrade, not only on a brand-new dataDir.
+    await chmod(config.dataDir, 0o700).catch(() => { });
     const { server, smtpService, imapService, backgroundSyncService, deliveryQueueService, snoozeService } = createServer(config, {
         startBackgroundSync: true,
     });