@camera.ui/server 2.2.5-beta.4 → 2.2.5

package/dist/server/src/assistant/tools/schedules.js

@@ -9,7 +9,7 @@ function manager() {
 const listScheduledPrompts = toolDefinition({
     name: 'list_scheduled_prompts',
     lazy: true,
-    description: 'List the prompts the assistant runs for this user on a schedule, for example a daily summary at 20:00, with their next run and the last result.',
+    description: 'List the scheduled prompts of the user, for example a daily summary at 20:00, with next run and last result.',
     inputSchema: zod.object({}),
 }).server((_input, ctx) => {
     const scheduler = manager().scheduler;
@@ -28,19 +28,14 @@ const listScheduledPrompts = toolDefinition({
 });
 const saveInput = zod.object({
     title: zod.string().min(1).max(80).describe('Short title, also the push title, e.g. "Daily summary"'),
-    prompt: zod.string().min(1).max(2000).describe('The question the assistant answers each time, written as the user would ask it'),
-    cron: zod
-        .string()
-        .min(9)
-        .max(100)
-        .describe('Five field cron in the user time zone, e.g. "0 20 * * *" for 20:00 every day, "0 8 * * 1-5" weekdays at 08:00, "0 18 * * 0" Sundays at 18:00'),
-    deliver: zod.enum(['push', 'thread', 'both']).optional().describe('push = notification to the user devices (default), thread = saved conversation, both'),
+    prompt: zod.string().min(1).max(2000).describe('The question to answer each time, as the user would ask it'),
+    cron: zod.string().min(9).max(100).describe('Five field cron in the user time zone, e.g. "0 20 * * *" daily at 20:00, "0 8 * * 1-5" weekdays at 08:00'),
+    deliver: zod.enum(['push', 'thread', 'both']).optional().describe('push (default), thread = saved conversation, or both'),
 });
 const saveScheduledPrompt = toolDefinition({
     name: 'save_scheduled_prompt',
     lazy: true,
-    description: 'Create a scheduled prompt: the assistant answers the prompt on the given schedule and delivers the answer as a push notification or a saved conversation. ' +
-        'Use it when the user wants a recurring report or check, for example a summary of the day every evening. Requires user confirmation.',
+    description: 'Schedule a prompt the assistant answers regularly and delivers as push or saved conversation, for example a summary every evening. Requires user confirmation.',
     needsApproval: true,
     inputSchema: approvalSchema(saveInput),
 }).server(async (args, ctx) => {
@@ -69,7 +64,7 @@ const saveScheduledPrompt = toolDefinition({
 const deleteScheduledPrompt = toolDefinition({
     name: 'delete_scheduled_prompt',
     lazy: true,
-    description: 'Delete one of the user scheduled prompts. Requires user confirmation.',
+    description: 'Delete a scheduled prompt. Requires user confirmation.',
     needsApproval: true,
     inputSchema: approvalSchema(zod.object({ id: zod.string().describe('Schedule id from list_scheduled_prompts') })),
 }).server(async (args, ctx) => {

package/dist/server/src/assistant/tools/schedules.js.map

@@ -1 +1 @@
-{"version":3,"file":"schedules.js","sourceRoot":"","sources":["../../../../../src/assistant/tools/schedules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAE3B,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAKjE,SAAS,OAAO;IACd,OAAO,SAAS,CAAC,OAAO,CAAmB,kBAAkB,CAAC,CAAC;AACjE,CAAC;AAED,MAAM,oBAAoB,GAAG,cAAc,CAAC;IAC1C,IAAI,EAAE,wBAAwB;IAC9B,IAAI,EAAE,IAAI;IACV,WAAW,EAAE,iJAAiJ;IAC9J,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;CAC5B,CAAC,CAAC,MAAM,CAAyB,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;IAChD,MAAM,SAAS,GAAG,OAAO,EAAE,CAAC,SAAS,CAAC;IACtC,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC3D,EAAE,EAAE,QAAQ,CAAC,GAAG;QAChB,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC;QAChF,OAAO,EAAE,QAAQ,CAAC,OAAO;YACvB,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE;YAChI,CAAC,CAAC,SAAS;KACd,CAAC,CAAC,CAAC;AACN,CAAC,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC;IAC3B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,wDAAwD,CAAC;IACrG,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,gFAAgF,CAAC;IAChI,IAAI,EAAE,GAAG;SACN,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,CAAC;SACN,GAAG,CAAC,GAAG,CAAC;SACR,QAAQ,CAAC,8IAA8I,CAAC;IAC3J,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,sFAAsF,CAAC;CAC1J,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG,cAAc,CAAC;IACzC,IAAI,EAAE,uBAAuB;IAC7B,IAAI,EAAE,IAAI;IACV,WAAW,EACT,4JAA4J;QAC5J,qIAAqI;IACvI,aAAa,EAAE,IAAI;IACnB,WAAW,EAAE,cAAc,CAAC,SAAS,CAAC;CACvC,CAAC,CAAC,MAAM,CAAyB,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;IACpD,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC,sBAAsB,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAE9I,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACrE,IAAI,OAAO;QAAE,OAAO,SAAS,CAAC,iBAAiB,MAAM,CAAC,IAAI,CAAC,IAAI,mBAAmB,OAAO,EAAE,CAAC,CAAC;IAE7F,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,OAAO,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE;YACpE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK;YACxB,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM;YAC1B,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI;YACtB,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,QAAQ;YAC9B,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,QAAQ;YAC9B,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,MAAM;YACtC,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QACH,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC3J,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,OAAO,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,MAAM,qBAAqB,GAAG,cAAc,CAAC;IAC3C,IAAI,EAAE,yBAAyB;IAC/B,IAAI,EAAE,IAAI;IACV,WAAW,EAAE,uEAAuE;IACpF,aAAa,EAAE,IAAI;IACnB,WAAW,EAAE,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,yCAAyC,CAAC,EAAE,CAAC,CAAC;CAClH,CAAC,CAAC,MAAM,CAAyB,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;IACpD,MAAM,GAAG,GAAI,IAAyB,CAAC,EAAE,CAAC;IAC1C,MAAM,EAAE,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9C,MAAM,OAAO,GAAG,MAAM,OAAO,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACzE,OAAO,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,gCAAgC,EAAE,IAAI,CAAC,CAAC;AACpF,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAe,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"schedules.js","sourceRoot":"","sources":["../../../../../src/assistant/tools/schedules.ts"],"names":[],"mappings":"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"}

package/dist/server/src/assistant/tools/sensors.js

@@ -1,6 +1,10 @@
+import { SensorType } from '@camera.ui/sdk';
 import { toolDefinition } from '@tanstack/ai';
 import * as zod from 'zod';
+import { CamerasService } from '../../api/services/cameras.service.js';
 import { SensorsService } from '../../api/services/sensors.service.js';
+import { SENSOR_TYPE_CONFIG } from '../../sensors/types.js';
+import { resolveCameraName } from './cameras.js';
 import { approvalSchema, toolError } from './shared.js';
 function findSensor(sensors, idOrName) {
     const byId = sensors.getById(idOrName);
@@ -10,16 +14,71 @@ function findSensor(sensors, idOrName) {
     const all = sensors.list();
     return all.find((s) => (s.displayName || s.name).toLowerCase() === needle) ?? all.find((s) => (s.displayName || s.name).toLowerCase().includes(needle));
 }
+function stateOf(sensor) {
+    const semantics = sensor.semantics;
+    if (!semantics)
+        return undefined;
+    const value = sensor.properties[semantics.stateProperty];
+    if (semantics.states)
+        return Object.entries(semantics.states).find(([, wire]) => wire === value)?.[0] ?? value;
+    if (typeof value === 'boolean') {
+        if (semantics.deviceClass === 'opening' || sensor.type === SensorType.Contact)
+            return value ? 'open' : 'closed';
+        if (sensor.type === SensorType.Doorbell)
+            return value ? 'ringing' : 'idle';
+        return value ? 'on' : 'off';
+    }
+    if (typeof value === 'number' && semantics.unit)
+        return `${value} ${semantics.unit}`;
+    return value;
+}
+const listSensors = toolDefinition({
+    name: 'list_sensors',
+    description: 'Sensors set up in camera.ui and their state right now: lights, switches, sirens, locks, doors, alarm systems, doorbells. ' +
+        'Also which cameras detect something at this moment. Which sensors are on, is the door locked.',
+    inputSchema: zod.object({
+        camera: zod.string().optional().describe('Only the sensors of this one camera, omit it to get all sensors in one call'),
+    }),
+}).server(({ camera }) => {
+    const resolved = camera ? resolveCameraName(camera) : undefined;
+    if (camera && !resolved)
+        return toolError(`No camera named "${camera}". Call list_cameras for the available names.`);
+    const names = new Map(new CamerasService().list().map((entry) => [entry._id, entry.name]));
+    const sensors = new SensorsService().list(resolved?.id);
+    const devices = sensors
+        .filter((sensor) => !SENSOR_TYPE_CONFIG[sensor.type]?.isDetectionType)
+        .map((sensor) => ({
+        name: sensor.displayName || sensor.name,
+        type: sensor.type,
+        state: stateOf(sensor),
+        cameras: sensor.assignedCameraIds.map((id) => names.get(id)).filter((name) => name !== undefined),
+        plugin: sensor.virtual ? 'virtual' : sensor.pluginName,
+        ...(sensor.connected ? {} : { offline: true }),
+    }));
+    const detecting = new Map();
+    for (const sensor of sensors) {
+        if (!SENSOR_TYPE_CONFIG[sensor.type]?.isDetectionType || sensor.properties.detected !== true)
+            continue;
+        for (const id of sensor.assignedCameraIds) {
+            const cameraName = names.get(id);
+            if (cameraName)
+                detecting.set(cameraName, (detecting.get(cameraName) ?? new Set()).add(sensor.type));
+        }
+    }
+    return {
+        devices,
+        detectingNow: Array.from(detecting, ([name, types]) => ({ camera: name, types: Array.from(types) })),
+    };
+});
 const setSensorPropertyInput = zod.object({
     sensor: zod.string().describe('Sensor id or display name'),
-    property: zod.string().optional().describe('Property to set, defaults to the command property of the sensor'),
+    property: zod.string().optional().describe('Property to set, default: the command property'),
     value: zod.union([zod.boolean(), zod.number(), zod.string()]).describe('New value'),
 });
 const setSensorProperty = toolDefinition({
     name: 'set_sensor_property',
     lazy: true,
-    description: 'Change a writable sensor: switch a light or siren, arm a virtual switch, set a value. ' +
-        'Read the sensor first to learn its command property. Requires user confirmation.',
+    description: 'Switch a sensor: turn a light, siren or switch on or off, set a value. Requires user confirmation.',
     needsApproval: true,
     inputSchema: approvalSchema(setSensorPropertyInput),
     metadata: { adminOnly: true },
@@ -47,5 +106,5 @@ const setSensorProperty = toolDefinition({
             return toolError('Sensor vanished while setting it.');
     }
 });
-export const sensorTools = [setSensorProperty];
+export const sensorTools = [listSensors, setSensorProperty];
 //# sourceMappingURL=sensors.js.map

package/dist/server/src/assistant/tools/sensors.js.map

@@ -1 +1 @@
-{"version":3,"file":"sensors.js","sourceRoot":"","sources":["../../../../../src/assistant/tools/sensors.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sensors.js","sourceRoot":"","sources":["../../../../../src/assistant/tools/sensors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAE3B,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAKxD,SAAS,UAAU,CAAC,OAAuB,EAAE,QAAgB;IAC3D,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IACtB,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC7C,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAC3B,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;AAC1J,CAAC;AAED,SAAS,OAAO,CAAC,MAAyB;IACxC,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;IACnC,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IACjC,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACzD,IAAI,SAAS,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,IAAK,KAA4B,CAAC;IACvI,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE,CAAC;QAC/B,IAAI,SAAS,CAAC,WAAW,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC;QAChH,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,QAAQ;YAAE,OAAO,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;QAC3E,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;IAC9B,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,SAAS,CAAC,IAAI;QAAE,OAAO,GAAG,KAAK,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;IACrF,OAAO,KAAoC,CAAC;AAC9C,CAAC;AAED,MAAM,WAAW,GAAG,cAAc,CAAC;IACjC,IAAI,EAAE,cAAc;IACpB,WAAW,EACT,2HAA2H;QAC3H,+FAA+F;IACjG,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC;QACtB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,6EAA6E,CAAC;KACxH,CAAC;CACH,CAAC,CAAC,MAAM,CAAyB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;IAC/C,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAChE,IAAI,MAAM,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC,oBAAoB,MAAM,+CAA+C,CAAC,CAAC;IAErH,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,IAAI,cAAc,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC3F,MAAM,OAAO,GAAG,IAAI,cAAc,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,OAAO;SACpB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,eAAe,CAAC;SACrE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI;QACvC,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC;QACtB,OAAO,EAAE,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC;QACjG,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU;QACtD,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;KAC/C,CAAC,CAAC,CAAC;IAEN,MAAM,SAAS,GAAG,IAAI,GAAG,EAAuB,CAAC;IACjD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,eAAe,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,KAAK,IAAI;YAAE,SAAS;QACvG,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAC1C,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACjC,IAAI,UAAU;gBAAE,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QACvG,CAAC;IACH,CAAC;IAED,OAAO;QACL,OAAO;QACP,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;KACrG,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,sBAAsB,GAAG,GAAG,CAAC,MAAM,CAAC;IACxC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,2BAA2B,CAAC;IAC1D,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,gDAAgD,CAAC;IAC5F,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC;CACpF,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,cAAc,CAAC;IACvC,IAAI,EAAE,qBAAqB;IAC3B,IAAI,EAAE,IAAI;IACV,WAAW,EAAE,oGAAoG;IACjH,aAAa,EAAE,IAAI;IACnB,WAAW,EAAE,cAAc,CAAC,sBAAsB,CAAC;IACnD,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE;CAC9B,CAAC,CAAC,MAAM,CAAyB,KAAK,EAAE,IAAI,EAAE,EAAE;IAC/C,MAAM,MAAM,GAAG,sBAAsB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACtD,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC,sBAAsB,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACpH,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;IAChD,MAAM,OAAO,GAAG,IAAI,cAAc,EAAE,CAAC;IACrC,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC1C,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC,cAAc,MAAM,IAAI,CAAC,CAAC;IAEvD,MAAM,MAAM,GAAG,QAAQ,IAAI,KAAK,CAAC,SAAS,EAAE,eAAe,CAAC;IAC5D,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC,WAAW,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,IAAI,iDAAiD,CAAC,CAAC;IAE3H,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IAC9D,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,IAAI;YACP,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QACxF,KAAK,WAAW;YACd,OAAO,SAAS,CAAC,WAAW,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,IAAI,iBAAiB,CAAC,CAAC;QAChF,KAAK,cAAc;YACjB,OAAO,SAAS,CAAC,WAAW,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,IAAI,oBAAoB,CAAC,CAAC;QACnF;YACE,OAAO,SAAS,CAAC,mCAAmC,CAAC,CAAC;IAC1D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAe,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC"}

package/dist/server/src/assistant/tools/settings.js

@@ -5,9 +5,8 @@ const SETTING_KEYS = ['terminalEnabled', 'memoryEnabled', 'sendImages'];
 const suggestSetting = toolDefinition({
     name: 'suggest_setting',
     lazy: true,
-    description: 'Show the user a switch for an assistant setting that is off and would answer their request: terminalEnabled (shell commands on the server), ' +
-        'memoryEnabled (remembering facts about the user), sendImages (pictures go to the model). Admins flip it right in the chat, others see who ' +
-        'can. Call it instead of describing where the setting lives, then answer with what works without it.',
+    description: 'Show a switch for an assistant setting that is off and would answer the request: terminalEnabled (shell commands), memoryEnabled (remember facts), ' +
+        'sendImages (pictures to the model). Call it instead of describing where the setting lives.',
     inputSchema: zod.object({
         setting: zod.enum(SETTING_KEYS),
     }),

package/dist/server/src/assistant/tools/settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../../src/assistant/tools/settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAE3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAKtD,MAAM,YAAY,GAAG,CAAC,iBAAiB,EAAE,eAAe,EAAE,YAAY,CAAmD,CAAC;AAE1H,MAAM,cAAc,GAAG,cAAc,CAAC;IACpC,IAAI,EAAE,iBAAiB;IACvB,IAAI,EAAE,IAAI;IACV,WAAW,EACT,8IAA8I;QAC9I,4IAA4I;QAC5I,qGAAqG;IACvG,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC;QACtB,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;KAChC,CAAC;IACF,QAAQ,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;CAChC,CAAC,CAAC,MAAM,CAAyB,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE;IACrD,GAAG,CAAC,eAAe,CAAC,uBAAuB,EAAE,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9F,OAAO,8BAA8B,OAAO,sGAAsG,CAAC;AACrJ,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAe,CAAC,cAAc,CAAC,CAAC"}
+{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../../src/assistant/tools/settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAE3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAKtD,MAAM,YAAY,GAAG,CAAC,iBAAiB,EAAE,eAAe,EAAE,YAAY,CAAmD,CAAC;AAE1H,MAAM,cAAc,GAAG,cAAc,CAAC;IACpC,IAAI,EAAE,iBAAiB;IACvB,IAAI,EAAE,IAAI;IACV,WAAW,EACT,qJAAqJ;QACrJ,4FAA4F;IAC9F,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC;QACtB,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;KAChC,CAAC;IACF,QAAQ,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;CAChC,CAAC,CAAC,MAAM,CAAyB,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE;IACrD,GAAG,CAAC,eAAe,CAAC,uBAAuB,EAAE,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9F,OAAO,8BAA8B,OAAO,sGAAsG,CAAC;AACrJ,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAe,CAAC,cAAc,CAAC,CAAC"}

package/dist/server/src/assistant/tools/system.js

@@ -10,8 +10,7 @@ import { createSourceName } from '../../utils/camera.js';
 import { collectSystemInfo } from '../../utils/system-info.js';
 const getSystemStatus = toolDefinition({
     name: 'get_system_status',
-    description: 'Report the health of the instance: camera.ui version, host hardware, plugins with their run state, remote workers, ' +
-        'and which cameras are online or have stream problems. Use it for "is everything running" questions.',
+    description: 'Health of the instance: version, host, plugins with run state, workers, cameras online or with stream problems. Is everything running.',
     inputSchema: zod.object({}),
 }).server(async (_input, ctx) => {
     const api = container.resolve('api');
@@ -44,8 +43,7 @@ const getSystemStatus = toolDefinition({
 const getFloorPlan = toolDefinition({
     name: 'get_floor_plan',
     lazy: true,
-    description: 'Describe the house layout: levels, rooms with their cameras, and which rooms connect through doors or stairs. ' +
-        'Use it to resolve "the camera in the kitchen" or "the room next to the entrance".',
+    description: 'The house layout: levels, rooms with their cameras and how rooms connect. Resolves the camera in the kitchen or the room next to the entrance.',
     inputSchema: zod.object({}),
 }).server(() => {
     const plan = new FloorPlanService().get();
@@ -66,7 +64,7 @@ const getFloorPlan = toolDefinition({
 export function createListToolsTool(registry) {
     return toolDefinition({
         name: 'list_tools',
-        description: 'List every tool you can call right now, including the ones plugins contribute, with a one line description each.',
+        description: 'List every tool available right now, with one line each.',
         inputSchema: zod.object({}),
     }).server((_input, ctx) => {
         return registry.describe(ctx.context.role).map((tool) => ({ name: tool.name, description: tool.description, needsConfirmation: tool.approval }));

package/dist/server/src/assistant/tools/system.js.map

@@ -1 +1 @@
-{"version":3,"file":"system.js","sourceRoot":"","sources":["../../../../../src/assistant/tools/system.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"system.js","sourceRoot":"","sources":["../../../../../src/assistant/tools/system.ts"],"names":[],"mappings":"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"}

package/dist/server/src/assistant/tools/terminal.js

@@ -8,15 +8,14 @@ const MAX_TIMEOUT_S = 120;
 const KILL_GRACE_MS = 2_000;
 const ENV_KEYS = ['PATH', 'HOME', 'LANG', 'LC_ALL', 'TERM', 'TMPDIR', 'TZ', 'USER', 'SystemRoot', 'COMSPEC'];
 const runCommandInput = zod.object({
-    command: zod.string().min(1).max(2000).describe('The shell command line, executed by the system shell'),
+    command: zod.string().min(1).max(2000).describe('The shell command line'),
     cwd: zod.string().min(1).max(500).optional().describe('Working directory, default: the server directory'),
-    timeoutSeconds: zod.number().int().min(1).max(MAX_TIMEOUT_S).optional().describe(`Kill the command after this many seconds, default ${DEFAULT_TIMEOUT_S}`),
+    timeoutSeconds: zod.number().int().min(1).max(MAX_TIMEOUT_S).optional().describe(`Seconds until the command is killed, default ${DEFAULT_TIMEOUT_S}`),
 });
 const runCommand = toolDefinition({
     name: 'run_command',
-    description: 'Run one shell command on the server that hosts camera.ui and return its output and exit code. For host diagnostics the other tools cannot ' +
-        'answer: disk usage, network reachability of a camera, processes, container logs. One command per call, no interactive programs. ' +
-        'The user sees the exact command and confirms it before it runs.',
+    description: 'Run one shell command on the camera.ui host for diagnostics the other tools cannot answer: disk usage, ping a camera, processes, container logs. ' +
+        'No interactive programs. The user confirms the exact command.',
     needsApproval: true,
     inputSchema: approvalSchema(runCommandInput),
     metadata: { adminOnly: true, group: 'terminal', chatOnly: true },

package/dist/server/src/assistant/tools/terminal.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../../../../src/assistant/tools/terminal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../../../../src/assistant/tools/terminal.ts"],"names":[],"mappings":"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"}

package/dist/server/src/assistant/types.d.ts

@@ -1,4 +1,4 @@
-import type { AssistantToolReference, AssistantToolSpec } from '@camera.ui/sdk';
+import type { AssistantModelSpec, AssistantModelStatus, AssistantToolReference, AssistantToolSpec } from '@camera.ui/sdk';
 import type { Interrupt, JSONSchema, UIMessage } from '@tanstack/ai';
 import type { DBAssistant, DBAssistantAttachment, DBAssistantModel, DBAssistantProvider, DBAssistantUsageMonth, DBRoles } from '../api/database/types.js';
 export declare const ASSISTANT_PROVIDERS: DBAssistantProvider[];
@@ -122,6 +122,13 @@ export interface AssistantExternalStatus {
     toolCount: number;
     error?: string;
 }
+export interface AssistantModelProviderInfo {
+    provider: string;
+    pluginId: string;
+    pluginName: string;
+    models: AssistantModelSpec[];
+    status?: AssistantModelStatus;
+}
 export interface AssistantInfo {
     settings: AssistantMaskedSettings;
     status: AssistantStatus;
@@ -129,6 +136,7 @@ export interface AssistantInfo {
         id: string;
         name: string;
     }[];
+    modelProviders: AssistantModelProviderInfo[];
     tools: AssistantToolInfo[];
     external: AssistantExternalStatus[];
 }
@@ -170,6 +178,7 @@ export interface AssistantThreadSummary {
     createdAt: number;
     updatedAt: number;
     messageCount: number;
+    modelId?: string;
     runId?: string;
 }
 export interface AssistantPluginTools {

package/dist/server/src/assistant/uploads.d.ts

@@ -15,5 +15,6 @@ export declare function attachmentKey(base64: string): string;
 export declare function isDataUpload(part: DataPart): boolean;
 export declare function isAttachmentMarker(part: DataPart): boolean;
 export declare function markerFor(part: DataPart): DataPart;
-export declare function messagesForModel(messages: ModelMessage[], sendImages: boolean): ModelMessage[];
+export declare function messagesForModel(messages: ModelMessage[], sendImages: boolean, maxPictures?: number): ModelMessage[];
+export declare function isPicturesMessage(message: ModelMessage): boolean;
 export declare function describeUploads(uploads: AssistantUpload[], sendImages: boolean): string;

package/dist/server/src/assistant/uploads.js

@@ -3,6 +3,8 @@ export const ATTACHMENT_PREFIX = 'attachment:';
 const LIMITS = { image: 12 * 1024 * 1024, audio: 25 * 1024 * 1024, video: 60 * 1024 * 1024 };
 const MAX_UPLOADS = 8;
 const KINDS = new Set(['image', 'audio', 'video']);
+const PICTURES_LEAD = 'The pictures of the tool results above. Carry on with what was asked.';
+const PICTURE_LEFT_OUT = '[picture left out, the context window holds only the newest]';
 const DEFAULT_MIME = { image: 'image/jpeg', audio: 'audio/wav', video: 'video/mp4' };
 export function partsOf(message) {
     const typed = message;
@@ -47,12 +49,12 @@ export function isAttachmentMarker(part) {
 export function markerFor(part) {
     return { type: part.type, source: { type: 'url', value: `${ATTACHMENT_PREFIX}${attachmentKey(part.source.value)}` } };
 }
-export function messagesForModel(messages, sendImages) {
+export function messagesForModel(messages, sendImages, maxPictures = Infinity) {
     const out = [];
     let pictures = [];
     for (const message of answerAfterResults(messages)) {
         if (pictures.length && message.role !== 'tool') {
-            out.push({ role: 'user', content: pictures });
+            out.push(picturesMessage(pictures));
             pictures = [];
         }
         if (message.role === 'tool' && Array.isArray(message.content)) {
@@ -76,7 +78,27 @@ export function messagesForModel(messages, sendImages) {
         out.push({ ...message, content: content.length ? content : [{ type: 'text', content: '[attachment]' }] });
     }
     if (pictures.length)
-        out.push({ role: 'user', content: pictures });
+        out.push(picturesMessage(pictures));
+    return Number.isFinite(maxPictures) ? newestPictures(out, maxPictures) : out;
+}
+export function isPicturesMessage(message) {
+    const first = Array.isArray(message.content) ? message.content[0] : undefined;
+    return first?.content === PICTURES_LEAD;
+}
+function picturesMessage(pictures) {
+    return { role: 'user', content: [{ type: 'text', content: PICTURES_LEAD }, ...pictures] };
+}
+function newestPictures(messages, limit) {
+    let kept = 0;
+    const out = [...messages];
+    for (let index = out.length - 1; index >= 0; index--) {
+        const message = out[index];
+        if (!Array.isArray(message.content))
+            continue;
+        const parts = message.content.map((part) => (part.type !== 'image' || ++kept <= limit ? part : { type: 'text', content: PICTURE_LEFT_OUT }));
+        if (kept > limit)
+            out[index] = { ...message, content: parts };
+    }
     return out;
 }
 function answerAfterResults(messages) {

package/dist/server/src/assistant/uploads.js.map

@@ -1 +1 @@
-{"version":3,"file":"uploads.js","sourceRoot":"","sources":["../../../../src/assistant/uploads.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"uploads.js","sourceRoot":"","sources":["../../../../src/assistant/uploads.ts"],"names":[],"mappings":"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"}

package/dist/server/src/camera/decoder/detection-coordinator.d.ts

@@ -3,6 +3,7 @@ import type { Logger } from '@camera.ui/common/logger';
 import type { RPCClient } from '@camera.ui/rpc';
 import type { CameraDetectionSettings, CameraFrameWorkerSettings, CameraUiSettings, CameraZones, PtzAutotrackSettings } from '@camera.ui/sdk';
 import type { CoordinatorSensorInfo } from '../../rpc/interfaces/detection.js';
+import type { TrackedClipEmbedding, TrackedFaceDetection } from './event-manager.js';
 import type { CoordinatorSourceUrl, FrameWorkerPerfSnapshot, ObjectBenchmarkResult } from './types.js';
 export interface DetectionCoordinatorConfig {
     cameraId: string;
@@ -86,6 +87,10 @@ export declare class DetectionCoordinator {
     updateFrameWorkerSettings(settings: CameraFrameWorkerSettings): void;
     updateNvrRpc(namespace?: string): void;
     updateInterfaceSettings(settings: CameraUiSettings): void;
+    vectorJobStarted(): void;
+    vectorJobSettled(): void;
+    acceptClipVectors(embeddings: TrackedClipEmbedding[], embeddingModel: string, capturedAt: number): void;
+    acceptFaceVectors(faces: TrackedFaceDetection[], embeddingModel: string, capturedAt: number): void;
     dispose(): Promise<void>;
     onSensorAdded(sensor: CoordinatorSensorInfo): Promise<void>;
     onSensorRemoved(sensorId: string): Promise<void>;

package/dist/server/src/camera/decoder/detection-coordinator.js

@@ -57,6 +57,12 @@ const MOTION_INTERVAL_MS = 200;
 const TICK_SLACK_MS = 20;
 const MAIN_STREAM_HOLD_MS = 5000;
 const EXTERNAL_FRAME_MAX_AGE_MS = 1000;
+function momentPictures(rendered) {
+    return { strip: rendered.strip, card: rendered.card, stripWindow: rendered.stripWindow, cardWindow: rendered.cardWindow };
+}
+function normalizedWindow(window, frameWidth, frameHeight) {
+    return { x: window.x / frameWidth, y: window.y / frameHeight, width: window.width / frameWidth, height: window.height / frameHeight };
+}
 let DetectionCoordinator = class DetectionCoordinator {
     config;
     proxy;
@@ -143,7 +149,7 @@ let DetectionCoordinator = class DetectionCoordinator {
         if (config.zones.lines.length > 0) {
             this.pipeline.updateLines(config.zones.lines, this.videoAspectRatio);
         }
-        this.eventManager = new DetectionEventManager(config.cameraId, this.proxy, this.logger);
+        this.eventManager = new DetectionEventManager(config.cameraId, this.proxy, this.logger, this.perf);
         this.eventManager.updateNvrRpc(config.nvrRpc);
         this.eventManager.onEventEnd(() => this.handleEventEnded());
         this.eventManager.onSegmentClosed(() => {
@@ -352,6 +358,18 @@ let DetectionCoordinator = class DetectionCoordinator {
             this.pipeline.updateLines(this.config.zones.lines, this.videoAspectRatio);
         }
     }
+    vectorJobStarted() {
+        this.eventManager.vectorJobStarted();
+    }
+    vectorJobSettled() {
+        this.eventManager.vectorJobSettled();
+    }
+    acceptClipVectors(embeddings, embeddingModel, capturedAt) {
+        this.eventManager.acceptClipVectors(embeddings, embeddingModel, capturedAt);
+    }
+    acceptFaceVectors(faces, embeddingModel, capturedAt) {
+        this.eventManager.acceptFaceVectors(faces, embeddingModel, capturedAt);
+    }
     async dispose() {
         this.heldMoments.clear();
         await this.stopVideoLoop();
@@ -1138,6 +1156,7 @@ let DetectionCoordinator = class DetectionCoordinator {
         let firstFrame = true;
         while (this.loopRunning) {
             const tickStart = Date.now();
+            const objectFramesBefore = this.perf.framesWithObjects;
             let onMainStream = false;
             const snap = await this.frameSource.nextFrame(lastFrameId);
             if (!snap)
@@ -1207,11 +1226,16 @@ let DetectionCoordinator = class DetectionCoordinator {
             else
                 this.perf.idleTicks++;
             this.perf.report(this.logger);
-            const remaining = (this.mainStreamActive ? ACTIVE_TICK_MS : IDLE_TICK_MS) - (Date.now() - tickStart);
+            const workMs = Date.now() - tickStart;
+            const remaining = (this.mainStreamActive ? ACTIVE_TICK_MS : IDLE_TICK_MS) - workMs;
             if (remaining > 0)
                 await sleep(remaining);
             const tickMs = Date.now() - tickStart;
             this.perf.loopMs += tickMs;
+            if (this.perf.framesWithObjects > objectFramesBefore) {
+                this.perf.objectWorkMs += workMs;
+                this.perf.objectLoopMs += tickMs;
+            }
             if (onMainStream) {
                 this.perf.mainTicks++;
                 this.perf.mainLoopMs += tickMs;
@@ -1624,11 +1648,6 @@ let DetectionCoordinator = class DetectionCoordinator {
                 }
             }
         }
-        if (results.clip) {
-            // clip has no sensor, embeddings flow through the buffer only
-            this.currentDetectionState.clip = results.clip;
-            this.currentDetectionState.clipEmbeddingModel = results.clipEmbeddingModel;
-        }
     }
     snapshotWillStartEvent(snapshot) {
         if (this.eventManager.hasActiveEvent())
@@ -1725,8 +1744,7 @@ let DetectionCoordinator = class DetectionCoordinator {
                 continue;
             const score = sighting.confidence * Math.sqrt(sighting.width * sighting.height);
             this.heldMoments.set(sighting.trackId, {
-                strip: rendered.strip,
-                card: rendered.card,
+                ...momentPictures(rendered),
                 capturedAt: at,
                 score,
                 rank: MOMENT_RANK_OBJECT,
@@ -1803,7 +1821,7 @@ let DetectionCoordinator = class DetectionCoordinator {
         const rendered = await this.renderMoment(target, analysis);
         if (!rendered)
             return;
-        this.eventManager.offerMoment({ strip: rendered.strip, card: rendered.card, capturedAt: at, score: bestScore, rank: MOMENT_RANK_OBJECT, stream: 'low' });
+        this.eventManager.offerMoment({ ...momentPictures(rendered), capturedAt: at, score: bestScore, rank: MOMENT_RANK_OBJECT, stream: 'low' });
         // debugging
         await this.recordMoment(target, rendered, analysis, `${subject.label}-external`, bestScore, 'external', at);
     }
@@ -1815,7 +1833,7 @@ let DetectionCoordinator = class DetectionCoordinator {
         if (!rendered)
             return;
         const stream = analysis.isMainStream ? 'main' : 'low';
-        this.eventManager.offerMoment({ strip: rendered.strip, card: rendered.card, capturedAt: at, score, rank: MOMENT_RANK_OBJECT, stream });
+        this.eventManager.offerMoment({ ...momentPictures(rendered), capturedAt: at, score, rank: MOMENT_RANK_OBJECT, stream });
         // debugging
         await this.recordMoment(target, rendered, analysis, `${subject.label}-${subject.trackId}`, score, trigger, at);
     }
@@ -1873,7 +1891,7 @@ let DetectionCoordinator = class DetectionCoordinator {
         if (!rendered)
             return;
         const stream = analysis.isMainStream ? 'main' : 'low';
-        this.eventManager.offerMoment({ strip: rendered.strip, card: rendered.card, capturedAt: at, score: bestScore, rank: MOMENT_RANK_ATTRIBUTE, stream });
+        this.eventManager.offerMoment({ ...momentPictures(rendered), capturedAt: at, score: bestScore, rank: MOMENT_RANK_ATTRIBUTE, stream });
         // debugging
         await this.recordMoment(target, rendered, analysis, best.label.replace(':', '-'), bestScore, 'attributeFound', at);
     }
@@ -1881,6 +1899,8 @@ let DetectionCoordinator = class DetectionCoordinator {
         const start = Date.now();
         const rendered = new Map();
         const windows = {};
+        // a card handed in was cut elsewhere, its window is not the one computed here
+        const cut = new Set();
         if (card)
             rendered.set('card', card);
         try {
@@ -1892,8 +1912,10 @@ let DetectionCoordinator = class DetectionCoordinator {
                 if (rendered.has(format.name))
                     continue;
                 const jpeg = await analysis.scaler.cropWindowToJPEG(analysis.frame, window, format.width, format.height, MOMENT_QUALITY);
-                if (jpeg)
+                if (jpeg) {
                     rendered.set(format.name, jpeg);
+                    cut.add(format.name);
+                }
             }
         }
         catch (error) {
@@ -1901,7 +1923,16 @@ let DetectionCoordinator = class DetectionCoordinator {
         }
         this.perf.jpegMs += Date.now() - start;
         const strip = rendered.get('strip');
-        return strip ? { strip, card: rendered.get('card'), windows } : null;
+        if (!strip)
+            return null;
+        const { width, height } = analysis.frame;
+        return {
+            strip,
+            card: rendered.get('card'),
+            windows,
+            stripWindow: windows.strip && cut.has('strip') ? normalizedWindow(windows.strip, width, height) : undefined,
+            cardWindow: windows.card && cut.has('card') ? normalizedWindow(windows.card, width, height) : undefined,
+        };
     }
     // debugging
     async recordMoment(target, rendered, analysis, subjectName, score, trigger, at) {