@voltro/plugin-mail 0.86.0 → 0.87.0

package/dist/idempotency.js

@@ -41,7 +41,7 @@ var s = i({ scope: "@voltro/plugin-mail" }), c = (e) => e ?? "*", l = () => {
 			}), r.catch((e) => r.sync(() => (s.warn("idempotency reserve failed — skipping send to avoid a double", {
 				key: o,
 				message: n(e)
-			}), { won: !1 })))) : r.succeed({ won: !0 });
+			}), { won: !1 })))) : r.succeed({ won: !1 });
 		},
 		record: (l, u, d) => {
 			let f = i;
@@ -57,6 +57,19 @@ var s = i({ scope: "@voltro/plugin-mail" }), c = (e) => e ?? "*", l = () => {
 			i = e;
 		}
 	};
-};
+}, d = (n, i, s) => t(() => n.query({
+	table: e,
+	predicate: a(o("tenant", c(i)), o("key", s)),
+	projection: ["resultId", "resultProvider"],
+	order: [],
+	take: 1,
+	skip: void 0
+})).pipe(r.map((e) => {
+	let t = e[0], n = t?.resultId, r = t?.resultProvider;
+	return typeof n == "string" && n !== "" && typeof r == "string" && r !== "" ? {
+		id: n,
+		provider: r
+	} : null;
+}), r.catch(() => r.succeed(null)));
 //#endregion
-export { l as memoryIdempotencyStore, u as postgresIdempotencyStore };
+export { l as memoryIdempotencyStore, u as postgresIdempotencyStore, d as readMailReceipt };

package/dist/index.d.ts

@@ -1,10 +1,13 @@
+import { ColumnBuilder } from '@voltro/database';
 import { Context } from 'effect';
 import { DataStore } from '@voltro/database';
 import { Effect } from 'effect';
+import { FieldDefinitions } from '@voltro/database';
 import { Layer } from 'effect';
 import { PluginEgressDeclaration } from '@voltro/protocol';
 import { PluginHttpRouteRequest } from '@voltro/protocol';
 import { Schema } from 'effect';
+import { Table } from '@voltro/database';
 import { VoltroPlugin } from '@voltro/protocol';
 import { YieldableError } from 'effect/Cause';
 
