apple-mail-mcp 2.8.2 → 2.8.3

package/build/services/replyForward.d.ts

@@ -1,87 +0,0 @@
-/**
- * Pure helpers that turn an existing message (its raw RFC 5322 source plus the
- * decoded plain-text body) into {@link SmtpSendOptions} for a **threaded reply**
- * or a **forward** sent over SMTP.
- *
- * This is the 2.5.0 "prefer-direct" path: when SMTP is configured we send
- * replies/forwards ourselves with correct `In-Reply-To`/`References` headers and
- * a clean MIME body, instead of driving Mail.app's `reply`/`forward` AppleScript
- * commands (which thread correctly but wrap the injected body in a `blockquote`
- * on macOS 15+). Kept separate from {@link sendViaSmtp} so the addressing,
- * subject-prefix, and quoting rules are unit-testable without a live SMTP server.
- */
-import type { SmtpSendOptions } from "../services/smtpMailer.js";
-/** The subset of an original message's headers we need to reply/forward. */
-export interface OriginalHeaders {
-    /** Raw `Message-ID` including angle brackets, e.g. `<abc@host>`. */
-    messageId?: string;
-    /** Thread chain: every `<id>` from `References` + `In-Reply-To`, in order. */
-    references: string[];
-    /** `From` address(es), bare (no display name). */
-    from: string[];
-    /** `Reply-To` address(es), bare. Preferred over {@link from} for replies. */
-    replyTo: string[];
-    /** `To` address(es), bare. */
-    to: string[];
-    /** `Cc` address(es), bare. */
-    cc: string[];
-    /** `Subject`, unfolded and trimmed (no `Re:`/`Fwd:` normalization). */
-    subject: string;
-    /** `Date` header verbatim, for the reply attribution line. */
-    date?: string;
-}
-/**
- * Pull bare email addresses out of a header value such as
- * `"Alice <a@x.com>, bob@y.com"` → `["a@x.com", "bob@y.com"]`. Splits on commas
- * (address lists are comma-separated) and unwraps `<...>` when present. Anything
- * without an `@` is dropped, so group syntax / junk is ignored.
- */
-export declare function extractAddresses(headerValue: string): string[];
-/**
- * Parse the header block (everything before the first blank line) of a raw
- * message. Continuation lines (folded headers, leading WSP) are unfolded, and
- * header names are matched case-insensitively. Only the headers in
- * {@link OriginalHeaders} are extracted.
- */
-export declare function parseOriginalHeaders(raw: string): OriginalHeaders;
-/**
- * Ensure `subject` carries `prefix` exactly once. Existing `Re:`/`Fwd:`/`Fw:`
- * prefixes (any case) are treated as already-present so we never stack them.
- */
-export declare function withSubjectPrefix(subject: string, prefix: "Re:" | "Fwd:"): string;
-/** Prefix every line of the original body with `> ` for the quoted reply block. */
-export declare function quoteBody(plainText: string): string;
-/**
- * Build {@link SmtpSendOptions} for a threaded reply.
- *
- * - recipients: `Reply-To` if the original had one, else `From`; with
- *   `replyAll`, the original `To`+`Cc` (minus our own addresses and the primary
- *   recipients) become `Cc`.
- * - subject: `Re: ` prepended unless already present.
- * - threading: `In-Reply-To` = original `Message-ID`; `References` = original
- *   chain + that `Message-ID`.
- * - body: the new text, then an attribution line and the quoted original.
- */
-export declare function buildReplyOptions(args: {
-    original: OriginalHeaders;
-    originalPlainText: string;
-    body: string;
-    replyAll: boolean;
-    /** Our own addresses, excluded from a reply-all recipient set. */
-    self: string[];
-    /** From override (defaults to the SMTP identity at send time when omitted). */
-    from?: string;
-}): SmtpSendOptions;
-/**
- * Build {@link SmtpSendOptions} for a forward to new recipients. A forward
- * starts a new thread, so no `In-Reply-To`/`References` are set — the win over
- * the AppleScript path is a clean, un-wrapped MIME body.
- */
-export declare function buildForwardOptions(args: {
-    original: OriginalHeaders;
-    originalPlainText: string;
-    to: string[];
-    body?: string;
-    from?: string;
-}): SmtpSendOptions;
-//# sourceMappingURL=replyForward.d.ts.map

