@blueharford/scrypted-spatial-awareness 0.6.22 → 0.6.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueharford/scrypted-spatial-awareness",
-  "version": "0.6.22",
+  "version": "0.6.24",
   "description": "Cross-camera object tracking for Scrypted NVR with spatial awareness",
   "author": "Joshua Seidel <blueharford>",
   "license": "Apache-2.0",

package/src/alerts/alert-manager.ts

@@ -155,6 +155,7 @@ export class AlertManager {
 
   /**
    * Get notification title based on alert type
+   * For movement alerts with LLM descriptions, use the smart description as title
    */
   private getNotificationTitle(alert: Alert): string {
     const prefix = alert.severity === 'critical' ? '🚨 ' :
@@ -167,11 +168,26 @@ export class AlertManager {
 
     switch (alert.type) {
       case 'property_entry':
+        // Legacy - use simple title
         return `${prefix}${objectType} Arrived`;
       case 'property_exit':
+        // Legacy - use simple title
         return `${prefix}${objectType} Left`;
       case 'movement':
-        // Include destination in title
+        // For smart activity alerts, use the LLM description as title if available
+        // This gives us rich context like "Person walking toward front door"
+        if (alert.details.objectLabel && alert.details.usedLlm) {
+          // Truncate to reasonable title length (first sentence or 60 chars)
+          let smartTitle = alert.details.objectLabel;
+          const firstPeriod = smartTitle.indexOf('.');
+          if (firstPeriod > 0 && firstPeriod < 60) {
+            smartTitle = smartTitle.substring(0, firstPeriod);
+          } else if (smartTitle.length > 60) {
+            smartTitle = smartTitle.substring(0, 57) + '...';
+          }
+          return `${prefix}${smartTitle}`;
+        }
+        // Fallback: include destination in title
         const dest = alert.details.toCameraName || 'area';
         return `${prefix}${objectType} → ${dest}`;
       case 'unusual_path':

package/src/core/topology-discovery.ts

@@ -748,16 +748,20 @@ Use the mount height to help estimate distances - objects at ground level will a
         return null;
       }
 
-      // Correlate if we have multiple cameras
+      // ALWAYS generate suggestions from each camera's analysis first
+      // This ensures landmarks and zones from individual cameras are captured
+      for (const analysis of analyses) {
+        this.generateSuggestionsFromAnalysis(analysis);
+      }
+      this.console.log(`[Discovery] Generated suggestions from ${analyses.length} camera analyses`);
+
+      // Then correlate if we have multiple cameras (adds shared landmarks and connections)
       let correlation: TopologyCorrelation | null = null;
       if (analyses.length >= 2) {
         correlation = await this.correlateScenes(analyses);
         if (correlation) {
           this.generateSuggestionsFromCorrelation(correlation);
         }
-      } else if (analyses.length === 1) {
-        // Single camera - generate suggestions from its analysis
-        this.generateSuggestionsFromAnalysis(analyses[0]);
       }
 
       this.status.lastScanTime = Date.now();

package/src/core/tracking-engine.ts

@@ -579,32 +579,19 @@ export class TrackingEngine {
         this.console.log(`[Entry Alert] Got description: "${spatialResult.description.substring(0, 60)}...", usedLlm=${spatialResult.usedLlm}`);
       }
 
-      if (isEntryPoint) {
-        // Entry point - generate property entry alert
-        await this.alertManager.checkAndAlert('property_entry', tracked, {
-          cameraId: sighting.cameraId,
-          cameraName: sighting.cameraName,
-          objectClass: sighting.detection.className,
-          objectLabel: spatialResult.description,
-          detectionId: sighting.detectionId,
-          involvedLandmarks: spatialResult.involvedLandmarks?.map(l => l.name),
-          usedLlm: spatialResult.usedLlm,
-        });
-      } else {
-        // Non-entry point - still alert about activity using movement alert type
-        // This notifies about any activity around the property using topology context
-        await this.alertManager.checkAndAlert('movement', tracked, {
-          cameraId: sighting.cameraId,
-          cameraName: sighting.cameraName,
-          toCameraId: sighting.cameraId,
-          toCameraName: sighting.cameraName,
-          objectClass: sighting.detection.className,
-          objectLabel: spatialResult.description, // Use spatial reasoning description (topology-based)
-          detectionId: sighting.detectionId,
-          involvedLandmarks: spatialResult.involvedLandmarks?.map(l => l.name),
-          usedLlm: spatialResult.usedLlm,
-        });
-      }
+      // Always use movement alert type for smart notifications with LLM descriptions
+      // The property_entry/property_exit types are legacy and disabled by default
+      await this.alertManager.checkAndAlert('movement', tracked, {
+        cameraId: sighting.cameraId,
+        cameraName: sighting.cameraName,
+        toCameraId: sighting.cameraId,
+        toCameraName: sighting.cameraName,
+        objectClass: sighting.detection.className,
+        objectLabel: spatialResult.description, // Smart LLM-generated description
+        detectionId: sighting.detectionId,
+        involvedLandmarks: spatialResult.involvedLandmarks?.map(l => l.name),
+        usedLlm: spatialResult.usedLlm,
+      });
 
       this.recordAlertTime(globalId);
     }, this.config.loiteringThreshold);
@@ -731,9 +718,12 @@ export class TrackingEngine {
           this.console.log(`[Exit Alert] Got description: "${spatialResult.description.substring(0, 60)}...", usedLlm=${spatialResult.usedLlm}`);
         }
 
-        await this.alertManager.checkAndAlert('property_exit', current, {
+        // Use movement alert for exit too - smart notifications with LLM descriptions
+        await this.alertManager.checkAndAlert('movement', current, {
           cameraId: sighting.cameraId,
           cameraName: sighting.cameraName,
+          toCameraId: sighting.cameraId,
+          toCameraName: sighting.cameraName,
           objectClass: current.className,
           objectLabel: spatialResult.description,
           involvedLandmarks: spatialResult.involvedLandmarks?.map(l => l.name),

package/src/main.ts

@@ -1919,6 +1919,9 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
           const distanceFeet = landmarkData.distanceFeet || 50; // Default 50ft if not set
           const distanceInPixels = distanceFeet * floorPlanScale;
 
+          // Debug: log the distance data to verify it's being used correctly
+          this.console.log(`[Discovery] Landmark "${suggestion.landmark.name}" distance data: distanceFeet=${distanceFeet}, distance="${landmarkData.distance || 'not set'}", floorPlanScale=${floorPlanScale}, distanceInPixels=${distanceInPixels}`);
+
           // Use bounding box for horizontal positioning within the FOV
           const bbox = landmarkData.boundingBox as [number, number, number, number] | undefined;
 

package/src/models/alert.ts

@@ -128,8 +128,8 @@ export function createDefaultRules(): AlertRule[] {
   return [
     {
       id: 'property-entry',
-      name: 'Property Entry',
-      enabled: true,
+      name: 'Property Entry (Legacy)',
+      enabled: false, // Disabled - use movement alerts with LLM descriptions instead
       type: 'property_entry',
       conditions: [],
       severity: 'info',
@@ -138,8 +138,8 @@ export function createDefaultRules(): AlertRule[] {
     },
     {
       id: 'property-exit',
-      name: 'Property Exit',
-      enabled: true,
+      name: 'Property Exit (Legacy)',
+      enabled: false, // Disabled - use movement alerts with LLM descriptions instead
       type: 'property_exit',
       conditions: [],
       severity: 'info',
@@ -148,7 +148,7 @@ export function createDefaultRules(): AlertRule[] {
     },
     {
       id: 'movement',
-      name: 'Movement Between Cameras',
+      name: 'Smart Activity Alerts',
       enabled: true,
       type: 'movement',
       conditions: [],