Upload agent.py

agent.py

@@ -25,15 +25,18 @@ class AgentRouter:
             "stock",
             "price",
             "weather",
+            "headline",
+            "happening",
         ]
         datetime_keywords = [
             "time",
             "date",
-            "day",
-            "month",
-            "year",
             "timezone",
             "clock",
+            "what time",
+            "current time",
+            "today's date",
+            "todays date",
         ]
         calc_keywords = [
             "calculate",
@@ -48,13 +51,24 @@ class AgentRouter:
             "minus",
         ]
 
-        if any(k in lower for k in datetime_keywords):
-            return "datetime"
+        tokens = set(re.findall(r"\b\w+\b", lower))
+
+        def has_phrase_or_token(keyword: str) -> bool:
+            if " " in keyword:
+                return keyword in lower
+            return keyword in tokens
+
+        has_web_intent = any(has_phrase_or_token(k) for k in web_keywords)
+        has_datetime_intent = any(has_phrase_or_token(k) for k in datetime_keywords)
 
-        if any(k in lower for k in web_keywords):
+        # Give web queries priority when both are present (e.g., "latest AI news today").
+        if has_web_intent:
             return "web"
 
-        if any(k in lower for k in calc_keywords):
+        if has_datetime_intent:
+            return "datetime"
+
+        if any(has_phrase_or_token(k) for k in calc_keywords):
             return "calculator"
 
         # Fallback detection for math-like expressions.