update tests

chore: refactor cleanup

client/src/Features/UI/uiSlice.ts

@@ -1,4 +1,8 @@
-import { dashboardCardKeys, type DashboardCardKey } from "@/Types/Dashboard";
+import {
+	dashboardCardKeys,
+	type DashboardCardKey,
+	type DashboardSortOrder,
+} from "@/Types/Dashboard";
 import { createSlice, type PayloadAction } from "@reduxjs/toolkit";
 
 type ThemeMode = "light" | "dark";
@@ -38,6 +42,7 @@ interface UIState {
 	starPromptOpen: boolean;
 	chartType: ChartType;
 	dashboardVisibleCards: DashboardCardKey[];
+	dashboardUptimeSortOrder: DashboardSortOrder;
 }
 
 const initialMode: ThemeMode = window?.matchMedia?.("(prefers-color-scheme: dark)")
@@ -78,6 +83,7 @@ const initialState: UIState = {
 	starPromptOpen: true,
 	chartType: "histogram",
 	dashboardVisibleCards: [...dashboardCardKeys],
+	dashboardUptimeSortOrder: "ascending",
 };
 
 const uiSlice = createSlice({
@@ -124,6 +130,9 @@ const uiSlice = createSlice({
 		setDashboardVisibleCards: (state, action: PayloadAction<DashboardCardKey[]>) => {
 			state.dashboardVisibleCards = action.payload;
 		},
+		setDashboardUptimeSortOrder: (state, action: PayloadAction<DashboardSortOrder>) => {
+			state.dashboardUptimeSortOrder = action.payload;
+		},
 	},
 });
 
@@ -141,4 +150,5 @@ export const {
 	setStarPromptOpen,
 	setChartType,
 	setDashboardVisibleCards,
+	setDashboardUptimeSortOrder,
 } = uiSlice.actions;

client/src/Pages/Dashboard/components/EditCardsModal.tsx

@@ -1,8 +1,11 @@
-import { useState } from "react";
+import { useMemo, useState } from "react";
 import Stack from "@mui/material/Stack";
 import FormControlLabel from "@mui/material/FormControlLabel";
+import Typography from "@mui/material/Typography";
+import { useTheme } from "@mui/material/styles";
 import { useTranslation } from "react-i18next";
 import { Checkbox, Dialog } from "@/Components/inputs";
+import { LAYOUT } from "@/Utils/Theme/constants";
 import { type DashboardCardKey, dashboardCardKeys } from "@/Types/Dashboard";
 
 interface EditCardsModalProps {
@@ -18,16 +21,19 @@ export const EditCardsModal = ({
 	onClose,
 	onSave,
 }: EditCardsModalProps) => {
+	const theme = useTheme();
 	const { t } = useTranslation();
-	const [draft, setDraft] = useState<Set<DashboardCardKey>>(new Set(visibleCards));
+	const [cardsSelection, setCardsSelection] = useState<Set<DashboardCardKey>>(
+		new Set(visibleCards)
+	);
 
 	const handleClose = () => {
-		setDraft(new Set(visibleCards));
+		setCardsSelection(new Set(visibleCards));
 		onClose();
 	};
 
 	const handleToggle = (key: DashboardCardKey) => {
-		setDraft((prev) => {
+		setCardsSelection((prev) => {
 			const next = new Set(prev);
 			if (next.has(key)) {
 				next.delete(key);
@@ -38,26 +44,40 @@ export const EditCardsModal = ({
 		});
 	};
 
+	const sortedCardKeys = useMemo(
+		() =>
+			[...dashboardCardKeys].sort((a, b) =>
+				t(`pages.dashboard.cards.${a}`).localeCompare(t(`pages.dashboard.cards.${b}`))
+			),
+		[t]
+	);
+
 	return (
 		<Dialog
 			open={open}
 			title={t("pages.dashboard.editCardsModal.title")}
 			content={t("pages.dashboard.editCardsModal.description")}
 			onCancel={handleClose}
-			onConfirm={() => onSave(draft)}
+			onConfirm={() => onSave(cardsSelection)}
 			confirmText={t("pages.dashboard.editCardsModal.done")}
 			maxWidth="xs"
 			fullWidth
 		>
-			<Stack>
-				{dashboardCardKeys.map((key: DashboardCardKey) => (
+			<Stack gap={theme.spacing(LAYOUT.XXS)}>
+				<Typography
+					variant="eyebrow"
+					color={theme.palette.text.disabled}
+				>
+					{t("pages.dashboard.editCardsModal.groups.uptime")}
+				</Typography>
+				{sortedCardKeys.map((key: DashboardCardKey) => (
 					<FormControlLabel
 						key={key}
 						label={t(`pages.dashboard.cards.${key}`)}
 						control={
 							<Checkbox
-								checked={draft.has(key)}
-								disabled={draft.has(key) && draft.size === 1}
+								checked={cardsSelection.has(key)}
+								disabled={cardsSelection.has(key) && cardsSelection.size === 1}
 								onChange={() => handleToggle(key)}
 							/>
 						}

client/src/Pages/Dashboard/components/cards/CurrentlyDownCard.tsx

@@ -0,0 +1,58 @@
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import { useTheme } from "@mui/material/styles";
+import { useTranslation } from "react-i18next";
+import { DashboardCard } from "@/Pages/Dashboard/components/DashboardCard";
+import { Dot } from "@/Components/design-elements";
+import { typographyLevels } from "@/Utils/Theme/Palette";
+import { LAYOUT } from "@/Utils/Theme/constants";
+import type { Monitor } from "@/Types/Monitor";
+
+interface CurrentlyDownCardProps {
+	monitors: Monitor[];
+}
+
+export const CurrentlyDownCard = ({ monitors }: CurrentlyDownCardProps) => {
+	const theme = useTheme();
+	const { t } = useTranslation();
+
+	const downMonitors = monitors.filter((monitor) => monitor.status === "down");
+
+	return (
+		<DashboardCard
+			title={t("pages.dashboard.cards.currentlyDown")}
+			topRight={downMonitors.length > 0 ? downMonitors.length : undefined}
+		>
+			{downMonitors.length === 0 ? (
+				<Typography
+					fontSize={typographyLevels.m}
+					color={theme.palette.text.disabled}
+				>
+					{t("pages.dashboard.currentlyDown.empty")}
+				</Typography>
+			) : (
+				<Stack gap={theme.spacing(LAYOUT.SM)}>
+					{downMonitors.map((monitor) => (
+						<Stack
+							key={monitor.id}
+							direction="row"
+							alignItems="center"
+							gap={theme.spacing(LAYOUT.XS)}
+						>
+							<Dot color={theme.palette.error.main} />
+							<Typography
+								fontSize={typographyLevels.m}
+								color={theme.palette.text.primary}
+								overflow="hidden"
+								textOverflow="ellipsis"
+								whiteSpace="nowrap"
+							>
+								{monitor.name}
+							</Typography>
+						</Stack>
+					))}
+				</Stack>
+			)}
+		</DashboardCard>
+	);
+};

client/src/Pages/Dashboard/components/cards/UptimeCard.tsx

@@ -0,0 +1,90 @@
+import IconButton from "@mui/material/IconButton";
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import { useTheme } from "@mui/material/styles";
+import { useTranslation } from "react-i18next";
+import { useDispatch, useSelector } from "react-redux";
+import { ArrowDown, ArrowUp } from "lucide-react";
+import { Icon } from "@/Components/design-elements";
+import { DashboardCard } from "@/Pages/Dashboard/components/DashboardCard";
+import { BarRow } from "@/Pages/Dashboard/components/cards/BarRow";
+import { getUptimePercentageColor } from "@/Utils/MonitorUtils";
+import { formatPercentage } from "@/Utils/FormatUtils";
+import { typographyLevels } from "@/Utils/Theme/Palette";
+import { LAYOUT } from "@/Utils/Theme/constants";
+import { setDashboardUptimeSortOrder } from "@/Features/UI/uiSlice";
+import type { Monitor } from "@/Types/Monitor";
+import type { AppDispatch, RootState } from "@/store";
+
+const TOP_N = 5;
+
+interface UptimeCardProps {
+	monitors: Monitor[];
+}
+
+export const UptimeCard = ({ monitors }: UptimeCardProps) => {
+	const theme = useTheme();
+	const { t } = useTranslation();
+	const dispatch = useDispatch<AppDispatch>();
+	const sortOrder = useSelector((state: RootState) => state.ui.dashboardUptimeSortOrder);
+
+	const direction = sortOrder === "ascending" ? 1 : -1;
+	const ranked = monitors
+		.filter((monitor) => monitor.status !== "paused")
+		.filter(
+			(monitor): monitor is Monitor & { uptimePercentage: number } =>
+				typeof monitor.uptimePercentage === "number"
+		)
+		.sort((a, b) => direction * (a.uptimePercentage - b.uptimePercentage))
+		.slice(0, TOP_N);
+
+	return (
+		<DashboardCard
+			title={t("pages.dashboard.cards.uptime")}
+			topRight={
+				<IconButton
+					size="small"
+					aria-label={t("pages.dashboard.uptimeCard.toggleSortOrder")}
+					onClick={() =>
+						dispatch(
+							setDashboardUptimeSortOrder(
+								sortOrder === "ascending" ? "descending" : "ascending"
+							)
+						)
+					}
+				>
+					<Icon
+						icon={sortOrder === "ascending" ? ArrowUp : ArrowDown}
+						size={16}
+						color={theme.palette.text.secondary}
+					/>
+				</IconButton>
+			}
+		>
+			{ranked.length === 0 ? (
+				<Typography
+					fontSize={typographyLevels.m}
+					color={theme.palette.text.disabled}
+				>
+					{t("pages.dashboard.noData")}
+				</Typography>
+			) : (
+				<Stack gap={theme.spacing(LAYOUT.SM)}>
+					{ranked.map((monitor) => {
+						const paletteKey = getUptimePercentageColor(monitor.uptimePercentage);
+						const color = theme.palette[paletteKey].main;
+						return (
+							<BarRow
+								key={monitor.id}
+								label={monitor.name}
+								value={formatPercentage(monitor.uptimePercentage)}
+								fillRatio={monitor.uptimePercentage}
+								valueColor={color}
+							/>
+						);
+					})}
+				</Stack>
+			)}
+		</DashboardCard>
+	);
+};

client/src/Pages/Dashboard/index.tsx

@@ -14,6 +14,8 @@ import { setDashboardVisibleCards } from "@/Features/UI/uiSlice";
 import type { RootState, AppDispatch } from "@/store";
 
 import { MonitorStatusCard } from "@/Pages/Dashboard/components/cards/MonitorStatusCard";
+import { CurrentlyDownCard } from "@/Pages/Dashboard/components/cards/CurrentlyDownCard";
+import { UptimeCard } from "@/Pages/Dashboard/components/cards/UptimeCard";
 import { MonitorsByTypeCard } from "@/Pages/Dashboard/components/cards/MonitorsByTypeCard";
 import { EditCardsModal } from "@/Pages/Dashboard/components/EditCardsModal";
 import { type DashboardCardKey, dashboardCardKeys } from "@/Types/Dashboard";
@@ -48,6 +50,8 @@ const Dashboard = () => {
 
 	const cardComponents: Record<DashboardCardKey, ReactNode> = {
 		monitorStatus: <MonitorStatusCard summary={summary} />,
+		currentlyDown: <CurrentlyDownCard monitors={monitors ?? []} />,
+		uptime: <UptimeCard monitors={monitors ?? []} />,
 		monitorsByType: <MonitorsByTypeCard monitorsByType={monitorsByType} />,
 	};
 

client/src/Types/Dashboard.ts

@@ -1,2 +1,10 @@
-export const dashboardCardKeys = ["monitorStatus", "monitorsByType"] as const;
+export const dashboardCardKeys = [
+	"monitorStatus",
+	"currentlyDown",
+	"uptime",
+	"monitorsByType",
+] as const;
 export type DashboardCardKey = (typeof dashboardCardKeys)[number];
+
+export const dashboardSortOrders = ["ascending", "descending"] as const;
+export type DashboardSortOrder = (typeof dashboardSortOrders)[number];

client/src/locales/en.json

@@ -1936,16 +1936,27 @@
 			},
 			"cards": {
 				"monitorStatus": "Monitor status",
+				"currentlyDown": "Currently down",
+				"uptime": "Monitor uptime",
 				"monitorsByType": "Monitors by type"
 			},
+			"uptimeCard": {
+				"toggleSortOrder": "Toggle sort order"
+			},
+			"currentlyDown": {
+				"empty": "No monitors are down at this moment."
+			},
 			"header": {
 				"title": "Dashboard",
 				"description": "See every monitor type in one place and spot what needs attention."
 			},
 			"editCards": "Edit cards",
 			"editCardsModal": {
-				"title": "Edit cards",
+				"title": "Dashboard cards",
 				"description": "Select the cards to display on your dashboard.",
+				"groups": {
+					"uptime": "Uptime"
+				},
 				"done": "Done"
 			}
 		}

server/src/domain/checks/check.service.ts

@@ -13,7 +13,6 @@ const SERVICE_NAME = "checkService";
 export interface ICheckService {
 	createChecks(checks: Check[]): Promise<Check[]>;
 	toCheck(statusResponse: MonitorStatusResponse<MonitorPayloadMap[keyof MonitorPayloadMap]>): Check | undefined;
-	toStatusResponse(check: Check): MonitorStatusResponse<MonitorPayloadMap[keyof MonitorPayloadMap]>;
 	getChecksByMonitor(params: {
 		monitorId: string;
 		teamId: string;
@@ -135,32 +134,6 @@ export class CheckService implements ICheckService {
 		return check;
 	};
 
-	private toPayload = (check: Check): HardwareStatusPayload | DockerStatusPayload | undefined => {
-		switch (check.metadata.type) {
-			case "hardware":
-				return { data: { cpu: check.cpu, memory: check.memory, disk: check.disk, host: check.host, net: check.net } } as HardwareStatusPayload;
-			case "docker":
-				return check.containers ? { containers: check.containers, summary: check.containerSummary } : undefined;
-			default:
-				return undefined;
-		}
-	};
-
-	toStatusResponse = (check: Check) => {
-		const statusResponse: MonitorStatusResponse<MonitorPayloadMap[keyof MonitorPayloadMap]> = {
-			monitorId: check.metadata.monitorId,
-			teamId: check.metadata.teamId,
-			type: check.metadata.type,
-			status: check.status,
-			code: check.statusCode,
-			message: check.message,
-			responseTime: check.responseTime,
-			// re-nest hardware metrics so updateMonitorStatus / extractThresholdBreaches see payload.data
-			payload: this.toPayload(check),
-		};
-		return statusResponse;
-	};
-
 	getChecksByMonitor = async ({
 		monitorId,
 		teamId,

server/src/domain/checks/check.snapshot.ts

@@ -45,12 +45,14 @@ const mapMemory = (memory?: CheckMemoryInfo): SnapshotMemoryInfo | undefined =>
 	};
 
 const mapDisk = (disk?: CheckDiskInfo[]): SnapshotDiskInfo[] | undefined =>
-	disk?.map((entry) => ({
-		device: entry.device,
-		total_bytes: entry.total_bytes,
-		used_bytes: entry.used_bytes,
-		usage_percent: entry.usage_percent,
-	}));
+	disk
+		?.filter((entry) => entry != null)
+		.map((entry) => ({
+			device: entry.device,
+			total_bytes: entry.total_bytes,
+			used_bytes: entry.used_bytes,
+			usage_percent: entry.usage_percent,
+		}));
 
 const mapHost = (host?: CheckHostInfo): SnapshotHostInfo | undefined =>
 	host && {

server/src/domain/incidents/incident.service.ts

@@ -1,6 +1,5 @@
-const SERVICE_NAME = "incidentService";
 import type { Monitor } from "@/domain/monitors/monitor.type.js";
-import type { DockerStatusPayload, MonitorStatusResponse } from "@/types/network.js";
+import type { Check } from "@/domain/checks/check.type.js";
 import { AppError } from "@/utils/AppError.js";
 import { getDateForRange } from "@/utils/dataUtils.js";
 import type { IIncidentsRepository } from "@/domain/incidents/incident.repository.interface.js";
@@ -12,15 +11,10 @@ import type { MonitorActionDecision } from "@/worker/worker.interface.js";
 import type { INotificationMessageBuilder } from "@/domain/notifications/notification.message-builder.js";
 import type { ILogger } from "@/utils/logger.js";
 import { DateRange } from "@/types/query.js";
-import { describeContainerBreach, findContainerBreaches } from "@/domain/docker/docker-alert.js";
 
+const SERVICE_NAME = "incidentService";
 export interface IIncidentService {
-	handleIncident(
-		monitor: Monitor,
-		code: number,
-		decision: MonitorActionDecision,
-		monitorStatusResponse?: MonitorStatusResponse
-	): Promise<Incident | null>;
+	handleIncident(monitor: Monitor, decision: MonitorActionDecision, check: Check): Promise<Incident | null>;
 	resolveIncident(incidentId: string, userId: string, teamId: string, comment?: string, userEmail?: string): Promise<Incident>;
 	getIncidentsByTeam(
 		teamId: string,
@@ -59,12 +53,7 @@ export class IncidentService implements IIncidentService {
 		this.notificationMessageBuilder = notificationMessageBuilder;
 	}
 
-	handleIncident = async (
-		monitor: Monitor,
-		code: number,
-		decision: MonitorActionDecision,
-		monitorStatusResponse?: MonitorStatusResponse
-	): Promise<Incident | null> => {
+	handleIncident = async (monitor: Monitor, decision: MonitorActionDecision, check: Check): Promise<Incident | null> => {
 		if (!decision.shouldCreateIncident && !decision.shouldResolveIncident) {
 			return null;
 		}
@@ -75,13 +64,13 @@ export class IncidentService implements IIncidentService {
 			if (activeIncident) {
 				return activeIncident;
 			} else {
-				let statusCode = code;
+				let statusCode = check.statusCode;
 				let message: string | undefined;
 
 				// For threshold breaches, use 9999 status code and build descriptive message
 				if (decision.incidentReason === "threshold_breach") {
 					statusCode = 9999;
-					message = this.buildThresholdBreachMessage(monitor, monitorStatusResponse);
+					message = this.notificationMessageBuilder.buildThresholdBreachMessage(monitor, check, decision.thresholdBreaches);
 				}
 
 				const incident = {
@@ -106,26 +95,6 @@ export class IncidentService implements IIncidentService {
 		return await this.incidentsRepository.updateById(activeIncident.id, activeIncident.teamId, activeIncident);
 	};
 
-	private buildThresholdBreachMessage(monitor: Monitor, monitorStatusResponse?: MonitorStatusResponse): string {
-		if (monitor.type === "docker") {
-			const containers = (monitorStatusResponse?.payload as DockerStatusPayload | undefined)?.containers ?? [];
-			const breaches = findContainerBreaches(monitor, containers);
-			return breaches.length > 0 ? breaches.map(describeContainerBreach).join(", ") : "Container alert";
-		}
-
-		if (!monitorStatusResponse) {
-			return "Threshold breach detected";
-		}
-
-		const breaches = this.notificationMessageBuilder.extractThresholdBreaches(monitor, monitorStatusResponse);
-
-		if (breaches.length === 0) {
-			return "Threshold breach detected";
-		}
-
-		return breaches.map((b) => `${b.metric.toUpperCase()}: ${b.formattedValue} (threshold: ${b.threshold}${b.unit})`).join(", ");
-	}
-
 	resolveIncident = async (incidentId: string, userId: string, teamId: string, comment?: string, userEmail?: string) => {
 		try {
 			if (!incidentId) {

server/src/domain/monitors/monitor.type.ts

@@ -240,3 +240,8 @@ export type GamesMap = Record<string, Game>;
 export type MonitorScheduleFields = Pick<Monitor, "id" | "type" | "isActive" | "interval" | "geoCheckEnabled" | "geoCheckInterval">;
 
 export type DockerContainerLogsResult = DockerLogPage;
+
+export const HardwareMetricKeys = ["cpu", "memory", "disk", "temp"] as const;
+export type HardwareMetricKey = (typeof HardwareMetricKeys)[number];
+export type HardwareBreaches = Record<HardwareMetricKey, boolean>;
+export type HardwareCounters = Record<HardwareMetricKey, number>;

server/src/domain/notifications/notification.message-builder.ts

@@ -1,5 +1,4 @@
-import type { Monitor } from "@/domain/monitors/monitor.type.js";
-import type { DockerStatusPayload, HardwareStatusPayload, MonitorStatusResponse } from "@/types/network.js";
+import { HardwareMetricKeys, type HardwareBreaches, type HardwareMetricKey, type Monitor } from "@/domain/monitors/monitor.type.js";
 import type { MonitorActionDecision } from "@/worker/worker.interface.js";
 import type {
 	NotificationMessage,
@@ -9,15 +8,11 @@ import type {
 	NotificationContent,
 } from "@/domain/notifications/notification.type.js";
 import { describeContainerBreach, findContainerBreaches } from "@/domain/docker/docker-alert.js";
+import type { Check } from "@/domain/checks/check.type.js";
 
 export interface INotificationMessageBuilder {
-	buildMessage(
-		monitor: Monitor,
-		monitorStatusResponse: MonitorStatusResponse,
-		decision: MonitorActionDecision,
-		clientHost: string
-	): NotificationMessage;
-	extractThresholdBreaches(monitor: Monitor, monitorStatusResponse: MonitorStatusResponse): ThresholdBreach[];
+	buildMessage(monitor: Monitor, check: Check, decision: MonitorActionDecision, clientHost: string): NotificationMessage;
+	buildThresholdBreachMessage(monitor: Monitor, check: Check, thresholdBreaches: HardwareBreaches | undefined): string;
 }
 
 const SERVICE_NAME = "NotificationMessageBuilder";
@@ -25,15 +20,10 @@ const SERVICE_NAME = "NotificationMessageBuilder";
 export class NotificationMessageBuilder implements INotificationMessageBuilder {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	buildMessage(
-		monitor: Monitor,
-		monitorStatusResponse: MonitorStatusResponse,
-		decision: MonitorActionDecision,
-		clientHost: string
-	): NotificationMessage {
+	buildMessage(monitor: Monitor, check: Check, decision: MonitorActionDecision, clientHost: string): NotificationMessage {
 		const type = this.determineNotificationType(decision, monitor);
 		const severity = this.determineSeverity(type);
-		const content = this.buildContent(type, monitor, monitorStatusResponse);
+		const content = this.buildContent(type, monitor, check, decision);
 
 		return {
 			type,
@@ -49,7 +39,7 @@ export class NotificationMessageBuilder implements INotificationMessageBuilder {
 			clientHost,
 			metadata: {
 				teamId: monitor.teamId,
-				notificationReason: decision.notificationReason || "status_change",
+				notificationReason: decision.notificationReason,
 			},
 		};
 	}
@@ -92,18 +82,18 @@ export class NotificationMessageBuilder implements INotificationMessageBuilder {
 		}
 	}
 
-	private buildContent(type: NotificationType, monitor: Monitor, monitorStatusResponse: MonitorStatusResponse): NotificationContent {
+	private buildContent(type: NotificationType, monitor: Monitor, check: Check, decision: MonitorActionDecision): NotificationContent {
 		switch (type) {
 			case "monitor_down":
-				return this.buildMonitorDownContent(monitor, monitorStatusResponse);
+				return this.buildMonitorDownContent(monitor, check);
 			case "monitor_up":
 				return this.buildMonitorUpContent(monitor);
 			case "threshold_breach":
-				return this.buildThresholdBreachContent(monitor, monitorStatusResponse as MonitorStatusResponse<HardwareStatusPayload>);
+				return this.buildThresholdBreachContent(monitor, check, decision.thresholdBreaches);
 			case "threshold_resolved":
 				return this.buildThresholdResolvedContent(monitor);
 			case "container_breach":
-				return this.buildContainerBreachContent(monitor, monitorStatusResponse as MonitorStatusResponse<DockerStatusPayload>);
+				return this.buildContainerBreachContent(monitor, check);
 			case "container_resolved":
 				return this.buildContainersRecoveredContent(monitor);
 			default:
@@ -111,19 +101,19 @@ export class NotificationMessageBuilder implements INotificationMessageBuilder {
 		}
 	}
 
-	private buildMonitorDownContent(monitor: Monitor, monitorStatusResponse: MonitorStatusResponse): NotificationContent {
+	private buildMonitorDownContent(monitor: Monitor, check: Check): NotificationContent {
 		const title = `Monitor Down: ${monitor.name}`;
 		const summary = `Monitor "${monitor.name}" is currently down and unreachable.`;
 		const details = [`URL: ${monitor.url}`, `Status: Down`, `Type: ${monitor.type}`];
 
 		// Add response code if available
-		if (monitorStatusResponse.code) {
-			details.push(`Response Code: ${monitorStatusResponse.code}`);
+		if (check.statusCode) {
+			details.push(`Response Code: ${check.statusCode}`);
 		}
 
 		// Add error message if available
-		if (monitorStatusResponse.message) {
-			details.push(`Error: ${monitorStatusResponse.message}`);
+		if (check.message) {
+			details.push(`Error: ${check.message}`);
 		}
 
 		return {
@@ -147,12 +137,12 @@ export class NotificationMessageBuilder implements INotificationMessageBuilder {
 		};
 	}
 
-	private buildThresholdBreachContent(monitor: Monitor, monitorStatusResponse: MonitorStatusResponse<HardwareStatusPayload>): NotificationContent {
+	private buildThresholdBreachContent(monitor: Monitor, check: Check, thresholdBreaches: HardwareBreaches | undefined): NotificationContent {
 		const title = `Threshold Exceeded: ${monitor.name}`;
 		const summary = `Monitor "${monitor.name}" has exceeded one or more thresholds.`;
 		const details = [`URL: ${monitor.url}`, `Status: Threshold exceeded`, `Type: ${monitor.type}`];
 
-		const thresholds = this.extractThresholdBreaches(monitor, monitorStatusResponse);
+		const thresholds = this.extractThresholdBreaches(monitor, check, thresholdBreaches);
 
 		return {
 			title,
@@ -176,13 +166,11 @@ export class NotificationMessageBuilder implements INotificationMessageBuilder {
 		};
 	}
 
-	private buildContainerBreachContent(monitor: Monitor, monitorStatusResponse: MonitorStatusResponse<DockerStatusPayload>): NotificationContent {
-		const payload = monitorStatusResponse.payload;
-		const containers = payload && typeof payload !== "string" ? payload.containers : [];
-		const breaches = findContainerBreaches(monitor, containers);
+	private buildContainerBreachContent(monitor: Monitor, check: Check): NotificationContent {
+		const lines = this.describeContainerBreaches(monitor, check);
 		const title = `Container Alert: ${monitor.name}`;
-		const summary = `${breaches.length} container(s) on "${monitor.name}" need attention.`;
-		const details = [`URL: ${monitor.url}`, `Type: ${monitor.type}`, ...breaches.map(describeContainerBreach)];
+		const summary = `${lines.length} container(s) on "${monitor.name}" need attention.`;
+		const details = [`URL: ${monitor.url}`, `Type: ${monitor.type}`, ...lines];
 		return { title, summary, details, timestamp: new Date() };
 	}
 
@@ -202,93 +190,57 @@ export class NotificationMessageBuilder implements INotificationMessageBuilder {
 		};
 	}
 
-	public extractThresholdBreaches(monitor: Monitor, monitorStatusResponse: MonitorStatusResponse<HardwareStatusPayload>): ThresholdBreach[] {
+	private describeBreach(metric: HardwareMetricKey, monitor: Monitor, check: Check): ThresholdBreach {
+		switch (metric) {
+			case "cpu": {
+				const currentValue = (check.cpu?.usage_percent ?? 0) * 100;
+				return { metric, currentValue, threshold: monitor.cpuAlertThreshold, unit: "%", formattedValue: `${currentValue.toFixed(1)}%` };
+			}
+			case "memory": {
+				const currentValue = (check.memory?.usage_percent ?? 0) * 100;
+				return { metric, currentValue, threshold: monitor.memoryAlertThreshold, unit: "%", formattedValue: `${currentValue.toFixed(1)}%` };
+			}
+			case "disk": {
+				const currentValue = Math.max(0, ...(check.disk ?? []).map((disk) => disk?.usage_percent ?? 0)) * 100;
+				return { metric, currentValue, threshold: monitor.diskAlertThreshold, unit: "%", formattedValue: `${currentValue.toFixed(1)}%` };
+			}
+			case "temp": {
+				const currentValue = Math.max(0, ...(check.cpu?.temperature ?? []));
+				return { metric, currentValue, threshold: monitor.tempAlertThreshold, unit: "°C", formattedValue: `${currentValue.toFixed(1)}°C` };
+			}
+		}
+	}
+
+	private extractThresholdBreaches(monitor: Monitor, check: Check, thresholdBreaches: HardwareBreaches | undefined): ThresholdBreach[] {
 		const breaches: ThresholdBreach[] = [];
 
 		// Check if this is a hardware monitor with threshold data
-		if (monitor.type !== "hardware" || !monitorStatusResponse.payload || typeof monitorStatusResponse.payload === "string") {
+		if (monitor.type !== "hardware" || thresholdBreaches === undefined) {
 			return breaches;
 		}
 
-		// Cast to HardwareStatusPayload type
-		const payload = monitorStatusResponse.payload;
-		const hardware = payload.data;
-
-		if (!hardware) {
-			return breaches;
-		}
-
-		// Note: usage_percent values in hardware payload are decimals (0-1)
-		if (monitor.cpuAlertThreshold !== undefined && monitor.cpuAlertThreshold !== null && hardware.cpu?.usage_percent !== undefined) {
-			const cpuUsageDecimal = hardware.cpu.usage_percent;
-			const cpuPercent = cpuUsageDecimal * 100;
-			const threshold = monitor.cpuAlertThreshold;
-			if (cpuPercent > threshold) {
-				breaches.push({
-					metric: "cpu",
-					currentValue: cpuPercent,
-					threshold,
-					unit: "%",
-					formattedValue: `${cpuPercent.toFixed(1)}%`,
-				});
-			}
-		}
-
-		// Memory threshold breach
-		if (monitor.memoryAlertThreshold !== undefined && monitor.memoryAlertThreshold !== null && hardware.memory?.usage_percent !== undefined) {
-			const memoryUsageDecimal = hardware.memory.usage_percent;
-			const memoryPercent = memoryUsageDecimal * 100;
-			const threshold = monitor.memoryAlertThreshold;
-			if (memoryPercent > threshold) {
-				breaches.push({
-					metric: "memory",
-					currentValue: memoryPercent,
-					threshold,
-					unit: "%",
-					formattedValue: `${memoryPercent.toFixed(1)}%`,
-				});
-			}
-		}
-
-		// Disk threshold breach
-		if (monitor.diskAlertThreshold !== undefined && monitor.diskAlertThreshold !== null && Array.isArray(hardware.disk)) {
-			// Find the highest disk usage
-			let maxDiskUsageDecimal = 0;
-			for (const disk of hardware.disk) {
-				if (disk.usage_percent !== undefined && disk.usage_percent > maxDiskUsageDecimal) {
-					maxDiskUsageDecimal = disk.usage_percent;
-				}
-			}
-			const maxDiskPercent = maxDiskUsageDecimal * 100;
-			const threshold = monitor.diskAlertThreshold;
-			if (maxDiskPercent > threshold) {
-				breaches.push({
-					metric: "disk",
-					currentValue: maxDiskPercent,
-					threshold,
-					unit: "%",
-					formattedValue: `${maxDiskPercent.toFixed(1)}%`,
-				});
-			}
-		}
-
-		// Temperature threshold breach
-		if (monitor.tempAlertThreshold !== undefined && monitor.tempAlertThreshold !== null && hardware.cpu?.temperature) {
-			// Temperature is an array in cpu.temperature
-			const temps = Array.isArray(hardware.cpu.temperature) ? hardware.cpu.temperature : [hardware.cpu.temperature];
-			const maxTemp = Math.max(...temps.filter((t: number) => !isNaN(t)));
-			const threshold = monitor.tempAlertThreshold;
-			if (maxTemp > threshold) {
-				breaches.push({
-					metric: "temp",
-					currentValue: maxTemp,
-					threshold,
-					unit: "°C",
-					formattedValue: `${maxTemp.toFixed(1)}°C`,
-				});
-			}
+		for (const metric of HardwareMetricKeys) {
+			if (!thresholdBreaches[metric]) continue;
+			breaches.push(this.describeBreach(metric, monitor, check));
 		}
 
 		return breaches;
 	}
+
+	private describeContainerBreaches(monitor: Monitor, check: Check): string[] {
+		return findContainerBreaches(monitor, check.containers ?? []).map(describeContainerBreach);
+	}
+
+	public buildThresholdBreachMessage(monitor: Monitor, check: Check, thresholdBreaches: HardwareBreaches | undefined): string {
+		if (monitor.type === "docker") {
+			const lines = this.describeContainerBreaches(monitor, check);
+			return lines.length > 0 ? lines.join(", ") : "Container alert";
+		}
+
+		const breaches = this.extractThresholdBreaches(monitor, check, thresholdBreaches);
+		if (breaches.length === 0) {
+			return "Threshold breach detected";
+		}
+		return breaches.map((b) => `${b.metric.toUpperCase()}: ${b.formattedValue} (threshold: ${b.threshold}${b.unit})`).join(", ");
+	}
 }

server/src/domain/notifications/notification.service.ts

@@ -1,6 +1,5 @@
 import type { Monitor } from "@/domain/monitors/monitor.type.js";
 import type { Notification } from "@/domain/notifications/notification.type.js";
-import type { MonitorStatusResponse } from "@/types/network.js";
 import type { NotificationMessage } from "@/domain/notifications/notification.type.js";
 import { IMonitorsRepository } from "@/domain/monitors/monitor.repository.interface.js";
 import { INotificationsRepository } from "@/domain/notifications/notification.repository.interface.js";
@@ -10,6 +9,7 @@ import type { ISettingsService } from "@/domain/app-settings/app-settings.servic
 import { ILogger } from "@/utils/logger.js";
 import type { INotificationMessageBuilder } from "@/domain/notifications/notification.message-builder.js";
 import type { NotificationChannel } from "@/domain/notifications/notification.type.js";
+import type { Check } from "@/domain/checks/check.type.js";
 
 export type NotificationProviderRegistry = Record<NotificationChannel, INotificationProvider>;
 
@@ -19,7 +19,7 @@ export interface INotificationsService {
 	findNotificationsByTeamId: (teamId: string) => Promise<Notification[]>;
 	updateById(id: string, teamId: string, updateData: Partial<Notification>): Promise<Notification>;
 	deleteById: (id: string, teamId: string) => Promise<Notification>;
-	handleNotifications: (monitor: Monitor, monitorStatusResponse: MonitorStatusResponse, decision: MonitorActionDecision) => Promise<boolean>;
+	handleNotifications: (monitor: Monitor, check: Check, decision: MonitorActionDecision) => Promise<boolean>;
 
 	sendTestNotification: (notification: Partial<Notification>) => Promise<boolean>;
 	testAllNotifications: (notificationIds: string[]) => Promise<boolean>;
@@ -63,7 +63,7 @@ export class NotificationsService implements INotificationsService {
 	private send = async (
 		notification: Notification,
 		monitor: Monitor,
-		monitorStatusResponse: MonitorStatusResponse,
+		check: Check,
 		decision: MonitorActionDecision,
 		notificationMessage: NotificationMessage | undefined
 	): Promise<boolean> => {
@@ -89,16 +89,16 @@ export class NotificationsService implements INotificationsService {
 		return await provider.sendMessage(notification, notificationMessage);
 	};
 
-	private sendNotifications = async (monitor: Monitor, monitorStatusResponse: MonitorStatusResponse, decision: MonitorActionDecision) => {
+	private sendNotifications = async (monitor: Monitor, check: Check, decision: MonitorActionDecision) => {
 		const notificationIds = monitor.notifications ?? [];
 		const notifications = await this.notificationsRepository.findNotificationsByIds(notificationIds);
 
 		// Build notification message once for all notifications
 		const settings = this.settingsService.getSettings();
 		const clientHost = settings.clientHost || "Host not defined";
-		const notificationMessage = this.notificationMessageBuilder.buildMessage(monitor, monitorStatusResponse, decision, clientHost);
+		const notificationMessage = this.notificationMessageBuilder.buildMessage(monitor, check, decision, clientHost);
 
-		const tasks = notifications.map((notification) => this.send(notification, monitor, monitorStatusResponse, decision, notificationMessage));
+		const tasks = notifications.map((notification) => this.send(notification, monitor, check, decision, notificationMessage));
 
 		const outcomes = await Promise.all(tasks);
 		const succeeded = outcomes.filter(Boolean).length;
@@ -114,13 +114,13 @@ export class NotificationsService implements INotificationsService {
 		return succeeded === notifications.length;
 	};
 
-	handleNotifications = async (monitor: Monitor, monitorStatusResponse: MonitorStatusResponse, decision: MonitorActionDecision) => {
+	handleNotifications = async (monitor: Monitor, check: Check, decision: MonitorActionDecision) => {
 		if (!decision.shouldSendNotification) {
 			return false;
 		}
 
 		// Send notifications based on decision
-		return await this.sendNotifications(monitor, monitorStatusResponse, decision);
+		return await this.sendNotifications(monitor, check, decision);
 	};
 
 	sendTestNotification = async (notification: Partial<Notification>) => {

server/src/domain/notifications/notification.type.ts

@@ -1,3 +1,6 @@
+import type { HardwareMetricKey } from "@/domain/monitors/monitor.type.js";
+import { MonitorActionDecision } from "@/worker/worker.interface.js";
+
 export const NotificationChannels = [
 	"email",
 	"slack",
@@ -85,7 +88,7 @@ export interface MonitorInfo {
 }
 
 export interface ThresholdBreach {
-	metric: "cpu" | "memory" | "disk" | "temp";
+	metric: HardwareMetricKey;
 	currentValue: number;
 	threshold: number;
 	unit: string;
@@ -117,6 +120,6 @@ export interface NotificationMessage {
 	clientHost: string;
 	metadata: {
 		teamId: string;
-		notificationReason: string;
+		notificationReason: MonitorActionDecision["notificationReason"];
 	};
 }

server/src/service/statusService.ts

@@ -1,19 +1,15 @@
 import { IMonitorStatsRepository } from "@/domain/monitor-stats/monitor-stats.repository.interface.js";
 import { IMonitorsRepository } from "@/domain/monitors/monitor.repository.interface.js";
 import type { Check, CheckDiskInfo } from "@/domain/checks/check.type.js";
-import { MonitorStatuses, type Monitor, type MonitorStatus } from "@/domain/monitors/monitor.type.js";
-import type {
-	DockerStatusPayload,
-	GameStatusPayload,
-	GrpcStatusPayload,
-	HardwareStatusPayload,
-	HttpStatusPayload,
-	MonitorStatusResponse,
-	PageSpeedStatusPayload,
-	PingStatusPayload,
-	PortStatusPayload,
-	StatusChangeResult,
-} from "@/types/network.js";
+import {
+	HardwareMetricKeys,
+	MonitorStatuses,
+	type HardwareBreaches,
+	type HardwareCounters,
+	type Monitor,
+	type MonitorStatus,
+} from "@/domain/monitors/monitor.type.js";
+import type { StatusChangeResult } from "@/types/network.js";
 import { AppError } from "@/utils/AppError.js";
 import { ILogger } from "@/utils/logger.js";
 import type { HardwareStatusMetrics } from "@/types/network.js";
@@ -23,28 +19,9 @@ import { findContainerBreaches } from "@/domain/docker/docker-alert.js";
 
 const SERVICE_NAME = "StatusService";
 const HARDWARE_ALERT_COUNTER_START = 5;
-const HARDWARE_METRIC_KEYS = ["cpu", "memory", "disk", "temp"] as const;
-type HardwareMetricKey = (typeof HARDWARE_METRIC_KEYS)[number];
-type HardwareBreaches = Record<HardwareMetricKey, boolean>;
-type HardwareCounters = Record<HardwareMetricKey, number>;
 
 export interface IStatusService {
-	updateRunningStats(monitor: Monitor, networkResponse: MonitorStatusResponse): Promise<boolean>;
-	updateMonitorStatus(
-		statusResponse: MonitorStatusResponse<
-			| PingStatusPayload
-			| HttpStatusPayload
-			| PageSpeedStatusPayload
-			| HardwareStatusPayload
-			| DockerStatusPayload
-			| PortStatusPayload
-			| GameStatusPayload
-			| GrpcStatusPayload
-			| undefined
-		>,
-		check: Check,
-		monitor: Monitor
-	): Promise<StatusChangeResult>;
+	updateMonitorStatus(check: Check, monitor: Monitor): Promise<StatusChangeResult>;
 }
 
 export class StatusService implements IStatusService {
@@ -59,32 +36,19 @@ export class StatusService implements IStatusService {
 		this.monitorStatsRepository = monitorStatsRepository;
 	}
 
-	async updateRunningStats(monitor: Monitor, networkResponse: MonitorStatusResponse) {
+	private tryUpdateRunningStats = async (check: Check, monitor: Monitor) => {
 		try {
 			await this.monitorStatsRepository.updateByMonitorId(monitor.id, {
-				status: networkResponse.status === true,
-				responseTime: networkResponse.responseTime ?? 0,
+				status: check.status === true,
+				responseTime: check.responseTime ?? 0,
 				now: Date.now(),
 			});
-			return true;
 		} catch (error: unknown) {
-			this.logger.error({
-				service: SERVICE_NAME,
-				message: error instanceof Error ? error.message : "Unknown error",
-				method: "updateRunningStats",
-				stack: error instanceof Error ? error.stack : undefined,
-			});
-			return false;
-		}
-	}
-
-	private tryUpdateRunningStats = async (monitor: Monitor, statusResponse: MonitorStatusResponse) => {
-		const statsOk = await this.updateRunningStats(monitor, statusResponse);
-		if (!statsOk) {
 			this.logger.warn({
 				service: SERVICE_NAME,
-				method: "updateMonitorStatus",
-				message: `Stats update failed for monitor ${monitor.id}`,
+				message: error instanceof Error ? error.message : "Unknown error",
+				method: "tryUpdateRunningStats",
+				stack: error instanceof Error ? error.stack : undefined,
 			});
 		}
 	};
@@ -136,7 +100,7 @@ export class StatusService implements IStatusService {
 
 		// Update counters: decrement (floored at 0) if breached, reset to start otherwise.
 		const nextCounters = { ...counters };
-		for (const key of HARDWARE_METRIC_KEYS) {
+		for (const key of HardwareMetricKeys) {
 			nextCounters[key] = breaches[key] ? Math.max(0, counters[key] - 1) : HARDWARE_ALERT_COUNTER_START;
 		}
 
@@ -148,8 +112,8 @@ export class StatusService implements IStatusService {
 		if (!reachabilityDown) {
 			// A counter can only reach zero via the decrement path, which only runs when that
 			// metric is currently breaching — so anyCounterZero already implies anyBreached.
-			const anyCounterZero = HARDWARE_METRIC_KEYS.some((k) => nextCounters[k] === 0);
-			const allNormal = HARDWARE_METRIC_KEYS.every((k) => !breaches[k]);
+			const anyCounterZero = HardwareMetricKeys.some((k) => nextCounters[k] === 0);
+			const allNormal = HardwareMetricKeys.every((k) => !breaches[k]);
 
 			if (anyCounterZero && currentStatus !== "breached") {
 				nextStatus = "breached";
@@ -180,26 +144,12 @@ export class StatusService implements IStatusService {
 		return { nextStatus, transitioned };
 	};
 
-	updateMonitorStatus = async (
-		statusResponse: MonitorStatusResponse<
-			| PingStatusPayload
-			| HttpStatusPayload
-			| PageSpeedStatusPayload
-			| HardwareStatusPayload
-			| DockerStatusPayload
-			| PortStatusPayload
-			| GameStatusPayload
-			| GrpcStatusPayload
-			| undefined
-		>,
-		check: Check,
-		monitor: Monitor
-	): Promise<StatusChangeResult> => {
+	updateMonitorStatus = async (check: Check, monitor: Monitor): Promise<StatusChangeResult> => {
 		try {
-			const { status, code } = statusResponse;
+			const { status } = check;
 
 			// Update running stats
-			await this.tryUpdateRunningStats(monitor, statusResponse);
+			await this.tryUpdateRunningStats(check, monitor);
 
 			const prevStatus = monitor.status;
 			const checkSnapshot = toCheckSnapshot(check);
@@ -224,83 +174,62 @@ export class StatusService implements IStatusService {
 				statusChanged = newStatus === "down";
 			}
 
-			// Not enough data points yet — record the check and return
-			if (projectedWindow.length < monitor.statusWindowSize) {
-				const updated = await this.monitorsRepository.updateStatusWindowAndChecks(
-					monitor.id,
-					monitor.teamId,
-					check.status,
-					checkSnapshot,
-					monitor.statusWindowSize,
-					MAX_RECENT_CHECKS,
-					patch
-				);
-
-				return {
-					monitor: updated,
-					statusChanged,
-					prevStatus,
-					code,
-					timestamp: Date.now(),
-				};
-			}
-
-			// First evaluate reachability status changes, which apply to all monitor types
-			// and take precedence over hardware breaches.
-			const reachabilityResult = this.computeReachability(newStatus, projectedWindow, monitor.statusWindowThreshold);
-			if (reachabilityResult.transitioned) {
-				newStatus = reachabilityResult.nextStatus;
-				statusChanged = true;
-			}
-
-			// Evaluate hardware threshold breaches (only for hardware monitors with metrics payload)
 			let thresholdBreaches: HardwareBreaches | undefined;
-			const hardwarePayload = statusResponse.payload as HardwareStatusPayload | undefined;
-			if (monitor.type === "hardware" && hardwarePayload?.data) {
-				const hardware = this.computeHardwareStatus({
-					currentStatus: newStatus,
-					reachabilityDown: newStatus === "down",
-					metrics: hardwarePayload.data,
-					thresholds: {
-						cpu: monitor.cpuAlertThreshold,
-						memory: monitor.memoryAlertThreshold,
-						disk: monitor.diskAlertThreshold,
-						temp: monitor.tempAlertThreshold,
-					},
-					counters: {
-						cpu: monitor.cpuAlertCounter,
-						memory: monitor.memoryAlertCounter,
-						disk: monitor.diskAlertCounter,
-						temp: monitor.tempAlertCounter,
-					},
-				});
 
-				patch.cpuAlertCounter = hardware.nextCounters.cpu;
-				patch.memoryAlertCounter = hardware.nextCounters.memory;
-				patch.diskAlertCounter = hardware.nextCounters.disk;
-				patch.tempAlertCounter = hardware.nextCounters.temp;
-				thresholdBreaches = hardware.breaches;
-				if (hardware.transitioned) {
-					newStatus = hardware.nextStatus;
+			if (projectedWindow.length >= monitor.statusWindowSize) {
+				// First evaluate reachability status changes, which apply to all monitor types
+				// and take precedence over hardware breaches.
+				const reachabilityResult = this.computeReachability(newStatus, projectedWindow, monitor.statusWindowThreshold);
+				if (reachabilityResult.transitioned) {
+					newStatus = reachabilityResult.nextStatus;
 					statusChanged = true;
 				}
-			}
 
-			const dockerPayload = statusResponse.payload as DockerStatusPayload | undefined;
-			if (monitor.type === "docker" && dockerPayload?.containers) {
-				const breaches = findContainerBreaches(monitor, dockerPayload.containers);
-				const docker = this.computeDockerStatus({
-					currentStatus: newStatus,
-					reachabilityDown: newStatus === "down",
-					breaching: breaches.length > 0,
-				});
-				if (docker.transitioned) {
-					newStatus = docker.nextStatus;
-					statusChanged = true;
+				// Evaluate hardware threshold breaches
+				if (monitor.type === "hardware") {
+					const hardware = this.computeHardwareStatus({
+						currentStatus: newStatus,
+						reachabilityDown: newStatus === "down",
+						metrics: check,
+						thresholds: {
+							cpu: monitor.cpuAlertThreshold,
+							memory: monitor.memoryAlertThreshold,
+							disk: monitor.diskAlertThreshold,
+							temp: monitor.tempAlertThreshold,
+						},
+						counters: {
+							cpu: monitor.cpuAlertCounter,
+							memory: monitor.memoryAlertCounter,
+							disk: monitor.diskAlertCounter,
+							temp: monitor.tempAlertCounter,
+						},
+					});
+
+					patch.cpuAlertCounter = hardware.nextCounters.cpu;
+					patch.memoryAlertCounter = hardware.nextCounters.memory;
+					patch.diskAlertCounter = hardware.nextCounters.disk;
+					patch.tempAlertCounter = hardware.nextCounters.temp;
+					thresholdBreaches = hardware.breaches;
+					if (hardware.transitioned) {
+						newStatus = hardware.nextStatus;
+						statusChanged = true;
+					}
 				}
-			}
 
-			patch.status = newStatus;
+				if (monitor.type === "docker" && check.containers) {
+					const breaches = findContainerBreaches(monitor, check.containers);
+					const docker = this.computeDockerStatus({
+						currentStatus: newStatus,
+						reachabilityDown: newStatus === "down",
+						breaching: breaches.length > 0,
+					});
+					if (docker.transitioned) {
+						newStatus = docker.nextStatus;
+						statusChanged = true;
+					}
+				}
+				patch.status = newStatus;
+			}
 
 			// Single atomic write: push arrays + set status/counters
 			const updated = await this.monitorsRepository.updateStatusWindowAndChecks(
@@ -317,8 +246,6 @@ export class StatusService implements IStatusService {
 				monitor: updated,
 				statusChanged,
 				prevStatus,
-				code,
-				timestamp: new Date().getTime(),
 				thresholdBreaches,
 			};
 		} catch (error: unknown) {

server/src/types/network.ts

@@ -10,7 +10,7 @@ import type {
 	ILighthouseAudit,
 } from "@/domain/checks/check.type.js";
 import { DockerContainerInfo, DockerContainerLogs, DockerContainerSummary } from "@/domain/docker/docker.type.js";
-import type { DnsRecordType, Monitor, MonitorMatchMethod, MonitorStatus, MonitorType } from "@/domain/monitors/monitor.type.js";
+import type { DnsRecordType, HardwareBreaches, Monitor, MonitorMatchMethod, MonitorStatus, MonitorType } from "@/domain/monitors/monitor.type.js";
 
 import type { QueryResult } from "gamedig";
 
@@ -182,14 +182,7 @@ export type StatusChangeResult = {
 	monitor: Monitor;
 	statusChanged: boolean;
 	prevStatus: MonitorStatus;
-	code: number;
-	timestamp: number;
-	thresholdBreaches?: {
-		cpu: boolean;
-		memory: boolean;
-		disk: boolean;
-		temp: boolean;
-	};
+	thresholdBreaches?: HardwareBreaches;
 };
 
 export type MonitorStatusResponseOverrides<T> = Partial<Omit<MonitorStatusResponse<T>, "monitorId" | "teamId" | "type">>;

server/src/worker/reactors/reactor.incident.ts

@@ -8,6 +8,6 @@ export class IncidentReactor implements IMonitorReactor {
 	constructor(private incidentService: IIncidentService) {}
 
 	react = async (evaluation: MonitorEvaluation) => {
-		await this.incidentService.handleIncident(evaluation.monitor, evaluation.statusChange.code, evaluation.decision, evaluation.status);
+		await this.incidentService.handleIncident(evaluation.monitor, evaluation.decision, evaluation.check);
 	};
 }

server/src/worker/reactors/reactor.notification.ts

@@ -7,7 +7,6 @@ export class NotificationReactor implements IMonitorReactor {
 	constructor(private notificationService: INotificationsService) {}
 
 	react = async (evaluation: MonitorEvaluation) => {
-		if (!evaluation.decision.shouldSendNotification) return;
-		await this.notificationService.handleNotifications(evaluation.monitor, evaluation.status, evaluation.decision);
+		await this.notificationService.handleNotifications(evaluation.monitor, evaluation.check, evaluation.decision);
 	};
 }

server/src/worker/worker.interface.ts

@@ -1,7 +1,6 @@
-import { Monitor } from "@/domain/monitors/monitor.type.js";
+import { HardwareBreaches, Monitor } from "@/domain/monitors/monitor.type.js";
 import { Check } from "@/domain/checks/check.type.js";
 import { Job, JobType } from "@/domain/jobs/job.type.js";
-import { MonitorPayloadMap, MonitorStatusResponse, StatusChangeResult } from "@/types/network.js";
 import { QueueWorker } from "@/domain/queue-workers/queue-worker.type.js";
 import type { QueueMode } from "@/domain/app-settings/app-settings.type.js";
 
@@ -13,19 +12,12 @@ export interface MonitorActionDecision {
 	shouldSendNotification: boolean;
 	incidentReason: "status_down" | "threshold_breach" | null;
 	notificationReason: "status_change" | "threshold_breach" | "threshold_resolved" | null;
-	thresholdBreaches?: {
-		cpu?: boolean;
-		memory?: boolean;
-		disk?: boolean;
-		temp?: boolean;
-	};
+	thresholdBreaches?: HardwareBreaches;
 }
 
 export type MonitorEvaluation = {
 	monitor: Monitor;
-	status: MonitorStatusResponse<MonitorPayloadMap[keyof MonitorPayloadMap]>; // raw result from networkService.requestStatus
 	check: Check;
-	statusChange: StatusChangeResult; // from statusService.updateMonitorStatus
 	decision: MonitorActionDecision;
 };
 

server/src/worker/worker.pipeline.ts

@@ -3,7 +3,6 @@ import { ICheckService } from "@/domain/checks/check.service.js";
 import { Check } from "@/domain/checks/check.type.js";
 import { IDockerLogsService } from "@/domain/docker/docker-log.service.js";
 import { IEgressService, isHttpStatusCode } from "@/domain/egress/egress.service.js";
-import type { EgressStatus } from "@/domain/egress/egress.type.js";
 import { IJobsRepository } from "@/domain/jobs/job.repository.interface.js";
 import { PendingCheck } from "@/domain/jobs/job.type.js";
 import { IMaintenanceWindowsRepository } from "@/domain/maintenance-windows/maintenance-window.repository.interface.js";
@@ -21,7 +20,13 @@ import { IReactorDispatcher } from "@/worker/reactors/reactor.dispatcher.js";
 import { JobHandler, MonitorActionDecision, MonitorEvaluation } from "@/worker/worker.interface.js";
 
 const SERVICE_NAME = "WorkerPipeline";
-
+const NO_ACTION: MonitorActionDecision = {
+	shouldCreateIncident: false,
+	shouldResolveIncident: false,
+	shouldSendNotification: false,
+	incidentReason: null,
+	notificationReason: null,
+};
 // The three entry points: the queue calls the two handlers, the buffer calls ingestChecks.
 // produce and evaluateCheck stay public on the class so tests can drive one stage without the queue or the buffer.
 export interface IWorkerPipeline {
@@ -128,7 +133,7 @@ export class WorkerPipeline implements IWorkerPipeline {
 
 		// Step 2b: On a transport failure, ask whether the instance itself can reach anything before blaming the
 		// target. Null means the egress check is disabled (or failed internally) and the check is treated as usual.
-		const egressStatus = this.isTransportFailure(monitor, status) ? await this.assessEgress(monitor.id) : null;
+		const egressStatus = this.isTransportFailure(monitor, status) ? await this.deps.egressService.assessAfterFailure() : null;
 		if (egressStatus !== null) {
 			check.egressStatus = egressStatus;
 		}
@@ -171,20 +176,6 @@ export class WorkerPipeline implements IWorkerPipeline {
 		return status.status === false && isEgressAttributable(monitor) && !this.peerAnswered(status);
 	}
 
-	// The egress check must never stop a check being recorded, so a rejection is logged and treated as unknown.
-	private async assessEgress(monitorId: string): Promise<EgressStatus | null> {
-		try {
-			return await this.deps.egressService.assessAfterFailure();
-		} catch (error: unknown) {
-			this.deps.logger.warn({
-				message: `Egress assessment failed for monitor ${monitorId}: ${error instanceof Error ? error.message : String(error)}`,
-				service: SERVICE_NAME,
-				method: "assessEgress",
-			});
-			return null;
-		}
-	}
-
 	// ****************************************************************
 	// Stage 2: Ingestion
 	// Called by the buffer, checks are inserted and evaluation jobs created
@@ -240,8 +231,7 @@ export class WorkerPipeline implements IWorkerPipeline {
 
 		let current = monitor;
 		for (const check of checks) {
-			const status = this.deps.checkService.toStatusResponse(check);
-			const evaluation = await this.evaluateCheck(status, check, current);
+			const evaluation = await this.evaluateCheck(check, current);
 			await this.deps.dispatcher.dispatch(evaluation); // Handle incidents and notifications
 			const leaseHeld = await this.deps.jobsRepository.pullEvaluated(job.id, [check.id]);
 			if (!leaseHeld) {
@@ -253,7 +243,7 @@ export class WorkerPipeline implements IWorkerPipeline {
 				});
 				return;
 			}
-			current = evaluation.statusChange.monitor; // fresh statusWindow/status/counters for the next check
+			current = evaluation.monitor; // fresh statusWindow/status/counters for the next check
 		}
 
 		// Ids whose check was not returned (deleted by retention cleanup) would otherwise sit on the row forever
@@ -272,48 +262,34 @@ export class WorkerPipeline implements IWorkerPipeline {
 	// A check taken while the instance had no outbound connectivity says nothing about the target.
 	// It is left out of the status window, running stats and monitor status entirely, so that no incident
 	// opens for it and no spurious "resolved"/"up" fires once egress returns.
-	private skipDegradedEgressCheck = (status: MonitorStatusResponse, check: Check, monitor: Monitor): MonitorEvaluation => {
+	private skipDegradedEgressCheck = (check: Check, monitor: Monitor): MonitorEvaluation => {
 		this.deps.logger.debug({
 			message: `Skipping evaluation of check ${check.id} for monitor ${monitor.id}: instance egress was degraded`,
 			service: SERVICE_NAME,
 			method: "evaluateCheck",
 		});
-		const decision: MonitorActionDecision = {
-			shouldCreateIncident: false,
-			shouldResolveIncident: false,
-			shouldSendNotification: false,
-			incidentReason: null,
-			notificationReason: null,
-		};
+
 		return {
 			monitor,
-			status,
 			check,
-			statusChange: { monitor, statusChanged: false, prevStatus: monitor.status, code: status.code, timestamp: Date.now() },
-			decision,
+			decision: { ...NO_ACTION },
 		};
 	};
 
-	evaluateCheck = async (status: MonitorStatusResponse, check: Check, monitor: Monitor): Promise<MonitorEvaluation> => {
+	evaluateCheck = async (check: Check, monitor: Monitor): Promise<MonitorEvaluation> => {
 		if (check.egressStatus === "degraded") {
-			return this.skipDegradedEgressCheck(status, check, monitor);
+			return this.skipDegradedEgressCheck(check, monitor);
 		}
 
-		const statusChange = await this.deps.statusService.updateMonitorStatus(status, check, monitor);
+		const statusChange = await this.deps.statusService.updateMonitorStatus(check, monitor);
 
 		const decision = this.decide(statusChange);
-		return { monitor: statusChange.monitor, status, check, statusChange, decision };
+		return { monitor: statusChange.monitor, check, decision };
 	};
 
 	private decide = (statusChange: StatusChangeResult): MonitorActionDecision => {
 		const { monitor, statusChanged, prevStatus } = statusChange;
-		const decision: MonitorActionDecision = {
-			shouldCreateIncident: false,
-			shouldResolveIncident: false,
-			shouldSendNotification: false,
-			incidentReason: null,
-			notificationReason: null,
-		};
+		const decision: MonitorActionDecision = { ...NO_ACTION };
 		if (!statusChanged) return decision;
 
 		if (monitor.status === "down") {
@@ -322,6 +298,7 @@ export class WorkerPipeline implements IWorkerPipeline {
 			decision.incidentReason = "status_down";
 			decision.notificationReason = "status_change";
 		} else if (monitor.status === "breached") {
+			if (statusChange.thresholdBreaches) decision.thresholdBreaches = statusChange.thresholdBreaches;
 			decision.shouldCreateIncident = true;
 			decision.shouldSendNotification = true;
 			decision.incidentReason = "threshold_breach";

server/test/helpers/heartbeatTestHarness.ts

@@ -5,17 +5,17 @@ import { IncidentReactor } from "../../src/worker/reactors/reactor.incident.ts";
 import { ReactorDispatcher } from "../../src/worker/reactors/reactor.dispatcher.ts";
 import { StatusService } from "../../src/service/statusService.ts";
 import { IncidentService } from "../../src/domain/incidents/incident.service.ts";
+import { CheckService } from "../../src/domain/checks/check.service.ts";
 import { InMemoryMonitorsRepository } from "./InMemoryMonitorsRepository.ts";
 import { InMemoryIncidentsRepository } from "./InMemoryIncidentsRepository.ts";
 import { createMockLogger } from "./createMockLogger.ts";
 import type { Monitor } from "../../src/domain/monitors/monitor.type.ts";
-import type { MonitorStatusResponse } from "../../src/types/network.ts";
 import type { Check } from "../../src/domain/checks/check.type.ts";
+import type { MonitorActionDecision } from "../../src/worker/worker.interface.ts";
+import type { MonitorStatusResponse } from "../../src/types/network.ts";
 import type { MaintenanceWindow } from "../../src/domain/maintenance-windows/maintenance-window.type.ts";
 import type { EgressStatus } from "../../src/domain/egress/egress.type.ts";
 
-let checkCounter = 0;
-
 export const makeMonitor = (overrides?: Partial<Monitor>): Monitor =>
 	({
 		id: "mon-1",
@@ -45,20 +45,6 @@ export const makeStatusResponse = (status: boolean, code: number): MonitorStatus
 	responseTime: status ? 150 : 0,
 });
 
-export const makeCheck = (status: boolean, code: number): Check => {
-	const now = new Date().toISOString();
-	return {
-		id: `check-${++checkCounter}`,
-		metadata: { monitorId: "mon-1", teamId: "team-1", type: "http" },
-		status,
-		statusCode: code,
-		responseTime: status ? 150 : 0,
-		message: status ? "OK" : "Service Unavailable",
-		createdAt: now,
-		updatedAt: now,
-	};
-};
-
 const createStubMonitorStatsRepo = () => ({
 	findByMonitorId: jest.fn().mockRejectedValue(new Error("no stats")),
 	create: jest.fn().mockResolvedValue({}),
@@ -77,7 +63,7 @@ export interface HeartbeatTestHarness {
 	networkService: { requestStatus: jest.Mock };
 	bufferStub: { addToBuffer: jest.Mock; addGeoCheckToBuffer: jest.Mock; scheduleNextFlush: jest.Mock };
 	maintenanceWindowsRepo: { findByMonitorId: jest.Mock };
-	messageBuilder: { extractThresholdBreaches: jest.Mock };
+	messageBuilder: { buildThresholdBreachMessage: jest.Mock };
 	egressService: { assessAfterFailure: jest.Mock };
 	heartbeatJob: (monitor: Monitor) => Promise<void>;
 	setNextResponse: (status: boolean, code: number) => void;
@@ -86,8 +72,6 @@ export interface HeartbeatTestHarness {
 }
 
 export function createHeartbeatTestHarness(): HeartbeatTestHarness {
-	checkCounter = 0;
-
 	const monitorsRepo = new InMemoryMonitorsRepository();
 	const incidentsRepo = new InMemoryIncidentsRepository();
 	const logger = createMockLogger() as any;
@@ -95,7 +79,7 @@ export function createHeartbeatTestHarness(): HeartbeatTestHarness {
 
 	const statusService = new StatusService(logger, monitorsRepo as any, createStubMonitorStatsRepo() as any);
 
-	const messageBuilder = { extractThresholdBreaches: jest.fn().mockReturnValue([]) };
+	const messageBuilder = { buildThresholdBreachMessage: jest.fn().mockReturnValue("") };
 	const incidentService = new IncidentService(logger, incidentsRepo, monitorsRepo as any, { findById: jest.fn() } as any, messageBuilder as any);
 
 	const notificationsService = { handleNotifications: jest.fn().mockResolvedValue(true) };
@@ -111,11 +95,9 @@ export function createHeartbeatTestHarness(): HeartbeatTestHarness {
 			return Promise.resolve(makeStatusResponse(nextStatus, nextCode));
 		}),
 	};
-	const checkService = {
-		toCheck: jest.fn().mockImplementation((response: MonitorStatusResponse) => {
-			return makeCheck(response.status, response.code);
-		}),
-	};
+	// The real mapper, so the stored check carries the hardware/docker payload the evaluator reads.
+	// Only toCheck is reached; the repositories are never touched.
+	const checkService = new CheckService(monitorsRepo as any, logger, {} as any);
 
 	const setNextResponse = (status: boolean, code: number) => {
 		nextResponse = null;
@@ -137,7 +119,13 @@ export function createHeartbeatTestHarness(): HeartbeatTestHarness {
 		nextEgressStatus = status;
 	};
 
-	const notificationReactor = new NotificationReactor(notificationsService as any);
+	// The real NotificationsService ignores decisions with shouldSendNotification false; the stub is reached only for
+	// the ones it would act on, so tests can assert on handleNotifications calls as "notifications sent".
+	const guardedNotificationsService = {
+		handleNotifications: (monitor: Monitor, check: Check, decision: MonitorActionDecision) =>
+			decision.shouldSendNotification ? notificationsService.handleNotifications(monitor, check, decision) : Promise.resolve(false),
+	};
+	const notificationReactor = new NotificationReactor(guardedNotificationsService as any);
 	const incidentReactor = new IncidentReactor(incidentService as any);
 	const reactorDispatcher = new ReactorDispatcher(logger, [notificationReactor, incidentReactor]);
 
@@ -165,7 +153,7 @@ export function createHeartbeatTestHarness(): HeartbeatTestHarness {
 		if (!monitor) return;
 		const result = await pipeline.produce(monitor);
 		if (!result) return; // skipped (e.g. maintenance window)
-		const evaluation = await pipeline.evaluateCheck(result.status, result.check, monitor);
+		const evaluation = await pipeline.evaluateCheck(result.check, monitor);
 		await reactorDispatcher.dispatch(evaluation);
 	};
 

server/test/integration/evaluateCursorMultiWorker.test.ts

@@ -131,9 +131,9 @@ describe("Evaluate cursor with more than one processing worker", () => {
 			bufferService,
 			dockerLogsService: { buildDockerLogs: jest.fn<any>() } as any,
 			statusService: {
-				updateMonitorStatus: async (_status: MonitorStatusResponse, check: Check, monitor: Monitor) => {
+				updateMonitorStatus: async (check: Check, monitor: Monitor) => {
 					evaluatedCheckIds.push(check.id);
-					return { monitor, statusChanged: false, prevStatus: monitor.status, code: 200, timestamp: 0 };
+					return { monitor, statusChanged: false, prevStatus: monitor.status };
 				},
 			} as any,
 			dispatcher: { dispatch: jest.fn<any>().mockResolvedValue(undefined) } as any,

server/test/integration/heartbeatJobThresholdBreach.test.ts

@@ -49,7 +49,7 @@ describe("Heartbeat job: hardware threshold breach", () => {
 		h.setNextResponseFull(makeHardwareResponse(0.9));
 
 		// Configure message builder for when incident is created
-		h.messageBuilder.extractThresholdBreaches.mockReturnValue([{ metric: "cpu", formattedValue: "90%", threshold: 80, unit: "%" }]);
+		h.messageBuilder.buildThresholdBreachMessage.mockReturnValue("CPU: 90% (threshold: 80%)");
 
 		// 4 heartbeats: counter goes 5→4→3→2→1, status still "up"
 		for (let i = 0; i < 4; i++) {
@@ -191,7 +191,7 @@ describe("Heartbeat job: hardware threshold breach", () => {
 		h.monitorsRepo.seed(monitor);
 
 		h.setNextResponseFull(makeHardwareResponse(0.9));
-		h.messageBuilder.extractThresholdBreaches.mockReturnValue([{ metric: "cpu", formattedValue: "90%", threshold: 80, unit: "%" }]);
+		h.messageBuilder.buildThresholdBreachMessage.mockReturnValue("CPU: 90% (threshold: 80%)");
 
 		// 5 heartbeats to trigger breach, then 5 more while still breaching
 		for (let i = 0; i < 10; i++) {

server/test/integration/incidentLifecycle.test.ts

@@ -7,6 +7,7 @@ import type { IUsersRepository } from "../../src/domain/users/user.repository.in
 import type { INotificationMessageBuilder } from "../../src/domain/notifications/notification.message-builder.ts";
 import type { Monitor } from "../../src/domain/monitors/monitor.type.ts";
 import type { MonitorActionDecision } from "../../src/worker/worker.interface.ts";
+import type { Check } from "../../src/domain/checks/check.type.ts";
 
 // ── Helpers ──────────────────────────────────────────────────────────────────
 
@@ -30,6 +31,17 @@ const makeDecision = (overrides?: Partial<MonitorActionDecision>): MonitorAction
 	...overrides,
 });
 
+const makeCheck = (statusCode: number): Check => ({
+	id: "check-1",
+	metadata: { monitorId: "mon-1", teamId: "team-1", type: "http" },
+	status: statusCode < 400,
+	statusCode,
+	responseTime: 100,
+	message: statusCode < 400 ? "OK" : "Service Unavailable",
+	createdAt: "2026-01-01T00:00:00Z",
+	updatedAt: "2026-01-01T00:00:00Z",
+});
+
 // ── Test suite ───────────────────────────────────────────────────────────────
 
 describe("Incident lifecycle (integration)", () => {
@@ -43,7 +55,7 @@ describe("Incident lifecycle (integration)", () => {
 		repo = new InMemoryIncidentsRepository();
 		monitorsRepo = { findById: jest.fn() } as unknown as jest.Mocked<IMonitorsRepository>;
 		usersRepo = { findById: jest.fn() } as unknown as jest.Mocked<IUsersRepository>;
-		messageBuilder = { extractThresholdBreaches: jest.fn() } as unknown as jest.Mocked<INotificationMessageBuilder>;
+		messageBuilder = { buildThresholdBreachMessage: jest.fn() } as unknown as jest.Mocked<INotificationMessageBuilder>;
 		service = new IncidentService(createMockLogger() as any, repo, monitorsRepo, usersRepo, messageBuilder);
 	});
 
@@ -53,7 +65,7 @@ describe("Incident lifecycle (integration)", () => {
 		const monitor = makeMonitor({ status: "down" });
 		const decision = makeDecision({ shouldCreateIncident: true, incidentReason: "status_down" });
 
-		const incident = await service.handleIncident(monitor, 503, decision);
+		const incident = await service.handleIncident(monitor, decision, makeCheck(503));
 
 		expect(incident).not.toBeNull();
 		expect(incident!.monitorId).toBe("mon-1");
@@ -74,8 +86,8 @@ describe("Incident lifecycle (integration)", () => {
 		const monitor = makeMonitor({ status: "down" });
 		const decision = makeDecision({ shouldCreateIncident: true, incidentReason: "status_down" });
 
-		const first = await service.handleIncident(monitor, 503, decision);
-		const second = await service.handleIncident(monitor, 503, decision);
+		const first = await service.handleIncident(monitor, decision, makeCheck(503));
+		const second = await service.handleIncident(monitor, decision, makeCheck(503));
 
 		expect(second!.id).toBe(first!.id);
 		expect(repo.getAll()).toHaveLength(1);
@@ -86,10 +98,10 @@ describe("Incident lifecycle (integration)", () => {
 	it("auto-resolves an incident when monitor recovers", async () => {
 		const monitor = makeMonitor({ status: "down" });
 		const createDecision = makeDecision({ shouldCreateIncident: true, incidentReason: "status_down" });
-		const created = await service.handleIncident(monitor, 503, createDecision);
+		const created = await service.handleIncident(monitor, createDecision, makeCheck(503));
 
 		const resolveDecision = makeDecision({ shouldResolveIncident: true });
-		const resolved = await service.handleIncident(monitor, 200, resolveDecision);
+		const resolved = await service.handleIncident(monitor, resolveDecision, makeCheck(200));
 
 		expect(resolved).not.toBeNull();
 		expect(resolved!.id).toBe(created!.id);
@@ -104,7 +116,7 @@ describe("Incident lifecycle (integration)", () => {
 		const monitor = makeMonitor({ status: "up" });
 		const decision = makeDecision({ shouldResolveIncident: true });
 
-		const result = await service.handleIncident(monitor, 200, decision);
+		const result = await service.handleIncident(monitor, decision, makeCheck(200));
 
 		expect(result).toBeNull();
 	});
@@ -114,7 +126,7 @@ describe("Incident lifecycle (integration)", () => {
 	it("manually resolves an active incident with comment", async () => {
 		const monitor = makeMonitor({ status: "down" });
 		const decision = makeDecision({ shouldCreateIncident: true, incidentReason: "status_down" });
-		const created = await service.handleIncident(monitor, 500, decision);
+		const created = await service.handleIncident(monitor, decision, makeCheck(500));
 
 		const resolved = await service.resolveIncident(created!.id, "user-1", "team-1", "Root cause identified", "user@test.com");
 
@@ -129,7 +141,7 @@ describe("Incident lifecycle (integration)", () => {
 	it("throws when manually resolving an already-resolved incident", async () => {
 		const monitor = makeMonitor({ status: "down" });
 		const decision = makeDecision({ shouldCreateIncident: true, incidentReason: "status_down" });
-		const created = await service.handleIncident(monitor, 500, decision);
+		const created = await service.handleIncident(monitor, decision, makeCheck(500));
 
 		await service.resolveIncident(created!.id, "user-1", "team-1");
 
@@ -140,13 +152,10 @@ describe("Incident lifecycle (integration)", () => {
 
 	it("creates a threshold breach incident with statusCode 9999 and descriptive message", async () => {
 		const monitor = makeMonitor({ status: "breached", type: "hardware" });
-		(messageBuilder.extractThresholdBreaches as jest.Mock).mockReturnValue([
-			{ metric: "cpu", formattedValue: "92%", threshold: 80, unit: "%" },
-			{ metric: "memory", formattedValue: "88%", threshold: 85, unit: "%" },
-		]);
+		(messageBuilder.buildThresholdBreachMessage as jest.Mock).mockReturnValue("CPU: 92% (threshold: 80%), MEMORY: 88% (threshold: 85%)");
 		const decision = makeDecision({ shouldCreateIncident: true, incidentReason: "threshold_breach" });
 
-		const incident = await service.handleIncident(monitor, 200, decision, { monitorId: "mon-1" } as any);
+		const incident = await service.handleIncident(monitor, decision, makeCheck(200));
 
 		expect(incident!.statusCode).toBe(9999);
 		expect(incident!.message).toBe("CPU: 92% (threshold: 80%), MEMORY: 88% (threshold: 85%)");
@@ -158,7 +167,7 @@ describe("Incident lifecycle (integration)", () => {
 		const monitor = makeMonitor({ status: "up" });
 		const decision = makeDecision();
 
-		const result = await service.handleIncident(monitor, 200, decision);
+		const result = await service.handleIncident(monitor, decision, makeCheck(200));
 
 		expect(result).toBeNull();
 		expect(repo.getAll()).toHaveLength(0);
@@ -170,19 +179,19 @@ describe("Incident lifecycle (integration)", () => {
 		const monitor = makeMonitor({ status: "down" });
 
 		// First outage
-		const first = await service.handleIncident(monitor, 503, makeDecision({ shouldCreateIncident: true, incidentReason: "status_down" }));
+		const first = await service.handleIncident(monitor, makeDecision({ shouldCreateIncident: true, incidentReason: "status_down" }), makeCheck(503));
 		expect(first!.status).toBe(true);
 
 		// Manually resolved
 		await service.resolveIncident(first!.id, "user-1", "team-1", "Restarted server");
 
 		// Second outage — new incident since previous was resolved
-		const second = await service.handleIncident(monitor, 502, makeDecision({ shouldCreateIncident: true, incidentReason: "status_down" }));
+		const second = await service.handleIncident(monitor, makeDecision({ shouldCreateIncident: true, incidentReason: "status_down" }), makeCheck(502));
 		expect(second!.id).not.toBe(first!.id);
 		expect(second!.statusCode).toBe(502);
 
 		// Auto-resolve
-		const resolved = await service.handleIncident(monitor, 200, makeDecision({ shouldResolveIncident: true }));
+		const resolved = await service.handleIncident(monitor, makeDecision({ shouldResolveIncident: true }), makeCheck(200));
 		expect(resolved!.id).toBe(second!.id);
 		expect(resolved!.status).toBe(false);
 		expect(resolved!.resolutionType).toBe("automatic");
@@ -200,14 +209,14 @@ describe("Incident lifecycle (integration)", () => {
 		const monitorB = makeMonitor({ id: "mon-b", status: "down" });
 		const decision = makeDecision({ shouldCreateIncident: true, incidentReason: "status_down" });
 
-		const incidentA = await service.handleIncident(monitorA, 500, decision);
-		const incidentB = await service.handleIncident(monitorB, 502, decision);
+		const incidentA = await service.handleIncident(monitorA, decision, makeCheck(500));
+		const incidentB = await service.handleIncident(monitorB, decision, makeCheck(502));
 
 		expect(incidentA!.id).not.toBe(incidentB!.id);
 		expect(repo.getAll()).toHaveLength(2);
 
 		// Resolving monitor A does not affect monitor B
-		const resolved = await service.handleIncident(monitorA, 200, makeDecision({ shouldResolveIncident: true }));
+		const resolved = await service.handleIncident(monitorA, makeDecision({ shouldResolveIncident: true }), makeCheck(200));
 		expect(resolved!.id).toBe(incidentA!.id);
 
 		const bStillActive = await repo.findActiveByMonitorId("mon-b", "team-1");

server/test/unit/services/checkService.test.ts

@@ -3,9 +3,7 @@ import { CheckService } from "../../../src/domain/checks/check.service.ts";
 import { createMockLogger } from "../../helpers/createMockLogger.ts";
 import type { IChecksRepository } from "../../../src/domain/checks/check.repository.interface.ts";
 import type { IMonitorsRepository } from "../../../src/domain/monitors/monitor.repository.interface.ts";
-import type { MonitorStatusResponse, HardwareStatusPayload, PageSpeedStatusPayload, DockerStatusPayload } from "../../../src/types/network.ts";
-import { NotificationMessageBuilder } from "../../../src/domain/notifications/notification.message-builder.ts";
-import type { Monitor } from "../../../src/domain/monitors/monitor.type.ts";
+import type { MonitorStatusResponse, HardwareStatusPayload, PageSpeedStatusPayload } from "../../../src/types/network.ts";
 
 // ── Helpers ──────────────────────────────────────────────────────────────────
 
@@ -281,112 +279,6 @@ describe("CheckService", () => {
 		});
 	});
 
-	// ── toStatusResponse round-trip (Phase 2 §5 guard) ─────────────────────────
-	// The DB-queue split persists a Check, then the evaluator rebuilds the status response from it.
-	// toStatusResponse is only correct because every field a downstream consumer reads survives
-	// toCheck → toStatusResponse. These tests pin that: if a future change drops a consumed field
-	// from the round-trip, they fail instead of silently regressing the evaluator/reactors.
-
-	describe("toStatusResponse round-trip", () => {
-		const makeHardwareStatus = (overrides?: Partial<MonitorStatusResponse>): MonitorStatusResponse =>
-			makeStatusResponse({
-				type: "hardware",
-				status: true,
-				code: 200,
-				message: "OK",
-				responseTime: 42,
-				payload: {
-					data: {
-						cpu: { usage_percent: 0.92 },
-						memory: { usage_percent: 0.81 },
-						disk: [{ device: "/dev/sda", usage_percent: 0.75 }],
-						host: { os: "linux" },
-						net: [{ name: "eth0" }],
-					},
-				} as HardwareStatusPayload,
-				...overrides,
-			} as any);
-
-		it("uptime: preserves every consumed scalar field", () => {
-			const { service } = createService();
-			const status = makeStatusResponse({ type: "http", status: false, code: 503, message: "Service Unavailable", responseTime: 87 });
-
-			const rebuilt = service.toStatusResponse(service.toCheck(status)!);
-
-			expect(rebuilt.monitorId).toBe(status.monitorId);
-			expect(rebuilt.teamId).toBe(status.teamId);
-			expect(rebuilt.type).toBe(status.type);
-			expect(rebuilt.status).toBe(status.status);
-			expect(rebuilt.code).toBe(status.code);
-			expect(rebuilt.message).toBe(status.message);
-			expect(rebuilt.responseTime).toBe(status.responseTime);
-		});
-
-		it("hardware: preserves payload.data metrics verbatim, same units (usage_percent stays a 0–1 decimal)", () => {
-			const { service } = createService();
-			const status = makeHardwareStatus();
-
-			const rebuilt = service.toStatusResponse(service.toCheck(status)!);
-
-			const original = status.payload as HardwareStatusPayload;
-			const roundtripped = rebuilt.payload as HardwareStatusPayload;
-			expect(roundtripped.data).toEqual(original.data);
-			expect(roundtripped.data.cpu!.usage_percent).toBe(0.92); // not rescaled to 92
-		});
-
-		it("hardware: a real consumer (extractThresholdBreaches) behaves identically on raw vs round-tripped status", () => {
-			const { service } = createService();
-			const builder = new NotificationMessageBuilder();
-			const monitor = {
-				id: "mon-1",
-				type: "hardware",
-				cpuAlertThreshold: 90, // 0.92 → 92% breaches
-				memoryAlertThreshold: 90, // 0.81 → 81% does not
-				diskAlertThreshold: 90, // 0.75 → 75% does not
-				tempAlertThreshold: 100,
-			} as Monitor;
-			const status = makeHardwareStatus();
-
-			const rebuilt = service.toStatusResponse(service.toCheck(status)!);
-
-			const fromRaw = builder.extractThresholdBreaches(monitor, status as MonitorStatusResponse<HardwareStatusPayload>);
-			const fromRebuilt = builder.extractThresholdBreaches(monitor, rebuilt as MonitorStatusResponse<HardwareStatusPayload>);
-
-			// sanity: the fixture actually triggers a breach, so the equality below is not vacuous
-			expect(fromRaw).toHaveLength(1);
-			expect(fromRaw[0].metric).toBe("cpu");
-			expect(fromRebuilt).toEqual(fromRaw);
-		});
-
-		it("docker: preserves payload.containers and payload.summary verbatim", () => {
-			const { service } = createService();
-			const payload: DockerStatusPayload = {
-				containers: [
-					{ id: "1", name: "db", image: "postgres:16", state: "exited", status: "Exited (1) 2 minutes ago", health: "none", exitCode: 1 },
-					{ id: "2", name: "api", image: "api:latest", state: "running", status: "Up 3 hours (unhealthy)", health: "unhealthy", restartCount: 2 },
-				],
-				summary: { total: 2, running: 1, stopped: 1, unhealthy: 1 },
-			};
-			const status = makeStatusResponse({ type: "docker", status: true, payload } as any);
-
-			const rebuilt = service.toStatusResponse(service.toCheck(status)!);
-
-			const roundtripped = rebuilt.payload as DockerStatusPayload;
-			expect(roundtripped.containers).toEqual(payload.containers);
-			expect(roundtripped.summary).toEqual(payload.summary);
-			expect(roundtripped.containers[0].exitCode).toBe(1);
-		});
-
-		it("docker: leaves payload undefined for a failed check with no containers", () => {
-			const { service } = createService();
-			const status = makeStatusResponse({ type: "docker", status: false, code: 5000, message: "connect ECONNREFUSED", payload: null } as any);
-
-			const rebuilt = service.toStatusResponse(service.toCheck(status)!);
-
-			expect(rebuilt.payload).toBeUndefined();
-		});
-	});
-
 	// ── createChecks ─────────────────────────────────────────────────────────
 
 	describe("createChecks", () => {

server/test/unit/services/incidentService.test.ts

@@ -8,6 +8,7 @@ import type { INotificationMessageBuilder } from "../../../src/domain/notificati
 import type { Monitor } from "../../../src/domain/monitors/monitor.type.ts";
 import type { Incident } from "../../../src/domain/incidents/incident.type.ts";
 import type { MonitorActionDecision } from "../../../src/worker/worker.interface.ts";
+import type { Check } from "../../../src/domain/checks/check.type.ts";
 
 // ── Helpers ──────────────────────────────────────────────────────────────────
 
@@ -35,7 +36,7 @@ const createUsersRepo = () =>
 
 const createMessageBuilder = () =>
 	({
-		extractThresholdBreaches: jest.fn(),
+		buildThresholdBreachMessage: jest.fn(),
 	}) as unknown as jest.Mocked<INotificationMessageBuilder>;
 
 const createService = (overrides?: {
@@ -79,6 +80,19 @@ const makeIncident = (overrides?: Partial<Incident>): Incident =>
 		...overrides,
 	}) as Incident;
 
+const makeCheck = (overrides?: Partial<Check>): Check =>
+	({
+		id: "check-1",
+		metadata: { monitorId: "mon-1", teamId: "team-1", type: "http" },
+		status: true,
+		statusCode: 200,
+		responseTime: 100,
+		message: "OK",
+		createdAt: "2026-01-01T00:00:00.000Z",
+		updatedAt: "2026-01-01T00:00:00.000Z",
+		...overrides,
+	}) as Check;
+
 const makeDecision = (overrides?: Partial<MonitorActionDecision>): MonitorActionDecision => ({
 	shouldCreateIncident: false,
 	shouldResolveIncident: false,
@@ -96,7 +110,7 @@ describe("IncidentService", () => {
 	describe("handleIncident", () => {
 		it("returns null when neither create nor resolve is requested", async () => {
 			const { service } = createService();
-			const result = await service.handleIncident(makeMonitor(), 200, makeDecision());
+			const result = await service.handleIncident(makeMonitor(), makeDecision(), makeCheck());
 			expect(result).toBeNull();
 		});
 
@@ -105,7 +119,11 @@ describe("IncidentService", () => {
 			const { service, incidentsRepository } = createService();
 			(incidentsRepository.findActiveByMonitorId as jest.Mock).mockResolvedValue(existing);
 
-			const result = await service.handleIncident(makeMonitor(), 500, makeDecision({ shouldCreateIncident: true, incidentReason: "status_down" }));
+			const result = await service.handleIncident(
+				makeMonitor(),
+				makeDecision({ shouldCreateIncident: true, incidentReason: "status_down" }),
+				makeCheck({ statusCode: 500 })
+			);
 
 			expect(result).toBe(existing);
 			expect(incidentsRepository.create).not.toHaveBeenCalled();
@@ -113,11 +131,15 @@ describe("IncidentService", () => {
 
 		it("creates a new incident when shouldCreateIncident and no active incident exists", async () => {
 			const created = makeIncident();
-			const { service, incidentsRepository } = createService();
+			const { service, incidentsRepository, notificationMessageBuilder } = createService();
 			(incidentsRepository.findActiveByMonitorId as jest.Mock).mockResolvedValue(null);
 			(incidentsRepository.create as jest.Mock).mockResolvedValue(created);
 
-			const result = await service.handleIncident(makeMonitor(), 500, makeDecision({ shouldCreateIncident: true, incidentReason: "status_down" }));
+			const result = await service.handleIncident(
+				makeMonitor(),
+				makeDecision({ shouldCreateIncident: true, incidentReason: "status_down" }),
+				makeCheck({ statusCode: 500 })
+			);
 
 			expect(result).toBe(created);
 			expect(incidentsRepository.create).toHaveBeenCalledWith(
@@ -128,6 +150,7 @@ describe("IncidentService", () => {
 					statusCode: 500,
 				})
 			);
+			expect(notificationMessageBuilder.buildThresholdBreachMessage).not.toHaveBeenCalled();
 		});
 
 		it("uses status code 9999 and builds message for threshold_breach incidents", async () => {
@@ -135,13 +158,15 @@ describe("IncidentService", () => {
 			const { service, incidentsRepository, notificationMessageBuilder } = createService();
 			(incidentsRepository.findActiveByMonitorId as jest.Mock).mockResolvedValue(null);
 			(incidentsRepository.create as jest.Mock).mockResolvedValue(created);
-			(notificationMessageBuilder.extractThresholdBreaches as jest.Mock).mockReturnValue([
-				{ metric: "cpu", formattedValue: "95%", threshold: 80, unit: "%" },
-			]);
+			(notificationMessageBuilder.buildThresholdBreachMessage as jest.Mock).mockReturnValue("CPU: 95% (threshold: 80%)");
 
-			const decision = makeDecision({ shouldCreateIncident: true, incidentReason: "threshold_breach" });
-			await service.handleIncident(makeMonitor(), 200, decision, { monitorId: "mon-1" } as any);
+			const monitor = makeMonitor({ type: "hardware" });
+			const check = makeCheck({ metadata: { monitorId: "mon-1", teamId: "team-1", type: "hardware" }, cpu: { usage_percent: 0.95 } });
+			const thresholdBreaches = { cpu: true, memory: false, disk: false, temp: false };
+			const decision = makeDecision({ shouldCreateIncident: true, incidentReason: "threshold_breach", thresholdBreaches });
+			await service.handleIncident(monitor, decision, check);
 
+			expect(notificationMessageBuilder.buildThresholdBreachMessage).toHaveBeenCalledWith(monitor, check, thresholdBreaches);
 			expect(incidentsRepository.create).toHaveBeenCalledWith(
 				expect.objectContaining({
 					statusCode: 9999,
@@ -150,89 +175,6 @@ describe("IncidentService", () => {
 			);
 		});
 
-		it("uses fallback message when monitorStatusResponse is undefined for threshold_breach", async () => {
-			const created = makeIncident();
-			const { service, incidentsRepository } = createService();
-			(incidentsRepository.findActiveByMonitorId as jest.Mock).mockResolvedValue(null);
-			(incidentsRepository.create as jest.Mock).mockResolvedValue(created);
-
-			const decision = makeDecision({ shouldCreateIncident: true, incidentReason: "threshold_breach" });
-			await service.handleIncident(makeMonitor(), 200, decision, undefined);
-
-			expect(incidentsRepository.create).toHaveBeenCalledWith(expect.objectContaining({ message: "Threshold breach detected" }));
-		});
-
-		it("uses fallback message when extractThresholdBreaches returns empty array", async () => {
-			const created = makeIncident();
-			const { service, incidentsRepository, notificationMessageBuilder } = createService();
-			(incidentsRepository.findActiveByMonitorId as jest.Mock).mockResolvedValue(null);
-			(incidentsRepository.create as jest.Mock).mockResolvedValue(created);
-			(notificationMessageBuilder.extractThresholdBreaches as jest.Mock).mockReturnValue([]);
-
-			const decision = makeDecision({ shouldCreateIncident: true, incidentReason: "threshold_breach" });
-			await service.handleIncident(makeMonitor(), 200, decision, { monitorId: "mon-1" } as any);
-
-			expect(incidentsRepository.create).toHaveBeenCalledWith(expect.objectContaining({ message: "Threshold breach detected" }));
-		});
-
-		it("builds the container list for docker threshold_breach incidents", async () => {
-			const created = makeIncident();
-			const { service, incidentsRepository, notificationMessageBuilder } = createService();
-			(incidentsRepository.findActiveByMonitorId as jest.Mock).mockResolvedValue(null);
-			(incidentsRepository.create as jest.Mock).mockResolvedValue(created);
-
-			const monitor = makeMonitor({ type: "docker", status: "breached", dockerAlertOnStopped: true, dockerAlertOnUnhealthy: true });
-			const response = {
-				monitorId: "mon-1",
-				payload: {
-					containers: [
-						{ id: "1", name: "db", image: "postgres", state: "exited", status: "Exited (1)", health: "none", exitCode: 1 },
-						{ id: "2", name: "api", image: "api", state: "running", status: "Up", health: "unhealthy" },
-						{ id: "3", name: "web", image: "nginx", state: "running", status: "Up", health: "healthy" },
-					],
-					summary: { total: 3, running: 2, stopped: 1, unhealthy: 1 },
-				},
-			} as any;
-			const decision = makeDecision({ shouldCreateIncident: true, incidentReason: "threshold_breach" });
-			await service.handleIncident(monitor, 200, decision, response);
-
-			expect(incidentsRepository.create).toHaveBeenCalledWith(
-				expect.objectContaining({ statusCode: 9999, message: "db: stopped (exit code 1), api: unhealthy" })
-			);
-			expect(notificationMessageBuilder.extractThresholdBreaches).not.toHaveBeenCalled();
-		});
-
-		it("uses the container fallback message for docker incidents with no response", async () => {
-			const created = makeIncident();
-			const { service, incidentsRepository } = createService();
-			(incidentsRepository.findActiveByMonitorId as jest.Mock).mockResolvedValue(null);
-			(incidentsRepository.create as jest.Mock).mockResolvedValue(created);
-
-			const monitor = makeMonitor({ type: "docker", status: "breached", dockerAlertOnStopped: true });
-			const decision = makeDecision({ shouldCreateIncident: true, incidentReason: "threshold_breach" });
-			await service.handleIncident(monitor, 200, decision, undefined);
-
-			expect(incidentsRepository.create).toHaveBeenCalledWith(expect.objectContaining({ statusCode: 9999, message: "Container alert" }));
-		});
-
-		it("joins multiple threshold breaches with commas", async () => {
-			const created = makeIncident();
-			const { service, incidentsRepository, notificationMessageBuilder } = createService();
-			(incidentsRepository.findActiveByMonitorId as jest.Mock).mockResolvedValue(null);
-			(incidentsRepository.create as jest.Mock).mockResolvedValue(created);
-			(notificationMessageBuilder.extractThresholdBreaches as jest.Mock).mockReturnValue([
-				{ metric: "cpu", formattedValue: "95%", threshold: 80, unit: "%" },
-				{ metric: "memory", formattedValue: "90%", threshold: 80, unit: "%" },
-			]);
-
-			const decision = makeDecision({ shouldCreateIncident: true, incidentReason: "threshold_breach" });
-			await service.handleIncident(makeMonitor(), 200, decision, { monitorId: "mon-1" } as any);
-
-			expect(incidentsRepository.create).toHaveBeenCalledWith(
-				expect.objectContaining({ message: "CPU: 95% (threshold: 80%), MEMORY: 90% (threshold: 80%)" })
-			);
-		});
-
 		it("resolves active incident when shouldResolveIncident", async () => {
 			const active = makeIncident();
 			const resolved = makeIncident({ status: false, endTime: "123", resolutionType: "automatic" });
@@ -240,7 +182,7 @@ describe("IncidentService", () => {
 			(incidentsRepository.findActiveByMonitorId as jest.Mock).mockResolvedValue(active);
 			(incidentsRepository.updateById as jest.Mock).mockResolvedValue(resolved);
 
-			const result = await service.handleIncident(makeMonitor(), 200, makeDecision({ shouldResolveIncident: true }));
+			const result = await service.handleIncident(makeMonitor(), makeDecision({ shouldResolveIncident: true }), makeCheck());
 
 			expect(result).toBe(resolved);
 			expect(incidentsRepository.updateById).toHaveBeenCalledWith(
@@ -254,7 +196,7 @@ describe("IncidentService", () => {
 			const { service, incidentsRepository } = createService();
 			(incidentsRepository.findActiveByMonitorId as jest.Mock).mockResolvedValue(null);
 
-			const result = await service.handleIncident(makeMonitor(), 200, makeDecision({ shouldResolveIncident: true }));
+			const result = await service.handleIncident(makeMonitor(), makeDecision({ shouldResolveIncident: true }), makeCheck());
 
 			expect(result).toBeNull();
 		});

server/test/unit/services/notificationMessageBuilder.test.ts

@@ -1,7 +1,8 @@
 import { describe, expect, it, beforeEach } from "@jest/globals";
 import { NotificationMessageBuilder } from "../../../src/domain/notifications/notification.message-builder.ts";
-import type { Monitor } from "../../../src/domain/monitors/monitor.type.ts";
-import type { MonitorStatusResponse, HardwareStatusPayload, DockerStatusPayload } from "../../../src/types/network.ts";
+import type { HardwareBreaches, Monitor } from "../../../src/domain/monitors/monitor.type.ts";
+import type { Check } from "../../../src/domain/checks/check.type.ts";
+import type { DockerContainerInfo } from "../../../src/domain/docker/docker.type.ts";
 import type { MonitorActionDecision } from "../../../src/worker/worker.interface.ts";
 
 // ── Helpers ──────────────────────────────────────────────────────────────────
@@ -30,29 +31,20 @@ const makeDecision = (overrides?: Partial<MonitorActionDecision>): MonitorAction
 	...overrides,
 });
 
-const makeStatusResponse = (overrides?: Partial<MonitorStatusResponse>): MonitorStatusResponse =>
-	({
-		monitorId: "mon-1",
-		teamId: "team-1",
-		type: "http",
-		status: false,
-		code: 500,
-		message: "Internal Server Error",
-		...overrides,
-	}) as MonitorStatusResponse;
+const makeCheck = (overrides?: Partial<Check>): Check => ({
+	id: "check-1",
+	metadata: { monitorId: "mon-1", teamId: "team-1", type: "http" },
+	status: false,
+	responseTime: 100,
+	statusCode: 500,
+	message: "Internal Server Error",
+	createdAt: "2026-01-01T00:00:00Z",
+	updatedAt: "2026-01-01T00:00:00Z",
+	...overrides,
+});
 
-const makeHardwarePayload = (overrides?: Partial<HardwareStatusPayload["data"]>): HardwareStatusPayload =>
-	({
-		data: {
-			cpu: { usage_percent: 0.5, temperature: [45] },
-			memory: { usage_percent: 0.6 },
-			disk: [{ usage_percent: 0.7 }],
-			...overrides,
-		},
-	}) as HardwareStatusPayload;
-
-const makeDockerPayload = (containers: Partial<DockerStatusPayload["containers"][number]>[]): DockerStatusPayload => ({
-	containers: containers.map((container, index) => ({
+const makeContainers = (containers: Partial<DockerContainerInfo>[]): DockerContainerInfo[] =>
+	containers.map((container, index) => ({
 		id: `container-${index}`,
 		name: `container-${index}`,
 		image: "nginx:latest",
@@ -60,9 +52,7 @@ const makeDockerPayload = (containers: Partial<DockerStatusPayload["containers"]
 		status: "Up 3 hours",
 		health: "none",
 		...container,
-	})),
-	summary: { total: containers.length, running: 0, stopped: 0, unhealthy: 0 },
-});
+	}));
 
 const makeDockerMonitor = (overrides?: Partial<Monitor>): Monitor =>
 	makeMonitor({
@@ -95,9 +85,9 @@ describe("NotificationMessageBuilder", () => {
 		it("builds a monitor_down message", () => {
 			const monitor = makeMonitor({ status: "down" });
 			const decision = makeDecision();
-			const response = makeStatusResponse();
+			const check = makeCheck();
 
-			const msg = builder.buildMessage(monitor, response, decision, "https://app.example.com");
+			const msg = builder.buildMessage(monitor, check, decision, "https://app.example.com");
 
 			expect(msg.type).toBe("monitor_down");
 			expect(msg.severity).toBe("critical");
@@ -120,7 +110,7 @@ describe("NotificationMessageBuilder", () => {
 			const monitor = makeMonitor({ status: "up", type: "http" });
 			const decision = makeDecision({ notificationReason: "status_change" });
 
-			const msg = builder.buildMessage(monitor, makeStatusResponse(), decision, "https://app.example.com");
+			const msg = builder.buildMessage(monitor, makeCheck(), decision, "https://app.example.com");
 
 			expect(msg.type).toBe("monitor_up");
 			expect(msg.severity).toBe("success");
@@ -129,13 +119,13 @@ describe("NotificationMessageBuilder", () => {
 
 		it("builds a threshold_breach message", () => {
 			const monitor = makeMonitor({ status: "up", type: "hardware", cpuAlertThreshold: 80 });
-			const decision = makeDecision({ notificationReason: "threshold_breach" });
-			const response = makeStatusResponse({
-				type: "hardware",
-				payload: makeHardwarePayload({ cpu: { usage_percent: 0.9, temperature: [50] } as any }),
-			} as any);
+			const decision = makeDecision({
+				notificationReason: "threshold_breach",
+				thresholdBreaches: { cpu: true, memory: false, disk: false, temp: false },
+			});
+			const check = makeCheck({ cpu: { usage_percent: 0.9, temperature: [50] } });
 
-			const msg = builder.buildMessage(monitor, response, decision, "https://app.example.com");
+			const msg = builder.buildMessage(monitor, check, decision, "https://app.example.com");
 
 			expect(msg.type).toBe("threshold_breach");
 			expect(msg.severity).toBe("warning");
@@ -148,21 +138,12 @@ describe("NotificationMessageBuilder", () => {
 			const monitor = makeMonitor({ status: "up", type: "hardware" });
 			const decision = makeDecision({ notificationReason: "threshold_resolved" });
 
-			const msg = builder.buildMessage(monitor, makeStatusResponse(), decision, "https://app.example.com");
+			const msg = builder.buildMessage(monitor, makeCheck(), decision, "https://app.example.com");
 
 			expect(msg.type).toBe("threshold_resolved");
 			expect(msg.severity).toBe("success");
 			expect(msg.content.title).toBe("Thresholds Resolved: Test Monitor");
 		});
-
-		it("uses notificationReason from decision, falling back to status_change", () => {
-			const monitor = makeMonitor({ status: "down" });
-			const decision = makeDecision({ notificationReason: null });
-
-			const msg = builder.buildMessage(monitor, makeStatusResponse(), decision, "https://app.example.com");
-
-			expect(msg.metadata.notificationReason).toBe("status_change");
-		});
 	});
 
 	// ── determineNotificationType (via buildMessage) ─────────────────────
@@ -172,7 +153,7 @@ describe("NotificationMessageBuilder", () => {
 			const monitor = makeMonitor({ status: "down" });
 			const decision = makeDecision({ notificationReason: "threshold_breach" });
 
-			const msg = builder.buildMessage(monitor, makeStatusResponse(), decision, "");
+			const msg = builder.buildMessage(monitor, makeCheck(), decision, "");
 
 			expect(msg.type).toBe("monitor_down");
 		});
@@ -181,7 +162,7 @@ describe("NotificationMessageBuilder", () => {
 			const monitor = makeMonitor({ status: "up", type: "hardware" });
 			const decision = makeDecision({ notificationReason: "threshold_breach" });
 
-			const msg = builder.buildMessage(monitor, makeStatusResponse(), decision, "");
+			const msg = builder.buildMessage(monitor, makeCheck(), decision, "");
 
 			expect(msg.type).toBe("threshold_breach");
 		});
@@ -190,7 +171,7 @@ describe("NotificationMessageBuilder", () => {
 			const monitor = makeMonitor({ status: "up", type: "hardware" });
 			const decision = makeDecision({ notificationReason: "threshold_resolved" });
 
-			const msg = builder.buildMessage(monitor, makeStatusResponse(), decision, "");
+			const msg = builder.buildMessage(monitor, makeCheck(), decision, "");
 
 			expect(msg.type).toBe("threshold_resolved");
 		});
@@ -199,7 +180,7 @@ describe("NotificationMessageBuilder", () => {
 			const monitor = makeMonitor({ status: "up", type: "hardware" });
 			const decision = makeDecision({ notificationReason: "status_change" });
 
-			const msg = builder.buildMessage(monitor, makeStatusResponse(), decision, "");
+			const msg = builder.buildMessage(monitor, makeCheck(), decision, "");
 
 			expect(msg.type).toBe("monitor_up");
 		});
@@ -207,7 +188,7 @@ describe("NotificationMessageBuilder", () => {
 		it("returns container_breach for docker monitor with threshold_breach reason", () => {
 			const decision = makeDecision({ notificationReason: "threshold_breach" });
 
-			const msg = builder.buildMessage(makeDockerMonitor(), makeStatusResponse(), decision, "");
+			const msg = builder.buildMessage(makeDockerMonitor(), makeCheck(), decision, "");
 
 			expect(msg.type).toBe("container_breach");
 		});
@@ -215,7 +196,7 @@ describe("NotificationMessageBuilder", () => {
 		it("returns container_resolved for docker monitor with threshold_resolved reason", () => {
 			const decision = makeDecision({ notificationReason: "threshold_resolved" });
 
-			const msg = builder.buildMessage(makeDockerMonitor({ status: "up" }), makeStatusResponse(), decision, "");
+			const msg = builder.buildMessage(makeDockerMonitor({ status: "up" }), makeCheck(), decision, "");
 
 			expect(msg.type).toBe("container_resolved");
 		});
@@ -223,7 +204,7 @@ describe("NotificationMessageBuilder", () => {
 		it("returns monitor_down for docker monitor that is down regardless of reason", () => {
 			const decision = makeDecision({ notificationReason: "threshold_breach" });
 
-			const msg = builder.buildMessage(makeDockerMonitor({ status: "down" }), makeStatusResponse(), decision, "");
+			const msg = builder.buildMessage(makeDockerMonitor({ status: "down" }), makeCheck(), decision, "");
 
 			expect(msg.type).toBe("monitor_down");
 		});
@@ -232,7 +213,7 @@ describe("NotificationMessageBuilder", () => {
 			const monitor = makeMonitor({ status: "up", type: "http" });
 			const decision = makeDecision({ notificationReason: "status_change" });
 
-			const msg = builder.buildMessage(monitor, makeStatusResponse(), decision, "");
+			const msg = builder.buildMessage(monitor, makeCheck(), decision, "");
 
 			expect(msg.type).toBe("monitor_up");
 		});
@@ -241,7 +222,7 @@ describe("NotificationMessageBuilder", () => {
 			const monitor = makeMonitor({ status: "unknown" as any });
 			const decision = makeDecision({ notificationReason: null });
 
-			const msg = builder.buildMessage(monitor, makeStatusResponse(), decision, "");
+			const msg = builder.buildMessage(monitor, makeCheck(), decision, "");
 
 			expect(msg.type).toBe("monitor_up");
 		});
@@ -251,14 +232,14 @@ describe("NotificationMessageBuilder", () => {
 
 	describe("determineSeverity", () => {
 		it("returns critical for monitor_down", () => {
-			const msg = builder.buildMessage(makeMonitor({ status: "down" }), makeStatusResponse(), makeDecision(), "");
+			const msg = builder.buildMessage(makeMonitor({ status: "down" }), makeCheck(), makeDecision(), "");
 			expect(msg.severity).toBe("critical");
 		});
 
 		it("returns warning for threshold_breach", () => {
 			const msg = builder.buildMessage(
 				makeMonitor({ status: "up", type: "hardware" }),
-				makeStatusResponse(),
+				makeCheck(),
 				makeDecision({ notificationReason: "threshold_breach" }),
 				""
 			);
@@ -268,7 +249,7 @@ describe("NotificationMessageBuilder", () => {
 		it("returns success for monitor_up", () => {
 			const msg = builder.buildMessage(
 				makeMonitor({ status: "up", type: "http" }),
-				makeStatusResponse(),
+				makeCheck(),
 				makeDecision({ notificationReason: "status_change" }),
 				""
 			);
@@ -278,7 +259,7 @@ describe("NotificationMessageBuilder", () => {
 		it("returns success for threshold_resolved", () => {
 			const msg = builder.buildMessage(
 				makeMonitor({ status: "up", type: "hardware" }),
-				makeStatusResponse(),
+				makeCheck(),
 				makeDecision({ notificationReason: "threshold_resolved" }),
 				""
 			);
@@ -286,14 +267,14 @@ describe("NotificationMessageBuilder", () => {
 		});
 
 		it("returns warning for container_breach", () => {
-			const msg = builder.buildMessage(makeDockerMonitor(), makeStatusResponse(), makeDecision({ notificationReason: "threshold_breach" }), "");
+			const msg = builder.buildMessage(makeDockerMonitor(), makeCheck(), makeDecision({ notificationReason: "threshold_breach" }), "");
 			expect(msg.severity).toBe("warning");
 		});
 
 		it("returns success for container_resolved", () => {
 			const msg = builder.buildMessage(
 				makeDockerMonitor({ status: "up" }),
-				makeStatusResponse(),
+				makeCheck(),
 				makeDecision({ notificationReason: "threshold_resolved" }),
 				""
 			);
@@ -307,9 +288,9 @@ describe("NotificationMessageBuilder", () => {
 		describe("monitor_down", () => {
 			it("includes response code and error message when present", () => {
 				const monitor = makeMonitor({ status: "down" });
-				const response = makeStatusResponse({ code: 503, message: "Service Unavailable" });
+				const check = makeCheck({ statusCode: 503, message: "Service Unavailable" });
 
-				const msg = builder.buildMessage(monitor, response, makeDecision(), "");
+				const msg = builder.buildMessage(monitor, check, makeDecision(), "");
 
 				expect(msg.content.details).toContain("Response Code: 503");
 				expect(msg.content.details).toContain("Error: Service Unavailable");
@@ -317,9 +298,9 @@ describe("NotificationMessageBuilder", () => {
 
 			it("omits response code when falsy", () => {
 				const monitor = makeMonitor({ status: "down" });
-				const response = makeStatusResponse({ code: 0, message: "" });
+				const check = makeCheck({ statusCode: 0, message: "" });
 
-				const msg = builder.buildMessage(monitor, response, makeDecision(), "");
+				const msg = builder.buildMessage(monitor, check, makeDecision(), "");
 
 				expect(msg.content.details).not.toContainEqual(expect.stringContaining("Response Code:"));
 				expect(msg.content.details).not.toContainEqual(expect.stringContaining("Error:"));
@@ -327,7 +308,7 @@ describe("NotificationMessageBuilder", () => {
 
 			it("includes URL, Status, and Type in details", () => {
 				const monitor = makeMonitor({ status: "down" });
-				const msg = builder.buildMessage(monitor, makeStatusResponse(), makeDecision(), "");
+				const msg = builder.buildMessage(monitor, makeCheck(), makeDecision(), "");
 
 				expect(msg.content.details).toContain("URL: https://example.com");
 				expect(msg.content.details).toContain("Status: Down");
@@ -336,13 +317,13 @@ describe("NotificationMessageBuilder", () => {
 
 			it("sets summary text", () => {
 				const monitor = makeMonitor({ status: "down" });
-				const msg = builder.buildMessage(monitor, makeStatusResponse(), makeDecision(), "");
+				const msg = builder.buildMessage(monitor, makeCheck(), makeDecision(), "");
 				expect(msg.content.summary).toBe('Monitor "Test Monitor" is currently down and unreachable.');
 			});
 
 			it("sets timestamp", () => {
 				const monitor = makeMonitor({ status: "down" });
-				const msg = builder.buildMessage(monitor, makeStatusResponse(), makeDecision(), "");
+				const msg = builder.buildMessage(monitor, makeCheck(), makeDecision(), "");
 				expect(msg.content.timestamp).toBeInstanceOf(Date);
 			});
 		});
@@ -350,7 +331,7 @@ describe("NotificationMessageBuilder", () => {
 		describe("monitor_up", () => {
 			it("includes recovery details", () => {
 				const monitor = makeMonitor({ status: "up", type: "http" });
-				const msg = builder.buildMessage(monitor, makeStatusResponse(), makeDecision(), "");
+				const msg = builder.buildMessage(monitor, makeCheck(), makeDecision(), "");
 
 				expect(msg.content.title).toBe("Monitor Recovered: Test Monitor");
 				expect(msg.content.summary).toBe('Monitor "Test Monitor" is back up and operational.');
@@ -359,30 +340,33 @@ describe("NotificationMessageBuilder", () => {
 		});
 
 		describe("threshold_breach", () => {
-			it("includes threshold breaches in content", () => {
+			it("includes the breaches flagged on the decision in content", () => {
 				const monitor = makeMonitor({ status: "up", type: "hardware", cpuAlertThreshold: 80 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ cpu: { usage_percent: 0.9, temperature: [50] } as any }),
-				} as any);
+				const check = makeCheck({ cpu: { usage_percent: 0.9, temperature: [50] } });
+				const decision = makeDecision({
+					notificationReason: "threshold_breach",
+					thresholdBreaches: { cpu: true, memory: false, disk: false, temp: false },
+				});
 
-				const msg = builder.buildMessage(monitor, response, makeDecision({ notificationReason: "threshold_breach" }), "");
+				const msg = builder.buildMessage(monitor, check, decision, "");
 
-				expect(msg.content.thresholds).toEqual(
-					expect.arrayContaining([
-						expect.objectContaining({
-							metric: "cpu",
-							currentValue: 90,
-							threshold: 80,
-						}),
-					])
-				);
+				expect(msg.content.thresholds).toEqual([expect.objectContaining({ metric: "cpu", currentValue: 90, threshold: 80 })]);
+			});
+
+			it("leaves thresholds empty when the decision carries no breaches", () => {
+				const monitor = makeMonitor({ status: "up", type: "hardware", cpuAlertThreshold: 80 });
+				const check = makeCheck({ cpu: { usage_percent: 0.9, temperature: [50] } });
+
+				const msg = builder.buildMessage(monitor, check, makeDecision({ notificationReason: "threshold_breach" }), "");
+
+				expect(msg.content.thresholds).toEqual([]);
 			});
 		});
 
 		describe("threshold_resolved", () => {
 			it("includes resolved details", () => {
 				const monitor = makeMonitor({ status: "up", type: "hardware" });
-				const msg = builder.buildMessage(monitor, makeStatusResponse(), makeDecision({ notificationReason: "threshold_resolved" }), "");
+				const msg = builder.buildMessage(monitor, makeCheck(), makeDecision({ notificationReason: "threshold_resolved" }), "");
 
 				expect(msg.content.title).toBe("Thresholds Resolved: Test Monitor");
 				expect(msg.content.summary).toBe('Monitor "Test Monitor" thresholds have returned to normal.');
@@ -392,13 +376,12 @@ describe("NotificationMessageBuilder", () => {
 
 		describe("container_breach", () => {
 			it("lists one detail line per breaching container", () => {
-				const response = makeStatusResponse({
-					type: "docker",
+				const check = makeCheck({
 					status: true,
-					payload: makeDockerPayload([{ name: "db", state: "exited", exitCode: 1 }, { name: "api", health: "unhealthy" }, { name: "web" }]),
-				} as any);
+					containers: makeContainers([{ name: "db", state: "exited", exitCode: 1 }, { name: "api", health: "unhealthy" }, { name: "web" }]),
+				});
 
-				const msg = builder.buildMessage(makeDockerMonitor(), response, makeDecision({ notificationReason: "threshold_breach" }), "");
+				const msg = builder.buildMessage(makeDockerMonitor(), check, makeDecision({ notificationReason: "threshold_breach" }), "");
 
 				expect(msg.content.title).toBe("Container Alert: Test Monitor");
 				expect(msg.content.summary).toBe('2 container(s) on "Test Monitor" need attention.');
@@ -407,25 +390,24 @@ describe("NotificationMessageBuilder", () => {
 			});
 
 			it("only lists containers matching an enabled switch", () => {
-				const response = makeStatusResponse({
-					type: "docker",
+				const check = makeCheck({
 					status: true,
-					payload: makeDockerPayload([
+					containers: makeContainers([
 						{ name: "db", state: "exited", exitCode: 1 },
 						{ name: "api", health: "unhealthy" },
 					]),
-				} as any);
+				});
 				const monitor = makeDockerMonitor({ dockerAlertOnStopped: false });
 
-				const msg = builder.buildMessage(monitor, response, makeDecision({ notificationReason: "threshold_breach" }), "");
+				const msg = builder.buildMessage(monitor, check, makeDecision({ notificationReason: "threshold_breach" }), "");
 
 				expect(msg.content.details).toEqual(["URL: unix:///var/run/docker.sock", "Type: docker", "api: unhealthy"]);
 			});
 
-			it("lists no containers when the payload is an error string", () => {
-				const response = makeStatusResponse({ type: "docker", status: false, payload: "connect ECONNREFUSED" } as any);
+			it("lists no containers when the check carries no container data", () => {
+				const check = makeCheck({ status: false, message: "connect ECONNREFUSED" });
 
-				const msg = builder.buildMessage(makeDockerMonitor(), response, makeDecision({ notificationReason: "threshold_breach" }), "");
+				const msg = builder.buildMessage(makeDockerMonitor(), check, makeDecision({ notificationReason: "threshold_breach" }), "");
 
 				expect(msg.content.summary).toBe('0 container(s) on "Test Monitor" need attention.');
 				expect(msg.content.details).toEqual(["URL: unix:///var/run/docker.sock", "Type: docker"]);
@@ -436,7 +418,7 @@ describe("NotificationMessageBuilder", () => {
 			it("includes recovered details", () => {
 				const msg = builder.buildMessage(
 					makeDockerMonitor({ status: "up" }),
-					makeStatusResponse(),
+					makeCheck(),
 					makeDecision({ notificationReason: "threshold_resolved" }),
 					""
 				);
@@ -457,7 +439,7 @@ describe("NotificationMessageBuilder", () => {
 				// Instead, let's verify the default case exists by checking that
 				// non-standard types would get default content
 				const monitor = makeMonitor({ status: "up", type: "http" });
-				const msg = builder.buildMessage(monitor, makeStatusResponse(), makeDecision(), "");
+				const msg = builder.buildMessage(monitor, makeCheck(), makeDecision(), "");
 
 				// monitor_up is handled, so content should be monitor_up specific
 				expect(msg.content.title).toBe("Monitor Recovered: Test Monitor");
@@ -484,7 +466,7 @@ describe("NotificationMessageBuilder", () => {
 	describe("buildContent edge cases", () => {
 		it("returns default content for unhandled notification type", () => {
 			const monitor = makeMonitor({ status: "up", type: "http" });
-			const result = (builder as any).buildContent("test", monitor, makeStatusResponse());
+			const result = (builder as any).buildContent("test", monitor, makeCheck());
 
 			expect(result.title).toBe("Monitor: Test Monitor");
 			expect(result.summary).toBe('Status update for monitor "Test Monitor".');
@@ -497,410 +479,199 @@ describe("NotificationMessageBuilder", () => {
 	// ── extractThresholdBreaches ─────────────────────────────────────────
 
 	describe("extractThresholdBreaches", () => {
-		it("returns empty array for non-hardware monitor", () => {
-			const monitor = makeMonitor({ type: "http" });
-			const response = makeStatusResponse();
+		const none: HardwareBreaches = { cpu: false, memory: false, disk: false, temp: false };
+		const hardwareMonitor = (overrides?: Partial<Monitor>) =>
+			makeMonitor({
+				type: "hardware",
+				cpuAlertThreshold: 80,
+				memoryAlertThreshold: 70,
+				diskAlertThreshold: 85,
+				tempAlertThreshold: 65,
+				...overrides,
+			});
 
-			const breaches = builder.extractThresholdBreaches(monitor, response);
+		it("returns empty when no breaches are supplied", () => {
+			const check = makeCheck({ cpu: { usage_percent: 0.99, temperature: [99] } });
 
-			expect(breaches).toEqual([]);
+			expect(builder.extractThresholdBreaches(hardwareMonitor(), check, undefined)).toEqual([]);
 		});
 
-		it("returns empty array when payload is missing", () => {
-			const monitor = makeMonitor({ type: "hardware" });
-			const response = makeStatusResponse({ payload: undefined } as any);
+		it("returns empty when every flag is false, whatever the check says", () => {
+			const check = makeCheck({
+				cpu: { usage_percent: 0.99, temperature: [99] },
+				memory: { usage_percent: 0.99 },
+				disk: [{ usage_percent: 0.99 }],
+			});
 
-			const breaches = builder.extractThresholdBreaches(monitor, response);
-
-			expect(breaches).toEqual([]);
+			expect(builder.extractThresholdBreaches(hardwareMonitor(), check, none)).toEqual([]);
 		});
 
-		it("returns empty array when hardware data is missing", () => {
-			const monitor = makeMonitor({ type: "hardware" });
-			const response = makeStatusResponse({ payload: { data: undefined } } as any);
+		it("returns empty for a non-hardware monitor even when flags are set", () => {
+			const check = makeCheck({ cpu: { usage_percent: 0.99 } });
 
-			const breaches = builder.extractThresholdBreaches(monitor, response);
-
-			expect(breaches).toEqual([]);
+			expect(builder.extractThresholdBreaches(makeMonitor({ type: "http" }), check, { ...none, cpu: true })).toEqual([]);
 		});
 
-		// ── CPU ──────────────────────────────────────────────────────────
+		// The flags are the verdict. The builder formats what it is told is breaching and never re-runs the comparison.
+		it("reports a flagged metric without re-testing it against the threshold", () => {
+			const check = makeCheck({ cpu: { usage_percent: 0.5, temperature: [50] } });
 
-		describe("cpu threshold", () => {
-			it("detects CPU breach when usage exceeds threshold", () => {
-				const monitor = makeMonitor({ type: "hardware", cpuAlertThreshold: 80 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ cpu: { usage_percent: 0.9, temperature: [50] } as any }),
-				} as any);
+			const breaches = builder.extractThresholdBreaches(hardwareMonitor(), check, { ...none, cpu: true });
 
-				const breaches = builder.extractThresholdBreaches(monitor, response);
+			expect(breaches).toEqual([{ metric: "cpu", currentValue: 50, threshold: 80, unit: "%", formattedValue: "50.0%" }]);
+		});
 
-				expect(breaches).toContainEqual(
-					expect.objectContaining({
-						metric: "cpu",
-						currentValue: 90,
-						threshold: 80,
-						unit: "%",
-						formattedValue: "90.0%",
-					})
-				);
+		describe("cpu", () => {
+			it("formats cpu usage as a percentage when flagged", () => {
+				const check = makeCheck({ cpu: { usage_percent: 0.9, temperature: [50] } });
+
+				const breaches = builder.extractThresholdBreaches(hardwareMonitor(), check, { ...none, cpu: true });
+
+				expect(breaches).toEqual([{ metric: "cpu", currentValue: 90, threshold: 80, unit: "%", formattedValue: "90.0%" }]);
 			});
 
-			it("does not report CPU breach when usage is below threshold", () => {
-				const monitor = makeMonitor({ type: "hardware", cpuAlertThreshold: 80 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ cpu: { usage_percent: 0.5, temperature: [50] } as any }),
-				} as any);
+			it("ignores cpu when not flagged", () => {
+				const check = makeCheck({ cpu: { usage_percent: 0.9, temperature: [50] } });
 
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches.find((b) => b.metric === "cpu")).toBeUndefined();
-			});
-
-			it("skips CPU check when cpuAlertThreshold is undefined", () => {
-				const monitor = makeMonitor({ type: "hardware", cpuAlertThreshold: undefined });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ cpu: { usage_percent: 0.99 } as any }),
-				} as any);
-
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches.find((b) => b.metric === "cpu")).toBeUndefined();
-			});
-
-			it("skips CPU check when cpuAlertThreshold is null", () => {
-				const monitor = makeMonitor({ type: "hardware", cpuAlertThreshold: null as any });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ cpu: { usage_percent: 0.99 } as any }),
-				} as any);
-
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches.find((b) => b.metric === "cpu")).toBeUndefined();
-			});
-
-			it("skips CPU check when cpu usage_percent is undefined", () => {
-				const monitor = makeMonitor({ type: "hardware", cpuAlertThreshold: 80 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ cpu: { usage_percent: undefined } as any }),
-				} as any);
-
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches.find((b) => b.metric === "cpu")).toBeUndefined();
-			});
-
-			it("skips CPU check when cpu object is undefined", () => {
-				const monitor = makeMonitor({ type: "hardware", cpuAlertThreshold: 80 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ cpu: undefined as any }),
-				} as any);
-
-				const breaches = builder.extractThresholdBreaches(monitor, response);
+				const breaches = builder.extractThresholdBreaches(hardwareMonitor(), check, { ...none, memory: true });
 
 				expect(breaches.find((b) => b.metric === "cpu")).toBeUndefined();
 			});
 		});
 
-		// ── Memory ───────────────────────────────────────────────────────
+		describe("memory", () => {
+			it("formats memory usage as a percentage when flagged", () => {
+				const check = makeCheck({ memory: { usage_percent: 0.85 } });
 
-		describe("memory threshold", () => {
-			it("detects memory breach when usage exceeds threshold", () => {
-				const monitor = makeMonitor({ type: "hardware", memoryAlertThreshold: 70 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ memory: { usage_percent: 0.85 } as any }),
-				} as any);
+				const breaches = builder.extractThresholdBreaches(hardwareMonitor(), check, { ...none, memory: true });
 
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches).toContainEqual(
-					expect.objectContaining({
-						metric: "memory",
-						currentValue: 85,
-						threshold: 70,
-						unit: "%",
-						formattedValue: "85.0%",
-					})
-				);
+				expect(breaches).toEqual([{ metric: "memory", currentValue: 85, threshold: 70, unit: "%", formattedValue: "85.0%" }]);
 			});
 
-			it("does not report memory breach when usage is below threshold", () => {
-				const monitor = makeMonitor({ type: "hardware", memoryAlertThreshold: 90 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ memory: { usage_percent: 0.5 } as any }),
-				} as any);
+			it("ignores memory when not flagged", () => {
+				const check = makeCheck({ memory: { usage_percent: 0.85 } });
 
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches.find((b) => b.metric === "memory")).toBeUndefined();
-			});
-
-			it("skips memory check when memoryAlertThreshold is undefined", () => {
-				const monitor = makeMonitor({ type: "hardware", memoryAlertThreshold: undefined });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ memory: { usage_percent: 0.99 } as any }),
-				} as any);
-
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches.find((b) => b.metric === "memory")).toBeUndefined();
-			});
-
-			it("skips memory check when memoryAlertThreshold is null", () => {
-				const monitor = makeMonitor({ type: "hardware", memoryAlertThreshold: null as any });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ memory: { usage_percent: 0.99 } as any }),
-				} as any);
-
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches.find((b) => b.metric === "memory")).toBeUndefined();
-			});
-
-			it("skips memory check when memory usage_percent is undefined", () => {
-				const monitor = makeMonitor({ type: "hardware", memoryAlertThreshold: 70 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ memory: { usage_percent: undefined } as any }),
-				} as any);
-
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches.find((b) => b.metric === "memory")).toBeUndefined();
-			});
-
-			it("skips memory check when memory object is undefined", () => {
-				const monitor = makeMonitor({ type: "hardware", memoryAlertThreshold: 70 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ memory: undefined as any }),
-				} as any);
-
-				const breaches = builder.extractThresholdBreaches(monitor, response);
+				const breaches = builder.extractThresholdBreaches(hardwareMonitor(), check, { ...none, cpu: true });
 
 				expect(breaches.find((b) => b.metric === "memory")).toBeUndefined();
 			});
 		});
 
-		// ── Disk ─────────────────────────────────────────────────────────
+		describe("disk", () => {
+			it("formats the highest usage across disks when flagged", () => {
+				const check = makeCheck({ disk: [{ usage_percent: 0.5 }, { usage_percent: 0.95 }, { usage_percent: 0.7 }] });
 
-		describe("disk threshold", () => {
-			it("detects disk breach using highest usage across multiple disks", () => {
-				const monitor = makeMonitor({ type: "hardware", diskAlertThreshold: 80 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({
-						disk: [{ usage_percent: 0.5 }, { usage_percent: 0.95 }, { usage_percent: 0.7 }] as any,
-					}),
-				} as any);
+				const breaches = builder.extractThresholdBreaches(hardwareMonitor(), check, { ...none, disk: true });
 
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches).toContainEqual(
-					expect.objectContaining({
-						metric: "disk",
-						currentValue: 95,
-						threshold: 80,
-						formattedValue: "95.0%",
-					})
-				);
+				expect(breaches).toEqual([{ metric: "disk", currentValue: 95, threshold: 85, unit: "%", formattedValue: "95.0%" }]);
 			});
 
-			it("does not report disk breach when all disks are below threshold", () => {
-				const monitor = makeMonitor({ type: "hardware", diskAlertThreshold: 90 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({
-						disk: [{ usage_percent: 0.5 }, { usage_percent: 0.6 }] as any,
-					}),
-				} as any);
+			it("treats a disk with no usage figure as zero when finding the highest", () => {
+				const check = makeCheck({ disk: [{ usage_percent: undefined }, { usage_percent: 0.3 }] });
 
-				const breaches = builder.extractThresholdBreaches(monitor, response);
+				const breaches = builder.extractThresholdBreaches(hardwareMonitor(), check, { ...none, disk: true });
 
-				expect(breaches.find((b) => b.metric === "disk")).toBeUndefined();
+				expect(breaches).toEqual([expect.objectContaining({ metric: "disk", currentValue: 30 })]);
 			});
 
-			it("skips disk check when diskAlertThreshold is undefined", () => {
-				const monitor = makeMonitor({ type: "hardware", diskAlertThreshold: undefined });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ disk: [{ usage_percent: 0.99 }] as any }),
-				} as any);
+			it("ignores disk when not flagged", () => {
+				const check = makeCheck({ disk: [{ usage_percent: 0.95 }] });
 
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches.find((b) => b.metric === "disk")).toBeUndefined();
-			});
-
-			it("skips disk check when diskAlertThreshold is null", () => {
-				const monitor = makeMonitor({ type: "hardware", diskAlertThreshold: null as any });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ disk: [{ usage_percent: 0.99 }] as any }),
-				} as any);
-
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches.find((b) => b.metric === "disk")).toBeUndefined();
-			});
-
-			it("skips disk check when disk is not an array", () => {
-				const monitor = makeMonitor({ type: "hardware", diskAlertThreshold: 80 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ disk: "not-an-array" as any }),
-				} as any);
-
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches.find((b) => b.metric === "disk")).toBeUndefined();
-			});
-
-			it("skips disks with undefined usage_percent", () => {
-				const monitor = makeMonitor({ type: "hardware", diskAlertThreshold: 50 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({
-						disk: [{ usage_percent: undefined }, { usage_percent: 0.3 }] as any,
-					}),
-				} as any);
-
-				const breaches = builder.extractThresholdBreaches(monitor, response);
+				const breaches = builder.extractThresholdBreaches(hardwareMonitor(), check, { ...none, temp: true });
 
 				expect(breaches.find((b) => b.metric === "disk")).toBeUndefined();
 			});
 		});
 
-		// ── Temperature ──────────────────────────────────────────────────
+		describe("temperature", () => {
+			it("formats the highest core temperature when flagged", () => {
+				const check = makeCheck({ cpu: { usage_percent: 0.5, temperature: [65, 75, 68] } });
 
-		describe("temperature threshold", () => {
-			it("detects temperature breach from array of temperatures", () => {
-				const monitor = makeMonitor({ type: "hardware", tempAlertThreshold: 70 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ cpu: { usage_percent: 0.5, temperature: [65, 75, 68] } as any }),
-				} as any);
+				const breaches = builder.extractThresholdBreaches(hardwareMonitor(), check, { ...none, temp: true });
 
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches).toContainEqual(
-					expect.objectContaining({
-						metric: "temp",
-						currentValue: 75,
-						threshold: 70,
-						unit: "°C",
-						formattedValue: "75.0°C",
-					})
-				);
+				expect(breaches).toEqual([{ metric: "temp", currentValue: 75, threshold: 65, unit: "°C", formattedValue: "75.0°C" }]);
 			});
 
-			it("handles single temperature value (non-array)", () => {
-				const monitor = makeMonitor({ type: "hardware", tempAlertThreshold: 70 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ cpu: { usage_percent: 0.5, temperature: 80 } as any }),
-				} as any);
+			it("ignores temperature when not flagged", () => {
+				const check = makeCheck({ cpu: { usage_percent: 0.5, temperature: [99] } });
 
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches).toContainEqual(
-					expect.objectContaining({
-						metric: "temp",
-						currentValue: 80,
-						threshold: 70,
-					})
-				);
-			});
-
-			it("does not report temperature breach when below threshold", () => {
-				const monitor = makeMonitor({ type: "hardware", tempAlertThreshold: 80 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ cpu: { usage_percent: 0.5, temperature: [60, 65] } as any }),
-				} as any);
-
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches.find((b) => b.metric === "temp")).toBeUndefined();
-			});
-
-			// A temperature exactly AT the threshold must not report a breach here, matching
-			// StatusService.computeHardwareStatus's own strict `>` comparison (cpu/memory/disk
-			// already agree with this file on `>`; temp alone used to diverge with `>=`, so an
-			// incident-driving check at exactly the threshold never fired but the notification
-			// content for a breach some OTHER metric triggered could still list temp as breaching).
-			it("does not report temperature breach when exactly at threshold", () => {
-				const monitor = makeMonitor({ type: "hardware", tempAlertThreshold: 80 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ cpu: { usage_percent: 0.5, temperature: [80] } as any }),
-				} as any);
-
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches.find((b) => b.metric === "temp")).toBeUndefined();
-			});
-
-			it("skips temperature check when tempAlertThreshold is undefined", () => {
-				const monitor = makeMonitor({ type: "hardware", tempAlertThreshold: undefined });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ cpu: { usage_percent: 0.5, temperature: [99] } as any }),
-				} as any);
-
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches.find((b) => b.metric === "temp")).toBeUndefined();
-			});
-
-			it("skips temperature check when tempAlertThreshold is null", () => {
-				const monitor = makeMonitor({ type: "hardware", tempAlertThreshold: null as any });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ cpu: { usage_percent: 0.5, temperature: [99] } as any }),
-				} as any);
-
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches.find((b) => b.metric === "temp")).toBeUndefined();
-			});
-
-			it("skips temperature check when cpu.temperature is falsy", () => {
-				const monitor = makeMonitor({ type: "hardware", tempAlertThreshold: 70 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ cpu: { usage_percent: 0.5, temperature: null } as any }),
-				} as any);
-
-				const breaches = builder.extractThresholdBreaches(monitor, response);
-
-				expect(breaches.find((b) => b.metric === "temp")).toBeUndefined();
-			});
-
-			it("skips temperature check when cpu object is undefined", () => {
-				const monitor = makeMonitor({ type: "hardware", tempAlertThreshold: 70 });
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({ cpu: undefined as any }),
-				} as any);
-
-				const breaches = builder.extractThresholdBreaches(monitor, response);
+				const breaches = builder.extractThresholdBreaches(hardwareMonitor(), check, { ...none, cpu: true });
 
 				expect(breaches.find((b) => b.metric === "temp")).toBeUndefined();
 			});
 		});
 
-		// ── Combined ─────────────────────────────────────────────────────
-
-		describe("combined thresholds", () => {
-			it("detects multiple breaches simultaneously", () => {
-				const monitor = makeMonitor({
-					type: "hardware",
-					cpuAlertThreshold: 80,
-					memoryAlertThreshold: 70,
-					diskAlertThreshold: 85,
-					tempAlertThreshold: 65,
+		describe("combined", () => {
+			it("reports every flagged metric in cpu, memory, disk, temp order", () => {
+				const check = makeCheck({
+					cpu: { usage_percent: 0.9, temperature: [70] },
+					memory: { usage_percent: 0.85 },
+					disk: [{ usage_percent: 0.95 }],
 				});
-				const response = makeStatusResponse({
-					payload: makeHardwarePayload({
-						cpu: { usage_percent: 0.9, temperature: [70] } as any,
-						memory: { usage_percent: 0.85 } as any,
-						disk: [{ usage_percent: 0.95 }] as any,
-					}),
-				} as any);
 
-				const breaches = builder.extractThresholdBreaches(monitor, response);
+				const breaches = builder.extractThresholdBreaches(hardwareMonitor(), check, { cpu: true, memory: true, disk: true, temp: true });
 
-				const metrics = breaches.map((b) => b.metric);
-				expect(metrics).toContain("cpu");
-				expect(metrics).toContain("memory");
-				expect(metrics).toContain("disk");
-				expect(metrics).toContain("temp");
+				expect(breaches.map((b) => b.metric)).toEqual(["cpu", "memory", "disk", "temp"]);
+			});
+
+			it("reports only the flagged subset", () => {
+				const check = makeCheck({
+					cpu: { usage_percent: 0.9, temperature: [70] },
+					memory: { usage_percent: 0.85 },
+					disk: [{ usage_percent: 0.95 }],
+				});
+
+				const breaches = builder.extractThresholdBreaches(hardwareMonitor(), check, { ...none, memory: true, temp: true });
+
+				expect(breaches.map((b) => b.metric)).toEqual(["memory", "temp"]);
 			});
 		});
 	});
+
+	// ── buildThresholdBreachMessage ─────────────────────────────────────────
+
+	describe("buildThresholdBreachMessage", () => {
+		const none: HardwareBreaches = { cpu: false, memory: false, disk: false, temp: false };
+		const hardwareMonitor = () => makeMonitor({ type: "hardware", cpuAlertThreshold: 80, memoryAlertThreshold: 80 });
+
+		it("describes a single flagged metric", () => {
+			const check = makeCheck({ cpu: { usage_percent: 0.95, temperature: [50] } });
+
+			const message = builder.buildThresholdBreachMessage(hardwareMonitor(), check, { ...none, cpu: true });
+
+			expect(message).toBe("CPU: 95.0% (threshold: 80%)");
+		});
+
+		it("joins several flagged metrics with a comma", () => {
+			const check = makeCheck({ cpu: { usage_percent: 0.95, temperature: [50] }, memory: { usage_percent: 0.9 } });
+
+			const message = builder.buildThresholdBreachMessage(hardwareMonitor(), check, { ...none, cpu: true, memory: true });
+
+			expect(message).toBe("CPU: 95.0% (threshold: 80%), MEMORY: 90.0% (threshold: 80%)");
+		});
+
+		it("falls back when no metric is flagged", () => {
+			const check = makeCheck({ cpu: { usage_percent: 0.95, temperature: [50] } });
+
+			expect(builder.buildThresholdBreachMessage(hardwareMonitor(), check, none)).toBe("Threshold breach detected");
+			expect(builder.buildThresholdBreachMessage(hardwareMonitor(), check, undefined)).toBe("Threshold breach detected");
+		});
+
+		it("lists the breaching containers for a docker monitor", () => {
+			const check = makeCheck({
+				status: true,
+				containers: makeContainers([{ name: "db", state: "exited", exitCode: 1 }, { name: "api", health: "unhealthy" }, { name: "web" }]),
+			});
+
+			const message = builder.buildThresholdBreachMessage(makeDockerMonitor(), check, undefined);
+
+			expect(message).toBe("db: stopped (exit code 1), api: unhealthy");
+		});
+
+		it("falls back when no container is breaching", () => {
+			const check = makeCheck({ status: true, containers: makeContainers([{ name: "web" }]) });
+
+			expect(builder.buildThresholdBreachMessage(makeDockerMonitor(), check, undefined)).toBe("Container alert");
+		});
+	});
 });

server/test/unit/services/notificationsService.test.ts

@@ -3,7 +3,7 @@ import { NotificationsService } from "../../../src/domain/notifications/notifica
 import { createMockLogger } from "../../helpers/createMockLogger.ts";
 import type { Monitor } from "../../../src/domain/monitors/monitor.type.ts";
 import type { Notification } from "../../../src/domain/notifications/notification.type.ts";
-import type { MonitorStatusResponse } from "../../../src/types/network.ts";
+import type { Check } from "../../../src/domain/checks/check.type.ts";
 import type { MonitorActionDecision } from "../../../src/worker/worker.interface.ts";
 
 // ── Helpers ──────────────────────────────────────────────────────────────────
@@ -33,7 +33,7 @@ const createSettingsService = (clientHost = "https://app.example.com") => ({
 
 const createMessageBuilder = () => ({
 	buildMessage: jest.fn().mockReturnValue({ type: "monitor_down", content: { title: "Down" } }),
-	extractThresholdBreaches: jest.fn(),
+	buildThresholdBreachMessage: jest.fn(),
 });
 
 const createService = (overrides?: Record<string, unknown>) => {
@@ -130,7 +130,17 @@ const makeDecision = (overrides?: Partial<MonitorActionDecision>): MonitorAction
 	...overrides,
 });
 
-const makeStatusResponse = () => ({ monitorId: "mon-1", status: false, code: 500 }) as unknown as MonitorStatusResponse;
+const makeCheck = (overrides?: Partial<Check>): Check => ({
+	id: "check-1",
+	metadata: { monitorId: "mon-1", teamId: "team-1", type: "http" },
+	status: false,
+	responseTime: 100,
+	statusCode: 500,
+	message: "Internal Server Error",
+	createdAt: "2026-01-01T00:00:00Z",
+	updatedAt: "2026-01-01T00:00:00Z",
+	...overrides,
+});
 
 // ── Tests ────────────────────────────────────────────────────────────────────
 
@@ -140,7 +150,7 @@ describe("NotificationsService", () => {
 	describe("handleNotifications", () => {
 		it("returns false when shouldSendNotification is false", async () => {
 			const { service } = createService();
-			const result = await service.handleNotifications(makeMonitor(), makeStatusResponse(), makeDecision({ shouldSendNotification: false }));
+			const result = await service.handleNotifications(makeMonitor(), makeCheck(), makeDecision({ shouldSendNotification: false }));
 			expect(result).toBe(false);
 		});
 
@@ -148,7 +158,7 @@ describe("NotificationsService", () => {
 			const { service, notificationsRepository, emailProvider } = createService();
 			(notificationsRepository.findNotificationsByIds as jest.Mock).mockResolvedValue([makeNotification({ type: "email" })]);
 
-			const result = await service.handleNotifications(makeMonitor(), makeStatusResponse(), makeDecision());
+			const result = await service.handleNotifications(makeMonitor(), makeCheck(), makeDecision());
 
 			expect(result).toBe(true);
 			expect(emailProvider.sendMessage).toHaveBeenCalledTimes(1);
@@ -160,7 +170,7 @@ describe("NotificationsService", () => {
 				const deps = createService();
 				(deps.notificationsRepository.findNotificationsByIds as jest.Mock).mockResolvedValue([makeNotification({ type })]);
 
-				await deps.service.handleNotifications(makeMonitor(), makeStatusResponse(), makeDecision());
+				await deps.service.handleNotifications(makeMonitor(), makeCheck(), makeDecision());
 
 				const providerMap: Record<string, ReturnType<typeof createProvider>> = {
 					webhook: deps.webhookProvider,
@@ -183,7 +193,7 @@ describe("NotificationsService", () => {
 			const { service, notificationsRepository, logger } = createService();
 			(notificationsRepository.findNotificationsByIds as jest.Mock).mockResolvedValue([makeNotification({ type: "carrier_pigeon" as any })]);
 
-			const result = await service.handleNotifications(makeMonitor(), makeStatusResponse(), makeDecision());
+			const result = await service.handleNotifications(makeMonitor(), makeCheck(), makeDecision());
 
 			expect(result).toBe(false);
 			expect(logger.warn).toHaveBeenCalledWith(
@@ -197,7 +207,7 @@ describe("NotificationsService", () => {
 			const { service, notificationsRepository, logger } = createService({ notificationMessageBuilder });
 			(notificationsRepository.findNotificationsByIds as jest.Mock).mockResolvedValue([makeNotification()]);
 
-			const result = await service.handleNotifications(makeMonitor(), makeStatusResponse(), makeDecision());
+			const result = await service.handleNotifications(makeMonitor(), makeCheck(), makeDecision());
 
 			expect(result).toBe(false);
 			expect(logger.warn).toHaveBeenCalledWith(expect.objectContaining({ message: "Notification message not provided" }));
@@ -207,7 +217,7 @@ describe("NotificationsService", () => {
 			const { service, notificationsRepository } = createService();
 			(notificationsRepository.findNotificationsByIds as jest.Mock).mockResolvedValue([]);
 
-			const result = await service.handleNotifications(makeMonitor({ notifications: undefined as any }), makeStatusResponse(), makeDecision());
+			const result = await service.handleNotifications(makeMonitor({ notifications: undefined as any }), makeCheck(), makeDecision());
 
 			expect(result).toBe(true);
 			expect(notificationsRepository.findNotificationsByIds).toHaveBeenCalledWith([]);
@@ -222,7 +232,7 @@ describe("NotificationsService", () => {
 			emailProvider.sendMessage.mockResolvedValue(true);
 			slackProvider.sendMessage.mockResolvedValue(false);
 
-			const result = await service.handleNotifications(makeMonitor(), makeStatusResponse(), makeDecision());
+			const result = await service.handleNotifications(makeMonitor(), makeCheck(), makeDecision());
 
 			expect(result).toBe(false);
 			expect(logger.warn).toHaveBeenCalledWith(expect.objectContaining({ message: expect.stringContaining("1 success, 1 failure") }));
@@ -233,7 +243,7 @@ describe("NotificationsService", () => {
 			const { service, notificationsRepository, notificationMessageBuilder } = createService({ settingsService });
 			(notificationsRepository.findNotificationsByIds as jest.Mock).mockResolvedValue([makeNotification()]);
 
-			await service.handleNotifications(makeMonitor(), makeStatusResponse(), makeDecision());
+			await service.handleNotifications(makeMonitor(), makeCheck(), makeDecision());
 
 			expect(notificationMessageBuilder.buildMessage).toHaveBeenCalledWith(
 				expect.anything(),

server/test/unit/services/statusService.test.ts

@@ -4,7 +4,7 @@ import { createMockLogger } from "../../helpers/createMockLogger.ts";
 import { MAX_RECENT_CHECKS } from "../../../src/domain/monitors/monitor.type.ts";
 import type { Monitor, MonitorStatus } from "../../../src/domain/monitors/monitor.type.ts";
 import type { Check } from "../../../src/domain/checks/check.type.ts";
-import type { MonitorStatusResponse, HardwareStatusPayload, DockerStatusPayload } from "../../../src/types/network.ts";
+import type { DockerContainerInfo } from "../../../src/domain/docker/docker.type.ts";
 import type { IMonitorsRepository } from "../../../src/domain/monitors/monitor.repository.interface.ts";
 import type { IMonitorStatsRepository } from "../../../src/domain/monitor-stats/monitor-stats.repository.interface.ts";
 
@@ -98,18 +98,6 @@ const makeMonitor = (overrides?: Partial<Monitor>): Monitor =>
 		...overrides,
 	}) as Monitor;
 
-const makeStatusResponse = (overrides?: Partial<MonitorStatusResponse>): MonitorStatusResponse =>
-	({
-		monitorId: "mon-1",
-		teamId: "team-1",
-		type: "http",
-		status: true,
-		code: 200,
-		message: "OK",
-		responseTime: 100,
-		...overrides,
-	}) as MonitorStatusResponse;
-
 const makeCheck = (overrides?: Partial<Check>): Check =>
 	({
 		id: "check-1",
@@ -143,92 +131,86 @@ const makeExistingStats = (overrides?: Record<string, unknown>) => ({
 // ── Tests ────────────────────────────────────────────────────────────────────
 
 describe("StatusService", () => {
-	// ── updateRunningStats ───────────────────────────────────────────────────
+	// ── running stats (via updateMonitorStatus) ──────────────────────────────
 
-	describe("updateRunningStats", () => {
-		// The service now delegates the entire running-stats computation to the repository's
-		// atomic `updateByMonitorId`, so the service-level tests only verify forwarding and error
-		// handling. The math (running average, uptimePercentage, timeOfLastFailure state machine)
-		// is a repository-level concern and is exercised by the repository tests.
+	describe("running stats", () => {
+		// The service delegates the running-stats computation to the repository's atomic `updateByMonitorId`,
+		// so these cases only verify what is forwarded and that a failure never blocks the status update.
+		// The math (running average, uptimePercentage, timeOfLastFailure) is exercised by the repository tests.
+
+		const run = async (check: Check) => {
+			const monitor = makeMonitor();
+			const deps = createService();
+			(deps.monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
+			(deps.monitorStatsRepository.updateByMonitorId as jest.Mock).mockResolvedValue({});
+			const result = await deps.service.updateMonitorStatus(check, monitor);
+			return { ...deps, result };
+		};
 
 		it("forwards a successful check to updateByMonitorId", async () => {
-			const { service, monitorStatsRepository } = createService();
-			(monitorStatsRepository.updateByMonitorId as jest.Mock).mockResolvedValue({});
+			const { monitorStatsRepository } = await run(makeCheck({ responseTime: 50 }));
 
-			const result = await service.updateRunningStats(makeMonitor(), makeStatusResponse({ responseTime: 50 }));
-
-			expect(result).toBe(true);
 			expect(monitorStatsRepository.updateByMonitorId).toHaveBeenCalledWith(
 				"mon-1",
-				expect.objectContaining({
-					status: true,
-					responseTime: 50,
-					now: expect.any(Number),
-				})
+				expect.objectContaining({ status: true, responseTime: 50, now: expect.any(Number) })
 			);
 		});
 
 		it("forwards a failed check to updateByMonitorId", async () => {
-			const { service, monitorStatsRepository } = createService();
-			(monitorStatsRepository.updateByMonitorId as jest.Mock).mockResolvedValue({});
+			const { monitorStatsRepository } = await run(makeCheck({ status: false, responseTime: 100 }));
 
-			const result = await service.updateRunningStats(makeMonitor(), makeStatusResponse({ status: false, responseTime: 100 }));
-
-			expect(result).toBe(true);
 			expect(monitorStatsRepository.updateByMonitorId).toHaveBeenCalledWith("mon-1", expect.objectContaining({ status: false, responseTime: 100 }));
 		});
 
 		it("passes 0 when responseTime is undefined", async () => {
-			const { service, monitorStatsRepository } = createService();
-			(monitorStatsRepository.updateByMonitorId as jest.Mock).mockResolvedValue({});
-
-			await service.updateRunningStats(makeMonitor(), makeStatusResponse({ responseTime: undefined }));
+			const { monitorStatsRepository } = await run(makeCheck({ responseTime: undefined as any }));
 
 			expect(monitorStatsRepository.updateByMonitorId).toHaveBeenCalledWith("mon-1", expect.objectContaining({ responseTime: 0 }));
 		});
 
 		it("forwards responseTime of 0 as 0 (falsy but defined)", async () => {
-			const { service, monitorStatsRepository } = createService();
-			(monitorStatsRepository.updateByMonitorId as jest.Mock).mockResolvedValue({});
-
-			await service.updateRunningStats(makeMonitor(), makeStatusResponse({ responseTime: 0 }));
+			const { monitorStatsRepository } = await run(makeCheck({ responseTime: 0 }));
 
 			expect(monitorStatsRepository.updateByMonitorId).toHaveBeenCalledWith("mon-1", expect.objectContaining({ responseTime: 0 }));
 		});
 
 		it("coerces a non-true status to false (e.g. undefined)", async () => {
-			const { service, monitorStatsRepository } = createService();
-			(monitorStatsRepository.updateByMonitorId as jest.Mock).mockResolvedValue({});
-
-			await service.updateRunningStats(makeMonitor(), makeStatusResponse({ status: undefined as unknown as boolean }));
+			const { monitorStatsRepository } = await run(makeCheck({ status: undefined as any }));
 
 			expect(monitorStatsRepository.updateByMonitorId).toHaveBeenCalledWith("mon-1", expect.objectContaining({ status: false }));
 		});
 
-		it("returns false and logs error when updateByMonitorId throws", async () => {
-			const { service, logger, monitorStatsRepository } = createService();
-			(monitorStatsRepository.updateByMonitorId as jest.Mock).mockRejectedValue(new Error("db write failed"));
+		it("warns once and still updates the status when updateByMonitorId throws", async () => {
+			const monitor = makeMonitor({ statusWindow: [true, true, true, true], statusWindowSize: 5, status: "up" });
+			const { service, logger, monitorsRepository, monitorStatsRepository } = createService();
+			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
+			(monitorStatsRepository.updateByMonitorId as jest.Mock).mockRejectedValue(new Error("stats db down"));
 
-			const result = await service.updateRunningStats(makeMonitor(), makeStatusResponse());
+			const result = await service.updateMonitorStatus(makeCheck({ status: true }), monitor);
 
-			expect(result).toBe(false);
-			expect(logger.error).toHaveBeenCalledWith(
+			expect(result.monitor.status).toBe("up");
+			expect(monitorsRepository.updateStatusWindowAndChecks).toHaveBeenCalledTimes(1);
+			expect(logger.warn).toHaveBeenCalledTimes(1);
+			expect(logger.warn).toHaveBeenCalledWith(
 				expect.objectContaining({
 					service: "StatusService",
-					method: "updateRunningStats",
-					message: "db write failed",
+					method: "tryUpdateRunningStats",
+					message: "stats db down",
+					stack: expect.any(String),
 				})
 			);
+			expect(logger.error).not.toHaveBeenCalled();
 		});
 
-		it("logs error with 'Unknown error' for non-Error exceptions", async () => {
-			const { service, logger, monitorStatsRepository } = createService();
+		it("warns with 'Unknown error' for non-Error rejections", async () => {
+			const monitor = makeMonitor();
+			const { service, logger, monitorsRepository, monitorStatsRepository } = createService();
+			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorStatsRepository.updateByMonitorId as jest.Mock).mockRejectedValue("string error");
 
-			const result = await service.updateRunningStats(makeMonitor(), makeStatusResponse());
+			await service.updateMonitorStatus(makeCheck(), monitor);
 
-			expect(result).toBe(false);
-			expect(logger.error).toHaveBeenCalledWith(expect.objectContaining({ message: "Unknown error", stack: undefined }));
+			expect(logger.warn).toHaveBeenCalledWith(expect.objectContaining({ message: "Unknown error", stack: undefined }));
 		});
 	});
 
@@ -241,7 +223,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: true }), makeCheck(), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: true }), monitor);
 
 			expect(result.statusChanged).toBe(false);
 			expect(result.prevStatus).toBe("up");
@@ -252,7 +234,7 @@ describe("StatusService", () => {
 			const { service, monitorsRepository } = createService();
 			(monitorsRepository.updateStatusWindowAndChecks as jest.Mock).mockResolvedValue(monitor);
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: true }), makeCheck(), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: true }), monitor);
 
 			expect(monitorsRepository.findById).not.toHaveBeenCalled();
 			expect(result.prevStatus).toBe("up");
@@ -265,7 +247,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			await service.updateMonitorStatus(makeStatusResponse({ status: false }), makeCheck({ status: false }), monitor);
+			await service.updateMonitorStatus(makeCheck({ status: false }), monitor);
 
 			// Atomic push should have been called with the correct status and window size
 			expect(monitorsRepository.updateStatusWindowAndChecks).toHaveBeenCalledWith(
@@ -286,7 +268,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			await service.updateMonitorStatus(makeStatusResponse(), makeCheck({ id: "new-check" }), monitor);
+			await service.updateMonitorStatus(makeCheck({ id: "new-check" }), monitor);
 
 			expect(monitor.recentChecks).toHaveLength(MAX_RECENT_CHECKS);
 			expect(monitor.recentChecks[MAX_RECENT_CHECKS - 1]).toEqual(expect.objectContaining({ id: "new-check" }));
@@ -304,7 +286,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: false }), makeCheck({ status: false }), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: false }), monitor);
 
 			expect(result.statusChanged).toBe(true);
 			expect(result.monitor.status).toBe("down");
@@ -322,7 +304,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: true }), makeCheck({ status: true }), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: true }), monitor);
 
 			expect(result.statusChanged).toBe(true);
 			expect(result.monitor.status).toBe("up");
@@ -339,7 +321,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: true }), makeCheck(), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: true }), monitor);
 
 			expect(result.statusChanged).toBe(false);
 			expect(result.monitor.status).toBe("up");
@@ -359,7 +341,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: false }), makeCheck({ status: false }), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: false }), monitor);
 
 			expect(result.statusChanged).toBe(false);
 			expect(result.monitor.status).toBe("up");
@@ -376,7 +358,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: false }), makeCheck({ status: false }), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: false }), monitor);
 
 			expect(result.statusChanged).toBe(false);
 			expect(result.monitor.status).toBe("down");
@@ -388,7 +370,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			await service.updateMonitorStatus(makeStatusResponse(), makeCheck(), monitor);
+			await service.updateMonitorStatus(makeCheck(), monitor);
 
 			expect(monitor.statusWindow).toEqual([true]);
 		});
@@ -399,7 +381,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			await service.updateMonitorStatus(makeStatusResponse(), makeCheck(), monitor);
+			await service.updateMonitorStatus(makeCheck(), monitor);
 
 			expect(monitor.recentChecks).toHaveLength(1);
 		});
@@ -409,7 +391,7 @@ describe("StatusService", () => {
 			const { service, monitorsRepository } = createService();
 			(monitorsRepository.updateStatusWindowAndChecks as jest.Mock).mockRejectedValue(new Error("db error"));
 
-			await expect(service.updateMonitorStatus(makeStatusResponse(), makeCheck(), monitor)).rejects.toThrow("Failed to update monitor");
+			await expect(service.updateMonitorStatus(makeCheck(), monitor)).rejects.toThrow("Failed to update monitor");
 		});
 
 		it("throws AppError with 'Unknown error' for non-Error exceptions", async () => {
@@ -417,7 +399,7 @@ describe("StatusService", () => {
 			const { service, monitorsRepository } = createService();
 			(monitorsRepository.updateStatusWindowAndChecks as jest.Mock).mockRejectedValue("string error");
 
-			await expect(service.updateMonitorStatus(makeStatusResponse(), makeCheck(), monitor)).rejects.toThrow("Unknown error");
+			await expect(service.updateMonitorStatus(makeCheck(), monitor)).rejects.toThrow("Unknown error");
 		});
 
 		it("keeps status 'down' on a single successful check that leaves failure rate at threshold (regression: #3438 mirror)", async () => {
@@ -435,7 +417,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: true }), makeCheck({ status: true }), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: true }), monitor);
 
 			expect(result.statusChanged).toBe(false);
 			expect(result.monitor.status).toBe("down");
@@ -453,7 +435,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: false }), makeCheck({ status: false }), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: false }), monitor);
 
 			expect(result.statusChanged).toBe(true);
 			expect(result.monitor.status).toBe("down");
@@ -475,7 +457,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: true }), makeCheck({ status: true }), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: true }), monitor);
 
 			expect(result.monitor.status).toBe("up");
 		});
@@ -493,7 +475,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: false }), makeCheck({ status: false }), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: false }), monitor);
 
 			expect(result.monitor.status).toBe("down");
 		});
@@ -514,7 +496,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: true }), makeCheck({ status: true }), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: true }), monitor);
 
 			expect(result.monitor.status).toBe("up");
 			expect(result.statusChanged).toBe(false); // was effectively up already — no notification storm
@@ -531,7 +513,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: false }), makeCheck({ status: false }), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: false }), monitor);
 
 			expect(result.monitor.status).toBe("down");
 			expect(result.statusChanged).toBe(true); // down must surface so an incident is opened
@@ -548,7 +530,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: false }), makeCheck({ status: false }), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: false }), monitor);
 
 			expect(result.statusChanged).toBe(false);
 			expect(result.monitor.status).toBe("up");
@@ -565,7 +547,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: false }), makeCheck({ status: false }), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: false }), monitor);
 
 			expect(result.statusChanged).toBe(true);
 			expect(result.monitor.status).toBe("down");
@@ -580,7 +562,7 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: false }), makeCheck({ status: false }), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: false }), monitor);
 
 			expect(result.statusChanged).toBe(true);
 			expect(result.monitor.status).toBe("down");
@@ -596,7 +578,7 @@ describe("StatusService", () => {
 			const { service, monitorsRepository } = createService();
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: true }), makeCheck({ status: true }), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: true }), monitor);
 
 			expect(result.statusChanged).toBe(false);
 			expect(result.monitor.status).toBe("up");
@@ -611,7 +593,7 @@ describe("StatusService", () => {
 			const { service, monitorsRepository } = createService();
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: false }), makeCheck({ status: false }), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: false }), monitor);
 
 			expect(result.statusChanged).toBe(true);
 			expect(result.monitor.status).toBe("down");
@@ -631,7 +613,7 @@ describe("StatusService", () => {
 			const { service, monitorsRepository } = createService();
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: true }), makeCheck({ status: true }), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: true }), monitor);
 
 			expect(result.monitor.status).toBe("up");
 		});
@@ -646,43 +628,12 @@ describe("StatusService", () => {
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: true }), makeCheck({ status: true }), monitor);
+			const result = await service.updateMonitorStatus(makeCheck({ status: true }), monitor);
 
 			expect(result.statusChanged).toBe(false);
 			expect(result.monitor.status).toBe("down");
 		});
 
-		it("logs a warning but still succeeds when running-stats update fails mid-flight", async () => {
-			const monitor = makeMonitor({ statusWindow: [true, true, true, true], statusWindowSize: 5, status: "up" });
-			const { service, logger, monitorsRepository, monitorStatsRepository } = createService();
-			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
-			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
-			(monitorStatsRepository.updateByMonitorId as jest.Mock).mockRejectedValue(new Error("stats db down"));
-
-			const result = await service.updateMonitorStatus(makeStatusResponse({ status: true }), makeCheck(), monitor);
-
-			expect(result.monitor.status).toBe("up");
-			expect(logger.warn).toHaveBeenCalledWith(
-				expect.objectContaining({
-					service: "StatusService",
-					method: "updateMonitorStatus",
-					message: expect.stringContaining("Stats update failed"),
-				})
-			);
-		});
-
-		it("returns code and timestamp in result", async () => {
-			const monitor = makeMonitor({ statusWindow: [true, true, true, true], statusWindowSize: 5 });
-			const { service, monitorsRepository } = createService();
-			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
-			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
-
-			const result = await service.updateMonitorStatus(makeStatusResponse({ code: 201 }), makeCheck(), monitor);
-
-			expect(result.code).toBe(201);
-			expect(result.timestamp).toBeGreaterThan(0);
-		});
-
 		// ── Hardware threshold breach tests ──────────────────────────────────
 
 		describe("hardware threshold breaches", () => {
@@ -703,13 +654,12 @@ describe("StatusService", () => {
 					...overrides,
 				});
 
-			const makeHardwareResponse = (payload: HardwareStatusPayload, overrides?: Partial<MonitorStatusResponse<HardwareStatusPayload>>) =>
-				makeStatusResponse({
-					type: "hardware",
+			const makeHardwareCheck = (metrics: Pick<Check, "cpu" | "memory" | "disk" | "host">, overrides?: Partial<Check>) =>
+				makeCheck({
 					status: true,
-					payload,
+					...metrics,
 					...overrides,
-				} as any) as MonitorStatusResponse<HardwareStatusPayload>;
+				});
 
 			it("detects CPU threshold breach and decrements counter", async () => {
 				const monitor = makeHardwareMonitor({ cpuAlertCounter: 1 });
@@ -717,8 +667,8 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({ data: { cpu: { usage_percent: 0.9 }, memory: { usage_percent: 0.5 }, disk: [], host: {} } } as any);
-				const result = await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const check = makeHardwareCheck({ cpu: { usage_percent: 0.9 }, memory: { usage_percent: 0.5 }, disk: [], host: {} });
+				const result = await service.updateMonitorStatus(check, monitor);
 
 				expect(result.thresholdBreaches?.cpu).toBe(true);
 				expect(result.thresholdBreaches?.memory).toBe(false);
@@ -734,8 +684,8 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({ data: { cpu: { usage_percent: 0.5 }, memory: { usage_percent: 0.9 }, disk: [], host: {} } } as any);
-				const result = await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const check = makeHardwareCheck({ cpu: { usage_percent: 0.5 }, memory: { usage_percent: 0.9 }, disk: [], host: {} });
+				const result = await service.updateMonitorStatus(check, monitor);
 
 				expect(result.thresholdBreaches?.memory).toBe(true);
 				const patch = (monitorsRepository.updateStatusWindowAndChecks as jest.Mock).mock.calls.at(-1)?.[6];
@@ -749,10 +699,8 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({
-					data: { cpu: { usage_percent: 0.1 }, memory: { usage_percent: 0.1 }, disk: [{ usage_percent: 0.95 }], host: {} },
-				} as any);
-				const result = await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const check = makeHardwareCheck({ cpu: { usage_percent: 0.1 }, memory: { usage_percent: 0.1 }, disk: [{ usage_percent: 0.95 }], host: {} });
+				const result = await service.updateMonitorStatus(check, monitor);
 
 				expect(result.thresholdBreaches?.disk).toBe(true);
 				const patch = (monitorsRepository.updateStatusWindowAndChecks as jest.Mock).mock.calls.at(-1)?.[6];
@@ -766,10 +714,8 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({
-					data: { cpu: { usage_percent: 0.1, temperature: [90] }, memory: { usage_percent: 0.1 }, disk: [], host: {} },
-				} as any);
-				const result = await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const check = makeHardwareCheck({ cpu: { usage_percent: 0.1, temperature: [90] }, memory: { usage_percent: 0.1 }, disk: [], host: {} });
+				const result = await service.updateMonitorStatus(check, monitor);
 
 				expect(result.thresholdBreaches?.temp).toBe(true);
 				const patch = (monitorsRepository.updateStatusWindowAndChecks as jest.Mock).mock.calls.at(-1)?.[6];
@@ -788,10 +734,13 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({
-					data: { cpu: { usage_percent: 0.1, temperature: [30] }, memory: { usage_percent: 0.1 }, disk: [{ usage_percent: 0.1 }], host: {} },
-				} as any);
-				await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const check = makeHardwareCheck({
+					cpu: { usage_percent: 0.1, temperature: [30] },
+					memory: { usage_percent: 0.1 },
+					disk: [{ usage_percent: 0.1 }],
+					host: {},
+				});
+				await service.updateMonitorStatus(check, monitor);
 
 				const patch = (monitorsRepository.updateStatusWindowAndChecks as jest.Mock).mock.calls.at(-1)?.[6];
 				expect(patch.cpuAlertCounter).toBe(5);
@@ -809,8 +758,8 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({ data: { cpu: { usage_percent: 0.9 }, memory: { usage_percent: 0.1 }, disk: [], host: {} } } as any);
-				const result = await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const check = makeHardwareCheck({ cpu: { usage_percent: 0.9 }, memory: { usage_percent: 0.1 }, disk: [], host: {} });
+				const result = await service.updateMonitorStatus(check, monitor);
 
 				expect(result.monitor.status).toBe("breached");
 				expect(result.statusChanged).toBe(false);
@@ -822,10 +771,13 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({
-					data: { cpu: { usage_percent: 0.1, temperature: [30] }, memory: { usage_percent: 0.1 }, disk: [{ usage_percent: 0.1 }], host: {} },
-				} as any);
-				const result = await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const check = makeHardwareCheck({
+					cpu: { usage_percent: 0.1, temperature: [30] },
+					memory: { usage_percent: 0.1 },
+					disk: [{ usage_percent: 0.1 }],
+					host: {},
+				});
+				const result = await service.updateMonitorStatus(check, monitor);
 
 				expect(result.statusChanged).toBe(true);
 				expect(result.monitor.status).toBe("up");
@@ -844,11 +796,8 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({
-					status: false,
-					data: { cpu: { usage_percent: 0.9 }, memory: { usage_percent: 0.1 }, disk: [], host: {} },
-				} as any);
-				const result = await service.updateMonitorStatus(response, makeCheck({ status: false }), monitor);
+				const check = makeHardwareCheck({ cpu: { usage_percent: 0.9 }, memory: { usage_percent: 0.1 }, disk: [], host: {} }, { status: false });
+				const result = await service.updateMonitorStatus(check, monitor);
 
 				expect(result.monitor.status).toBe("down");
 			});
@@ -859,8 +808,8 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({ data: { cpu: {}, memory: { usage_percent: 0.1 }, disk: [], host: {} } } as any);
-				const result = await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const check = makeHardwareCheck({ cpu: {}, memory: { usage_percent: 0.1 }, disk: [], host: {} });
+				const result = await service.updateMonitorStatus(check, monitor);
 
 				expect(result.thresholdBreaches?.cpu).toBe(false);
 			});
@@ -871,8 +820,8 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({ data: { cpu: { usage_percent: 0.1 }, memory: {}, disk: [], host: {} } } as any);
-				const result = await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const check = makeHardwareCheck({ cpu: { usage_percent: 0.1 }, memory: {}, disk: [], host: {} });
+				const result = await service.updateMonitorStatus(check, monitor);
 
 				expect(result.thresholdBreaches?.memory).toBe(false);
 			});
@@ -883,10 +832,8 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({
-					data: { cpu: { usage_percent: 0.1, temperature: [] }, memory: { usage_percent: 0.1 }, disk: [], host: {} },
-				} as any);
-				const result = await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const check = makeHardwareCheck({ cpu: { usage_percent: 0.1, temperature: [] }, memory: { usage_percent: 0.1 }, disk: [], host: {} });
+				const result = await service.updateMonitorStatus(check, monitor);
 
 				expect(result.thresholdBreaches?.temp).toBe(false);
 			});
@@ -897,36 +844,25 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({
-					data: { cpu: { usage_percent: 0.1 }, memory: { usage_percent: 0.1 }, disk: [], host: {} },
-				} as any);
-				const result = await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const check = makeHardwareCheck({ cpu: { usage_percent: 0.1 }, memory: { usage_percent: 0.1 }, disk: [], host: {} });
+				const result = await service.updateMonitorStatus(check, monitor);
 
 				expect(result.thresholdBreaches?.temp).toBe(false);
 			});
 
-			it("skips threshold evaluation when payload is undefined", async () => {
-				const monitor = makeHardwareMonitor();
+			it("reports no breaches when the check carries no hardware metrics", async () => {
+				// A stored hardware check with no metrics (cpu/memory/disk/host all absent) must not
+				// throw and must not report any breach.
+				const monitor = makeHardwareMonitor({ cpuAlertCounter: 1 });
 				const { service, monitorsRepository } = createService();
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse(undefined as any);
-				const result = await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const result = await service.updateMonitorStatus(makeCheck(), monitor);
 
-				expect(result.thresholdBreaches).toBeUndefined();
-			});
-
-			it("skips threshold evaluation when payload.data is undefined", async () => {
-				const monitor = makeHardwareMonitor();
-				const { service, monitorsRepository } = createService();
-				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
-				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
-
-				const response = makeHardwareResponse({} as any);
-				const result = await service.updateMonitorStatus(response, makeCheck(), monitor);
-
-				expect(result.thresholdBreaches).toBeUndefined();
+				expect(result.thresholdBreaches).toEqual({ cpu: false, memory: false, disk: false, temp: false });
+				expect(result.statusChanged).toBe(false);
+				expect(result.monitor.status).toBe("up");
 			});
 
 			it("does not set thresholdBreaches for non-hardware monitors", async () => {
@@ -939,7 +875,7 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const result = await service.updateMonitorStatus(makeStatusResponse(), makeCheck(), monitor);
+				const result = await service.updateMonitorStatus(makeCheck(), monitor);
 
 				expect(result.thresholdBreaches).toBeUndefined();
 			});
@@ -950,10 +886,8 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({
-					data: { cpu: { usage_percent: 0.1 }, memory: { usage_percent: 0.1 }, disk: [null as any], host: {} },
-				} as any);
-				const result = await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const check = makeHardwareCheck({ cpu: { usage_percent: 0.1 }, memory: { usage_percent: 0.1 }, disk: [null as any], host: {} });
+				const result = await service.updateMonitorStatus(check, monitor);
 
 				expect(result.thresholdBreaches?.disk).toBe(false);
 			});
@@ -964,10 +898,8 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({
-					data: { cpu: { usage_percent: 0.1 }, memory: { usage_percent: 0.1 }, disk: [{ device: "/dev/sda" }], host: {} },
-				} as any);
-				const result = await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const check = makeHardwareCheck({ cpu: { usage_percent: 0.1 }, memory: { usage_percent: 0.1 }, disk: [{ device: "/dev/sda" }], host: {} });
+				const result = await service.updateMonitorStatus(check, monitor);
 
 				expect(result.thresholdBreaches?.disk).toBe(false);
 			});
@@ -978,10 +910,8 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({
-					data: { cpu: undefined, memory: { usage_percent: 0.1 }, disk: [], host: {} },
-				} as any);
-				const result = await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const check = makeHardwareCheck({ cpu: undefined, memory: { usage_percent: 0.1 }, disk: [], host: {} });
+				const result = await service.updateMonitorStatus(check, monitor);
 
 				expect(result.thresholdBreaches?.cpu).toBe(false);
 				expect(result.thresholdBreaches?.temp).toBe(false);
@@ -993,10 +923,8 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({
-					data: { cpu: { usage_percent: 0.1 }, memory: undefined, disk: [], host: {} },
-				} as any);
-				const result = await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const check = makeHardwareCheck({ cpu: { usage_percent: 0.1 }, memory: undefined, disk: [], host: {} });
+				const result = await service.updateMonitorStatus(check, monitor);
 
 				expect(result.thresholdBreaches?.memory).toBe(false);
 			});
@@ -1007,10 +935,8 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({
-					data: { cpu: { usage_percent: 0.1 }, memory: { usage_percent: 0.1 }, disk: undefined, host: {} },
-				} as any);
-				const result = await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const check = makeHardwareCheck({ cpu: { usage_percent: 0.1 }, memory: { usage_percent: 0.1 }, disk: undefined, host: {} });
+				const result = await service.updateMonitorStatus(check, monitor);
 
 				expect(result.thresholdBreaches?.disk).toBe(false);
 			});
@@ -1023,8 +949,8 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({ data: { cpu: { usage_percent: 0.9 }, memory: { usage_percent: 0.1 }, disk: [], host: {} } } as any);
-				const result = await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const check = makeHardwareCheck({ cpu: { usage_percent: 0.9 }, memory: { usage_percent: 0.1 }, disk: [], host: {} });
+				const result = await service.updateMonitorStatus(check, monitor);
 
 				const patch = (monitorsRepository.updateStatusWindowAndChecks as jest.Mock).mock.calls.at(-1)?.[6];
 				expect(patch.cpuAlertCounter).toBe(2);
@@ -1046,11 +972,8 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({
-					status: false,
-					data: { cpu: { usage_percent: 0.1 }, memory: { usage_percent: 0.1 }, disk: [], host: {} },
-				} as any);
-				const result = await service.updateMonitorStatus(response, makeCheck({ status: false }), monitor);
+				const check = makeHardwareCheck({ cpu: { usage_percent: 0.1 }, memory: { usage_percent: 0.1 }, disk: [], host: {} }, { status: false });
+				const result = await service.updateMonitorStatus(check, monitor);
 
 				expect(result.statusChanged).toBe(true);
 				expect(result.monitor.status).toBe("down");
@@ -1067,10 +990,13 @@ describe("StatusService", () => {
 				(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 				(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
 
-				const response = makeHardwareResponse({
-					data: { cpu: { usage_percent: 0.9, temperature: [90] }, memory: { usage_percent: 0.9 }, disk: [{ usage_percent: 0.95 }], host: {} },
-				} as any);
-				await service.updateMonitorStatus(response, makeCheck(), monitor);
+				const check = makeHardwareCheck({
+					cpu: { usage_percent: 0.9, temperature: [90] },
+					memory: { usage_percent: 0.9 },
+					disk: [{ usage_percent: 0.95 }],
+					host: {},
+				});
+				await service.updateMonitorStatus(check, monitor);
 
 				expect(monitor.cpuAlertCounter).toBe(0);
 				expect(monitor.memoryAlertCounter).toBe(0);
@@ -1099,8 +1025,8 @@ describe("StatusService", () => {
 				...overrides,
 			});
 
-		const makeContainers = (containers: Partial<DockerStatusPayload["containers"][number]>[]): DockerStatusPayload => ({
-			containers: containers.map((container, index) => ({
+		const makeContainers = (containers: Partial<DockerContainerInfo>[]): DockerContainerInfo[] =>
+			containers.map((container, index) => ({
 				id: `container-${index}`,
 				name: `container-${index}`,
 				image: "nginx:latest",
@@ -1108,23 +1034,20 @@ describe("StatusService", () => {
 				status: "Up 3 hours",
 				health: "none",
 				...container,
-			})),
-			summary: { total: containers.length, running: 0, stopped: 0, unhealthy: 0 },
-		});
+			}));
 
-		const makeDockerResponse = (payload: DockerStatusPayload | null, overrides?: Partial<MonitorStatusResponse<DockerStatusPayload>>) =>
-			makeStatusResponse({
-				type: "docker",
+		const makeDockerCheck = (containers: DockerContainerInfo[] | null, overrides?: Partial<Check>) =>
+			makeCheck({
 				status: true,
-				payload,
+				...(containers ? { containers } : {}),
 				...overrides,
-			} as any) as MonitorStatusResponse<DockerStatusPayload>;
+			});
 
-		const run = async (monitor: Monitor, response: MonitorStatusResponse<DockerStatusPayload>, check = makeCheck()) => {
+		const run = async (monitor: Monitor, check: Check) => {
 			const { service, monitorsRepository } = createService();
 			(monitorsRepository.findById as jest.Mock).mockResolvedValue(monitor);
 			(monitorsRepository.updateById as jest.Mock).mockImplementation((_id: unknown, _tid: unknown, m: unknown) => Promise.resolve(m));
-			const result = await service.updateMonitorStatus(response, check, monitor);
+			const result = await service.updateMonitorStatus(check, monitor);
 			return { result, monitorsRepository };
 		};
 
@@ -1132,14 +1055,14 @@ describe("StatusService", () => {
 		const unhealthy = { name: "api", health: "unhealthy" as const };
 
 		it("goes to breached on the first check with a stopped container", async () => {
-			const { result } = await run(makeDockerMonitor(), makeDockerResponse(makeContainers([stopped])));
+			const { result } = await run(makeDockerMonitor(), makeDockerCheck(makeContainers([stopped])));
 
 			expect(result.statusChanged).toBe(true);
 			expect(result.monitor.status).toBe("breached");
 		});
 
 		it("goes to breached on the first check with an unhealthy container", async () => {
-			const { result } = await run(makeDockerMonitor(), makeDockerResponse(makeContainers([unhealthy])));
+			const { result } = await run(makeDockerMonitor(), makeDockerCheck(makeContainers([unhealthy])));
 
 			expect(result.statusChanged).toBe(true);
 			expect(result.monitor.status).toBe("breached");
@@ -1147,7 +1070,7 @@ describe("StatusService", () => {
 
 		it("stays up on a stopped container when both switches are off", async () => {
 			const monitor = makeDockerMonitor({ dockerAlertOnStopped: false, dockerAlertOnUnhealthy: false });
-			const { result } = await run(monitor, makeDockerResponse(makeContainers([stopped, unhealthy])));
+			const { result } = await run(monitor, makeDockerCheck(makeContainers([stopped, unhealthy])));
 
 			expect(result.statusChanged).toBe(false);
 			expect(result.monitor.status).toBe("up");
@@ -1155,35 +1078,35 @@ describe("StatusService", () => {
 
 		it("stays up on a stopped container when only the unhealthy switch is on", async () => {
 			const monitor = makeDockerMonitor({ dockerAlertOnStopped: false });
-			const { result } = await run(monitor, makeDockerResponse(makeContainers([stopped])));
+			const { result } = await run(monitor, makeDockerCheck(makeContainers([stopped])));
 
 			expect(result.statusChanged).toBe(false);
 			expect(result.monitor.status).toBe("up");
 		});
 
 		it("stays up on an exited container with code 0", async () => {
-			const { result } = await run(makeDockerMonitor(), makeDockerResponse(makeContainers([{ name: "job", state: "exited", exitCode: 0 }])));
+			const { result } = await run(makeDockerMonitor(), makeDockerCheck(makeContainers([{ name: "job", state: "exited", exitCode: 0 }])));
 
 			expect(result.statusChanged).toBe(false);
 			expect(result.monitor.status).toBe("up");
 		});
 
 		it("stays breached without a transition while a container is still down", async () => {
-			const { result } = await run(makeDockerMonitor({ status: "breached" }), makeDockerResponse(makeContainers([stopped])));
+			const { result } = await run(makeDockerMonitor({ status: "breached" }), makeDockerCheck(makeContainers([stopped])));
 
 			expect(result.statusChanged).toBe(false);
 			expect(result.monitor.status).toBe("breached");
 		});
 
 		it("stays up without a transition while every container is clean", async () => {
-			const { result } = await run(makeDockerMonitor(), makeDockerResponse(makeContainers([{ name: "web" }])));
+			const { result } = await run(makeDockerMonitor(), makeDockerCheck(makeContainers([{ name: "web" }])));
 
 			expect(result.statusChanged).toBe(false);
 			expect(result.monitor.status).toBe("up");
 		});
 
 		it("recovers from breached to up on the first clean check", async () => {
-			const { result } = await run(makeDockerMonitor({ status: "breached" }), makeDockerResponse(makeContainers([{ name: "web" }])));
+			const { result } = await run(makeDockerMonitor({ status: "breached" }), makeDockerCheck(makeContainers([{ name: "web" }])));
 
 			expect(result.statusChanged).toBe(true);
 			expect(result.prevStatus).toBe("breached");
@@ -1192,7 +1115,7 @@ describe("StatusService", () => {
 
 		it("recovers from breached to up when the breaching switch is turned off", async () => {
 			const monitor = makeDockerMonitor({ status: "breached", dockerAlertOnStopped: false });
-			const { result } = await run(monitor, makeDockerResponse(makeContainers([stopped])));
+			const { result } = await run(monitor, makeDockerCheck(makeContainers([stopped])));
 
 			expect(result.statusChanged).toBe(true);
 			expect(result.monitor.status).toBe("up");
@@ -1200,16 +1123,16 @@ describe("StatusService", () => {
 
 		it("does not override down with breached when the host is unreachable", async () => {
 			const monitor = makeDockerMonitor({ statusWindow: [false, false, false, false], statusWindowThreshold: 80 });
-			const response = makeDockerResponse(null, { status: false, code: 5000 });
-			const { result } = await run(monitor, response, makeCheck({ status: false }));
+			const check = makeDockerCheck(null, { status: false, statusCode: 5000 });
+			const { result } = await run(monitor, check);
 
 			expect(result.monitor.status).toBe("down");
 		});
 
 		it("transitions from breached to down when the reachability threshold trips", async () => {
 			const monitor = makeDockerMonitor({ status: "breached", statusWindow: [false, false, false, false], statusWindowThreshold: 80 });
-			const response = makeDockerResponse(null, { status: false, code: 5000 });
-			const { result } = await run(monitor, response, makeCheck({ status: false }));
+			const check = makeDockerCheck(null, { status: false, statusCode: 5000 });
+			const { result } = await run(monitor, check);
 
 			expect(result.statusChanged).toBe(true);
 			expect(result.monitor.status).toBe("down");
@@ -1217,7 +1140,7 @@ describe("StatusService", () => {
 
 		it("does not evaluate containers while the status window is short", async () => {
 			const monitor = makeDockerMonitor({ statusWindow: [true], statusWindowSize: 5 });
-			const { result } = await run(monitor, makeDockerResponse(makeContainers([stopped])));
+			const { result } = await run(monitor, makeDockerCheck(makeContainers([stopped])));
 
 			expect(result.statusChanged).toBe(false);
 			expect(result.monitor.status).toBe("up");
@@ -1225,15 +1148,15 @@ describe("StatusService", () => {
 
 		it("does not evaluate a failed check with a null payload", async () => {
 			const monitor = makeDockerMonitor({ status: "breached" });
-			const response = makeDockerResponse(null, { status: false, code: 5000 });
-			const { result } = await run(monitor, response, makeCheck({ status: false }));
+			const check = makeDockerCheck(null, { status: false, statusCode: 5000 });
+			const { result } = await run(monitor, check);
 
 			expect(result.statusChanged).toBe(false);
 			expect(result.monitor.status).toBe("breached");
 		});
 
 		it("does not touch the hardware counters or thresholdBreaches", async () => {
-			const { result, monitorsRepository } = await run(makeDockerMonitor(), makeDockerResponse(makeContainers([stopped])));
+			const { result, monitorsRepository } = await run(makeDockerMonitor(), makeDockerCheck(makeContainers([stopped])));
 
 			expect(result.thresholdBreaches).toBeUndefined();
 			const patch = (monitorsRepository.updateStatusWindowAndChecks as jest.Mock).mock.calls.at(-1)?.[6];

server/test/unit/services/workerPipeline.test.ts

@@ -64,8 +64,6 @@ const makeStatusChange = (overrides: Partial<StatusChangeResult> & { status?: st
 		monitor: { id: "m1", status } as any,
 		statusChanged: false,
 		prevStatus: "up",
-		code: 200,
-		timestamp: 0,
 		...rest,
 	} as StatusChangeResult;
 };
@@ -92,7 +90,6 @@ const createPipeline = (overrides?: Record<string, any>) => {
 		},
 		checkService: {
 			toCheck: jest.fn<any>().mockReturnValue({ id: "check-1" }),
-			toStatusResponse: jest.fn<any>().mockReturnValue({ monitorId: "m1", status: true, code: 200, message: "OK" }),
 			createChecks: jest.fn<any>().mockResolvedValue([]),
 		},
 		networkService: { requestStatus: jest.fn<any>().mockResolvedValue({ monitorId: "m1", status: true, code: 200, message: "OK" }) },
@@ -519,24 +516,6 @@ describe("WorkerPipeline", () => {
 			expect(check.egressStatus).toBe("ok");
 		});
 
-		it("buffers the check when the egress assessment rejects", async () => {
-			const check: Record<string, unknown> = { id: "check-1" };
-			const { pipeline, deps } = createPipeline({
-				networkService: { requestStatus: jest.fn<any>().mockResolvedValue(failingStatus) },
-				checkService: { toCheck: jest.fn<any>().mockReturnValue(check) },
-				egressService: { assessAfterFailure: jest.fn<any>().mockRejectedValue(new Error("settings unavailable")) },
-			});
-
-			const result = await pipeline.produce(makeMonitor());
-
-			expect(deps.bufferService.addToBuffer).toHaveBeenCalledWith(check);
-			expect(check).not.toHaveProperty("egressStatus");
-			expect(result).toEqual({ status: failingStatus, check });
-			expect(deps.logger.warn).toHaveBeenCalledWith(
-				expect.objectContaining({ message: expect.stringContaining("settings unavailable"), service: "WorkerPipeline", method: "assessEgress" })
-			);
-		});
-
 		it("leaves the field unset on a failing check when the egress check is disabled", async () => {
 			const check: Record<string, unknown> = { id: "check-1" };
 			const { pipeline, deps } = createPipeline({
@@ -624,7 +603,7 @@ describe("WorkerPipeline", () => {
 		it("loads the row's pending checks, dispatches each, and pulls its id after dispatch", async () => {
 			const job = makeEvaluateJob("c1");
 			const { pipeline, deps } = createPipeline({
-				checksRepository: { findUnevaluatedByMonitorId: jest.fn<any>().mockResolvedValue([{ id: "c1" }]) },
+				checksRepository: { findUnevaluatedByMonitorId: jest.fn<any>().mockResolvedValue([makeCheck({ id: "c1" })]) },
 			});
 
 			await pipeline.handleEvaluate(job);
@@ -661,7 +640,9 @@ describe("WorkerPipeline", () => {
 		it("stops applying checks once the lease is lost so a second claimer does not double-apply", async () => {
 			const job = makeEvaluateJob("c1", "c2", "c3");
 			const { pipeline, deps } = createPipeline({
-				checksRepository: { findUnevaluatedByMonitorId: jest.fn<any>().mockResolvedValue([{ id: "c1" }, { id: "c2" }, { id: "c3" }]) },
+				checksRepository: {
+					findUnevaluatedByMonitorId: jest.fn<any>().mockResolvedValue([makeCheck({ id: "c1" }), makeCheck({ id: "c2" }), makeCheck({ id: "c3" })]),
+				},
 				jobsRepository: {
 					upsertEvaluate: jest.fn<any>(),
 					pullEvaluated: jest.fn<any>().mockResolvedValueOnce(true).mockResolvedValueOnce(false), // lease lost after c2
@@ -679,7 +660,7 @@ describe("WorkerPipeline", () => {
 		it("pulls ids whose check no longer exists so they do not sit on the row forever", async () => {
 			const job = makeEvaluateJob("c1", "c-gone");
 			const { pipeline, deps } = createPipeline({
-				checksRepository: { findUnevaluatedByMonitorId: jest.fn<any>().mockResolvedValue([{ id: "c1" }]) }, // c-gone was cleaned up
+				checksRepository: { findUnevaluatedByMonitorId: jest.fn<any>().mockResolvedValue([makeCheck({ id: "c1" })]) }, // c-gone was cleaned up
 			});
 
 			await pipeline.handleEvaluate(job);
@@ -695,7 +676,7 @@ describe("WorkerPipeline", () => {
 			const postWriteMonitor = makeMonitor({ status: "down" }); // what updateStatusWindowAndChecks would return after check c1
 			const { pipeline, deps } = createPipeline({
 				monitorsRepository: { findByIdLean: jest.fn<any>().mockResolvedValue(initialMonitor), updateById: jest.fn<any>() },
-				checksRepository: { findUnevaluatedByMonitorId: jest.fn<any>().mockResolvedValue([{ id: "c1" }, { id: "c2" }]) },
+				checksRepository: { findUnevaluatedByMonitorId: jest.fn<any>().mockResolvedValue([makeCheck({ id: "c1" }), makeCheck({ id: "c2" })]) },
 				statusService: { updateMonitorStatus: jest.fn<any>().mockResolvedValue(makeStatusChange({ monitor: postWriteMonitor })) },
 			});
 
@@ -705,38 +686,34 @@ describe("WorkerPipeline", () => {
 			expect(deps.monitorsRepository.findByIdLean).toHaveBeenCalledTimes(1);
 			expect(deps.statusService.updateMonitorStatus).toHaveBeenCalledTimes(2);
 			// First check evaluates against the freshly-read monitor; the second against the post-write monitor from the first
-			expect(deps.statusService.updateMonitorStatus.mock.calls[0][2]).toBe(initialMonitor);
-			expect(deps.statusService.updateMonitorStatus.mock.calls[1][2]).toBe(postWriteMonitor);
+			expect(deps.statusService.updateMonitorStatus.mock.calls[0][1]).toBe(initialMonitor);
+			expect(deps.statusService.updateMonitorStatus.mock.calls[1][1]).toBe(postWriteMonitor);
 		});
 	});
 
 	describe("evaluateCheck", () => {
-		it("threads status, check, and monitor through to the status service", async () => {
+		it("threads check and monitor through to the status service", async () => {
 			const { pipeline, deps } = createPipeline();
-			const status = { monitorId: "m1", status: true, code: 200, message: "OK" } as any;
-			const check = { id: "check-1" } as any;
+			const check = makeCheck({ status: true, statusCode: 200, message: "OK" });
 			const monitor = makeMonitor({ status: "up" });
 
-			await pipeline.evaluateCheck(status, check, monitor);
+			await pipeline.evaluateCheck(check, monitor);
 
-			expect(deps.statusService.updateMonitorStatus).toHaveBeenCalledWith(status, check, monitor);
+			expect(deps.statusService.updateMonitorStatus).toHaveBeenCalledWith(check, monitor);
 		});
 
 		it("returns an evaluation that opens an incident on a down transition", async () => {
-			const status = { monitorId: "m1", status: false, code: 500, message: "Error" } as any;
-			const check = { id: "check-1" } as any;
-			const statusChange = makeStatusChange({ monitor: makeMonitor({ status: "down" }), statusChanged: true, prevStatus: "up", code: 500 });
+			const check = makeCheck({ status: false, statusCode: 500, message: "Error" });
+			const statusChange = makeStatusChange({ monitor: makeMonitor({ status: "down" }), statusChanged: true, prevStatus: "up" });
 			const { pipeline } = createPipeline({
 				statusService: { updateMonitorStatus: jest.fn<any>().mockResolvedValue(statusChange) },
 			});
 
-			const result = await pipeline.evaluateCheck(status, check, makeMonitor());
+			const result = await pipeline.evaluateCheck(check, makeMonitor());
 
 			expect(result).toMatchObject({
 				monitor: statusChange.monitor,
-				status,
 				check,
-				statusChange,
 				decision: expect.objectContaining({
 					shouldCreateIncident: true,
 					shouldSendNotification: true,
@@ -746,22 +723,20 @@ describe("WorkerPipeline", () => {
 		});
 
 		it("returns an evaluation that resolves an incident on recovery", async () => {
-			const status = { monitorId: "m1", status: true, code: 200, message: "OK" } as any;
 			const statusChange = makeStatusChange({ monitor: makeMonitor({ status: "up" }), statusChanged: true, prevStatus: "down" });
 			const { pipeline } = createPipeline({
 				statusService: { updateMonitorStatus: jest.fn<any>().mockResolvedValue(statusChange) },
 			});
 
-			const result = await pipeline.evaluateCheck(status, { id: "check-1" } as any, makeMonitor({ status: "down" }));
+			const result = await pipeline.evaluateCheck(makeCheck({ status: true, statusCode: 200, message: "OK" }), makeMonitor({ status: "down" }));
 
 			expect(result.decision).toMatchObject({ shouldResolveIncident: true, shouldSendNotification: true });
 		});
 
 		it("produces a no-op decision when status did not change", async () => {
-			const status = { monitorId: "m1", status: true, code: 200, message: "OK" } as any;
 			const { pipeline } = createPipeline();
 
-			const result = await pipeline.evaluateCheck(status, { id: "check-1" } as any, makeMonitor());
+			const result = await pipeline.evaluateCheck(makeCheck({ status: true, statusCode: 200, message: "OK" }), makeMonitor());
 
 			expect(result.decision).toMatchObject({
 				shouldCreateIncident: false,
@@ -773,17 +748,15 @@ describe("WorkerPipeline", () => {
 		// ── degraded egress ───────────────────────────────────────────────────
 
 		it("short-circuits a check flagged with degraded egress without touching monitor status", async () => {
-			const status = { monitorId: "m1", status: false, code: 500, message: "Error" } as any;
-			const check = { id: "check-1", egressStatus: "degraded" } as any;
+			const check = makeCheck({ status: false, statusCode: 500, message: "Error", egressStatus: "degraded" });
 			const monitor = makeMonitor({ status: "up" });
 			const { pipeline, deps } = createPipeline();
 
-			const result = await pipeline.evaluateCheck(status, check, monitor);
+			const result = await pipeline.evaluateCheck(check, monitor);
 
 			expect(deps.statusService.updateMonitorStatus).not.toHaveBeenCalled();
 			expect(result.monitor).toBe(monitor);
-			expect(result.statusChange).toMatchObject({ monitor, statusChanged: false, prevStatus: "up", code: 500 });
-			expect(result.statusChange.timestamp).toEqual(expect.any(Number));
+			expect(result).not.toHaveProperty("statusChange");
 			expect(result.decision).toEqual({
 				shouldCreateIncident: false,
 				shouldResolveIncident: false,
@@ -795,13 +768,12 @@ describe("WorkerPipeline", () => {
 		});
 
 		it("evaluates a check flagged with egress ok as normal", async () => {
-			const status = { monitorId: "m1", status: false, code: 500, message: "Error" } as any;
-			const check = { id: "check-1", egressStatus: "ok" } as any;
+			const check = makeCheck({ status: false, statusCode: 500, message: "Error", egressStatus: "ok" });
 			const { pipeline, deps } = createPipeline();
 
-			await pipeline.evaluateCheck(status, check, makeMonitor());
+			await pipeline.evaluateCheck(check, makeMonitor());
 
-			expect(deps.statusService.updateMonitorStatus).toHaveBeenCalledWith(status, check, expect.anything());
+			expect(deps.statusService.updateMonitorStatus).toHaveBeenCalledWith(check, expect.anything());
 		});
 	});
 
@@ -812,11 +784,7 @@ describe("WorkerPipeline", () => {
 			const { pipeline } = createPipeline({
 				statusService: { updateMonitorStatus: jest.fn<any>().mockResolvedValue(statusChange) },
 			});
-			const result = await pipeline.evaluateCheck(
-				{ monitorId: "m1", status: true, code: 200, message: "OK" } as any,
-				{ id: "check-1" } as any,
-				makeMonitor()
-			);
+			const result = await pipeline.evaluateCheck(makeCheck({ status: true, statusCode: 200, message: "OK" }), makeMonitor());
 			return result.decision;
 		};
 
@@ -832,7 +800,7 @@ describe("WorkerPipeline", () => {
 		});
 
 		it("creates incident and notifies when monitor goes down", async () => {
-			const decision = await decide(makeStatusChange({ status: "down", statusChanged: true, prevStatus: "up", code: 500 }));
+			const decision = await decide(makeStatusChange({ status: "down", statusChanged: true, prevStatus: "up" }));
 			expect(decision).toMatchObject({
 				shouldCreateIncident: true,
 				shouldSendNotification: true,
@@ -875,5 +843,56 @@ describe("WorkerPipeline", () => {
 			const decision = await decide(makeStatusChange({ status: "paused", statusChanged: true, prevStatus: "up" }));
 			expect(decision).toMatchObject({ shouldCreateIncident: false, shouldResolveIncident: false, shouldSendNotification: false });
 		});
+
+		it("carries the threshold breaches onto a breached decision", async () => {
+			const thresholdBreaches = { cpu: true, memory: false, disk: true, temp: false };
+			const decision = await decide(makeStatusChange({ status: "breached", statusChanged: true, prevStatus: "up", thresholdBreaches }));
+			expect(decision.thresholdBreaches).toEqual(thresholdBreaches);
+		});
+
+		it("leaves threshold breaches off a down decision even when the status change carries them", async () => {
+			const thresholdBreaches = { cpu: true, memory: false, disk: false, temp: false };
+			const decision = await decide(makeStatusChange({ status: "down", statusChanged: true, prevStatus: "up", thresholdBreaches }));
+			expect(decision).not.toHaveProperty("thresholdBreaches");
+		});
+
+		it("leaves threshold breaches off a no-op decision", async () => {
+			const thresholdBreaches = { cpu: true, memory: false, disk: false, temp: false };
+			const decision = await decide(makeStatusChange({ status: "breached", statusChanged: false, prevStatus: "breached", thresholdBreaches }));
+			expect(decision).not.toHaveProperty("thresholdBreaches");
+		});
+
+		// StatusService only sets thresholdBreaches for hardware monitors; a docker breach must not leave the key behind holding undefined.
+		it("leaves threshold breaches off a breached decision when the status change carries none", async () => {
+			const decision = await decide(makeStatusChange({ status: "breached", statusChanged: true, prevStatus: "up" }));
+			expect(decision).toMatchObject({ shouldCreateIncident: true, incidentReason: "threshold_breach" });
+			expect(decision).not.toHaveProperty("thresholdBreaches");
+		});
+
+		// Each decision starts from a shared template. A transition must not leak its flags into the next decision
+		// the same pipeline makes, whether that is a no-op evaluation or a degraded-egress short-circuit.
+		it("starts every decision clean after a transition on the same pipeline", async () => {
+			const updateMonitorStatus = jest
+				.fn<any>()
+				.mockResolvedValueOnce(makeStatusChange({ status: "down", statusChanged: true, prevStatus: "up" }))
+				.mockResolvedValueOnce(makeStatusChange({ status: "down", statusChanged: false, prevStatus: "down" }));
+			const { pipeline } = createPipeline({ statusService: { updateMonitorStatus } });
+			const failing = makeCheck({ status: false, statusCode: 500, message: "Error" });
+
+			const first = await pipeline.evaluateCheck(failing, makeMonitor());
+			const second = await pipeline.evaluateCheck(failing, makeMonitor({ status: "down" }));
+			const degraded = await pipeline.evaluateCheck(makeCheck({ ...failing, egressStatus: "degraded" }), makeMonitor({ status: "down" }));
+
+			expect(first.decision.shouldCreateIncident).toBe(true);
+			const clean = {
+				shouldCreateIncident: false,
+				shouldResolveIncident: false,
+				shouldSendNotification: false,
+				incidentReason: null,
+				notificationReason: null,
+			};
+			expect(second.decision).toEqual(clean);
+			expect(degraded.decision).toEqual(clean);
+		});
 	});
 });