@teamscala/service-boot 0.23.404 → 0.23.406

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "@teamscala/service-boot",
   "type": "module",
-  "version": "0.23.404",
+  "version": "0.23.406",
   "sideEffects": false,
   "imports": {
     "#service-boot/*": "./src/*",
@@ -42,6 +42,7 @@
     "@teamscala/publish-registry": "*",
     "@teamscala/realtime-utils": "*",
     "@teamscala/resolver-engine": "*",
+    "@teamscala/safe-fallback": "*",
     "@teamscala/timing": "*",
     "@teamscala/tool-executor": "*",
     "@teamscala/watchdog": "*",
@@ -373,6 +374,14 @@
       "types": "./src/fn-routers/public-gpt-session-router.d.ts",
       "default": "./src/fn-routers/public-gpt-session-router.ts"
     },
+    "./fn-routers/resend-client": {
+      "types": "./src/fn-routers/resend-client.d.ts",
+      "default": "./src/fn-routers/resend-client.ts"
+    },
+    "./fn-routers/resend-client.ts": {
+      "types": "./src/fn-routers/resend-client.d.ts",
+      "default": "./src/fn-routers/resend-client.ts"
+    },
     "./fn-routers/sign-in-flow-router": {
       "types": "./src/fn-routers/sign-in-flow-router.d.ts",
       "default": "./src/fn-routers/sign-in-flow-router.ts"
@@ -421,6 +430,14 @@
       "types": "./src/handlers/bun-stable-watch.d.ts",
       "default": "./src/handlers/bun-stable-watch.ts"
     },
+    "./handlers/messaging-send-reconcile-logic": {
+      "types": "./src/handlers/messaging-send-reconcile-logic.d.ts",
+      "default": "./src/handlers/messaging-send-reconcile-logic.ts"
+    },
+    "./handlers/messaging-send-reconcile-logic.ts": {
+      "types": "./src/handlers/messaging-send-reconcile-logic.d.ts",
+      "default": "./src/handlers/messaging-send-reconcile-logic.ts"
+    },
     "./handlers/messaging-send-recording-logic": {
       "types": "./src/handlers/messaging-send-recording-logic.d.ts",
       "default": "./src/handlers/messaging-send-recording-logic.ts"
@@ -437,6 +454,14 @@
       "types": "./src/handlers/messaging-send-recording-watch.d.ts",
       "default": "./src/handlers/messaging-send-recording-watch.ts"
     },
+    "./handlers/messaging-send-sweep-selection": {
+      "types": "./src/handlers/messaging-send-sweep-selection.d.ts",
+      "default": "./src/handlers/messaging-send-sweep-selection.ts"
+    },
+    "./handlers/messaging-send-sweep-selection.ts": {
+      "types": "./src/handlers/messaging-send-sweep-selection.d.ts",
+      "default": "./src/handlers/messaging-send-sweep-selection.ts"
+    },
     "./handlers/pane-outbox-drain": {
       "types": "./src/handlers/pane-outbox-drain.d.ts",
       "default": "./src/handlers/pane-outbox-drain.ts"

package/src/fn-routers/agreement-completion-email.ts

@@ -17,7 +17,7 @@ import { getServerClient } from "@teamscala/orpc/server-client-registry";
 import type { PrismaClient } from "@teamscala/db/client";
 import { loadRegistryConfig } from "@teamscala/db/registry/load-config";
 import { decryptSecretConfig } from "@teamscala/encryption/crypto/secret-config";
-import { sendEmail, initResendClient } from "@teamscala/api-resend/send-email";
+import { sendResendEmail } from "./resend-client.ts";
 import { applyTemplateVars, lookupTemplate } from "@teamscala/email/templates/lookup";
 import { getAppLogger } from "@teamscala/logger/app-loggers";
 import { signAgreementAccessToken } from "@teamscala/document-signing/agreement-access-token";
@@ -64,7 +64,6 @@ export async function sendAgreementCompletionEmails(
 			log.warn("[completion-email] Resend token unavailable — skipping");
 			return;
 		}
-		initResendClient(decrypted.token);
 		const from = await getDefaultEmailSender();
 
 		const base = baseUrl.replace(/\/+$/, "");
@@ -90,7 +89,7 @@ export async function sendAgreementCompletionEmails(
 				agreementName: agreement.name,
 				url,
 			});