package/build/services/replyForward.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"replyForward.d.ts","sourceRoot":"","sources":["../../src/services/replyForward.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAEhE,4EAA4E;AAC5E,MAAM,WAAW,eAAe;IAC9B,oEAAoE;IACpE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,kDAAkD;IAClD,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,6EAA6E;IAC7E,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,8BAA8B;IAC9B,EAAE,EAAE,MAAM,EAAE,CAAC;IACb,8BAA8B;IAC9B,EAAE,EAAE,MAAM,EAAE,CAAC;IACb,uEAAuE;IACvE,OAAO,EAAE,MAAM,CAAC;IAChB,8DAA8D;IAC9D,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,CAS9D;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAkCjE;AAgBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAIjF;AAED,mFAAmF;AACnF,wBAAgB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAMnD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,QAAQ,EAAE,eAAe,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,kEAAkE;IAClE,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,+EAA+E;IAC/E,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,eAAe,CAmClB;AAQD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE;IACxC,QAAQ,EAAE,eAAe,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,EAAE,EAAE,MAAM,EAAE,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,eAAe,CAsBlB"}

package/build/services/replyForward.js

@@ -1,150 +0,0 @@
-/**
- * Pull bare email addresses out of a header value such as
- * `"Alice <a@x.com>, bob@y.com"` → `["a@x.com", "bob@y.com"]`. Splits on commas
- * (address lists are comma-separated) and unwraps `<...>` when present. Anything
- * without an `@` is dropped, so group syntax / junk is ignored.
- */
-export function extractAddresses(headerValue) {
-    if (!headerValue.trim())
-        return [];
-    return headerValue
-        .split(",")
-        .map((part) => {
-        const angle = part.match(/<([^>]+)>/);
-        return (angle ? angle[1] : part).trim();
-    })
-        .filter((addr) => addr.includes("@"));
-}
-/**
- * Parse the header block (everything before the first blank line) of a raw
- * message. Continuation lines (folded headers, leading WSP) are unfolded, and
- * header names are matched case-insensitively. Only the headers in
- * {@link OriginalHeaders} are extracted.
- */
-export function parseOriginalHeaders(raw) {
-    const headerBlock = raw.split(/\r?\n\r?\n/)[0] ?? "";
-    // Unfold: any line starting with a space/tab continues the previous header.
-    const lines = [];
-    for (const line of headerBlock.split(/\r?\n/)) {
-        if (/^[ \t]/.test(line) && lines.length > 0) {
-            lines[lines.length - 1] += " " + line.trim();
-        }
-        else {
-            lines.push(line);
-        }
-    }
-    const get = (name) => {
-        const prefix = `${name.toLowerCase()}:`;
-        const found = lines.find((l) => l.toLowerCase().startsWith(prefix));
-        return found ? found.slice(found.indexOf(":") + 1).trim() : undefined;
-    };
-    const rawMessageId = get("Message-ID");
-    const messageId = rawMessageId?.match(/<[^>]+>/)?.[0] ?? rawMessageId ?? undefined;
-    const references = `${get("References") ?? ""} ${get("In-Reply-To") ?? ""}`.match(/<[^>]+>/g) ?? [];
-    return {
-        messageId,
-        references,
-        from: extractAddresses(get("From") ?? ""),
-        replyTo: extractAddresses(get("Reply-To") ?? ""),
-        to: extractAddresses(get("To") ?? ""),
-        cc: extractAddresses(get("Cc") ?? ""),
-        subject: get("Subject") ?? "",
-        date: get("Date"),
-    };
-}
-/** Case-insensitive de-dupe that preserves first-seen order and casing. */
-function dedupe(addrs) {
-    const seen = new Set();
-    const out = [];
-    for (const a of addrs) {
-        const k = a.toLowerCase();
-        if (!seen.has(k)) {
-            seen.add(k);
-            out.push(a);
-        }
-    }
-    return out;
-}
-/**
- * Ensure `subject` carries `prefix` exactly once. Existing `Re:`/`Fwd:`/`Fw:`
- * prefixes (any case) are treated as already-present so we never stack them.
- */
-export function withSubjectPrefix(subject, prefix) {
-    const s = subject.trim();
-    const present = prefix === "Re:" ? /^re:/i : /^(fwd?|fw):/i;
-    return present.test(s) ? s : `${prefix} ${s}`;
-}
-/** Prefix every line of the original body with `> ` for the quoted reply block. */
-export function quoteBody(plainText) {
-    return plainText
-        .replace(/\s+$/, "")
-        .split(/\r?\n/)
-        .map((l) => (l ? `> ${l}` : ">"))
-        .join("\n");
-}
-/**
- * Build {@link SmtpSendOptions} for a threaded reply.
- *
- * - recipients: `Reply-To` if the original had one, else `From`; with
- *   `replyAll`, the original `To`+`Cc` (minus our own addresses and the primary
- *   recipients) become `Cc`.
- * - subject: `Re: ` prepended unless already present.
- * - threading: `In-Reply-To` = original `Message-ID`; `References` = original
- *   chain + that `Message-ID`.
- * - body: the new text, then an attribution line and the quoted original.
- */
-export function buildReplyOptions(args) {
-    const { original, originalPlainText, body, replyAll, self, from } = args;
-    const selfSet = new Set(self.filter(Boolean).map((s) => s.toLowerCase()));
-    const to = dedupe((original.replyTo.length ? original.replyTo : original.from).filter(Boolean));
-    const toSet = new Set(to.map((t) => t.toLowerCase()));
-    let cc;
-    if (replyAll) {
-        const extra = dedupe([...original.to, ...original.cc].filter((a) => !selfSet.has(a.toLowerCase()) && !toSet.has(a.toLowerCase())));
-        cc = extra.length ? extra : undefined;
-    }
-    const attribution = buildAttribution(original);
-    const quoted = originalPlainText.trim()
-        ? `\n\n${attribution}${quoteBody(originalPlainText)}`
-        : "";
-    const references = dedupe(original.messageId ? [...original.references, original.messageId] : original.references);
-    return {
-        to,
-        cc,
-        subject: withSubjectPrefix(original.subject, "Re:"),
-        body: `${body}${quoted}`,
-        inReplyTo: original.messageId,
-        references: references.length ? references : undefined,
-        from,
-    };
-}
-/** "On <date>, <sender> wrote:\n" — omits the date clause when unknown. */
-function buildAttribution(original) {
-    const who = original.from[0] ?? original.replyTo[0] ?? "the sender";
-    return original.date ? `On ${original.date}, ${who} wrote:\n` : `${who} wrote:\n`;
-}
-/**
- * Build {@link SmtpSendOptions} for a forward to new recipients. A forward
- * starts a new thread, so no `In-Reply-To`/`References` are set — the win over
- * the AppleScript path is a clean, un-wrapped MIME body.
- */
-export function buildForwardOptions(args) {
-    const { original, originalPlainText, to, body, from } = args;
-    const headerBlock = [
-        "---------- Forwarded message ----------",
-        original.from.length ? `From: ${original.from.join(", ")}` : "",
-        original.date ? `Date: ${original.date}` : "",
-        `Subject: ${original.subject}`,
-        original.to.length ? `To: ${original.to.join(", ")}` : "",
-        original.cc.length ? `Cc: ${original.cc.join(", ")}` : "",
-    ]
-        .filter(Boolean)
-        .join("\n");
-    const prefix = body?.trim() ? `${body}\n\n` : "";
-    return {
-        to: dedupe(to),
-        subject: withSubjectPrefix(original.subject, "Fwd:"),
-        body: `${prefix}${headerBlock}\n\n${originalPlainText}`,
-        from,
-    };
-}

