Update SuperAgent/app/services/router.py

SuperAgent/app/services/router.py

@@ -636,7 +636,40 @@ class RouterService:
                     "orchestration": orch
                 }
 
- 
+            # Check if user requested a specific metric (e.g., oil level, pressure) that the selected asset does NOT possess
+            lowered_msg = state["message"].lower()
+            requested_metric = None
+            for m_kw in ["oil_level", "oil level", "level", "pressure", "voltage", "current", "vibration"]:
+                if m_kw in lowered_msg:
+                    requested_metric = m_kw
+                    break
+                    
+            if requested_metric and asset_id:
+                user_allowed = asset_registry.list_all_assets(state["user_id"])
+                matched_asset_obj = next((a for a in user_allowed if str(a["id"]) == str(asset_id)), None)
+                if matched_asset_obj:
+                    asset_attr_keys = [str(k).lower() for k in (matched_asset_obj.get("attribute_keys") or matched_asset_obj.get("attributes") or [])]
+                    clean_kw = requested_metric.replace(" ", "_")
+                    has_metric = any(clean_kw in k or requested_metric in k for k in asset_attr_keys)
+                    
+                    if not has_metric:
+                        matching_assets = [
+                            a["name"] for a in user_allowed
+                            if any(clean_kw in str(k).lower() or requested_metric in str(k).lower() for k in (a.get("attribute_keys") or a.get("attributes") or []))
+                        ]
+                        sample_names = ", ".join(matching_assets[:4]) if matching_assets else "Tank 1, Physical 01"
+                        avail_metrics = ", ".join([str(k).replace("_", " ").title() for k in asset_attr_keys if str(k).lower() not in {'notes', 'location'}]) or "Temperature, Humidity"
+                        
+                        answer = (
+                            f"**{asset_name}** (active in this chat) does not have an **{requested_metric.replace('_', ' ').title()}** sensor (available metrics: **{avail_metrics}**).\n\n"
+                            f"Which asset's **{requested_metric.replace('_', ' ').title()}** would you like to check? (e.g., {sample_names})"
+                        )
+                        orch.append(f"Gateway: Metric '{requested_metric}' absent on '{asset_name}'. Prompting counter-question.")
+                        return {
+                            "intent": "counter_question",
+                            "answer": answer,
+                            "orchestration": orch
+                        }
         # Check if asset specification is required but missing/invalid
         if intent not in ("report", "executive") and not is_all_query and not asset_name:
             user_specs = [