@@ -215,6 +218,17 @@ export declare interface MailgunOptions {
 
 export declare const mailgunProvider: (options: MailgunOptions) => MailProvider;
 
+/** One row per idempotency key: the reservation, then the winning send's result. */
+export declare const mailIdempotencyTable: Table<"_voltro_mail_idempotency", FieldDefinitions<{
+    readonly id: ColumnBuilder<number, "id", boolean>;
+    readonly tenant: ColumnBuilder<string, "text", boolean>;
+    readonly key: ColumnBuilder<string, "text", boolean>;
+    readonly resultId: ColumnBuilder<string | null, "text", boolean>;
+    readonly resultProvider: ColumnBuilder<string | null, "text", boolean>;
+    readonly createdAt: ColumnBuilder<Date, "timestamp", true>;
+    readonly created_at: ColumnBuilder<unknown, "text", boolean>;
+}>, false, never>;
+
 /** A message to send. `from` is optional here — the service fills it
  *  from the plugin's configured default before handing it to a provider. */
 export declare interface MailMessage {
@@ -245,6 +259,10 @@ export declare interface MailMessage {
      *  step. The first send with a given key delivers; a replay with the same
      *  key is a no-op returning the recorded result. Scoped per tenant. */
     readonly idempotencyKey?: string;
+    /** Override the service's transient retry count for this message. Zero means
+     * one provider dispatch, for callers that durably reconcile unknown outcomes.
+     * This is not a provider-side delivery/idempotency guarantee. */
+    readonly retryAttempts?: number;
     /** `transactional` (default) or `broadcast`. See `MailStream`. */
     readonly stream?: MailStream;
     /** How a recipient leaves a broadcast. See `MailUnsubscribe`. */
@@ -447,6 +465,17 @@ export declare interface MailServiceShape {
  */
 export declare type MailStream = 'transactional' | 'broadcast';
 
+/** One row per suppressed (tenant, address). Kept until lifted — a bounce or a
+ *  complaint does not expire, so this table has no retention policy. */
+export declare const mailSuppressionTable: Table<"_voltro_mail_suppression", FieldDefinitions<{
+    readonly id: ColumnBuilder<number, "id", boolean>;
+    readonly tenant: ColumnBuilder<string, "text", boolean>;
+    readonly email: ColumnBuilder<string, "text", boolean>;
+    readonly reason: ColumnBuilder<string | null, "text", boolean>;
+    readonly createdAt: ColumnBuilder<Date, "timestamp", true>;
+    readonly created_at: ColumnBuilder<unknown, "text", boolean>;
+}>, false, never>;
+
 /**
  * How a recipient leaves a broadcast. `oneClickUrl` is the HTTPS endpoint a
  * mail client POSTs `List-Unsubscribe=One-Click` to (RFC 8058); the service
@@ -543,6 +572,11 @@ export declare const postmarkProvider: (options: {
 /** Stable snapshot of everything the memory provider has "sent". */
 export declare const readMailBuffer: () => ReadonlyArray<ResolvedMessage>;
 
+/** Read a recorded persistent receipt without reserving a key or dispatching.
+ * Missing, pending, unbound or unavailable storage is not delivery evidence.
+ * The server caller owns authorization for the requested tenant/key. */
+export declare const readMailReceipt: (store: DataStore, tenantId: string | null, key: string) => Effect.Effect<SendResult | null>;
+
 /** Register CLI-discovered (or hand-collected) templates. Idempotent per key. */
 export declare const registerEmailTemplates: (templates: ReadonlyArray<AnyEmailTemplate>) => void;
 
@@ -697,6 +731,10 @@ export declare interface TemplateMessage {
     readonly scheduledAt?: Date;
     /** See `MailMessage.idempotencyKey`. */
     readonly idempotencyKey?: string;
+    /** Override the service's transient retry count for this message. Zero means
+     * one provider dispatch, for callers that durably reconcile unknown outcomes.
+     * This is not a provider-side delivery/idempotency guarantee. */
+    readonly retryAttempts?: number;
     /** See `MailMessage.stream`. */
     readonly stream?: MailStream;
     /** See `MailMessage.unsubscribe`. */

package/dist/index.js

@@ -1,17 +1,17 @@
 import { MailError as e, MailService as t, MailWebhookError as n, defineEmail as r } from "./types.js";
 import { renderTemplate as i } from "./render.js";
 import { clearGlobalTemplates as a, globalTemplateCount as o, isEmailTemplate as s, listGlobalTemplates as c, lookupGlobalTemplate as l, registerEmailTemplates as u } from "./registry.js";
-import { MAIL_IDEMPOTENCY_TABLE as ee, mailIdempotencyTable as d, mailSuppressionTable as f } from "./storeTables.js";
-import { memorySuppressionStore as p, postgresSuppressionStore as m } from "./suppression.js";
-import { memoryIdempotencyStore as h, postgresIdempotencyStore as g } from "./idempotency.js";
-import { heldId as _, makeScheduler as v, memoryScheduleStore as y } from "./scheduler.js";
-import { clearMailBuffer as b, consoleProvider as x, lettermintProvider as S, mailgunProvider as C, memoryProvider as w, postmarkProvider as T, readMailBuffer as E, resendProvider as D, sendgridProvider as O, sesProvider as k, smtpProvider as A, verifyLettermintSignature as j } from "./providers.js";
-import { buildMailService as M, buildMailServiceWithScheduler as N, mailServiceLayer as P, resolveProvider as F } from "./service.js";
-import { handleMailEvents as I, parseMailEvent as L } from "./events.js";
-import { createOutbox as R } from "./outbox.js";
-import { mailEgressOf as z } from "./egress.js";
+import { MAIL_IDEMPOTENCY_TABLE as d, mailIdempotencyTable as f, mailSuppressionTable as p } from "./storeTables.js";
+import { memorySuppressionStore as m, postgresSuppressionStore as h } from "./suppression.js";
+import { memoryIdempotencyStore as g, postgresIdempotencyStore as _, readMailReceipt as v } from "./idempotency.js";
+import { heldId as y, makeScheduler as b, memoryScheduleStore as x } from "./scheduler.js";
+import { clearMailBuffer as S, consoleProvider as C, lettermintProvider as w, mailgunProvider as T, memoryProvider as E, postmarkProvider as D, readMailBuffer as O, resendProvider as k, sendgridProvider as A, sesProvider as j, smtpProvider as M, verifyLettermintSignature as N } from "./providers.js";
+import { buildMailService as P, buildMailServiceWithScheduler as F, mailServiceLayer as I, resolveProvider as L } from "./service.js";
+import { handleMailEvents as ee, parseMailEvent as R } from "./events.js";
+import { createOutbox as z } from "./outbox.js";
+import { mailEgressOf as B } from "./egress.js";
 import { schemaSkeleton as te } from "./skeleton.js";
-import { Duration as B, Effect as V, Fiber as H, Layer as U, Result as W, Schedule as G } from "effect";
+import { Duration as ne, Effect as V, Fiber as H, Layer as U, Result as W, Schedule as G } from "effect";
 import { definePlugin as K, pluginInstanceName as q } from "@voltro/protocol";
 import { pluginEnv as J } from "@voltro/env";
 import { registerRetention as Y, retentionTtlMsFromEnv as X } from "@voltro/database";
@@ -141,7 +141,7 @@ var Z = J([
 	status: e,
 	contentType: "application/json",
 	body: JSON.stringify(t)
-}), ne = (e, t, n, r) => {
+}), re = (e, t, n, r) => {
 	let i = e.webhook;
 	if (i === void 0) throw Error(`@voltro/plugin-mail: provider '${e.name}' has no webhook verifier — mailPlugin({ webhook }) needs one (lettermint)`);
 	let a = n.secret ?? Z.read("MAIL_WEBHOOK_SECRET");
@@ -153,7 +153,7 @@ var Z = J([
 			if (!a) return $(503, { error: "mail webhook secret not configured" });
 			let o = await V.runPromise(V.result(i.verify(r.headers, new TextDecoder().decode(r.rawBody), a)));
 			if (W.isFailure(o)) return $(401, { error: o.failure.message });
-			let s = L(e.name, o.success);
+			let s = R(e.name, o.success);
 			try {
 				for (let e of s) {
 					e.type === "bounced" || e.type === "complained" ? await V.runPromise(t.suppress(null, e.email, e.type)) : e.type === "unsuppressed" && await V.runPromise(t.unsuppress(null, e.email));
@@ -169,46 +169,46 @@ var Z = J([
 			return $(200, { received: s.length });
 		}
 	};
-}, re = (e = {}) => {
-	let n = process.env, r = F({
+}, ie = (e = {}) => {
+	let n = process.env, r = L({
 		...e.provider === void 0 ? {} : { provider: e.provider },
 		...e.apiKey === void 0 ? {} : { apiKey: e.apiKey },
 		env: n
-	}), a = Z.read("MAIL_ALLOWLIST"), o = e.allowlist ?? (a ? a.split(",").map((e) => e.trim()).filter(Boolean) : void 0), s = n.NODE_ENV === "production", u = e.suppression === void 0 || e.suppression === "memory" ? p() : e.suppression === "postgres" ? m() : e.suppression, _ = e.idempotency === void 0 || e.idempotency === "memory" ? h() : e.idempotency === "postgres" ? g() : e.idempotency, v = e.schedule ?? y(), b = [...e.suppression === "postgres" ? [f] : [], ...e.idempotency === "postgres" ? [d] : []];
+	}), a = Z.read("MAIL_ALLOWLIST"), o = e.allowlist ?? (a ? a.split(",").map((e) => e.trim()).filter(Boolean) : void 0), s = n.NODE_ENV === "production", u = e.suppression === void 0 || e.suppression === "memory" ? m() : e.suppression === "postgres" ? h() : e.suppression, v = e.idempotency === void 0 || e.idempotency === "memory" ? g() : e.idempotency === "postgres" ? _() : e.idempotency, y = e.schedule ?? x(), b = [...e.suppression === "postgres" ? [p] : [], ...e.idempotency === "postgres" ? [f] : []];
 	e.idempotency === "postgres" && Y({
 		source: "plugin",
-		table: ee,
+		table: d,
 		timeColumn: "createdAt",
 		ttlMs: X(process.env.VOLTRO_MAIL_IDEMPOTENCY_TTL_HOURS, 720),
 		label: "mail idempotency keys"
 	});
-	let x = R(), S = N({
+	let S = z(), C = F({
 		provider: r,
 		suppression: u,
-		idempotency: _,
-		schedule: v,
-		onSent: x.record,
+		idempotency: v,
+		schedule: y,
+		onSent: S.record,
 		...e.from === void 0 ? {} : { from: e.from },
 		...e.replyTo === void 0 ? {} : { replyTo: e.replyTo },
 		...o === void 0 ? {} : { allowlist: o },
 		...e.attempts === void 0 ? {} : { attempts: e.attempts },
 		...e.templates === void 0 ? {} : { templates: e.templates },
 		production: s
-	}), C = U.succeed(t, S.service), w = r.supportsScheduling !== !0, T = e.scheduleTickMs ?? 1e3, E, D = /* @__PURE__ */ new Map();
-	for (let t of e.templates ?? []) D.set(t.locale ? `${t.name}:${t.locale}` : t.name, t);
-	let O = (e, t) => (t ? D.get(`${e}:${t}`) : void 0) ?? D.get(e) ?? l(e, t), k = (e) => ({
+	}), w = U.succeed(t, C.service), T = r.supportsScheduling !== !0, E = e.scheduleTickMs ?? 1e3, D, O = /* @__PURE__ */ new Map();
+	for (let t of e.templates ?? []) O.set(t.locale ? `${t.name}:${t.locale}` : t.name, t);
+	let k = (e, t) => (t ? O.get(`${e}:${t}`) : void 0) ?? O.get(e) ?? l(e, t), A = (e) => ({
 		name: e.name,
 		...e.locale ? { locale: e.locale } : {},
 		props: e.preview ?? te(e.props)
-	}), A = () => {
+	}), j = () => {
 		let t = /* @__PURE__ */ new Map();
-		for (let n of e.templates ?? []) t.set(n.locale ? `${n.name}:${n.locale}` : n.name, k(n));
+		for (let n of e.templates ?? []) t.set(n.locale ? `${n.name}:${n.locale}` : n.name, A(n));
 		for (let e of c()) {
 			let n = l(e.name, e.locale);
-			n && t.set(e.locale ? `${e.name}:${e.locale}` : e.name, k(n));
+			n && t.set(e.locale ? `${e.name}:${e.locale}` : e.name, A(n));
 		}
 		return [...t.values()];
-	}, j = e.webhook === void 0 ? [] : [ne(r, u, e.webhook, s)], M = [
+	}, M = e.webhook === void 0 ? [] : [re(r, u, e.webhook, s)], N = [
 		{
 			method: "GET",
 			path: "/outbox",
@@ -216,7 +216,7 @@ var Z = J([
 			description: "Recent sent mail (dev capture buffer), newest first",
 			handler: () => V.succeed({
 				kind: "json",
-				data: { sends: x.list() }
+				data: { sends: S.list() }
 			})
 		},
 		{
@@ -226,7 +226,7 @@ var Z = J([
 			description: "Discovered + registered email templates",
 			handler: () => V.succeed({
 				kind: "json",
-				data: { templates: A() }
+				data: { templates: j() }
 			})
 		},
 		{
@@ -249,7 +249,7 @@ var Z = J([
 					status: 400,
 					data: { error: "missing \"template\"" }
 				};
-				let n = O(t.template, t.locale);
+				let n = k(t.template, t.locale);
 				return n ? yield* i(n, t.props).pipe(V.map((e) => ({
 					kind: "json",
 					data: e
@@ -281,21 +281,21 @@ var Z = J([
 			description: "Transactional and broadcast email — MailService over Lettermint / Resend / Postmark / SendGrid / SES / Mailgun / SMTP (+ console/memory), with default-from, transient retry, suppression and a dev allowlist.",
 			permissions: P,
 			declaredEnv: Z.declared,
-			egress: z({
+			egress: B({
 				...e.provider === void 0 ? {} : { provider: e.provider },
 				env: n
 			}),
-			services: C,
-			inspectEndpoints: M,
-			...j.length > 0 ? { httpRoutes: j } : {},
+			services: w,
+			inspectEndpoints: N,
+			...M.length > 0 ? { httpRoutes: M } : {},
 			...b.length > 0 ? { extendSchema: { tables: b } } : {},
 			bindDataStore: async (e) => {
-				await u.bind?.(e), await _.bind?.(e);
+				await u.bind?.(e), await v.bind?.(e);
 			},
 			onActivate: (t) => V.gen(function* () {
-				if (u.activate && (yield* V.promise(() => u.activate(t.env))), _.activate && (yield* V.promise(() => _.activate(t.env))), w) {
-					let e = S.scheduler.tick().pipe(V.repeat(G.spaced(B.millis(Math.max(50, T)))));
-					E = V.runFork(e);
+				if (u.activate && (yield* V.promise(() => u.activate(t.env))), v.activate && (yield* V.promise(() => v.activate(t.env))), T) {
+					let e = C.scheduler.tick().pipe(V.repeat(G.spaced(ne.millis(Math.max(50, E)))));
+					D = V.runFork(e);
 				}
 				t.logger.info("mail active", {
 					provider: r.name,
@@ -308,11 +308,11 @@ var Z = J([
 				});
 			}),
 			onDeactivate: () => V.gen(function* () {
-				E !== void 0 && (yield* H.interrupt(E), E = void 0), u.deactivate && (yield* V.promise(() => u.deactivate())), _.deactivate && (yield* V.promise(() => _.deactivate()));
+				D !== void 0 && (yield* H.interrupt(D), D = void 0), u.deactivate && (yield* V.promise(() => u.deactivate())), v.deactivate && (yield* V.promise(() => v.deactivate()));
 			})
 		}),
-		service: S.service
+		service: C.service
 	};
 };
 //#endregion
-export { e as MailError, t as MailService, n as MailWebhookError, M as buildMailService, N as buildMailServiceWithScheduler, a as clearGlobalTemplates, b as clearMailBuffer, x as consoleProvider, R as createOutbox, r as defineEmail, o as globalTemplateCount, I as handleMailEvents, _ as heldId, s as isEmailTemplate, S as lettermintProvider, c as listGlobalTemplates, l as lookupGlobalTemplate, z as mailEgressOf, re as mailPlugin, P as mailServiceLayer, C as mailgunProvider, v as makeScheduler, h as memoryIdempotencyStore, w as memoryProvider, y as memoryScheduleStore, p as memorySuppressionStore, L as parseMailEvent, g as postgresIdempotencyStore, m as postgresSuppressionStore, T as postmarkProvider, E as readMailBuffer, u as registerEmailTemplates, i as renderTemplate, D as resendProvider, F as resolveProvider, O as sendgridProvider, k as sesProvider, A as smtpProvider, j as verifyLettermintSignature };
+export { e as MailError, t as MailService, n as MailWebhookError, P as buildMailService, F as buildMailServiceWithScheduler, a as clearGlobalTemplates, S as clearMailBuffer, C as consoleProvider, z as createOutbox, r as defineEmail, o as globalTemplateCount, ee as handleMailEvents, y as heldId, s as isEmailTemplate, w as lettermintProvider, c as listGlobalTemplates, l as lookupGlobalTemplate, B as mailEgressOf, f as mailIdempotencyTable, ie as mailPlugin, I as mailServiceLayer, p as mailSuppressionTable, T as mailgunProvider, b as makeScheduler, g as memoryIdempotencyStore, E as memoryProvider, x as memoryScheduleStore, m as memorySuppressionStore, R as parseMailEvent, _ as postgresIdempotencyStore, h as postgresSuppressionStore, D as postmarkProvider, O as readMailBuffer, v as readMailReceipt, u as registerEmailTemplates, i as renderTemplate, k as resendProvider, L as resolveProvider, A as sendgridProvider, j as sesProvider, M as smtpProvider, N as verifyLettermintSignature };

package/dist/service.js

@@ -47,18 +47,18 @@ var S = x({ scope: "@voltro/plugin-mail" }), C = (e) => {
 		default: return l((e, t) => S.info(e, t));
 	}
 }, w = (t) => {
-	let l = t.attempts ?? 3, u = t.suppression ?? a(), d = t.allowlist, f = t.production !== !0 && d !== void 0 && d.length > 0, p = (e) => d.some((t) => t.toLowerCase() === e.toLowerCase()), m = b.recurs(l).pipe(b.while(({ input: e }) => e.transient)), h = /* @__PURE__ */ new Map();
-	for (let e of t.templates ?? []) h.set(e.locale ? `${e.name}:${e.locale}` : e.name, e);
-	let g = (e, t) => (t ? h.get(`${e}:${t}`) : void 0) ?? h.get(e) ?? i(e, t), _ = /* @__PURE__ */ new Map(), y = (e, t) => `${e.name}|${e.locale ?? ""}|${JSON.stringify(t ?? null)}`, x = (e, t) => {
-		if (_.set(e, t), _.size > 500) {
-			let e = _.keys().next().value;
-			e !== void 0 && _.delete(e);
+	let l = t.attempts ?? 3, u = t.suppression ?? a(), d = t.allowlist, f = t.production !== !0 && d !== void 0 && d.length > 0, p = (e) => d.some((t) => t.toLowerCase() === e.toLowerCase()), m = (e) => b.recurs(e).pipe(b.while(({ input: e }) => e.transient)), h = m(l), g = /* @__PURE__ */ new Map();
+	for (let e of t.templates ?? []) g.set(e.locale ? `${e.name}:${e.locale}` : e.name, e);
+	let _ = (e, t) => (t ? g.get(`${e}:${t}`) : void 0) ?? g.get(e) ?? i(e, t), y = /* @__PURE__ */ new Map(), x = (e, t) => `${e.name}|${e.locale ?? ""}|${JSON.stringify(t ?? null)}`, C = (e, t) => {
+		if (y.set(e, t), y.size > 500) {
+			let e = y.keys().next().value;
+			e !== void 0 && y.delete(e);
 		}
-	}, C = t.idempotency ?? o(), w = s({
+	}, w = t.idempotency ?? o(), T = s({
 		store: t.schedule ?? c(),
 		providerSchedules: t.provider.supportsScheduling === !0,
-		flush: (e) => O(e)
-	}), T = (n) => {
+		flush: (e) => A(e)
+	}), E = (n) => {
 		if (n.stream !== "broadcast" || t.provider.managesUnsubscribe === !0) return v.succeed(void 0);
 		let r = n.unsubscribe;
 		if (r === void 0 || !r.oneClickUrl.startsWith("https://")) return v.fail(new e({
@@ -71,7 +71,7 @@ var S = x({ scope: "@voltro/plugin-mail" }), C = (e) => {
 			"List-Unsubscribe": i.join(", "),
 			"List-Unsubscribe-Post": "List-Unsubscribe=One-Click"
 		});
-	}, E = (r) => v.gen(function* () {
+	}, D = (r) => v.gen(function* () {
 		let i = r.from ?? t.from;
 		if (!i) return yield* v.fail(new e({
 			provider: t.provider.name,
@@ -122,7 +122,7 @@ var S = x({ scope: "@voltro/plugin-mail" }), C = (e) => {
 			}
 		};
 		a = s;
-		let c = r.replyTo ?? t.replyTo, l = yield* T(r), d = l === void 0 ? r.headers : {
+		let c = r.replyTo ?? t.replyTo, l = yield* E(r), d = l === void 0 ? r.headers : {
 			...r.headers,
 			...l
 		};
@@ -136,9 +136,13 @@ var S = x({ scope: "@voltro/plugin-mail" }), C = (e) => {
 				...d === void 0 ? {} : { headers: d }
 			}
 		};
-	}), D = (e) => {
+	}), O = (n) => n.retryAttempts === void 0 || Number.isSafeInteger(n.retryAttempts) && n.retryAttempts >= 0 ? v.void : v.fail(new e({
+		provider: t.provider.name,
+		transient: !1,
+		message: "retryAttempts must be a non-negative safe integer."
+	})), k = (e) => {
 		let r = n(e.to);
-		return t.provider.send(e).pipe(v.retry(m), v.tap((n) => v.sync(() => {
+		return t.provider.send(e).pipe(v.retry(e.retryAttempts === void 0 ? h : m(e.retryAttempts)), v.tap((n) => v.sync(() => {
 			S.info("mail sent", {
 				provider: n.provider,
 				id: n.id,
@@ -156,7 +160,7 @@ var S = x({ scope: "@voltro/plugin-mail" }), C = (e) => {
 			S.warn("mail failed", {
 				provider: n.provider,
 				status: n.status,
-				message: n.message
+				message: "Mail provider request failed."
 			}), t.onSent?.({
 				id: `err-${Date.now()}`,
 				to: r,
@@ -164,13 +168,14 @@ var S = x({ scope: "@voltro/plugin-mail" }), C = (e) => {
 				subject: e.subject,
 				provider: n.provider,
 				ok: !1,
-				error: n.message,
+				error: "Mail provider request failed.",
 				ts: Date.now()
 			});
 		})));
-	}, O = (e) => v.gen(function* () {
-		let r = yield* E(e);
-		return r.kind === "skip" ? r.result : w.shouldHold(e.scheduledAt) ? (yield* w.hold(r.message), S.info("mail scheduled (held for later flush)", {
+	}, A = (e) => v.gen(function* () {
+		yield* O(e);
+		let r = yield* D(e);
+		return r.kind === "skip" ? r.result : T.shouldHold(e.scheduledAt) ? (yield* T.hold(r.message), S.info("mail scheduled (held for later flush)", {
 			subject: r.message.subject,
 			dueAt: e.scheduledAt?.toISOString()
 		}), t.onSent?.({
@@ -184,24 +189,24 @@ var S = x({ scope: "@voltro/plugin-mail" }), C = (e) => {
 		}), {
 			id: "scheduled",
 			provider: "scheduled"
-		}) : yield* D(r.message);
-	}), k = (e, t, n) => t === void 0 ? n : v.gen(function* () {
-		let r = yield* C.reserve(e, t);
+		}) : yield* k(r.message);
+	}), j = (e, t, n) => t === void 0 ? n : v.gen(function* () {
+		let r = yield* w.reserve(e, t);
 		if (!r.won) return S.info("mail idempotent replay — skipped", { key: t }), r.prior ?? {
 			id: "idempotent-replay",
 			provider: "idempotent"
 		};
 		let i = yield* n;
-		return yield* C.record(e, t, i), i;
-	}), A = (t) => v.suspend(() => {
-		let n = g(t.template, t.locale);
+		return yield* w.record(e, t, i), i;
+	}), M = (t) => v.suspend(() => {
+		let n = _(t.template, t.locale);
 		if (!n) return v.fail(new e({
 			provider: "template",
 			message: `unknown template '${t.template}'${t.locale ? ` (locale '${t.locale}')` : ""}`,
 			transient: !1
 		}));
-		let i = y(n, t.props), a = _.get(i);
-		return (a ? v.succeed(a) : r(n, t.props).pipe(v.tap((e) => v.sync(() => x(i, e))))).pipe(v.map((e) => ({
+		let i = x(n, t.props), a = y.get(i);
+		return (a ? v.succeed(a) : r(n, t.props).pipe(v.tap((e) => v.sync(() => C(i, e))))).pipe(v.map((e) => ({
 			to: t.to,
 			subject: e.subject,
 			html: e.html,
@@ -216,26 +221,27 @@ var S = x({ scope: "@voltro/plugin-mail" }), C = (e) => {
 			...t.tenantId === void 0 ? {} : { tenantId: t.tenantId },
 			...t.scheduledAt === void 0 ? {} : { scheduledAt: t.scheduledAt },
 			...t.idempotencyKey === void 0 ? {} : { idempotencyKey: t.idempotencyKey },
+			...t.retryAttempts === void 0 ? {} : { retryAttempts: t.retryAttempts },
 			...t.stream === void 0 ? {} : { stream: t.stream },
 			...t.unsubscribe === void 0 ? {} : { unsubscribe: t.unsubscribe },
 			...t.metadata === void 0 ? {} : { metadata: t.metadata }
 		})));
-	}), j = (e) => "template" in e ? A(e) : v.succeed(e);
+	}), N = (e) => ("template" in e ? M(e) : v.succeed(e)).pipe(v.tap(O));
 	return {
 		service: {
 			send: (e) => v.gen(function* () {
-				let t = yield* j(e);
-				return yield* k(t.tenantId ?? null, t.idempotencyKey, O(t));
+				let t = yield* N(e);
+				return yield* j(t.tenantId ?? null, t.idempotencyKey, A(t));
 			}),
 			sendBatch: (e) => v.gen(function* () {
-				let r = yield* v.forEach(e, j), i = r.some((e) => e.idempotencyKey !== void 0 || w.shouldHold(e.scheduledAt));
+				let r = yield* v.forEach(e, N), i = r.some((e) => e.idempotencyKey !== void 0 || e.retryAttempts !== void 0 || T.shouldHold(e.scheduledAt));
 				if (t.provider.sendBatch && !i) {
 					let e = [], i = [];
 					for (let t of r) {
-						let n = yield* E(t);
+						let n = yield* D(t);
 						n.kind === "skip" ? i.push(n.result) : (i.push(e.length), e.push(n.message));
 					}
-					let a = e.length > 0 ? yield* t.provider.sendBatch(e).pipe(v.retry(m), v.tap((r) => v.sync(() => {
+					let a = e.length > 0 ? yield* t.provider.sendBatch(e).pipe(v.retry(h), v.tap((r) => v.sync(() => {
 						e.forEach((e, i) => {
 							let a = r[i];
 							a && (S.info("mail sent (batch)", {
@@ -255,14 +261,14 @@ var S = x({ scope: "@voltro/plugin-mail" }), C = (e) => {
 					})), v.tapError((e) => v.sync(() => S.warn("mail batch failed", {
 						provider: e.provider,
 						status: e.status,
-						message: e.message
+						message: "Mail provider request failed."
 					})))) : [];
 					return i.map((e) => typeof e == "number" ? a[e] ?? {
 						id: "batch",
 						provider: t.provider.name
 					} : e);
 				}
-				return yield* v.forEach(r, (e) => k(e.tenantId ?? null, e.idempotencyKey, O(e)));
+				return yield* v.forEach(r, (e) => j(e.tenantId ?? null, e.idempotencyKey, A(e)));
 			}),
 			suppress: u.suppress,
 			unsuppress: u.unsuppress,
@@ -272,7 +278,7 @@ var S = x({ scope: "@voltro/plugin-mail" }), C = (e) => {
 				managesUnsubscribe: t.provider.managesUnsubscribe === !0
 			}
 		},
-		scheduler: w
+		scheduler: T
 	};
 }, T = (e) => w(e).service, E = (e) => y.succeed(t, T(e));
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/plugin-mail",
-  "version": "0.86.0",
+  "version": "0.87.0",
   "description": "Transactional and broadcast email — one MailProvider contract, multiple adapters (Lettermint / Resend / Postmark / SendGrid / SES / Mailgun / SMTP + console/memory for dev/test). Exposes a MailService via the plugin services layer with transient retry, suppression, a mounted delivery-event webhook and a dev allowlist.",
   "keywords": [
     "voltro",
@@ -33,10 +33,10 @@
     "node": ">=24.0.0"
   },
   "dependencies": {
-    "@voltro/database": "0.86.0",
-    "@voltro/env": "0.86.0",
-    "@voltro/logger": "0.86.0",
-    "@voltro/protocol": "0.86.0"
+    "@voltro/database": "0.87.0",
+    "@voltro/env": "0.87.0",
+    "@voltro/logger": "0.87.0",
+    "@voltro/protocol": "0.87.0"
   },
   "optionalDependencies": {
     "nodemailer": "^10.0.10"