package/build/services/smtpMailer.d.ts

@@ -1,160 +0,0 @@
-/**
- * SMTP transport for sending mail (issue #12).
- *
- * Mail.app's AppleScript send path wraps any injected body in
- * `<blockquote type="cite">` under the Apple-Mail-URLShareWrapperClass template
- * on macOS 15+, so messages render to recipients as quoted/forwarded content
- * (Apple radar FB11734014, open since Ventura). This module bypasses Mail.app
- * entirely and submits clean MIME directly over SMTP via nodemailer.
- *
- * Connection settings come from environment variables; the password is read
- * from the macOS Keychain via the `security` CLI by default so no secret is
- * ever placed in config. When SMTP is configured, `send-email` auto-prefers it
- * over AppleScript (opt out per call with `transport: "applescript"`); see
- * {@link shouldUseSmtp}.
- *
- * @module services/smtpMailer
- */
-import nodemailer from "nodemailer";
-import type { AttachmentInput } from "../types.js";
-/** Options for an SMTP send, mirroring the AppleScript send-email surface. */
-export interface SmtpSendOptions {
-    to: string[];
-    subject: string;
-    /** Plain-text body. Always sent as the text/plain part. */
-    body: string;
-    cc?: string[];
-    bcc?: string[];
-    /** Overrides the configured From address (must be allowed by the SMTP server). */
-    from?: string;
-    /** Files to attach: absolute paths and/or inline base64 content (B4). */
-    attachments?: AttachmentInput[];
-    /**
-     * Optional HTML body. When provided, the message is sent as
-     * multipart/alternative ({@link SmtpSendOptions.body} as the text/plain part,
-     * this as the text/html part) so clients pick the richer rendering while
-     * plain-text clients still get a clean fallback.
-     */
-    htmlBody?: string;
-    /**
-     * RFC 5322 threading (2.5.0): the message this is replying to — emitted as the
-     * `In-Reply-To` header so SMTP replies/forwards thread correctly in Gmail and
-     * other clients. Pass the original message's `Message-ID`.
-     */
-    inReplyTo?: string;
-    /**
-     * RFC 5322 threading (2.5.0): the `References` chain — the original message's
-     * existing `References` plus its `Message-ID`. nodemailer accepts an array.
-     */
-    references?: string[];
-}
-/** Resolved SMTP connection configuration. */
-export interface SmtpConfig {
-    host: string;
-    port: number;
-    secure: boolean;
-    user: string;
-    pass: string;
-    from: string;
-}
-/** Result of an SMTP send. */
-export interface SmtpSendResult {
-    success: boolean;
-    messageId?: string;
-    error?: string;
-}
-/**
- * Environment variables consumed by {@link resolveSmtpConfig}. Documented here
- * (and in the README) so the error path can point users at exactly what to set.
- */
-export declare const SMTP_ENV: {
-    readonly host: "APPLE_MAIL_MCP_SMTP_HOST";
-    readonly port: "APPLE_MAIL_MCP_SMTP_PORT";
-    readonly secure: "APPLE_MAIL_MCP_SMTP_SECURE";
-    readonly user: "APPLE_MAIL_MCP_SMTP_USER";
-    readonly from: "APPLE_MAIL_MCP_SMTP_FROM";
-    readonly password: "APPLE_MAIL_MCP_SMTP_PASSWORD";
-    readonly keychainService: "APPLE_MAIL_MCP_SMTP_KEYCHAIN_SERVICE";
-    readonly keychainAccount: "APPLE_MAIL_MCP_SMTP_KEYCHAIN_ACCOUNT";
-};
-/**
- * Cheap check for whether the SMTP transport is configured at all, i.e. the two
- * required settings ({@link SMTP_ENV.host} and {@link SMTP_ENV.user}) are
- * present. Used to auto-prefer SMTP over AppleScript when no transport is
- * explicitly requested, and by `doctor`. Does NOT touch the Keychain or verify
- * the password — a misconfigured password still surfaces a clear error at send
- * time via {@link resolveSmtpConfig}.
- */
-export declare function isSmtpConfigured(env?: NodeJS.ProcessEnv): boolean;
-/**
- * Decides whether `send-email` should use the SMTP transport for this call.
- *
- * - explicit `"smtp"` → always SMTP (config errors surface, no fallback);
- * - explicit `"applescript"` → always the Mail.app path;
- * - omitted → SMTP when configured, **except** when a non-email `account` label
- *   (a Mail.app account name such as `"Work"`) is supplied. That requests
- *   account-based sending, which only the AppleScript path can do, so we honor
- *   the caller's intent instead of silently switching their account. An
- *   `account` that is an email address is treated as a From override and does
- *   not block SMTP.
- */
-export declare function shouldUseSmtp(transport: "applescript" | "smtp" | undefined, account: string | undefined, configured?: boolean): boolean;
-/**
- * Reads a password from the macOS login Keychain via the `security` CLI.
- *
- * Tries `find-internet-password` first (where Mail.app stores account
- * passwords) and falls back to `find-generic-password`. Returns null if no
- * matching item exists or the lookup fails for any reason — callers fall back
- * to the password env var and ultimately surface a clear configuration error.
- *
- * @param service - Keychain service / server name (typically the SMTP host)
- * @param account - Keychain account (typically the SMTP username)
- */
-export declare function readKeychainPassword(service: string, account: string): string | null;
-/**
- * Resolves SMTP connection configuration from environment + Keychain.
- *
- * @throws Error with an actionable message listing the missing settings.
- */
-export declare function resolveSmtpConfig(env?: NodeJS.ProcessEnv): SmtpConfig;
-/**
- * Sends an email over SMTP, producing clean MIME with no blockquote wrapping.
- *
- * Config is resolved via {@link resolveSmtpConfig} unless one is injected (the
- * `config` parameter exists for testing). The body is sent as plain text; pass
- * a transporter factory only in tests.
- */
-export declare function sendViaSmtp(opts: SmtpSendOptions, config?: SmtpConfig, createTransport?: typeof nodemailer.createTransport): Promise<SmtpSendResult>;
-/** One recipient of a mail-merge batch (mirrors the AppleScript serial path). */
-export interface SerialSmtpRecipient {
-    email: string;
-    variables: Record<string, string>;
-}
-/** Per-recipient outcome of a serial SMTP send. */
-export interface SerialSmtpResult {
-    email: string;
-    success: boolean;
-    error?: string;
-}
-/**
- * Replace every `{{Key}}` token in `template` with the matching value from
- * `variables`. Keys are escaped so regex metacharacters in a key are literal.
- * Mirrors the substitution in {@link AppleMailManager.sendSerialEmail} so the
- * two transports personalize identically.
- */
-export declare function applyPlaceholders(template: string, variables: Record<string, string>): string;
-/**
- * Send a personalized mail-merge batch over SMTP — one individual message per
- * recipient (recipients never see each other), with `{{Key}}` placeholders in
- * the subject/body replaced per recipient. Returns a per-recipient result list;
- * a single recipient's failure does not abort the batch.
- *
- * `opts.send` and `opts.sleep` are injectable for tests (no real SMTP / no real
- * delay). The default `sleep` waits `delayMs` (clamped 0–10000) between sends.
- */
-export declare function sendSerialViaSmtp(recipients: SerialSmtpRecipient[], subject: string, body: string, config: SmtpConfig, opts?: {
-    delayMs?: number;
-    send?: typeof sendViaSmtp;
-    sleep?: (ms: number) => Promise<void>;
-}): Promise<SerialSmtpResult[]>;
-//# sourceMappingURL=smtpMailer.d.ts.map

