@camstack/addon-advanced-notifier 1.1.29 → 1.1.30

package/dist/addon.js

@@ -7645,6 +7645,160 @@ function cosineSimilarity(a, b) {
 	const denom = Math.sqrt(normA) * Math.sqrt(normB);
 	return denom === 0 ? 0 : dotProduct / denom;
 }
+var COCO_TO_MACRO = {
+	mapping: {
+		person: "person",
+		bicycle: "vehicle",
+		car: "vehicle",
+		motorcycle: "vehicle",
+		airplane: "vehicle",
+		bus: "vehicle",
+		train: "vehicle",
+		truck: "vehicle",
+		boat: "vehicle",
+		bird: "animal",
+		cat: "animal",
+		dog: "animal",
+		horse: "animal",
+		sheep: "animal",
+		cow: "animal",
+		elephant: "animal",
+		bear: "animal",
+		zebra: "animal",
+		giraffe: "animal",
+		suitcase: "package",
+		backpack: "package",
+		handbag: "package"
+	},
+	preserveOriginal: false
+};
+var AUDIO_MACRO_LABELS = [
+	{
+		id: "speech",
+		name: "Speech",
+		icon: "🗣️"
+	},
+	{
+		id: "scream",
+		name: "Scream / Shout",
+		icon: "😱"
+	},
+	{
+		id: "crying",
+		name: "Crying / Baby",
+		icon: "😢"
+	},
+	{
+		id: "laughter",
+		name: "Laughter",
+		icon: "😂"
+	},
+	{
+		id: "music",
+		name: "Music",
+		icon: "🎵"
+	},
+	{
+		id: "dog",
+		name: "Dog",
+		icon: "🐕"
+	},
+	{
+		id: "cat",
+		name: "Cat",
+		icon: "🐈"
+	},
+	{
+		id: "bird",
+		name: "Bird",
+		icon: "🐦"
+	},
+	{
+		id: "animal",
+		name: "Animal (other)",
+		icon: "🐾"
+	},
+	{
+		id: "alarm",
+		name: "Alarm / Siren",
+		icon: "🚨"
+	},
+	{
+		id: "doorbell",
+		name: "Doorbell / Knock",
+		icon: "🔔"
+	},
+	{
+		id: "glass_breaking",
+		name: "Glass Breaking",
+		icon: "💥"
+	},
+	{
+		id: "gunshot",
+		name: "Gunshot / Explosion",
+		icon: "💣"
+	},
+	{
+		id: "vehicle",
+		name: "Vehicle",
+		icon: "🚗"
+	},
+	{
+		id: "siren",
+		name: "Emergency Siren",
+		icon: "🚑"
+	},
+	{
+		id: "fire",
+		name: "Fire / Smoke",
+		icon: "🔥"
+	},
+	{
+		id: "water",
+		name: "Water",
+		icon: "💧"
+	},
+	{
+		id: "wind",
+		name: "Wind / Weather",
+		icon: "🌬️"
+	},
+	{
+		id: "door",
+		name: "Door",
+		icon: "🚪"
+	},
+	{
+		id: "footsteps",
+		name: "Footsteps",
+		icon: "👣"
+	},
+	{
+		id: "crowd",
+		name: "Crowd / Chatter",
+		icon: "👥"
+	},
+	{
+		id: "telephone",
+		name: "Telephone",
+		icon: "📞"
+	},
+	{
+		id: "engine",
+		name: "Engine / Motor",
+		icon: "⚙️"
+	},
+	{
+		id: "tools",
+		name: "Tools / Construction",
+		icon: "🔨"
+	},
+	{
+		id: "silence",
+		name: "Silence",
+		icon: "🤫"
+	}
+];
 var YAMNET_TO_MACRO = {
 	mapping: {
 		Speech: "speech",
@@ -7911,6 +8065,125 @@ var _macroLookup = /* @__PURE__ */ new Map();
 for (const [k, v] of Object.entries(YAMNET_TO_MACRO.mapping)) _macroLookup.set(k.toLowerCase(), v);
 for (const [k, v] of Object.entries(APPLE_SA_TO_MACRO.mapping)) _macroLookup.set(k.toLowerCase(), v);
 /**
+* Unified event-kind taxonomy — THE single source of truth for
+* `kind → { parentKind, category, level, color, iconId, labelKey, label,
+* icon }`.
+*
+* This dictionary folds together what used to be scattered across four
+* copies:
+*   - `capabilities/sensor-event-kinds.ts` (sensor cap colors)
+*   - `addon-post-analysis/.../services/event-kinds.ts`
+*     (MOTION/PERSON/VEHICLE… _COLOR constants)
+*   - `ui-library/composites/detection-colors.ts` (CLASS_COLORS)
+*   - `addon-post-analysis/shared/frame/box-drawer.ts` (DEFAULT_COLOR)
+*   - the COCO / audio class maps (macro ↔ sub relationships)
+*
+* The DATA (serializable — color/iconId/labelKey/parentKind) lives here in
+* `@camstack/types`. The UI-side mapping `iconId → lucide component` and
+* `labelKey → t()` lives in `@camstack/ui-library`. UIs never hardcode a
+* color or an icon: they read this dictionary (server descriptors carry the
+* fields inline; the client resolves color/icon/label from `iconId`/`kind`).
+*
+* Two levels only (v1 YAGNI): macro → sub. `person` is a leaf macro.
+*/
+var TAXONOMY_COLORS = {
+	motion: "#f59e0b",
+	audio: "#06b6d4",
+	person: "#22c55e",
+	vehicle: "#3b82f6",
+	animal: "#f97316",
+	package: "#a855f7",
+	sensor: "#8b5cf6",
+	control: "#10b981",
+	genericDetection: "#64748b"
+};
+var DETECTION_SUB_COLORS = {
+	car: "#f59e0b",
+	truck: "#d97706",
+	bus: "#b45309",
+	motorcycle: "#eab308",
+	bicycle: "#ca8a04",
+	airplane: "#60a5fa",
+	boat: "#2563eb",
+	train: "#1d4ed8",
+	bird: "#14b8a6",
+	dog: "#84cc16",
+	cat: "#f97316",
+	horse: "#a16207",
+	sheep: "#a3a3a3",
+	cow: "#78716c",
+	elephant: "#6b7280",
+	bear: "#7c2d12",
+	zebra: "#404040",
+	giraffe: "#d4a373"
+};
+function titleCase(id) {
+	return id.split(/[-_ ]/).filter((p) => p.length > 0).map((p) => p.charAt(0).toUpperCase() + p.slice(1)).join(" ");
+}
+var entries = /* @__PURE__ */ new Map();
+function macro(kind, category, color, iconId, label) {
+	entries.set(kind, {
+		kind,
+		parentKind: null,
+		level: "macro",
+		category,
+		color,
+		iconId,
+		labelKey: `eventKind.${kind}`,
+		label
+	});
+}
+function sub(kind, parentKind, category, color, iconId, label) {
+	entries.set(kind, {
+		kind,
+		parentKind,
+		level: "sub",
+		category,
+		color,
+		iconId,
+		labelKey: `eventKind.${kind}`,
+		label
+	});
+}
+macro("motion", "motion", TAXONOMY_COLORS.motion, "motion", "Motion");
+macro("audio", "audio", TAXONOMY_COLORS.audio, "audio", "Audio");
+macro("person", "detection", TAXONOMY_COLORS.person, "person", "Person");
+macro("vehicle", "detection", TAXONOMY_COLORS.vehicle, "vehicle", "Vehicle");
+macro("animal", "detection", TAXONOMY_COLORS.animal, "animal", "Animal");
+macro("package", "package", TAXONOMY_COLORS.package, "package", "Package");
+macro("sensor", "sensor", TAXONOMY_COLORS.sensor, "sensor", "Sensor");
+macro("control", "control", TAXONOMY_COLORS.control, "control", "Control");
+for (const [cocoClass, macroClass] of Object.entries(COCO_TO_MACRO.mapping)) {
+	if (macroClass !== "vehicle" && macroClass !== "animal") continue;
+	if (entries.has(cocoClass)) continue;
+	sub(cocoClass, macroClass, "detection", DETECTION_SUB_COLORS[cocoClass] ?? TAXONOMY_COLORS.genericDetection, cocoClass, titleCase(cocoClass));
+}
+sub("package-delivered", "package", "package", TAXONOMY_COLORS.package, "package", "Package delivered");
+sub("package-picked-up", "package", "package", TAXONOMY_COLORS.package, "package", "Package picked up");
+sub("contact", "sensor", "sensor", "#f59e0b", "door", "Contact");
+sub("motion-sensor", "sensor", "sensor", TAXONOMY_COLORS.sensor, "pir", "Motion sensor");
+sub("smoke", "sensor", "sensor", "#ef4444", "smoke", "Smoke");
+sub("flood", "sensor", "sensor", "#3b82f6", "water", "Water leak");
+sub("gas", "sensor", "sensor", "#ef4444", "gas", "Gas");
+sub("carbon-monoxide", "sensor", "sensor", "#dc2626", "smoke", "Carbon monoxide");
+sub("vibration", "sensor", "sensor", "#eab308", "vibration", "Vibration");
+sub("tamper", "sensor", "sensor", "#f97316", "tamper", "Tamper");
+sub("presence", "sensor", "sensor", "#22c55e", "presence", "Presence");
+sub("enum-sensor", "sensor", "sensor", TAXONOMY_COLORS.sensor, "generic", "Sensor state");
+sub("device-event", "sensor", "sensor", "#10b981", "button", "Device event");
+sub("lock", "control", "control", "#0ea5e9", "lock", "Lock");
+sub("switch", "control", "control", TAXONOMY_COLORS.control, "switch", "Switch");
+sub("siren", "control", "control", "#dc2626", "siren", "Siren");
+sub("button", "control", "control", "#10b981", "button", "Button");
+sub("doorbell", "control", "control", "#a855f7", "doorbell", "Doorbell");
+for (const l of AUDIO_MACRO_LABELS) {
+	const kind = `audio-${l.id}`;
+	if (entries.has(kind)) continue;
+	sub(kind, "audio", "audio", TAXONOMY_COLORS.audio, kind, l.name);
+}
+/** The complete taxonomy dictionary, keyed by kind. */
+var EVENT_TAXONOMY = Object.freeze(Object.fromEntries(entries));
+/**
 * Error types for the safe expression engine. Two distinct classes so callers
 * can tell a compile-time (grammar) failure from a runtime (evaluation)
 * failure — both are non-fatal to the host: read paths degrade to "skip link".
@@ -15886,17 +16159,30 @@ var EventKindCategorySchema = _enum([
 	"audio",
 	"detection",
 	"sensor",
+	"control",
 	"custom",
 	"package"
 ]);
+/** Taxonomy level — macro (timeline lane) vs sub (events-page leaf). */
+var EventKindLevelSchema = _enum(["macro", "sub"]);
 var EventKindDescriptorSchema = object({
-	/** Stable kind id (e.g. 'motion', 'person', 'contact'). */
+	/** Stable kind id (e.g. 'motion', 'vehicle', 'car', 'lock'). */
 	kind: string(),
+	/** i18n key resolved on the UI side; `label` is the English fallback. */
+	labelKey: string(),
+	/** English fallback label (kept for clients that don't translate). */
 	label: string(),
 	/** Hex color for timeline/legend rendering. */
 	color: string(),
+	/** Dictionary id → lucide component on the UI side. */
+	iconId: string(),
+	/** Legacy closed-vocab glyph — fallback for `iconId`. */
 	icon: EventKindIconSchema,
 	category: EventKindCategorySchema,
+	/** Macro parent for this kind ('car' → 'vehicle'); null for a macro. */
+	parentKind: string().nullable(),
+	/** Derived from `parentKind`, explicit for the client tree. */
+	level: EventKindLevelSchema,
 	/** Which cap + device contributes this kind. For built-ins the camera
 	*  itself; for sensor kinds the LINKED source device. */
 	source: object({
@@ -15969,11 +16255,21 @@ var TrackAudioLabelSchema = object({
 	firstAt: number(),
 	lastAt: number()
 });
+/**
+* How a track was produced. `pipeline` (default / absent) = the spatial
+* detection+tracking pipeline. `sensor` = a SYNTHETIC track projected from a
+* linked sensor/control state change (no positions; carries a snapshot). The
+* spatial subsystems (tracker association, occupancy count, re-id/embedding,
+* resurrection) MUST skip `sensor` tracks — they have no bbox trajectory.
+*/
+var TrackSourceSchema = _enum(["pipeline", "sensor"]);
 var TrackSchema = object({
 	trackId: string(),
 	deviceId: number(),
 	className: string(),
 	label: string().optional(),
+	/** Track provenance. Absent ⇒ `pipeline` (legacy rows). */
+	source: TrackSourceSchema.optional(),
 	firstSeen: number(),
 	lastSeen: number(),
 	/** Frame-rate position history (subject to maxPositionHistory cap). */
@@ -16350,6 +16646,76 @@ DeviceType.Camera, method(object({ deviceId: number() }), array(TrackSchema).rea
 	eventId: string(),
 	timestamp: number()
 });
+/**
+* Cap → event-kind mapping for the SENSOR / CONTROL cap families — the table
+* `pipeline-analytics.listEventKinds` uses to turn a linked device's bound
+* caps into per-camera event-kind descriptors.
+*
+* The descriptor DATA (color / iconId / labelKey / parentKind / category)
+* is NOT duplicated here — every entry is derived from the single
+* `EVENT_TAXONOMY` dictionary (`catalogs/event-taxonomy.ts`). This file owns
+* ONLY the cap-name → taxonomy-kind mapping. Adding a new eventful sensor /
+* control cap means adding one line here (and a taxonomy entry); the anti-
+* drift guard `scripts/check-event-kind-coverage.ts` fails the build if an
+* eventful cap is missing.
+*/
+/** Map a taxonomy `iconId` onto the legacy closed `EventKindIcon` enum. */
+var LEGACY_ICON = {
+	motion: "motion",
+	audio: "audio",
+	person: "person",
+	vehicle: "vehicle",
+	animal: "animal",
+	package: "package",
+	door: "door",
+	pir: "pir",
+	smoke: "smoke",
+	water: "water",
+	button: "button",
+	generic: "generic",
+	gas: "smoke",
+	vibration: "generic",
+	tamper: "generic",
+	presence: "person",
+	lock: "generic",
+	siren: "generic",
+	switch: "generic",
+	doorbell: "button"
+};
+function legacyIcon(iconId) {
+	return LEGACY_ICON[iconId] ?? "generic";
+}
+/**
+* Cap name → taxonomy kind id. Covers EVERY eventful sensor / control cap.
+* The anti-drift guard cross-checks this against the eventful caps declared
+* in `packages/types/src/capabilities/*.cap.ts`.
+*/
+var CAP_TO_KIND = {
+	contact: "contact",
+	motion: "motion-sensor",
+	smoke: "smoke",
+	flood: "flood",
+	gas: "gas",
+	"carbon-monoxide": "carbon-monoxide",
+	vibration: "vibration",
+	tamper: "tamper",
+	presence: "presence",
+	"enum-sensor": "enum-sensor",
+	"event-emitter": "device-event",
+	"lock-control": "lock",
+	switch: "switch",
+	button: "button",
+	doorbell: "doorbell"
+};
+function buildDescriptor(capName, kind) {
+	const t = EVENT_TAXONOMY[kind];
+	if (t === void 0) throw new Error(`EVENT_KIND_BY_CAP: cap '${capName}' maps to unknown taxonomy kind '${kind}'`);
+	return {
+		...t,
+		icon: legacyIcon(t.iconId)
+	};
+}
+Object.freeze(Object.fromEntries(Object.entries(CAP_TO_KIND).map(([capName, kind]) => [capName, buildDescriptor(capName, kind)])));
 var CameraPipelineConfigSchema = object({
 	engine: PipelineEngineChoiceSchema.optional(),
 	steps: array(PipelineStepInputSchema).readonly(),
@@ -24988,7 +25354,7 @@ var RuleEngine = class {
 			if (!className || !conditions.classNames.includes(className)) return false;
 		}
 		if (conditions.zoneIds?.length) {
-			const zones = data["zones"];
+			const zones = data["zones"] ?? data["zoneIds"];
 			const zoneId = data["zoneId"];
 			if (!(zones ?? (zoneId ? [zoneId] : [])).some((z) => conditions.zoneIds.includes(z))) return false;
 		}
@@ -25075,7 +25441,9 @@ var EVENT_CATEGORIES = [
 	EventCategory.DetectionRaw,
 	EventCategory.DetectionResult,
 	EventCategory.PipelineAnalyticsDetectionEvent,
-	EventCategory.EventEmitted
+	EventCategory.EventEmitted,
+	EventCategory.PipelineAnalyticsPackageDelivered,
+	EventCategory.PipelineAnalyticsPackagePickedUp
 ];
 var DEFAULT_NOTIFIER_CONFIG = {
 	defaultCooldownSeconds: 60,
@@ -25330,7 +25698,7 @@ var AdvancedNotifierAddon = class extends BaseAddon {
 			deviceName: data["deviceName"] ?? String(event.source.id),
 			className: data["className"] ?? "",
 			confidence: String(data["confidence"] ?? ""),
-			zoneId: data["zoneId"] ?? "",
+			zoneId: data["zoneId"] ?? (Array.isArray(data["zoneIds"]) ? String(data["zoneIds"][0] ?? "") : ""),
 			zoneName: data["zoneName"] ?? "",
 			category: event.category,
 			timestamp: event.timestamp.toISOString()

package/dist/addon.mjs

@@ -7641,6 +7641,160 @@ function cosineSimilarity(a, b) {
 	const denom = Math.sqrt(normA) * Math.sqrt(normB);
 	return denom === 0 ? 0 : dotProduct / denom;
 }
+var COCO_TO_MACRO = {
+	mapping: {
+		person: "person",
+		bicycle: "vehicle",
+		car: "vehicle",
+		motorcycle: "vehicle",
+		airplane: "vehicle",
+		bus: "vehicle",
+		train: "vehicle",
+		truck: "vehicle",
+		boat: "vehicle",
+		bird: "animal",
+		cat: "animal",
+		dog: "animal",
+		horse: "animal",
+		sheep: "animal",
+		cow: "animal",
+		elephant: "animal",
+		bear: "animal",
+		zebra: "animal",
+		giraffe: "animal",
+		suitcase: "package",
+		backpack: "package",
+		handbag: "package"
+	},
+	preserveOriginal: false
+};
+var AUDIO_MACRO_LABELS = [
+	{
+		id: "speech",
+		name: "Speech",
+		icon: "🗣️"
+	},
+	{
+		id: "scream",
+		name: "Scream / Shout",
+		icon: "😱"
+	},
+	{
+		id: "crying",
+		name: "Crying / Baby",
+		icon: "😢"
+	},
+	{
+		id: "laughter",
+		name: "Laughter",
+		icon: "😂"
+	},
+	{
+		id: "music",
+		name: "Music",
+		icon: "🎵"
+	},
+	{
+		id: "dog",
+		name: "Dog",
+		icon: "🐕"
+	},
+	{
+		id: "cat",
+		name: "Cat",
+		icon: "🐈"
+	},
+	{
+		id: "bird",
+		name: "Bird",
+		icon: "🐦"
+	},
+	{
+		id: "animal",
+		name: "Animal (other)",
+		icon: "🐾"
+	},
+	{
+		id: "alarm",
+		name: "Alarm / Siren",
+		icon: "🚨"
+	},
+	{
+		id: "doorbell",
+		name: "Doorbell / Knock",
+		icon: "🔔"
+	},
+	{
+		id: "glass_breaking",
+		name: "Glass Breaking",
+		icon: "💥"
+	},
+	{
+		id: "gunshot",
+		name: "Gunshot / Explosion",
+		icon: "💣"
+	},
+	{
+		id: "vehicle",
+		name: "Vehicle",
+		icon: "🚗"
+	},
+	{
+		id: "siren",
+		name: "Emergency Siren",
+		icon: "🚑"
+	},
+	{
+		id: "fire",
+		name: "Fire / Smoke",
+		icon: "🔥"
+	},
+	{
+		id: "water",
+		name: "Water",
+		icon: "💧"
+	},
+	{
+		id: "wind",
+		name: "Wind / Weather",
+		icon: "🌬️"
+	},
+	{
+		id: "door",
+		name: "Door",
+		icon: "🚪"
+	},
+	{
+		id: "footsteps",
+		name: "Footsteps",
+		icon: "👣"
+	},
+	{
+		id: "crowd",
+		name: "Crowd / Chatter",
+		icon: "👥"
+	},
+	{
+		id: "telephone",
+		name: "Telephone",
+		icon: "📞"
+	},
+	{
+		id: "engine",
+		name: "Engine / Motor",
+		icon: "⚙️"
+	},
+	{
+		id: "tools",
+		name: "Tools / Construction",
+		icon: "🔨"
+	},
+	{
+		id: "silence",
+		name: "Silence",
+		icon: "🤫"
+	}
+];
 var YAMNET_TO_MACRO = {
 	mapping: {
 		Speech: "speech",
@@ -7907,6 +8061,125 @@ var _macroLookup = /* @__PURE__ */ new Map();
 for (const [k, v] of Object.entries(YAMNET_TO_MACRO.mapping)) _macroLookup.set(k.toLowerCase(), v);
 for (const [k, v] of Object.entries(APPLE_SA_TO_MACRO.mapping)) _macroLookup.set(k.toLowerCase(), v);
 /**
+* Unified event-kind taxonomy — THE single source of truth for
+* `kind → { parentKind, category, level, color, iconId, labelKey, label,
+* icon }`.
+*
+* This dictionary folds together what used to be scattered across four
+* copies:
+*   - `capabilities/sensor-event-kinds.ts` (sensor cap colors)
+*   - `addon-post-analysis/.../services/event-kinds.ts`
+*     (MOTION/PERSON/VEHICLE… _COLOR constants)
+*   - `ui-library/composites/detection-colors.ts` (CLASS_COLORS)
+*   - `addon-post-analysis/shared/frame/box-drawer.ts` (DEFAULT_COLOR)
+*   - the COCO / audio class maps (macro ↔ sub relationships)
+*
+* The DATA (serializable — color/iconId/labelKey/parentKind) lives here in
+* `@camstack/types`. The UI-side mapping `iconId → lucide component` and
+* `labelKey → t()` lives in `@camstack/ui-library`. UIs never hardcode a
+* color or an icon: they read this dictionary (server descriptors carry the
+* fields inline; the client resolves color/icon/label from `iconId`/`kind`).
+*
+* Two levels only (v1 YAGNI): macro → sub. `person` is a leaf macro.
+*/
+var TAXONOMY_COLORS = {
+	motion: "#f59e0b",
+	audio: "#06b6d4",
+	person: "#22c55e",
+	vehicle: "#3b82f6",
+	animal: "#f97316",
+	package: "#a855f7",
+	sensor: "#8b5cf6",
+	control: "#10b981",
+	genericDetection: "#64748b"
+};
+var DETECTION_SUB_COLORS = {
+	car: "#f59e0b",
+	truck: "#d97706",
+	bus: "#b45309",
+	motorcycle: "#eab308",
+	bicycle: "#ca8a04",
+	airplane: "#60a5fa",
+	boat: "#2563eb",
+	train: "#1d4ed8",
+	bird: "#14b8a6",
+	dog: "#84cc16",
+	cat: "#f97316",
+	horse: "#a16207",
+	sheep: "#a3a3a3",
+	cow: "#78716c",
+	elephant: "#6b7280",
+	bear: "#7c2d12",
+	zebra: "#404040",
+	giraffe: "#d4a373"
+};
+function titleCase(id) {
+	return id.split(/[-_ ]/).filter((p) => p.length > 0).map((p) => p.charAt(0).toUpperCase() + p.slice(1)).join(" ");
+}
+var entries = /* @__PURE__ */ new Map();
+function macro(kind, category, color, iconId, label) {
+	entries.set(kind, {
+		kind,
+		parentKind: null,
+		level: "macro",
+		category,
+		color,
+		iconId,
+		labelKey: `eventKind.${kind}`,
+		label
+	});
+}
+function sub(kind, parentKind, category, color, iconId, label) {
+	entries.set(kind, {
+		kind,
+		parentKind,
+		level: "sub",
+		category,
+		color,
+		iconId,
+		labelKey: `eventKind.${kind}`,
+		label
+	});
+}
+macro("motion", "motion", TAXONOMY_COLORS.motion, "motion", "Motion");
+macro("audio", "audio", TAXONOMY_COLORS.audio, "audio", "Audio");
+macro("person", "detection", TAXONOMY_COLORS.person, "person", "Person");
+macro("vehicle", "detection", TAXONOMY_COLORS.vehicle, "vehicle", "Vehicle");
+macro("animal", "detection", TAXONOMY_COLORS.animal, "animal", "Animal");
+macro("package", "package", TAXONOMY_COLORS.package, "package", "Package");
+macro("sensor", "sensor", TAXONOMY_COLORS.sensor, "sensor", "Sensor");
+macro("control", "control", TAXONOMY_COLORS.control, "control", "Control");
+for (const [cocoClass, macroClass] of Object.entries(COCO_TO_MACRO.mapping)) {
+	if (macroClass !== "vehicle" && macroClass !== "animal") continue;
+	if (entries.has(cocoClass)) continue;
+	sub(cocoClass, macroClass, "detection", DETECTION_SUB_COLORS[cocoClass] ?? TAXONOMY_COLORS.genericDetection, cocoClass, titleCase(cocoClass));
+}
+sub("package-delivered", "package", "package", TAXONOMY_COLORS.package, "package", "Package delivered");
+sub("package-picked-up", "package", "package", TAXONOMY_COLORS.package, "package", "Package picked up");
+sub("contact", "sensor", "sensor", "#f59e0b", "door", "Contact");
+sub("motion-sensor", "sensor", "sensor", TAXONOMY_COLORS.sensor, "pir", "Motion sensor");
+sub("smoke", "sensor", "sensor", "#ef4444", "smoke", "Smoke");
+sub("flood", "sensor", "sensor", "#3b82f6", "water", "Water leak");
+sub("gas", "sensor", "sensor", "#ef4444", "gas", "Gas");
+sub("carbon-monoxide", "sensor", "sensor", "#dc2626", "smoke", "Carbon monoxide");
+sub("vibration", "sensor", "sensor", "#eab308", "vibration", "Vibration");
+sub("tamper", "sensor", "sensor", "#f97316", "tamper", "Tamper");
+sub("presence", "sensor", "sensor", "#22c55e", "presence", "Presence");
+sub("enum-sensor", "sensor", "sensor", TAXONOMY_COLORS.sensor, "generic", "Sensor state");
+sub("device-event", "sensor", "sensor", "#10b981", "button", "Device event");
+sub("lock", "control", "control", "#0ea5e9", "lock", "Lock");
+sub("switch", "control", "control", TAXONOMY_COLORS.control, "switch", "Switch");
+sub("siren", "control", "control", "#dc2626", "siren", "Siren");
+sub("button", "control", "control", "#10b981", "button", "Button");
+sub("doorbell", "control", "control", "#a855f7", "doorbell", "Doorbell");
+for (const l of AUDIO_MACRO_LABELS) {
+	const kind = `audio-${l.id}`;
+	if (entries.has(kind)) continue;
+	sub(kind, "audio", "audio", TAXONOMY_COLORS.audio, kind, l.name);
+}
+/** The complete taxonomy dictionary, keyed by kind. */
+var EVENT_TAXONOMY = Object.freeze(Object.fromEntries(entries));
+/**
 * Error types for the safe expression engine. Two distinct classes so callers
 * can tell a compile-time (grammar) failure from a runtime (evaluation)
 * failure — both are non-fatal to the host: read paths degrade to "skip link".
@@ -15882,17 +16155,30 @@ var EventKindCategorySchema = _enum([
 	"audio",
 	"detection",
 	"sensor",
+	"control",
 	"custom",
 	"package"
 ]);
+/** Taxonomy level — macro (timeline lane) vs sub (events-page leaf). */
+var EventKindLevelSchema = _enum(["macro", "sub"]);
 var EventKindDescriptorSchema = object({
-	/** Stable kind id (e.g. 'motion', 'person', 'contact'). */
+	/** Stable kind id (e.g. 'motion', 'vehicle', 'car', 'lock'). */
 	kind: string(),
+	/** i18n key resolved on the UI side; `label` is the English fallback. */
+	labelKey: string(),
+	/** English fallback label (kept for clients that don't translate). */
 	label: string(),
 	/** Hex color for timeline/legend rendering. */
 	color: string(),
+	/** Dictionary id → lucide component on the UI side. */
+	iconId: string(),
+	/** Legacy closed-vocab glyph — fallback for `iconId`. */
 	icon: EventKindIconSchema,
 	category: EventKindCategorySchema,
+	/** Macro parent for this kind ('car' → 'vehicle'); null for a macro. */
+	parentKind: string().nullable(),
+	/** Derived from `parentKind`, explicit for the client tree. */
+	level: EventKindLevelSchema,
 	/** Which cap + device contributes this kind. For built-ins the camera
 	*  itself; for sensor kinds the LINKED source device. */
 	source: object({
@@ -15965,11 +16251,21 @@ var TrackAudioLabelSchema = object({
 	firstAt: number(),
 	lastAt: number()
 });
+/**
+* How a track was produced. `pipeline` (default / absent) = the spatial
+* detection+tracking pipeline. `sensor` = a SYNTHETIC track projected from a
+* linked sensor/control state change (no positions; carries a snapshot). The
+* spatial subsystems (tracker association, occupancy count, re-id/embedding,
+* resurrection) MUST skip `sensor` tracks — they have no bbox trajectory.
+*/
+var TrackSourceSchema = _enum(["pipeline", "sensor"]);
 var TrackSchema = object({
 	trackId: string(),
 	deviceId: number(),
 	className: string(),
 	label: string().optional(),
+	/** Track provenance. Absent ⇒ `pipeline` (legacy rows). */
+	source: TrackSourceSchema.optional(),
 	firstSeen: number(),
 	lastSeen: number(),
 	/** Frame-rate position history (subject to maxPositionHistory cap). */
@@ -16346,6 +16642,76 @@ DeviceType.Camera, method(object({ deviceId: number() }), array(TrackSchema).rea
 	eventId: string(),
 	timestamp: number()
 });
+/**
+* Cap → event-kind mapping for the SENSOR / CONTROL cap families — the table
+* `pipeline-analytics.listEventKinds` uses to turn a linked device's bound
+* caps into per-camera event-kind descriptors.
+*
+* The descriptor DATA (color / iconId / labelKey / parentKind / category)
+* is NOT duplicated here — every entry is derived from the single
+* `EVENT_TAXONOMY` dictionary (`catalogs/event-taxonomy.ts`). This file owns
+* ONLY the cap-name → taxonomy-kind mapping. Adding a new eventful sensor /
+* control cap means adding one line here (and a taxonomy entry); the anti-
+* drift guard `scripts/check-event-kind-coverage.ts` fails the build if an
+* eventful cap is missing.
+*/
+/** Map a taxonomy `iconId` onto the legacy closed `EventKindIcon` enum. */
+var LEGACY_ICON = {
+	motion: "motion",
+	audio: "audio",
+	person: "person",
+	vehicle: "vehicle",
+	animal: "animal",
+	package: "package",
+	door: "door",
+	pir: "pir",
+	smoke: "smoke",
+	water: "water",
+	button: "button",
+	generic: "generic",
+	gas: "smoke",
+	vibration: "generic",
+	tamper: "generic",
+	presence: "person",
+	lock: "generic",
+	siren: "generic",
+	switch: "generic",
+	doorbell: "button"
+};
+function legacyIcon(iconId) {
+	return LEGACY_ICON[iconId] ?? "generic";
+}
+/**
+* Cap name → taxonomy kind id. Covers EVERY eventful sensor / control cap.
+* The anti-drift guard cross-checks this against the eventful caps declared
+* in `packages/types/src/capabilities/*.cap.ts`.
+*/
+var CAP_TO_KIND = {
+	contact: "contact",
+	motion: "motion-sensor",
+	smoke: "smoke",
+	flood: "flood",
+	gas: "gas",
+	"carbon-monoxide": "carbon-monoxide",
+	vibration: "vibration",
+	tamper: "tamper",
+	presence: "presence",
+	"enum-sensor": "enum-sensor",
+	"event-emitter": "device-event",
+	"lock-control": "lock",
+	switch: "switch",
+	button: "button",
+	doorbell: "doorbell"
+};
+function buildDescriptor(capName, kind) {
+	const t = EVENT_TAXONOMY[kind];
+	if (t === void 0) throw new Error(`EVENT_KIND_BY_CAP: cap '${capName}' maps to unknown taxonomy kind '${kind}'`);
+	return {
+		...t,
+		icon: legacyIcon(t.iconId)
+	};
+}
+Object.freeze(Object.fromEntries(Object.entries(CAP_TO_KIND).map(([capName, kind]) => [capName, buildDescriptor(capName, kind)])));
 var CameraPipelineConfigSchema = object({
 	engine: PipelineEngineChoiceSchema.optional(),
 	steps: array(PipelineStepInputSchema).readonly(),
@@ -24984,7 +25350,7 @@ var RuleEngine = class {
 			if (!className || !conditions.classNames.includes(className)) return false;
 		}
 		if (conditions.zoneIds?.length) {
-			const zones = data["zones"];
+			const zones = data["zones"] ?? data["zoneIds"];
 			const zoneId = data["zoneId"];
 			if (!(zones ?? (zoneId ? [zoneId] : [])).some((z) => conditions.zoneIds.includes(z))) return false;
 		}
@@ -25071,7 +25437,9 @@ var EVENT_CATEGORIES = [
 	EventCategory.DetectionRaw,
 	EventCategory.DetectionResult,
 	EventCategory.PipelineAnalyticsDetectionEvent,
-	EventCategory.EventEmitted
+	EventCategory.EventEmitted,
+	EventCategory.PipelineAnalyticsPackageDelivered,
+	EventCategory.PipelineAnalyticsPackagePickedUp
 ];
 var DEFAULT_NOTIFIER_CONFIG = {
 	defaultCooldownSeconds: 60,
@@ -25326,7 +25694,7 @@ var AdvancedNotifierAddon = class extends BaseAddon {
 			deviceName: data["deviceName"] ?? String(event.source.id),
 			className: data["className"] ?? "",
 			confidence: String(data["confidence"] ?? ""),
-			zoneId: data["zoneId"] ?? "",
+			zoneId: data["zoneId"] ?? (Array.isArray(data["zoneIds"]) ? String(data["zoneIds"][0] ?? "") : ""),
 			zoneName: data["zoneName"] ?? "",
 			category: event.category,
 			timestamp: event.timestamp.toISOString()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-advanced-notifier",
-  "version": "1.1.29",
+  "version": "1.1.30",
   "description": "Rules-based notification engine for CamStack",
   "license": "MIT",
   "main": "./dist/index.js",