@camstack/addon-advanced-notifier 1.1.3 → 1.1.5

package/dist/addon.js

@@ -4632,7 +4632,7 @@ function _instanceof(cls, params = {}) {
 	return inst;
 }
 //#endregion
-//#region ../types/dist/sleep-BV7rLc6Y.mjs
+//#region ../types/dist/sleep-NOH4yRwj.mjs
 var EventCategory = /* @__PURE__ */ function(EventCategory) {
 	EventCategory["SystemBoot"] = "system.boot";
 	EventCategory["SystemAddonsReady"] = "system.addons-ready";
@@ -5747,15 +5747,24 @@ var BaseAddon = class {
 		} catch {}
 	}
 	/**
-	* Resolve the shared models directory path via the storage capability.
-	* Falls back to `camstack-data/models` if storage is unavailable.
-	* Used by inference addons (detection-pipeline, audio-classifier, embedding-encoder).
+	* Resolve the shared, node-local models directory: `<nodeDataDir>/models`.
+	*
+	* This is the SINGLE centralized models-dir resolver for every inference addon
+	* (detection-pipeline, audio-analyzer, embedding-encoder, model-studio). It is
+	* anchored at the node's own writable data root (`ctx.nodeDataDir`, i.e.
+	* `CAMSTACK_DATA` ?? the kernel boot dir) — never the hub-singleton `storage`
+	* cap, which returns the hub's `/data/models` to every node and breaks any node
+	* whose real data dir differs (e.g. the macOS electron agent).
+	*
+	* `node:path`/`node:fs` are imported dynamically so the `@camstack/types` root
+	* barrel (re-exported into browser bundles) stays free of node builtins.
 	*/
 	async resolveModelsDir() {
-		return this.ctx.api.storage.resolve.query({
-			location: "models",
-			relativePath: ""
-		}).catch(() => "camstack-data/models");
+		const { join } = await import("node:path");
+		const { promises: fsp } = await import("node:fs");
+		const dir = join(this.ctx.nodeDataDir, "models");
+		await fsp.mkdir(dir, { recursive: true });
+		return dir;
 	}
 	/**
 	* Access the runtime capability registry for in-process provider lookups.
@@ -7113,6 +7122,20 @@ var EncodeProfileSchema = object({
 	*/
 	outputArgs: array(string()).optional()
 });