-			const res = await sendEmail({
+			const res = await sendResendEmail(decrypted.token, {
 				from,
 				to: p.email,
 				subject: tpl.subject,

package/src/fn-routers/agreement-send-router.ts

@@ -29,7 +29,7 @@ import {
 	decryptSecretConfig,
 	type SecretConfigLike,
 } from "@teamscala/encryption/crypto/secret-config";
-import { sendEmail, initResendClient } from "@teamscala/api-resend/send-email";
+import { sendResendEmail } from "./resend-client.ts";
 import { applyTemplateVars, lookupTemplate } from "@teamscala/email/templates/lookup";
 import { loadRegistryConfig } from "@teamscala/db/registry/load-config";
 import { getAppLogger } from "@teamscala/logger/app-loggers";
@@ -232,7 +232,6 @@ async function runSend(
 		if (!decrypted.token) {
 			return { ok: false as const, error: "Resend API key missing token" };
 		}
-		initResendClient(decrypted.token);
 
 		const sent: Array<{ email: string; ok: boolean; id?: string; error?: string }> =
 			[];
@@ -265,7 +264,7 @@ async function runSend(
 					url: recipientUrl,
 				},
 			);
-			const res = await sendEmail({
+			const res = await sendResendEmail(decrypted.token, {
 				from: sender.from,
 				to: r.email,
 				reply_to: sender.replyTo,

package/src/fn-routers/proposal-send-router.ts

@@ -12,7 +12,7 @@
 import { os } from "@orpc/server";
 import * as v from "valibot";
 import { decryptSecretConfig } from "@teamscala/encryption/crypto/secret-config";
-import { sendEmail, initResendClient } from "@teamscala/api-resend/send-email";
+import { sendResendEmail } from "./resend-client.ts";
 import { applyTemplateVars, lookupTemplate } from "@teamscala/email/templates/lookup";
 import { loadRegistryConfig } from "@teamscala/db/registry/load-config";
 import { getAppLogger } from "@teamscala/logger/app-loggers";
@@ -155,7 +155,6 @@ export const proposalSendRouter = {
 			if (!decrypted?.token) {
 				return { ok: false as const, error: "Resend API key not configured" };
 			}
-			initResendClient(decrypted.token);
 
 			const sender = await resolveSender(prisma, proposal.organisation_id);
 			const token = signAccessToken(
@@ -180,7 +179,7 @@ export const proposalSendRouter = {
 				proposalName: proposal.name,
 				url,
 			});
-			const res = await sendEmail({
+			const res = await sendResendEmail(decrypted.token, {
 				from: sender.from,
 				to: email,
 				reply_to: sender.replyTo,

package/src/fn-routers/public-assessment-router.test.ts

@@ -45,12 +45,12 @@ mock.module("@teamscala/logger/app-loggers", () => ({
 	getAppLogger: () => noopLogger,
 }));
 
-mock.module("@teamscala/api-resend/send-email", () => ({
-	initResendClient: () => {},
-	sendEmail: async (args: CapturedEmail) => {
+mock.module("@teamscala/api-resend", () => ({
+	createResendAdapter: () => ({ bridged: true }),
+	sendEmail: async (_client: unknown, args: CapturedEmail) => {
 		capturedEmail = args;
 		emailResolve?.(args);
-		return { success: true as const, id: "re_test_123" };
+		return { id: "re_test_123" };
 	},
 }));
 

package/src/fn-routers/public-assessment-router.ts

@@ -23,7 +23,7 @@
 import { os } from "@orpc/server";
 import * as v from "valibot";
 import { getAppLogger } from "@teamscala/logger/app-loggers";
-import { sendEmail, initResendClient } from "@teamscala/api-resend/send-email";
+import { sendResendEmail } from "./resend-client.ts";
 import { applyTemplateVars, lookupTemplate } from "@teamscala/email/templates/lookup";
 import { resolveEmailSender } from "@teamscala/email/identity/resolve-email-sender";
 import { decryptSecretConfig } from "@teamscala/encryption/crypto/secret-config";
@@ -129,7 +129,6 @@ async function sendAuthorityReportEmail(opts: {
 		log.warn("[authority-report-email] Resend token unavailable — skipping");
 		return;
 	}
-	initResendClient(decrypted.token);
 
 	const brandRow =
 		opts.organisationId && opts.prisma
@@ -259,7 +258,7 @@ async function sendAuthorityReportEmail(opts: {
 	});
 
 	const sendOnce = async (fromHeader: string, replyToHeader: string | undefined) =>
-		sendEmail({
+		sendResendEmail(decrypted.token, {
 			from: fromHeader,
 			to: opts.to,
 			subject: tpl.subject,

package/src/fn-routers/resend-client.ts

@@ -0,0 +1,38 @@
+/**
+ * @system server-boot
+ * @status handwritten
+ * @edit edit directly
+ *
+ * The fn-router Resend send: a per-call adapter (org rest_client token)
+ * carrying the {success, id?, error?} shape the routers consume. Replaces
+ * the module-global @teamscala/api-resend/send-email wrapper a regen wiped;
+ * failure routes through safe-fallback (fail-open-noisy).
+ */
+import { createResendAdapter, sendEmail } from "@teamscala/api-resend";
+import { createSafeFallback } from "@teamscala/safe-fallback/create-safe-fallback";
+
+/** The Resend send body (from/to/subject + html/text/reply_to) — forwarded
+ * to the adapter operation verbatim; nothing is assembled here. */
+export type ResendSendBody = Parameters<typeof sendEmail>[1];
+
+export interface ResendSendResult {
+	success: boolean;
+	id?: string;
+	error?: string;
+}
+
+const sendLayer = createSafeFallback<ResendSendResult>({
+	name: "service-boot:resend-send",
+	onFailure: "fail-open-noisy",
+	degradedResult: { success: false, error: "resend send layer degraded" },
+	failureBudget: 5,
+});
+
+export async function sendResendEmail(token: string, body: ResendSendBody): Promise<ResendSendResult> {
+	const result = await sendLayer.call(async () => {
+		const client = createResendAdapter({ apiKey: token });
+		const res = await sendEmail(client, body);
+		return { success: true, id: res.id } satisfies ResendSendResult;
+	});
+	return result;
+}

package/src/handlers/platform-fault-escalation-logic.ts

@@ -79,12 +79,19 @@ function isSustained(
 	aggregate: FaultAggregate,
 	policy: FaultEscalationPolicy,
 	override: KindThresholdOverride | undefined,
+	now: Date,
 ): boolean {
 	const minCount = override?.minCount ?? policy.minCount;
 	const minSpan = override?.minSpanMinutes ?? policy.minSpanMinutes;
+	// Recency, not merely presence in the lookback window. Count and span
+	// answer "did this happen"; a fault qualifies only while it is STILL
+	// happening. Without this the 720-minute lookback keeps a dead fault
+	// qualifying for hours, and since a resolved episode reads as no episode
+	// it re-escalates on every sweep until its events age out (2026-08-26).
 	return (
 		aggregate.count >= minCount &&
-		minutesBetween(aggregate.firstSeen, aggregate.lastSeen) >= minSpan
+		minutesBetween(aggregate.firstSeen, aggregate.lastSeen) >= minSpan &&
+		minutesBetween(aggregate.lastSeen, now) < policy.resolveAfterMinutes
 	);
 }
 
@@ -107,7 +114,7 @@ export function decideSweep(
 
 	for (const aggregate of aggregates) {
 		const episode = byKind.get(aggregate.kind);
-		if (!isSustained(aggregate, policy, kindThresholds[aggregate.kind])) continue;
+		if (!isSustained(aggregate, policy, kindThresholds[aggregate.kind], now)) continue;
 		// No episode, or the previous episode closed (quiet past resolve window):
 		// a NEW episode begins and must be delivered.
 		if (!episode || episode.resolvedAt) {

package/src/handlers/platform-fault-escalation.test.ts

@@ -202,3 +202,47 @@ describe("composeEscalationMessage", () => {
 		expect(message.split("\n")).toHaveLength(4);
 	});
 });
+
+describe("decideSweep — qualification asks 'is this happening', not 'did this happen'", () => {
+	// 2026-08-26: llm.provider.call.failed re-escalated every ~10 minutes with
+	// lastSeen frozen at 16:54 — escalated 19:40 on a fault three hours dead,
+	// resolved 19:45, repeat. The tell was the closure counter climbing
+	// (141/151/171 min): quiet measured from one frozen aggregate lastSeen.
+	// isSustained checked count and span but never recency, so a dead fault
+	// kept qualifying for the rest of the 720-minute lookback while a resolved
+	// episode read as "no episode" and re-escalated it.
+	const resolved = (kind: string) =>
+		episode({ kind, resolvedAt: new Date(NOW.getTime() - 5 * 60_000) });
+
+	test("a fault quiet past the resolve window does not re-escalate after resolution", () => {
+		const decision = decideSweep(
+			[agg("stale.error", 30, 400, 170)],
+			[resolved("stale.error")],
+			POLICY,
+			NOW,
+		);
+		expect(decision.escalate).toHaveLength(0);
+	});
+
+	test("a fault quiet past the resolve window does not escalate with no episode at all", () => {
+		const decision = decideSweep([agg("stale.error", 30, 400, 170)], [], POLICY, NOW);
+		expect(decision.escalate).toHaveLength(0);
+	});
+
+	// The other direction, and the one that protects live escalations: the fix
+	// must not silence a fault that is still emitting.
+	test("a fault still emitting escalates", () => {
+		const decision = decideSweep([agg("live.error", 30, 400, 2)], [], POLICY, NOW);
+		expect(decision.escalate).toHaveLength(1);
+	});
+
+	test("a recurring fault opens a NEW episode after its previous one resolved", () => {
+		const decision = decideSweep(
+			[agg("live.error", 30, 400, 2)],
+			[resolved("live.error")],
+			POLICY,
+			NOW,
+		);
+		expect(decision.escalate).toHaveLength(1);
+	});
+});