@teamscala/service-boot 0.23.411 → 0.23.412

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "@teamscala/service-boot",
   "type": "module",
-  "version": "0.23.411",
+  "version": "0.23.412",
   "sideEffects": false,
   "imports": {
     "#service-boot/*": "./src/*",

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

@@ -148,21 +148,16 @@ export function formatSpanMinutes(minutes: number): string {
 }
 
 /**
- * The WhatsApp message id from a GOWA /send/message result. The canonical
- * shape (from the spec the api-gowa adapter is generated from,
- * SendResponse = { code, message, results: { message_id, status } }) is
- * `results.message_id`; the legacy shape returned the bare id string as
- * `results`. Delivery is only VERIFIED on a real id — `"true"`, a status
- * string, or an empty body is not a message id and must not be recorded as
- * delivered.
+ * The WhatsApp message id from a messaging_whatsapp_send result. The
+ * intrinsic (scala-mcp / messaging-mcp-boot) returns
+ * `{ ok, message_id, error }` — the Rust scala-messaging-service owns the
+ * channel, picks the device, and records the send in messaging_logs itself.
+ * Delivery is only VERIFIED on a real id — a `"true"` ack, an error body, or
+ * an empty body is not a message id and must not be recorded as delivered.
  */
-export function extractGowaMessageId(sendResult: unknown): string | null {
-	const results = (sendResult as { results?: unknown } | undefined)?.results;
-	if (typeof results === "string") {
-		return /^[A-Z0-9]{8,}$/i.test(results) ? results : null;
-	}
-	if (results && typeof results === "object") {
-		const id = (results as { message_id?: unknown }).message_id;
+export function extractWhatsAppMessageId(sendResult: unknown): string | null {
+	if (sendResult && typeof sendResult === "object") {
+		const id = (sendResult as { message_id?: unknown }).message_id;
 		if (typeof id === "string" && id.length > 0) return id;
 	}
 	return null;

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

@@ -12,7 +12,7 @@ import { describe, expect, test } from "bun:test";
 import {
 	composeEscalationMessage,
 	decideSweep,
-	extractGowaMessageId,
+	extractWhatsAppMessageId,
 	formatEscalationSample,
 	type EscalationEpisode,
 	type FaultAggregate,
@@ -186,23 +186,20 @@ describe("decideSweep — a future-dated lastSeen is not recurrence evidence", (
 	});
 });
 
-describe("extractGowaMessageId — delivery verification", () => {
-	test("the canonical GOWA SendResponse shape yields results.message_id", () => {
-		expect(extractGowaMessageId({ code: "SUCCESS", results: { message_id: "3EB089B9D6ADD58153C561", status: "sent" } })).toBe(
+describe("extractWhatsAppMessageId — delivery verification", () => {
+	test("the messaging_whatsapp_send result shape yields message_id", () => {
+		expect(extractWhatsAppMessageId({ ok: true, message_id: "3EB089B9D6ADD58153C561" })).toBe(
 			"3EB089B9D6ADD58153C561",
 		);
 	});
 
-	test("the legacy bare-string results shape yields the id", () => {
-		expect(extractGowaMessageId({ results: "3EB089B9D6ADD58153C561" })).toBe("3EB089B9D6ADD58153C561");
-	});
-
-	test("a 'true' ack is NOT a message id — delivery stays unverified", () => {
+	test("a 'true' ack or an error body is NOT a message id — delivery stays unverified", () => {
 		// A boolean-ish ack string must never be recorded as a delivered id:
 		// that would mark the episode delivered with an unfollowable handle.
-		expect(extractGowaMessageId({ results: "true" })).toBeNull();
-		expect(extractGowaMessageId({ code: "SUCCESS", message: "sent", results: { status: "sent" } })).toBeNull();
-		expect(extractGowaMessageId({ code: "SUCCESS" })).toBeNull();
+		expect(extractWhatsAppMessageId({ ok: true })).toBeNull();
+		expect(extractWhatsAppMessageId({ ok: false, error: "no device" })).toBeNull();
+		expect(extractWhatsAppMessageId("true")).toBeNull();
+		expect(extractWhatsAppMessageId(null)).toBeNull();
 	});
 });
 

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

@@ -19,7 +19,7 @@ import { pgBossHandlerRegistry } from "../pg-boss-handler-registry.ts";
 import {
 	composeEscalationMessage,
 	decideSweep,
-	extractGowaMessageId,
+	extractWhatsAppMessageId,
 	formatEscalationSample,
 	type EscalationEpisode,
 	type FaultAggregate,
@@ -276,20 +276,6 @@ async function resolveOperatorRelay(): Promise<OperatorRelayBot> {
 	return bot as OperatorRelayBot;
 }
 
-/** GOWA device whose JID matches the PA number, so the escalation is sent BY the PA. */
-async function resolvePaDeviceId(paPhoneDigits: string): Promise<string | undefined> {
-	const { userId, organisationId } = await getSystemIdentity();
-	const systemCtx: ExecutionContext = { userId, organisationId } as ExecutionContext;
-	const { forwardToolToCentralMcp } = await import("@teamscala/chat-completion/central-tool-forwarder");
-	const res = (await forwardToolToCentralMcp(
-		"api_gowa_devices",
-		{ action: "listDevices" },
-		systemCtx,
-	)) as { results?: Array<{ id: string; jid?: string }> } | undefined;
-	const match = (res?.results ?? []).find((device) => (device.jid ?? "").includes(paPhoneDigits));
-	return match?.id;
-}
-
 async function deliverEscalation(
 	kind: string,
 	aggregate: FaultAggregate,
@@ -316,7 +302,12 @@ async function deliverEscalation(
 		},
 	});
 
-	// 2. Resolve the PA path (bot → operator phone → PA device) and send.
+	// 2. Resolve the operator relay and send. The send surface is the
+	// `messaging_whatsapp_send` intrinsic (scala-mcp / messaging-mcp-boot),
+	// which delegates to the Rust scala-messaging-service — the channel owner
+	// that picks the device and records the send in messaging_logs. The retired
+	// api_gowa_message tool (deactivated 2026-08-26) is no longer callable;
+	// naming it here left every escalation send failing with "Unknown tool".
 	const bot = await resolveOperatorRelay();
 	const operatorPhone = (bot.flow_config as { operator_phone?: string }).operator_phone!;
 	const copy = config.copy[kind] ?? config.default_copy;
@@ -333,23 +324,15 @@ async function deliverEscalation(
 	const { userId, organisationId } = await getSystemIdentity();
 	const systemCtx: ExecutionContext = { userId, organisationId } as ExecutionContext;
 	const { forwardToolToCentralMcp } = await import("@teamscala/chat-completion/central-tool-forwarder");
-	const paDigits = (bot.external_id ?? "").replace(/\D/g, "");
-	const deviceId = paDigits ? await resolvePaDeviceId(paDigits) : undefined;
-	if (paDigits && !deviceId) {
-		log.warn("[platform-fault-escalation] no GOWA device matched the PA number — sending via default device");
-	}
 	const sendResult = await forwardToolToCentralMcp(
-		"api_gowa_message",
-		{
-			action: "sendMessage",
-			params: { phone: operatorPhone, message, ...(deviceId ? { device_id: deviceId } : {}) },
-		},
+		"messaging_whatsapp_send",
+		{ phone: operatorPhone, message },
 		systemCtx,
 	);
 
 	// 3. VERIFY delivery before recording it: the send must return a WhatsApp
 	// message id. No id => throw, the claim stays undelivered, next sweep retries.
-	const messageId = extractGowaMessageId(sendResult);
+	const messageId = extractWhatsAppMessageId(sendResult);
 	if (!messageId) {
 		throw new Error(
 			`platform-fault-escalation: WhatsApp send for '${kind}' returned no message id — not recording delivery. ` +