+/** Cosine similarity between two embedding vectors */
+function cosineSimilarity(a, b) {
+	if (a.length !== b.length) return 0;
+	let dotProduct = 0;
+	let normA = 0;
+	let normB = 0;
+	for (let i = 0; i < a.length; i++) {
+		dotProduct += a[i] * b[i];
+		normA += a[i] * a[i];
+		normB += b[i] * b[i];
+	}
+	const denom = Math.sqrt(normA) * Math.sqrt(normB);
+	return denom === 0 ? 0 : dotProduct / denom;
+}
 var YAMNET_TO_MACRO = {
 	mapping: {
 		Speech: "speech",
@@ -12651,7 +12674,8 @@ method(object({
 	sessionId: string().optional()
 }), ConvertResultSchema, {
 	kind: "mutation",
-	auth: "admin"
+	auth: "admin",
+	timeoutMs: 6e5
 });
 var AddonHttpRouteSchema = object({
 	method: _enum([
@@ -14195,7 +14219,14 @@ var NotificationRuleConditionsSchema = object({
 	/** Match against `event.data.eventType` token (e.g. `'press_long'`). When non-empty, only events
 	*  carrying a matching `data.eventType` string pass this condition. Rules without this field are
 	*  unaffected (back-compat). Distinct from `rule.eventTypes` which holds EventCategory strings. */
-	eventTypeTokens: array(string()).readonly().optional()
+	eventTypeTokens: array(string()).readonly().optional(),
+	/** Match detections whose CLIP image embedding is semantically similar to this free-text
+	*  description. Requires the embedding-encoder cap to have pre-warmed the text vector.
+	*  `minSimilarity` is the cosine similarity threshold in [0, 1]. */
+	clipDescription: object({
+		text: string().min(1),
+		minSimilarity: number().min(0).max(1)
+	}).optional()
 });
 var NotificationRuleTemplateSchema = object({
 	title: string(),
@@ -14449,6 +14480,16 @@ var TrackedDetectionSchema = object({
 	zones: array(string()).readonly(),
 	state: TrackStateSchema
 });
+var ScoredObjectEventSchema = ObjectEventSchema.extend({ score: number() });
+var SearchObjectEventsInput = object({
+	text: string(),
+	deviceId: number().optional(),
+	since: number().optional(),
+	until: number().optional(),
+	classFilter: string().optional(),
+	limit: number().default(50),
+	minScore: number().min(0).max(1).default(.2)
+});
 DeviceType.Camera, method(object({ deviceId: number() }), array(TrackSchema).readonly()), method(object({
 	deviceId: number(),
 	trackId: string()
@@ -14483,7 +14524,7 @@ DeviceType.Camera, method(object({ deviceId: number() }), array(TrackSchema).rea
 }), method(object({
 	eventId: string(),
 	kind: MediaFileKindEnum.optional()
-}), array(MediaFileSchema).readonly()), method(object({ trackId: string() }), array(MediaFileSchema).readonly()), object({
+}), array(MediaFileSchema).readonly()), method(object({ trackId: string() }), array(MediaFileSchema).readonly()), method(SearchObjectEventsInput, array(ScoredObjectEventSchema).readonly()), object({
 	deviceId: number(),
 	timestamp: number(),
 	frameWidth: number(),
@@ -19133,6 +19174,12 @@ Object.freeze({
 		addonId: null,
 		access: "create"
 	},
+	"pipelineAnalytics.searchObjectEvents": {
+		capName: "pipeline-analytics",
+		capScope: "device",
+		addonId: null,
+		access: "view"
+	},
 	"pipelineExecutor.cacheFrameInPool": {
 		capName: "pipeline-executor",
 		capScope: "system",
@@ -21055,6 +21102,17 @@ var RuleStore = class {
 //#endregion
 //#region src/rules/rule-engine.ts
 var RuleEngine = class {
+	clip;
+	constructor(clip) {
+		this.clip = {
+			textEmbeddingCache: clip?.textEmbeddingCache ?? /* @__PURE__ */ new Map(),
+			encoderModelId: clip?.encoderModelId
+		};
+	}
+	/** Update the active encoder's modelId after the cache is warmed. */
+	updateEncoderModelId(modelId) {
+		this.clip.encoderModelId = modelId;
+	}
 	evaluate(event, rules) {
 		return rules.filter((rule) => this.matchesRule(event, rule));
 	}
@@ -21099,6 +21157,17 @@ var RuleEngine = class {
 			if (typeof rawToken !== "string") return false;
 			if (!conditions.eventTypeTokens.includes(rawToken)) return false;
 		}
+		if (conditions.clipDescription !== void 0) {
+			const { text, minSimilarity } = conditions.clipDescription;
+			const eventModelId = data["embeddingModelId"];
+			if (typeof eventModelId !== "string") return false;
+			if (this.clip.encoderModelId !== void 0 && eventModelId !== this.clip.encoderModelId) return false;
+			const textVec = this.clip.textEmbeddingCache.get(text);
+			if (textVec === void 0) return false;
+			const rawEmbedding = data["embedding"];
+			if (!Array.isArray(rawEmbedding)) return false;
+			if (cosineSimilarity(new Float32Array(textVec), new Float32Array(rawEmbedding)) < minSimilarity) return false;
+		}
 		return true;
 	}
 };
@@ -21223,6 +21292,8 @@ var AdvancedNotifierAddon = class extends BaseAddon {
 	outputs = [];
 	auditLog;
 	unsubscribers = [];
+	clipTextCache = /* @__PURE__ */ new Map();
+	clipEncoderModelId = void 0;
 	notifier = {
 		getRules: async () => ({ rules: this.cachedRules }),
 		upsertRule: async ({ rule }) => {
@@ -21234,6 +21305,8 @@ var AdvancedNotifierAddon = class extends BaseAddon {
 				...this.cachedRules.slice(idx + 1)
 			];
 			else this.cachedRules = [...this.cachedRules, rule];
+			const api = this.ctx.api;
+			if (api) await this.warmClipCache(this.cachedRules, api);
 			return { success: true };
 		},
 		deleteRule: async ({ ruleId }) => {
@@ -21262,7 +21335,10 @@ var AdvancedNotifierAddon = class extends BaseAddon {
 		}
 	};
 	async onInitialize() {
-		this.ruleEngine = new RuleEngine();
+		this.ruleEngine = new RuleEngine({
+			textEmbeddingCache: this.clipTextCache,
+			encoderModelId: this.clipEncoderModelId
+		});
 		this.cooldown = new CooldownTracker();
 		this.consoleOutput = new ConsoleOutput(this.ctx.logger.child("console-output"));
 		this.outputs = [this.consoleOutput];
@@ -21272,6 +21348,7 @@ var AdvancedNotifierAddon = class extends BaseAddon {
 			this.auditLog = new AuditLog(api);
 			this.cachedRules = await this.ruleStore.getRules();
 			this.ctx.logger.info("Loaded notification rules", { meta: { count: this.cachedRules.length } });
+			await this.warmClipCache(this.cachedRules, api);
 		} else this.ctx.logger.warn("No ctx.api — rules will not be persisted");
 		for (const category of EVENT_CATEGORIES) {
 			const unsubscribe = this.ctx.eventBus.subscribe({ category }, (event) => {
@@ -21341,6 +21418,53 @@ var AdvancedNotifierAddon = class extends BaseAddon {
 			]
 		}] });
 	}
+	/**
+	* Pre-warm the CLIP text embedding cache for all `clipDescription.text`
+	* values present in the current rule set.
+	*
+	* Called once at boot (after rules are loaded) and again after any
+	* `upsertRule` mutation. Fetches the encoder's `modelId` via `getInfo` so
+	* the evaluation gate (`embeddingModelId` on the detection event) is always
+	* aligned with the active CLIP variant.
+	*
+	* This is the ONLY async boundary for CLIP in the notifier; `evaluateConditions`
+	* in `RuleEngine` stays synchronous by doing an O(1) `Map.get()` lookup.
+	*/
+	async warmClipCache(rules, api) {
+		const texts = /* @__PURE__ */ new Set();
+		for (const rule of rules) {
+			const text = rule.conditions.clipDescription?.text;
+			if (text !== void 0) texts.add(text);
+		}
+		if (texts.size === 0) return;
+		const info = await api.embeddingEncoder.getInfo.query().catch((err) => {
+			this.ctx.logger.warn("warmClipCache: embeddingEncoder.getInfo failed", { meta: { error: String(err) } });
+			return null;
+		});
+		if (!info?.ready) {
+			this.ctx.logger.debug("warmClipCache: embedding encoder not ready — cache not warmed", { meta: { pendingTexts: texts.size } });
+			return;
+		}
+		this.ruleEngine.updateEncoderModelId(info.modelId);
+		this.clipEncoderModelId = info.modelId;
+		for (const text of texts) {
+			if (this.clipTextCache.has(text)) continue;
+			const result = await api.embeddingEncoder.encodeText.query({ text }).catch((err) => {
+				this.ctx.logger.warn("warmClipCache: encodeText failed", { meta: {
+					text,
+					error: String(err)
+				} });
+				return null;
+			});
+			if (result) {
+				this.clipTextCache.set(text, result.embedding);
+				this.ctx.logger.debug("warmClipCache: cached text embedding", { meta: {
+					text,
+					modelId: info.modelId
+				} });
+			}
+		}
+	}
 	async handleEvent(event) {
 		const matchedRules = this.ruleEngine.evaluate(event, this.cachedRules);
 		for (const rule of matchedRules) {

package/dist/addon.mjs

@@ -4628,7 +4628,7 @@ function _instanceof(cls, params = {}) {
 	return inst;
 }
 //#endregion
-//#region ../types/dist/sleep-BV7rLc6Y.mjs
+//#region ../types/dist/sleep-NOH4yRwj.mjs
 var EventCategory = /* @__PURE__ */ function(EventCategory) {
 	EventCategory["SystemBoot"] = "system.boot";
 	EventCategory["SystemAddonsReady"] = "system.addons-ready";
@@ -5743,15 +5743,24 @@ var BaseAddon = class {
 		} catch {}
 	}
 	/**
-	* Resolve the shared models directory path via the storage capability.
-	* Falls back to `camstack-data/models` if storage is unavailable.
-	* Used by inference addons (detection-pipeline, audio-classifier, embedding-encoder).
+	* Resolve the shared, node-local models directory: `<nodeDataDir>/models`.
+	*
+	* This is the SINGLE centralized models-dir resolver for every inference addon
+	* (detection-pipeline, audio-analyzer, embedding-encoder, model-studio). It is
+	* anchored at the node's own writable data root (`ctx.nodeDataDir`, i.e.
+	* `CAMSTACK_DATA` ?? the kernel boot dir) — never the hub-singleton `storage`
+	* cap, which returns the hub's `/data/models` to every node and breaks any node
+	* whose real data dir differs (e.g. the macOS electron agent).
+	*
+	* `node:path`/`node:fs` are imported dynamically so the `@camstack/types` root
+	* barrel (re-exported into browser bundles) stays free of node builtins.
 	*/
 	async resolveModelsDir() {
-		return this.ctx.api.storage.resolve.query({
-			location: "models",
-			relativePath: ""
-		}).catch(() => "camstack-data/models");
+		const { join } = await import("node:path");
+		const { promises: fsp } = await import("node:fs");
+		const dir = join(this.ctx.nodeDataDir, "models");
+		await fsp.mkdir(dir, { recursive: true });
+		return dir;
 	}
 	/**
 	* Access the runtime capability registry for in-process provider lookups.
@@ -7109,6 +7118,20 @@ var EncodeProfileSchema = object({
 	*/
 	outputArgs: array(string()).optional()
 });
+/** Cosine similarity between two embedding vectors */
+function cosineSimilarity(a, b) {
+	if (a.length !== b.length) return 0;
+	let dotProduct = 0;
+	let normA = 0;
+	let normB = 0;
+	for (let i = 0; i < a.length; i++) {
+		dotProduct += a[i] * b[i];
+		normA += a[i] * a[i];
+		normB += b[i] * b[i];
+	}
+	const denom = Math.sqrt(normA) * Math.sqrt(normB);
+	return denom === 0 ? 0 : dotProduct / denom;
+}
 var YAMNET_TO_MACRO = {
 	mapping: {
 		Speech: "speech",
@@ -12647,7 +12670,8 @@ method(object({
 	sessionId: string().optional()
 }), ConvertResultSchema, {
 	kind: "mutation",
-	auth: "admin"
+	auth: "admin",
+	timeoutMs: 6e5
 });
 var AddonHttpRouteSchema = object({
 	method: _enum([
@@ -14191,7 +14215,14 @@ var NotificationRuleConditionsSchema = object({
 	/** Match against `event.data.eventType` token (e.g. `'press_long'`). When non-empty, only events
 	*  carrying a matching `data.eventType` string pass this condition. Rules without this field are
 	*  unaffected (back-compat). Distinct from `rule.eventTypes` which holds EventCategory strings. */
-	eventTypeTokens: array(string()).readonly().optional()
+	eventTypeTokens: array(string()).readonly().optional(),
+	/** Match detections whose CLIP image embedding is semantically similar to this free-text
+	*  description. Requires the embedding-encoder cap to have pre-warmed the text vector.
+	*  `minSimilarity` is the cosine similarity threshold in [0, 1]. */
+	clipDescription: object({
+		text: string().min(1),
+		minSimilarity: number().min(0).max(1)
+	}).optional()
 });
 var NotificationRuleTemplateSchema = object({
 	title: string(),
@@ -14445,6 +14476,16 @@ var TrackedDetectionSchema = object({
 	zones: array(string()).readonly(),
 	state: TrackStateSchema
 });
+var ScoredObjectEventSchema = ObjectEventSchema.extend({ score: number() });
+var SearchObjectEventsInput = object({
+	text: string(),
+	deviceId: number().optional(),
+	since: number().optional(),
+	until: number().optional(),
+	classFilter: string().optional(),
+	limit: number().default(50),
+	minScore: number().min(0).max(1).default(.2)
+});
 DeviceType.Camera, method(object({ deviceId: number() }), array(TrackSchema).readonly()), method(object({
 	deviceId: number(),
 	trackId: string()
@@ -14479,7 +14520,7 @@ DeviceType.Camera, method(object({ deviceId: number() }), array(TrackSchema).rea
 }), method(object({
 	eventId: string(),
 	kind: MediaFileKindEnum.optional()
-}), array(MediaFileSchema).readonly()), method(object({ trackId: string() }), array(MediaFileSchema).readonly()), object({
+}), array(MediaFileSchema).readonly()), method(object({ trackId: string() }), array(MediaFileSchema).readonly()), method(SearchObjectEventsInput, array(ScoredObjectEventSchema).readonly()), object({
 	deviceId: number(),
 	timestamp: number(),
 	frameWidth: number(),
@@ -19129,6 +19170,12 @@ Object.freeze({
 		addonId: null,
 		access: "create"
 	},
+	"pipelineAnalytics.searchObjectEvents": {
+		capName: "pipeline-analytics",
+		capScope: "device",
+		addonId: null,
+		access: "view"
+	},
 	"pipelineExecutor.cacheFrameInPool": {
 		capName: "pipeline-executor",
 		capScope: "system",
@@ -21051,6 +21098,17 @@ var RuleStore = class {
 //#endregion
 //#region src/rules/rule-engine.ts
 var RuleEngine = class {
+	clip;
+	constructor(clip) {
+		this.clip = {
+			textEmbeddingCache: clip?.textEmbeddingCache ?? /* @__PURE__ */ new Map(),
+			encoderModelId: clip?.encoderModelId
+		};
+	}
+	/** Update the active encoder's modelId after the cache is warmed. */
+	updateEncoderModelId(modelId) {
+		this.clip.encoderModelId = modelId;
+	}
 	evaluate(event, rules) {
 		return rules.filter((rule) => this.matchesRule(event, rule));
 	}
@@ -21095,6 +21153,17 @@ var RuleEngine = class {
 			if (typeof rawToken !== "string") return false;
 			if (!conditions.eventTypeTokens.includes(rawToken)) return false;
 		}
+		if (conditions.clipDescription !== void 0) {
+			const { text, minSimilarity } = conditions.clipDescription;
+			const eventModelId = data["embeddingModelId"];
+			if (typeof eventModelId !== "string") return false;
+			if (this.clip.encoderModelId !== void 0 && eventModelId !== this.clip.encoderModelId) return false;
+			const textVec = this.clip.textEmbeddingCache.get(text);
+			if (textVec === void 0) return false;
+			const rawEmbedding = data["embedding"];
+			if (!Array.isArray(rawEmbedding)) return false;
+			if (cosineSimilarity(new Float32Array(textVec), new Float32Array(rawEmbedding)) < minSimilarity) return false;
+		}
 		return true;
 	}
 };
@@ -21219,6 +21288,8 @@ var AdvancedNotifierAddon = class extends BaseAddon {
 	outputs = [];
 	auditLog;
 	unsubscribers = [];
+	clipTextCache = /* @__PURE__ */ new Map();
+	clipEncoderModelId = void 0;
 	notifier = {
 		getRules: async () => ({ rules: this.cachedRules }),
 		upsertRule: async ({ rule }) => {
@@ -21230,6 +21301,8 @@ var AdvancedNotifierAddon = class extends BaseAddon {
 				...this.cachedRules.slice(idx + 1)
 			];
 			else this.cachedRules = [...this.cachedRules, rule];
+			const api = this.ctx.api;
+			if (api) await this.warmClipCache(this.cachedRules, api);
 			return { success: true };
 		},
 		deleteRule: async ({ ruleId }) => {
@@ -21258,7 +21331,10 @@ var AdvancedNotifierAddon = class extends BaseAddon {
 		}
 	};
 	async onInitialize() {
-		this.ruleEngine = new RuleEngine();
+		this.ruleEngine = new RuleEngine({
+			textEmbeddingCache: this.clipTextCache,
+			encoderModelId: this.clipEncoderModelId
+		});
 		this.cooldown = new CooldownTracker();
 		this.consoleOutput = new ConsoleOutput(this.ctx.logger.child("console-output"));
 		this.outputs = [this.consoleOutput];
@@ -21268,6 +21344,7 @@ var AdvancedNotifierAddon = class extends BaseAddon {
 			this.auditLog = new AuditLog(api);
 			this.cachedRules = await this.ruleStore.getRules();
 			this.ctx.logger.info("Loaded notification rules", { meta: { count: this.cachedRules.length } });
+			await this.warmClipCache(this.cachedRules, api);
 		} else this.ctx.logger.warn("No ctx.api — rules will not be persisted");
 		for (const category of EVENT_CATEGORIES) {
 			const unsubscribe = this.ctx.eventBus.subscribe({ category }, (event) => {
@@ -21337,6 +21414,53 @@ var AdvancedNotifierAddon = class extends BaseAddon {
 			]
 		}] });
 	}
+	/**
+	* Pre-warm the CLIP text embedding cache for all `clipDescription.text`
+	* values present in the current rule set.
+	*
+	* Called once at boot (after rules are loaded) and again after any
+	* `upsertRule` mutation. Fetches the encoder's `modelId` via `getInfo` so
+	* the evaluation gate (`embeddingModelId` on the detection event) is always
+	* aligned with the active CLIP variant.
+	*
+	* This is the ONLY async boundary for CLIP in the notifier; `evaluateConditions`
+	* in `RuleEngine` stays synchronous by doing an O(1) `Map.get()` lookup.
+	*/
+	async warmClipCache(rules, api) {
+		const texts = /* @__PURE__ */ new Set();
+		for (const rule of rules) {
+			const text = rule.conditions.clipDescription?.text;
+			if (text !== void 0) texts.add(text);
+		}
+		if (texts.size === 0) return;
+		const info = await api.embeddingEncoder.getInfo.query().catch((err) => {
+			this.ctx.logger.warn("warmClipCache: embeddingEncoder.getInfo failed", { meta: { error: String(err) } });
+			return null;
+		});
+		if (!info?.ready) {
+			this.ctx.logger.debug("warmClipCache: embedding encoder not ready — cache not warmed", { meta: { pendingTexts: texts.size } });
+			return;
+		}
+		this.ruleEngine.updateEncoderModelId(info.modelId);
+		this.clipEncoderModelId = info.modelId;
+		for (const text of texts) {
+			if (this.clipTextCache.has(text)) continue;
+			const result = await api.embeddingEncoder.encodeText.query({ text }).catch((err) => {
+				this.ctx.logger.warn("warmClipCache: encodeText failed", { meta: {
+					text,
+					error: String(err)
+				} });
+				return null;
+			});
+			if (result) {
+				this.clipTextCache.set(text, result.embedding);
+				this.ctx.logger.debug("warmClipCache: cached text embedding", { meta: {
+					text,
+					modelId: info.modelId
+				} });
+			}
+		}
+	}
 	async handleEvent(event) {
 		const matchedRules = this.ruleEngine.evaluate(event, this.cachedRules);
 		for (const rule of matchedRules) {

package/package.json

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