Alert gate: confidence >=7.0 AND PA grade A/A+ (was conf>=8.8, no grade check)

main.py

@@ -60,6 +60,27 @@ def is_synthetic(symbol: str) -> bool:
     return any(p.search(symbol) for p in _SYNTHETIC_PATTERNS)
 
 
+# ── Alert trigger rule (confidence + PA confluence grade) ──────────────────
+# Changed 13 Jul 2026 per explicit instruction: previously any card with
+# confidence >= 8.8 fired an alert, no grade check. Now the confidence floor
+# is lowered to 7.0, but a chart-pattern (confluence) grade of A or A+ is
+# REQUIRED regardless of how high confidence is — grade B/C/D never fires,
+# even at confidence 9+. Single shared gate used by both the background loop
+# and manual /api/scan so the two paths can't drift apart again (that exact
+# drift was the earlier website/Telegram discrepancy bug).
+ALERT_CONF_MIN = 7.0
+ALERT_GRADES_OK = {"A+", "A"}
+
+
+def _passes_alert_gate(card: dict) -> bool:
+    if card.get("vetoed", False):
+        return False
+    if card.get("confidence", 0) < ALERT_CONF_MIN:
+        return False
+    grade = (card.get("price_action") or {}).get("confluence_grade")
+    return grade in ALERT_GRADES_OK
+
+
 # ── Website -> Telegram alert config sync ──────────────────────────────────
 # Root cause fixed here: the dashboard's account/risk/top/leverage settings
 # used to live only in the browser tab and were never seen by the background
@@ -120,9 +141,7 @@ async def _alert_loop():
                 try:
                     card = score_symbol(src, c["symbol"], alert_account, alert_risk_pct,
                                         secondary=secondary, user_leverage=alert_leverage)
-                    conf   = card.get("confidence", 0)
-                    vetoed = card.get("vetoed", False)
-                    if conf >= 8.8 and not vetoed:
+                    if _passes_alert_gate(card):
                         tv_sym = src.tv_symbol(card["symbol"])
                         sent = await send_alert(card, tv_sym)
                         # Only log alerts that actually reached Telegram (sent=True) —
@@ -331,11 +350,9 @@ def scan(top: int = 8, min_volume: float = None, account: float = 100000,
                     log_signal(card)
                 except Exception:
                     pass
-                # Fire Telegram alert if confidence >= 9.0
+                # Fire Telegram alert per _passes_alert_gate (confidence >= 7.0 AND PA grade A/A+)
                 try:
-                    conf   = card.get("confidence", 0)
-                    vetoed = card.get("vetoed", False)
-                    if conf >= 8.8 and not vetoed and _event_loop is not None:
+                    if _passes_alert_gate(card) and _event_loop is not None:
                         from telegram_alert import send_alert
                         tv_sym = src.tv_symbol(card["symbol"])
                         asyncio.run_coroutine_threadsafe(

telegram_alert.py

@@ -106,15 +106,28 @@ def _rr(card: dict) -> str:
 def _tier_line(conf: float) -> str:
     """Confidence tier prefix (Strategy Fix Plan F1a).
 
-    Alert threshold stays 8.8 (data collection continues); this only labels
-    the message so Utkarsh can tell trade-grade from watch-only at a glance.
-    Auto-trade gate (CONF_MIN=9.0, per ADDENDUM) is a separate, later concern.
+    Cosmetic label only — the actual send/no-send decision lives in
+    main.py's _passes_alert_gate() (confidence >= 7.0 AND PA grade A/A+,
+    changed 13 Jul 2026). This just tells Utkarsh at a glance where in the
+    confidence range a delivered alert sits.
     """
     if conf >= 9.0:
         return "💎 <b>TRADE-GRADE</b>"
     if conf >= 8.8:
         return "🔭 <b>WATCH ONLY</b> — below auto-trade bar"
-    return ""
+    if conf >= 8.0:
+        return "🟡 <b>STRONG</b>"
+    return "🟠 <b>WATCH</b>"
+
+
+def _grade_line(card: dict) -> str:
+    """PA confluence grade line — required by the alert gate itself now, so
+    surface it on every message (grade is always A or A+ for delivered
+    alerts, since B/C/D never pass _passes_alert_gate)."""
+    grade = (card.get("price_action") or {}).get("confluence_grade")
+    if not grade:
+        return ""
+    return f"📐 <b>Grade {grade}</b>"
 
 
 def _momentum_line(card: dict) -> str:
@@ -184,12 +197,14 @@ def build_message(card: dict, tv_sym: str) -> str:
     )
     flow_line = _order_flow_line(card)
     tier_line = _tier_line(float(conf))
+    grade_line = _grade_line(card)
     momentum_line = _momentum_line(card)
     tp_dyn = lvl.get("tp_dyn")
 
     lines = [
         *([tier_line] if tier_line else []),
         f"{dir_emoji} <b>{sym}  {direction}  ·  {conf:.1f}/10</b>",
+        *([grade_line] if grade_line else []),
         "",
         f"📍 <b>Entry</b>  <code>{_fmt_price(card.get('close'))}</code>",
         f"🛑 <b>SL</b>     <code>{_fmt_price(lvl.get('sl'))}</code>",