proton-mail-bridge-client 1.17.1 → 1.18.0

package/README.md

@@ -346,6 +346,7 @@ PROTONMAIL_IMAP_PORT='1143'
 PROTONMAIL_IMAP_SECURE='false'
 PROTONMAIL_SMTP_HOST='127.0.0.1'
 PROTONMAIL_SMTP_PORT='1025'
+PROTONMAIL_SMTP_SECURE='true'         # Bridge's local SMTP port requires implicit TLS from the first byte; set false only for a non-Bridge SMTP relay
 
 # Secrets via file or command (avoids raw credentials in config)
 PROTONMAIL_USERNAME_FILE='/path/to/user.txt'

package/dist/index.d.ts

@@ -9,6 +9,7 @@ import { SimpleIMAPService } from "./services/simple-imap-service.js";
 import { SMTPService } from "./services/smtp-service.js";
 import { SnoozeService } from "./services/snooze-service.js";
 import type { EmailDetail, ProtonMailConfig } from "./types/index.js";
+export declare const CORE_TOOL_NAMES: Set<string>;
 export declare function headerString(headers: Record<string, unknown> | undefined, name: string): string | undefined;
 export declare function parseAuthenticationResults(value?: string): {
     dkim?: string;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAOA,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,EAAwD,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC5H,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;AA82D1B,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;AAs5BD,wBAAgB,kBAAkB,IAAI,gBAAgB,CA4FrD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,gBAAgB,EACxB,OAAO,GAAE;IACP,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC1B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAupFP;AAED,wBAAsB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAqD1C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAOA,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,EAAwD,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC5H,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;AAkqD1B,eAAO,MAAM,eAAe,aAyB1B,CAAC;AAuLH,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;AAk5BD,wBAAgB,kBAAkB,IAAI,gBAAgB,CAgGrD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,gBAAgB,EACxB,OAAO,GAAE;IACP,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC1B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6pFP;AAED,wBAAsB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAqD1C"}

package/dist/index.js

@@ -718,7 +718,7 @@ const TOOLS = [
     },
     {
         name: "snooze_email",
-        description: "Move an email out of sight into Folders/Snoozed and bring it back to its original folder at wakeAt. IMPORTANT: like scheduled sends, wake only fires while this MCP server process stays running — if the app is closed before wakeAt, the email wakes on next server startup instead of at the requested time, not reliably at wakeAt itself. Cancelable via cancel_snooze, which wakes it immediately.",
+        description: "Move an email out of sight into Folders/MCP-Snoozed and bring it back to its original folder at wakeAt. IMPORTANT: like scheduled sends, wake only fires while this MCP server process stays running — if the app is closed before wakeAt, the email wakes on next server startup instead of at the requested time, not reliably at wakeAt itself. Cancelable via cancel_snooze, which wakes it immediately.",
         annotations: { destructiveHint: false },
         inputSchema: {
             type: "object",
@@ -1668,10 +1668,14 @@ const TOOLS = [
 // Core tier: the 20 tools that cover ~80% of daily email use.
 // Set PROTONMAIL_TOOL_TIER=core to expose only these — reduces context-window burn
 // significantly on every session. Default is "full" (all tools).
-const CORE_TOOL_NAMES = new Set([
+export const CORE_TOOL_NAMES = new Set([
     "get_emails",
     "get_email_by_id",
-    "search_emails",
+    // search_emails (live IMAP) is deliberately excluded from core — it
+    // overlaps with search_indexed_emails (faster, offline-capable, and
+    // already the "prefer" default per its own description) and the core
+    // tier exists specifically to reduce tool-selection overlap. Still
+    // available under PROTONMAIL_TOOL_TIER=full for stale-index/live-only cases.
     "search_indexed_emails",
     "send_email",
     "reply_to_email",
@@ -2427,20 +2431,17 @@ async function previewEmailAction(imapService, emailId, action, targetFolder) {
         isStarred: detail.isStarred,
     };
 }
+// Best-effort: confirms the sent copy landed in the Sent folder, purely for
+// the sentCopy:"[sent-copy:verified]" hint in the response. sentCopyVerify
+// already does its own robust folder resolution internally (by specialUse,
+// then by name) on every call — retrying it with different guessed folder
+// names here was redundant and, worse, sequential (up to 3 x 30s = 90s),
+// which blocked the send_email response long enough to trip the MCP
+// client's own request timeout on an email that had already sent
+// successfully. One bounded call; failing to verify quickly just means the
+// hint stays "unverified", never a false failure.
 async function verifySentCopy(imapService, messageId) {
-    const resolver = imapService.resolveSentFolder;
-    const resolved = await resolver?.();
-    if (resolved) {
-        return imapService.sentCopyVerify(messageId, resolved, 30_000);
-    }
-    let lastResult = { found: false };
-    for (const sentFolderName of ["Sent", "Sent Mail", "Sent Messages"]) {
-        lastResult = await imapService.sentCopyVerify(messageId, sentFolderName, 30_000);
-        if (lastResult.found) {
-            return lastResult;
-        }
-    }
-    return lastResult;
+    return imapService.sentCopyVerify(messageId, "Sent", 8_000);
 }
 function getBulkMaxBatchSize(args) {
     return typeof args.maxBatchSize === "number" ? Math.min(args.maxBatchSize, 2000) : 500;
@@ -2609,7 +2610,11 @@ export function buildConfigFromEnv() {
     if (!username || !password) {
         throw new Error("Missing required environment variables or secret sources: PROTONMAIL_USERNAME and PROTONMAIL_PASSWORD.");
     }
-    const smtpPort = parseIntegerEnv("PROTONMAIL_SMTP_PORT", 587, 1, 65_535);
+    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);
     const imapPort = parseIntegerEnv("PROTONMAIL_IMAP_PORT", 1143, 1, 65_535);
     const debug = parseBooleanEnv("DEBUG", false);
     const readOnly = parseBooleanEnv("PROTONMAIL_READ_ONLY", false);
@@ -2645,7 +2650,7 @@ export function buildConfigFromEnv() {
         smtp: {
             host: smtpHost,
             port: smtpPort,
-            secure: smtpPort === 465,
+            secure: smtpSecure,
             username,
             password,
         },
@@ -4883,7 +4888,16 @@ export function createServer(config, options = {}) {
             if (isLikelyConnectionError(error)) {
                 throw new McpError(ErrorCode.InternalError, "Could not connect to Proton Bridge. Make sure the Bridge app is running, and that PROTONMAIL_IMAP_HOST/PORT and PROTONMAIL_SMTP_HOST/PORT match the ports shown in Bridge's settings. Run run_doctor for a full connectivity check.");
             }
-            throw new McpError(ErrorCode.InternalError, "An internal error occurred. Check get_logs for details, or run run_doctor for a full connectivity check.");
+            // Every throw new Error(...) across src/services and src/utils is a
+            // deliberately-worded, actionable message (not-found, validation,
+            // policy-disabled, etc.) with no secrets or stack traces in it —
+            // surface it directly instead of discarding it into a generic
+            // "check get_logs" message that sends the caller on a diagnostic
+            // wild goose chase for something that was already fully explained.
+            const message = error instanceof Error && error.message
+                ? error.message
+                : "An internal error occurred. Check get_logs for details, or run run_doctor for a full connectivity check.";
+            throw new McpError(ErrorCode.InternalError, message);
         }
     });
     return {