package/build/services/smtpMailer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"smtpMailer.d.ts","sourceRoot":"","sources":["../../src/services/smtpMailer.ts"],"names":[],"mappings":"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"}

package/build/services/smtpMailer.js

@@ -1,268 +0,0 @@
-/**
- * SMTP transport for sending mail (issue #12).
- *
- * Mail.app's AppleScript send path wraps any injected body in
- * `<blockquote type="cite">` under the Apple-Mail-URLShareWrapperClass template
- * on macOS 15+, so messages render to recipients as quoted/forwarded content
- * (Apple radar FB11734014, open since Ventura). This module bypasses Mail.app
- * entirely and submits clean MIME directly over SMTP via nodemailer.
- *
- * Connection settings come from environment variables; the password is read
- * from the macOS Keychain via the `security` CLI by default so no secret is
- * ever placed in config. When SMTP is configured, `send-email` auto-prefers it
- * over AppleScript (opt out per call with `transport: "applescript"`); see
- * {@link shouldUseSmtp}.
- *
- * @module services/smtpMailer
- */
-import nodemailer from "nodemailer";
-import { execFileSync } from "child_process";
-import { isAbsolute } from "path";
-import { existsSync } from "fs";
-/**
- * Environment variables consumed by {@link resolveSmtpConfig}. Documented here
- * (and in the README) so the error path can point users at exactly what to set.
- */
-export const SMTP_ENV = {
-    host: "APPLE_MAIL_MCP_SMTP_HOST",
-    port: "APPLE_MAIL_MCP_SMTP_PORT",
-    secure: "APPLE_MAIL_MCP_SMTP_SECURE",
-    user: "APPLE_MAIL_MCP_SMTP_USER",
-    from: "APPLE_MAIL_MCP_SMTP_FROM",
-    password: "APPLE_MAIL_MCP_SMTP_PASSWORD",
-    keychainService: "APPLE_MAIL_MCP_SMTP_KEYCHAIN_SERVICE",
-    keychainAccount: "APPLE_MAIL_MCP_SMTP_KEYCHAIN_ACCOUNT",
-};
-/**
- * Cheap check for whether the SMTP transport is configured at all, i.e. the two
- * required settings ({@link SMTP_ENV.host} and {@link SMTP_ENV.user}) are
- * present. Used to auto-prefer SMTP over AppleScript when no transport is
- * explicitly requested, and by `doctor`. Does NOT touch the Keychain or verify
- * the password — a misconfigured password still surfaces a clear error at send
- * time via {@link resolveSmtpConfig}.
- */
-export function isSmtpConfigured(env = process.env) {
-    return Boolean(env[SMTP_ENV.host]?.trim() && env[SMTP_ENV.user]?.trim());
-}
-/**
- * Decides whether `send-email` should use the SMTP transport for this call.
- *
- * - explicit `"smtp"` → always SMTP (config errors surface, no fallback);
- * - explicit `"applescript"` → always the Mail.app path;
- * - omitted → SMTP when configured, **except** when a non-email `account` label
- *   (a Mail.app account name such as `"Work"`) is supplied. That requests
- *   account-based sending, which only the AppleScript path can do, so we honor
- *   the caller's intent instead of silently switching their account. An
- *   `account` that is an email address is treated as a From override and does
- *   not block SMTP.
- */
-export function shouldUseSmtp(transport, account, configured = isSmtpConfigured()) {
-    if (transport === "smtp")
-        return true;
-    if (transport === "applescript")
-        return false;
-    if (!configured)
-        return false;
-    const isAccountLabel = Boolean(account && !account.includes("@"));
-    return !isAccountLabel;
-}
-/**
- * Reads a password from the macOS login Keychain via the `security` CLI.
- *
- * Tries `find-internet-password` first (where Mail.app stores account
- * passwords) and falls back to `find-generic-password`. Returns null if no
- * matching item exists or the lookup fails for any reason — callers fall back
- * to the password env var and ultimately surface a clear configuration error.
- *
- * @param service - Keychain service / server name (typically the SMTP host)
- * @param account - Keychain account (typically the SMTP username)
- */
-export function readKeychainPassword(service, account) {
-    for (const kind of ["find-internet-password", "find-generic-password"]) {
-        try {
-            const out = execFileSync("security", [kind, "-s", service, "-a", account, "-w"], {
-                encoding: "utf8",
-                stdio: ["ignore", "pipe", "ignore"],
-            });
-            const pass = out.replace(/\n$/, "");
-            if (pass)
-                return pass;
-        }
-        catch {
-            // Not found via this kind; try the next.
-        }
-    }
-    return null;
-}
-/**
- * Resolves SMTP connection configuration from environment + Keychain.
- *
- * @throws Error with an actionable message listing the missing settings.
- */
-export function resolveSmtpConfig(env = process.env) {
-    const host = env[SMTP_ENV.host]?.trim();
-    const user = env[SMTP_ENV.user]?.trim();
-    const missing = [];
-    if (!host)
-        missing.push(SMTP_ENV.host);
-    if (!user)
-        missing.push(SMTP_ENV.user);
-    if (missing.length > 0) {
-        throw new Error(`SMTP transport is not configured. Set ${missing.join(" and ")} ` +
-            `(plus a password via ${SMTP_ENV.password} or the Keychain). ` +
-            `See the README "SMTP transport" section.`);
-    }
-    // secure=true => implicit TLS (port 465); otherwise STARTTLS (port 587).
-    const secure = /^(1|true|yes)$/i.test(env[SMTP_ENV.secure]?.trim() ?? "");
-    const port = env[SMTP_ENV.port]
-        ? Number.parseInt(env[SMTP_ENV.port], 10)
-        : secure
-            ? 465
-            : 587;
-    if (!Number.isInteger(port) || port <= 0) {
-        throw new Error(`Invalid ${SMTP_ENV.port}: "${env[SMTP_ENV.port]}" is not a valid port.`);
-    }
-    const from = env[SMTP_ENV.from]?.trim() || user;
-    // Password: explicit env var wins, otherwise Keychain (service/account
-    // default to the host/user but can be overridden).
-    let pass = env[SMTP_ENV.password];
-    if (!pass) {
-        const service = env[SMTP_ENV.keychainService]?.trim() || host;
-        const account = env[SMTP_ENV.keychainAccount]?.trim() || user;
-        pass = readKeychainPassword(service, account) ?? undefined;
-    }
-    if (!pass) {
-        throw new Error(`No SMTP password found. Set ${SMTP_ENV.password}, or store an internet ` +
-            `password in the Keychain for service "${env[SMTP_ENV.keychainService]?.trim() || host}" / account "${env[SMTP_ENV.keychainAccount]?.trim() || user}".`);
-    }
-    return { host: host, port, secure, user: user, pass, from };
-}
-/**
- * Validates attachment paths the same way the AppleScript path does: absolute
- * and existing. Returns nodemailer attachment descriptors.
- */
-function buildAttachments(attachments) {
-    if (!attachments || attachments.length === 0)
-        return undefined;
-    return attachments.map((a) => {
-        if (typeof a === "string") {
-            if (!isAbsolute(a))
-                throw new Error(`Attachment path must be absolute: "${a}"`);
-            if (!existsSync(a))
-                throw new Error(`Attachment file not found: "${a}"`);
-            return { path: a };
-        }
-        if (!a.filename || !a.contentBase64) {
-            throw new Error("Inline attachment requires both filename and contentBase64.");
-        }
-        return { filename: a.filename, content: Buffer.from(a.contentBase64, "base64") };
-    });
-}
-/**
- * Sends an email over SMTP, producing clean MIME with no blockquote wrapping.
- *
- * Config is resolved via {@link resolveSmtpConfig} unless one is injected (the
- * `config` parameter exists for testing). The body is sent as plain text; pass
- * a transporter factory only in tests.
- */
-export async function sendViaSmtp(opts, config, createTransport = nodemailer.createTransport) {
-    let cfg;
-    try {
-        cfg = config ?? resolveSmtpConfig();
-    }
-    catch (error) {
-        return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-    let attachments;
-    try {
-        attachments = buildAttachments(opts.attachments);
-    }
-    catch (error) {
-        return { success: false, error: error instanceof Error ? error.message : String(error) };
-    }
-    const transporter = createTransport({
-        host: cfg.host,
-        port: cfg.port,
-        secure: cfg.secure,
-        auth: { user: cfg.user, pass: cfg.pass },
-    });
-    const html = opts.htmlBody?.trim() ? opts.htmlBody : undefined;
-    try {
-        const info = await transporter.sendMail({
-            from: opts.from?.trim() || cfg.from,
-            to: opts.to,
-            cc: opts.cc,
-            bcc: opts.bcc,
-            subject: opts.subject,
-            text: opts.body,
-            // When present, nodemailer emits multipart/alternative (text + html).
-            html,
-            attachments,
-            // RFC 5322 threading for SMTP replies/forwards (2.5.0).
-            inReplyTo: opts.inReplyTo?.trim() || undefined,
-            references: opts.references?.length ? opts.references : undefined,
-        });
-        return { success: true, messageId: info.messageId };
-    }
-    catch (error) {
-        return {
-            success: false,
-            error: `SMTP send failed: ${error instanceof Error ? error.message : String(error)}`,
-        };
-    }
-    finally {
-        transporter.close();
-    }
-}
-/**
- * Replace every `{{Key}}` token in `template` with the matching value from
- * `variables`. Keys are escaped so regex metacharacters in a key are literal.
- * Mirrors the substitution in {@link AppleMailManager.sendSerialEmail} so the
- * two transports personalize identically.
- */
-export function applyPlaceholders(template, variables) {
-    let out = template;
-    for (const [key, value] of Object.entries(variables)) {
-        const safeKey = key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-        out = out.replace(new RegExp(`\\{\\{${safeKey}\\}\\}`, "g"), value);
-    }
-    return out;
-}
-/**
- * Send a personalized mail-merge batch over SMTP — one individual message per
- * recipient (recipients never see each other), with `{{Key}}` placeholders in
- * the subject/body replaced per recipient. Returns a per-recipient result list;
- * a single recipient's failure does not abort the batch.
- *
- * `opts.send` and `opts.sleep` are injectable for tests (no real SMTP / no real
- * delay). The default `sleep` waits `delayMs` (clamped 0–10000) between sends.
- */
-export async function sendSerialViaSmtp(recipients, subject, body, config, opts = {}) {
-    const send = opts.send ?? sendViaSmtp;
-    const sleep = opts.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
-    const delay = Math.min(Math.max(opts.delayMs ?? 500, 0), 10000);
-    const results = [];
-    for (let i = 0; i < recipients.length; i++) {
-        const r = recipients[i];
-        try {
-            const res = await send({
-                to: [r.email],
-                subject: applyPlaceholders(subject, r.variables),
-                body: applyPlaceholders(body, r.variables),
-                from: config.from,
-            }, config);
-            results.push({ email: r.email, success: res.success, error: res.error });
-        }
-        catch (error) {
-            results.push({
-                email: r.email,
-                success: false,
-                error: error instanceof Error ? error.message : String(error),
-            });
-        }
-        if (delay > 0 && i < recipients.length - 1) {
-            await sleep(delay);
-        }
-    }
-    return results;
-}