Spaces:

build-small-hackathon
/

matchday

Running

App Files Files Community

mzidan000 commited on 19 days ago

Commit

342f056

verified ·

1 Parent(s): 433072e

Upload folder using huggingface_hub

Browse files

Files changed (7) hide show

app.py +35 -0
index.html +68 -0
matchday/.DS_Store +0 -0
matchday/agent_loop.py +6 -6
matchday/apis/__init__.py +6 -1
matchday/apis/web.py +24 -2
matchday/render.py +178 -51

app.py CHANGED Viewed

@@ -104,6 +104,17 @@ async def _pulse(coro, holder, message, interval: int = 9):
         yield _ev(type="commentary", text=f"{message} ({int(time.monotonic() - start)}s)")
 # Cached per-boot preflight (N35). Fail-fast ONLY on genuinely-doomed config
 # (missing SerpApi key — build_trip_packages cannot fetch live flights/hotels).
 # Modal cold-start is NOT a hard failure: it streams via _pulse heartbeats and
@@ -170,6 +181,8 @@ async def plan_trip(user_text: str) -> str:
         return
     yield _ev(type="commentary", text="Reading your trip request…")
     agent = None
     if USE_AGENT:
@@ -261,6 +274,10 @@ async def plan_trip(user_text: str) -> str:
                 type="commentary",
                 text="✈️ Scanning airlines · 🏨 Finding hotels near BC Place · 🌤️ Checking the match-day forecast…",
             )
             hb = {}
             try:
                 async for beat in _pulse(
@@ -274,6 +291,7 @@ async def plan_trip(user_text: str) -> str:
                 yield _ev(type="error", text=f"⚠️ {exc}")
                 return
         else:
             yield _ev(
                 type="clarify",
                 text=parsed.question
@@ -283,9 +301,23 @@ async def plan_trip(user_text: str) -> str:
     # Clarify / direct answer from the Brain (no packages to show).
     if result is None:
         yield _ev(type="clarify", text=agent_text)
         return
     # ── Render. greenlight confirms the captured intent just before the packages.
     if trip is not None:
         yield _ev(type="greenlight", text=trip.summary())
@@ -308,6 +340,9 @@ async def plan_trip(user_text: str) -> str:
     # Final: the full Layla-competitive render (status + cards + map + timeline).
     # leaflet_preloaded=True → the frontend already loaded Leaflet in <head>; the
     # map's inline init script is re-run after injection (see index.html).
     yield _ev(type="result", html=render_full(result, trip, leaflet_preloaded=True), explanation=explanation)

         yield _ev(type="commentary", text=f"{message} ({int(time.monotonic() - start)}s)")
+def _notice_status(result, *keywords: str) -> str:
+    """Map a data category to ``done`` | ``fallback`` from REAL degradation notices.
+    Honest per-category progress: if ``build_trip_packages`` reported a category
+    as unavailable, that step is ``fallback``; otherwise ``done``. Tied to the
+    real dispatch outcome — never a cosmetic timer.
+    """
+    blob = " ".join(result.degradation_notices or "").lower()
+    return "fallback" if any(k in blob for k in keywords) else "done"
 # Cached per-boot preflight (N35). Fail-fast ONLY on genuinely-doomed config
 # (missing SerpApi key — build_trip_packages cannot fetch live flights/hotels).
 # Modal cold-start is NOT a hard failure: it streams via _pulse heartbeats and
         return
     yield _ev(type="commentary", text="Reading your trip request…")
+    yield _ev(type="progress", step="read", status="done", text="Read your request")
+    yield _ev(type="progress", step="extract", status="running", text="Understanding your trip")
     agent = None
     if USE_AGENT:
                 type="commentary",
                 text="✈️ Scanning airlines · 🏨 Finding hotels near BC Place · 🌤️ Checking the match-day forecast…",
             )
+            yield _ev(type="progress", step="flights", status="running")
+            yield _ev(type="progress", step="hotels", status="running")
+            yield _ev(type="progress", step="weather", status="running")
+            yield _ev(type="progress", step="nearby", status="running")
             hb = {}
             try:
                 async for beat in _pulse(
                 yield _ev(type="error", text=f"⚠️ {exc}")
                 return
         else:
+            yield _ev(type="progress", step="ready", status="fallback", text="Need a detail from you")
             yield _ev(
                 type="clarify",
                 text=parsed.question
     # Clarify / direct answer from the Brain (no packages to show).
     if result is None:
+        yield _ev(type="progress", step="ready", status="fallback", text="Need a detail from you")
         yield _ev(type="clarify", text=agent_text)
         return
+    # ── Honest per-category progress from the REAL dispatch outcome (N10/I1):
+    # each data step is done/fallback according to build_trip_packages' own
+    # degradation notices — never a cosmetic timer.
+    if trip is not None:
+        yield _ev(type="progress", step="extract", status="done", text="Trip details captured")
+    yield _ev(type="progress", step="flights", status=_notice_status(result, "flight"))
+    yield _ev(type="progress", step="hotels", status=_notice_status(result, "hotels unavailable", "hotels,"))
+    yield _ev(type="progress", step="weather", status=_notice_status(result, "weather"))
+    yield _ev(type="progress", step="nearby", status=_notice_status(result, "amenities", "nearby"))
+    yield _ev(type="progress", step="score", status="done" if result.packages else "fallback")
+    yield _ev(type="progress", step="itinerary", status="running", text="Building itinerary")
+    yield _ev(type="progress", step="links", status="running", text="Preparing links")
     # ── Render. greenlight confirms the captured intent just before the packages.
     if trip is not None:
         yield _ev(type="greenlight", text=trip.summary())
     # Final: the full Layla-competitive render (status + cards + map + timeline).
     # leaflet_preloaded=True → the frontend already loaded Leaflet in <head>; the
     # map's inline init script is re-run after injection (see index.html).
+    yield _ev(type="progress", step="itinerary", status="done")
+    yield _ev(type="progress", step="links", status="done")
+    yield _ev(type="progress", step="ready", status="done", text="Your packages are ready")
     yield _ev(type="result", html=render_full(result, trip, leaflet_preloaded=True), explanation=explanation)

index.html CHANGED Viewed

@@ -145,6 +145,30 @@
   .empty p{margin:0;font-size:13.5px;max-width:360px;line-height:1.6;color:#94a3b8;}
   /* ── "Building your trip" skeleton state (premium wait UX) ── */
   .building{padding:2px 0;}
   .build-head{display:flex;align-items:center;gap:11px;background:linear-gradient(135deg,#0f172a,#1e3a8a);
     color:#fff;border-radius:16px;padding:14px 17px;margin-bottom:18px;box-shadow:var(--shadow-md);
@@ -371,6 +395,9 @@ function showSkeleton(bubble){
          <span class="elapsed">· 0:00</span>
          <div class="cold-hint" style="display:none"></div>
        </div>
        <div class="sk-cards">
          ${`<div class="sk-card"><div class="sk big"></div><div class="sk line w80"></div><div class="sk line w60"></div><div class="sk line"></div><div class="sk line w80"></div></div>`.repeat(3)}
        </div>
@@ -397,9 +424,49 @@ function startTimer(bubble){
 }
 function stopTimer(){ if (elapsedTimer){ clearInterval(elapsedTimer); elapsedTimer = null; } }
 // ── Streaming via raw SSE ───────────────────────────────
 function handleEvent(ev, bubble){
   if (!ev) return;
   if (ev.type === "commentary"){
     lastRealAt = performance.now(); lastRealMsg = ev.text || "";
     setStatus(bubble, lastRealMsg);
@@ -470,6 +537,7 @@ async function runTrip(forcedText){
   if (!text) return;
   running = true; sendBtn.disabled = true; resultHandled = false;
   lastRealAt = 0; lastRealMsg = "";
   addUserBubble(text);
   const bubble = addAssistantBubble();
   showSkeleton(bubble);

   .empty p{margin:0;font-size:13.5px;max-width:360px;line-height:1.6;color:#94a3b8;}
   /* ── "Building your trip" skeleton state (premium wait UX) ── */
+  /* Layla-style visible progress steps (N10): real tool activity + provenance,
+     never raw chain-of-thought. Driven by backend `progress` events. */
+  .steps{display:flex;flex-direction:column;gap:5px;margin-bottom:18px;
+    background:#fff;border:1px solid var(--line2);border-radius:14px;padding:13px 15px;box-shadow:var(--shadow-sm);}
+  .steps-h{font-size:11px;font-weight:800;letter-spacing:.06em;text-transform:uppercase;color:var(--mut);margin-bottom:7px;}
+  .step{display:flex;align-items:center;gap:10px;font-size:13px;color:var(--mut2);transition:color .2s;}
+  .step .si{width:18px;height:18px;border-radius:50%;flex:0 0 18px;display:inline-flex;
+    align-items:center;justify-content:center;font-size:11px;background:#eef0f3;color:transparent;}
+  .step.is-running{color:var(--ink2);font-weight:600;}
+  .step.is-running .si{background:var(--violet);color:#fff;}
+  .step.is-running .si::after{content:"";width:7px;height:7px;border-radius:50%;background:#fff;
+    animation:pulse 1.1s infinite;}
+  .step.is-done{color:var(--ink2);}
+  .step.is-done .si{background:var(--emerald);color:#fff;}
+  .step.is-done .si::after{content:"✓";}
+  .step.is-fallback{color:#b45309;}
+  .step.is-fallback .si{background:#fef3c7;color:#b45309;}
+  .step.is-fallback .si::after{content:"!";}
+  .step.is-unavailable{color:var(--mut2);}
+  .step.is-unavailable .si{background:#f3f4f6;color:var(--mut2);}
+  .step.is-unavailable .si::after{content:"–";}
+  .step .st{flex:1;min-width:0;}
+  .step .sd{font-size:11.5px;color:var(--mut2);font-weight:500;}
+  .step.is-running .sd,.step.is-done .sd{color:inherit;opacity:.75;}
   .building{padding:2px 0;}
   .build-head{display:flex;align-items:center;gap:11px;background:linear-gradient(135deg,#0f172a,#1e3a8a);
     color:#fff;border-radius:16px;padding:14px 17px;margin-bottom:18px;box-shadow:var(--shadow-md);
          <span class="elapsed">· 0:00</span>
          <div class="cold-hint" style="display:none"></div>
        </div>
+       <div class="steps" id="md-steps">
+         <div class="steps-h">Planning your trip</div>
+       </div>
        <div class="sk-cards">
          ${`<div class="sk-card"><div class="sk big"></div><div class="sk line w80"></div><div class="sk line w60"></div><div class="sk line"></div><div class="sk line w80"></div></div>`.repeat(3)}
        </div>
 }
 function stopTimer(){ if (elapsedTimer){ clearInterval(elapsedTimer); elapsedTimer = null; } }
+// ── Visible agent progress steps (N10 / Layla tripProgress) ───────────
+// Ordered checklist of SAFE tool activity + provenance. Driven by real backend
+// `progress` events; never exposes raw chain-of-thought. Each step's status is
+// pending → running → done | fallback | unavailable.
+const STEPS = [
+  {key:"read",      label:"Reading your request"},
+  {key:"extract",   label:"Extracting trip details"},
+  {key:"flights",   label:"Checking flights"},
+  {key:"hotels",    label:"Checking hotels"},
+  {key:"weather",   label:"Checking weather"},
+  {key:"nearby",    label:"Checking nearby spots"},
+  {key:"score",     label:"Scoring packages"},
+  {key:"itinerary", label:"Building itinerary"},
+  {key:"links",     label:"Preparing booking & transit links"},
+  {key:"ready",     label:"Packages ready"},
+];
+let stepState = {};
+function renderSteps(){
+  const box = document.getElementById("md-steps");
+  if (!box) return;
+  let html = '<div class="steps-h">Planning your trip</div>';
+  for (const s of STEPS){
+    const st = stepState[s.key];
+    const status = st ? st.status : "pending";
+    const cls = status === "pending" ? "" : "is-" + status;
+    const detail = (st && st.text) ? `<span class="sd"> · ${esc(st.text)}</span>` : "";
+    html += `<div class="step ${cls}"><span class="si"></span><span class="st">${s.label}${detail}</span></div>`;
+  }
+  box.innerHTML = html;
+}
 // ── Streaming via raw SSE ───────────────────────────────
 function handleEvent(ev, bubble){
   if (!ev) return;
+  if (ev.type === "progress"){
+    if (ev.step){
+      stepState[ev.step] = {status: ev.status || "running", text: ev.text || ""};
+      renderSteps();
+      if (ev.step === "ready" && ev.status === "done"){ setStatus(bubble, "Done — see your packages →"); }
+      else if (ev.text){ setStatus(bubble, ev.text); }
+    }
+    return;
+  }
   if (ev.type === "commentary"){
     lastRealAt = performance.now(); lastRealMsg = ev.text || "";
     setStatus(bubble, lastRealMsg);
   if (!text) return;
   running = true; sendBtn.disabled = true; resultHandled = false;
   lastRealAt = 0; lastRealMsg = "";
+  stepState = {};                 // reset progress steps for the new run
   addUserBubble(text);
   const bubble = addAssistantBubble();
   showSkeleton(bubble);

matchday/.DS_Store ADDED Viewed

Binary file (10.2 kB). View file

matchday/agent_loop.py CHANGED Viewed

@@ -1,9 +1,9 @@
 """
 MatchDay -- Bounded Nemotron agent loop with controlled tool use.
-Architecture (per Codex recommendation):
-- Maximum 2 tool rounds (Nemotron calls a tool -> result returned -> one more
-  turn to maybe call a second tool or produce final answer).
 - Tool-name allowlist: ["build_trip_packages", "web_search", "clarify"]
 - Pydantic argument validation before every tool call
 - Duplicate-call detection (same tool + same args in same turn)
@@ -641,7 +641,7 @@ class AgentLoopResult:
 class AgentLoop:
     """Bounded agent loop that orchestrates Nemotron tool use.
-    The loop runs at most ``MAX_TOOL_ROUNDS`` (2) turns. Each turn:
     1. Send the current message list to the agent (Nemotron).
     2. Parse the agent's response.
     3. If the agent calls a tool:
@@ -680,7 +680,7 @@ class AgentLoop:
             The built-in allowlist always takes precedence; external tools
             are checked separately.
         max_rounds:
-            Maximum number of tool-call rounds (default 2). After this many
             rounds the loop forces a final answer or falls back.
         """
         self._agent = agent
@@ -1057,7 +1057,7 @@ async def run_agent_loop(
     tools:
         Optional extra tools (merged with built-in allowlist).
     max_rounds:
-        Maximum tool rounds (default 2).
     Returns
     -------

 """
 MatchDay -- Bounded Nemotron agent loop with controlled tool use.
+Architecture:
+- Up to MAX_TOOL_ROUNDS (5) tool rounds per turn — a ceiling, not a target.
+  Happy-path turns exit at 2-3 rounds (understand -> build -> explain).
 - Tool-name allowlist: ["build_trip_packages", "web_search", "clarify"]
 - Pydantic argument validation before every tool call
 - Duplicate-call detection (same tool + same args in same turn)
 class AgentLoop:
     """Bounded agent loop that orchestrates Nemotron tool use.
+    The loop runs at most ``MAX_TOOL_ROUNDS`` (5) turns. Each turn:
     1. Send the current message list to the agent (Nemotron).
     2. Parse the agent's response.
     3. If the agent calls a tool:
             The built-in allowlist always takes precedence; external tools
             are checked separately.
         max_rounds:
+            Maximum number of tool-call rounds (default 5). After this many
             rounds the loop forces a final answer or falls back.
         """
         self._agent = agent
     tools:
         Optional extra tools (merged with built-in allowlist).
     max_rounds:
+        Maximum tool rounds (default 5).
     Returns
     -------

matchday/apis/__init__.py CHANGED Viewed

@@ -12,8 +12,13 @@ Normalizers are grouped by data source:
 - ``weather`` — Open-Meteo daily forecast (keyless).
 - ``pois``    — OpenStreetMap points of interest near BC Place (keyless).
-- ``routes``  — OpenRouteService walking/transit routes (ORS key).
 - ``flights`` / ``hotels`` / ``web`` — SerpApi (Google Flights/Hotels/Search).
 """
 # Load .env first so the registry's is_enabled() checks see API keys.

 - ``weather`` — Open-Meteo daily forecast (keyless).
 - ``pois``    — OpenStreetMap points of interest near BC Place (keyless).
 - ``flights`` / ``hotels`` / ``web`` — SerpApi (Google Flights/Hotels/Search).
+NOTE (honesty): no ``routes`` normalizer is registered here. Transit time is a
+deterministic walking-speed proxy computed in ``scoring.py``
+(``distance_to_stadium_km / 5 km/h``), not live OpenRouteService routing
+(plan U2 two-phase routes dispatch is deferred). The card "Transit" CTA links
+to Google Maps directions rather than a computed ORS route.
 """
 # Load .env first so the registry's is_enabled() checks see API keys.

matchday/apis/web.py CHANGED Viewed

@@ -26,6 +26,26 @@ _SERPAPI_URL = "https://serpapi.com/search"
 _REQUEST_TIMEOUT = 30.0
 _SNIPPET_CAP = 160
 class WebSearchInput(BaseModel):
     """Input for the web_search normalizer."""
@@ -38,11 +58,13 @@ class WebSearchInput(BaseModel):
 def _normalize(organic: list[dict[str, Any]] | None, max_results: int) -> list[dict[str, str]]:
     out: list[dict[str, str]] = []
-    for r in (organic or [])[:max_results]:
         title = (r.get("title") or "").strip()
         url = (r.get("link") or r.get("url") or "").strip()
         snippet = (r.get("snippet") or "").strip()[:_SNIPPET_CAP]
-        if title and url:
             out.append({"title": title, "url": url, "snippet": snippet})
     return out

 _REQUEST_TIMEOUT = 30.0
 _SNIPPET_CAP = 160
+# I6 domain restriction — enforced in Python, not just promised in the prompt.
+# The agent prompt tells Nemotron web_search is "restricted to fifa.com,
+# vancouverfwc26.ca, bcplace.com, translink.ca"; this filter makes that true by
+# dropping any SerpApi result whose URL is not on (a subdomain of) one of these.
+# Substring match is intentionally lenient (matches www./subdomains/paths) and
+# never raises — a result that doesn't match is simply omitted.
+_ALLOWED_DOMAINS = (
+    "fifa.com",
+    "vancouverfwc26.ca",
+    "bcplace.com",
+    "translink.ca",
+)
+def _domain_allowed(url: str) -> bool:
+    if not url:
+        return False
+    low = url.lower()
+    return any(d in low for d in _ALLOWED_DOMAINS)
 class WebSearchInput(BaseModel):
     """Input for the web_search normalizer."""
 def _normalize(organic: list[dict[str, Any]] | None, max_results: int) -> list[dict[str, str]]:
     out: list[dict[str, str]] = []
+    for r in organic or []:
+        if len(out) >= max_results:
+            break
         title = (r.get("title") or "").strip()
         url = (r.get("link") or r.get("url") or "").strip()
         snippet = (r.get("snippet") or "").strip()[:_SNIPPET_CAP]
+        if title and url and _domain_allowed(url):  # I6 — drop off-allowlist results
             out.append({"title": title, "url": url, "snippet": snippet})
     return out

matchday/render.py CHANGED Viewed

@@ -19,6 +19,52 @@ from matchday.trip_tool import TripPackageResult
 BC_PLACE_LAT = 49.2827
 BC_PLACE_LON = -123.1207
 # Per-label accent + matching soft tint (avoids color-mix for max compatibility).
 _LABEL_COLOR = {
     "Cheapest": "#16a34a",
@@ -217,7 +263,7 @@ def _weather_fact(pkg: ScoredPackage) -> str:
     )
-def render_card(pkg: ScoredPackage, is_top: bool = False, idx: int = 0) -> str:
     accent = _LABEL_COLOR.get(pkg.label, "#7c3aed")
     tint = _LABEL_TINT.get(pkg.label, "#ede9fe")
     icon = _LABEL_ICON.get(pkg.label, "✅")
@@ -225,6 +271,11 @@ def render_card(pkg: ScoredPackage, is_top: bool = False, idx: int = 0) -> str:
     f = pkg.flight
     h = pkg.hotel
     # Hotel fact
     if h:
         bits = []
@@ -253,35 +304,67 @@ def render_card(pkg: ScoredPackage, is_top: bool = False, idx: int = 0) -> str:
     topflag = '<span class="md-topflag">★ Best match</span>' if is_top else ""
-    # Per-option booking CTAs (Layla-style). Hotels carry a REAL SerpApi deep
-    # link (Hotel.booking_url from Google Hotels). Flights expose no resolved
-    # booking URL (booking_token needs a deferred SerpApi call), so we deep-link
-    # to Skyscanner for the exact route+date — a real booking site, not a generic
-    # web search. Transit links to Google Maps directions to BC Place.
-    fdate = f.arrival_time.strftime("%Y-%m-%d")
-    flight_url = (
-        f"https://www.skyscanner.com/transport/flights/{f.origin.lower()}/"
-        f"{f.destination.lower()}/{fdate}/"
-    )
     if h and getattr(h, "booking_url", None):
-        hotel_url, hotel_label = h.booking_url, "🏨 Book hotel"
     elif h:
-        hotel_url = (
-            "https://www.google.com/travel/hotels?q="
-            + _urlquote(f"{h.name} Vancouver BC Place")
-        )
-        hotel_label = "🏨 Find hotel"
     else:
         hotel_url = hotel_label = None
-    transit_url = (
-        "https://www.google.com/maps/dir/?api=1&destination=BC%20Place%20"
-        "Stadium%2C%20Vancouver&travelmode=transit"
-    )
-    hotel_btn = (
-        f'<a class="md-cta md-cta-h" href="{_e(hotel_url)}" target="_blank" '
-        f'rel="noopener noreferrer">{hotel_label} →</a>'
-        if hotel_url else ""
-    )
     return f"""
     <article class="md-card{' is-top' if is_top else ''}" style="--accent:{accent};--tint:{tint}">
@@ -302,20 +385,19 @@ def render_card(pkg: ScoredPackage, is_top: bool = False, idx: int = 0) -> str:
         <li><span class="md-fico">🚶</span><span class="md-fbody"><b>{pkg.hotel_to_stadium_min} min walk</b>
           <span class="md-fdet">hotel → BC Place · {len(pkg.amenities)} nearby spots</span></span></li>
       </ul>
-      <div class="md-card-cta"><div class="md-cta-row">
-        <a class="md-cta md-cta-f" href="{flight_url}" target="_blank" rel="noopener noreferrer">✈️ Book flight →</a>
-        {hotel_btn}
-        <a class="md-cta md-cta-t" href="{transit_url}" target="_blank" rel="noopener noreferrer">🚖 Transit →</a>
-      </div></div>
       </div>
     </article>
     """
-def render_cards(result: TripPackageResult) -> str:
     if not result.packages:
         return '<div class="md-row" style="padding:14px;color:#6b7280">No packages could be formed from the available data.</div>'
-    cards = "".join(render_card(p, is_top=(i == 0), idx=i) for i, p in enumerate(result.packages))
     return f'{_CSS}<div class="md-wrap">{_section("Your 3 ranked packages")}<div class="md-cards">{cards}</div></div>'
@@ -411,42 +493,87 @@ def render_map(result: TripPackageResult, leaflet_preloaded: bool = False) -> st
 def render_timeline(trip, result: TripPackageResult) -> str:
-    """Day-by-day itinerary (A2): arrival → match day → explore."""
     from datetime import timedelta
     top = result.packages[0] if result.packages else None
     items: list[str] = []
     d = trip.check_in
     idx = 0
     while d <= trip.check_out:
         idx += 1
-        if d == trip.check_in and top:
-            hotel = top.hotel.name if top.hotel else "your hotel"
             icon, lbl, title, body, cls = (
-                "✈️", "Arrival", f"Day {idx} · {d:%a %b %d}",
-                f"Land via <b>{_e(top.flight.airline)} {_e(top.flight.flight_number)}</b> "
-                f"({_e(top.flight.origin)} → YVR) and check in to <b>{_e(hotel)}</b>. Settle in, grab dinner downtown.",
-                "",
             )
-        elif d == trip.match_date:
             icon, lbl, title, body, cls = (
-                "🏟️", "Match day", f"Day {idx} · {d:%a %b %d} — MATCH DAY",
-                f"<b>{_e(trip.match_name)}</b> at BC Place, 7:00 PM PT. Hit the fan zone first, "
-                "then walk from your hotel — it's minutes away.",
-                "is-match",
             )
-        elif d < trip.match_date:
             icon, lbl, title, body, cls = (
-                "🏙️", "Explore", f"Day {idx} · {d:%a %b %d}",
-                "Stanley Park seawall, Granville Island, Gastown — Vancouver is built for walking.",
                 "",
             )
         else:
             icon, lbl, title, body, cls = (
-                "🗺️", "Heading home", f"Day {idx} · {d:%a %b %d}",
-                "Brunch and last sights, then back to YVR. Safe flight home.",
                 "",
             )
         items.append(
             f'<div class="md-day {cls}"><div class="md-day-ico">{icon}</div>'
             f'<div class="md-day-lbl">{lbl}</div>'
@@ -463,7 +590,7 @@ def render_timeline(trip, result: TripPackageResult) -> str:
 def render_full(result: TripPackageResult, trip=None, leaflet_preloaded: bool = False) -> str:
     out = (
         render_status_bar(result)
-        + render_cards(result)
         + render_map(result, leaflet_preloaded=leaflet_preloaded)
     )
     if trip is not None:

 BC_PLACE_LAT = 49.2827
 BC_PLACE_LON = -123.1207
+YVR_LAT = 49.1939
+YVR_LON = -123.1844
+_STADIUM = "BC Place Stadium, Vancouver"
+_YVR = "YVR, Vancouver"
+# Google Maps keyless directions (U2: real routing deferred; ORS needs a key).
+# Crucially, ``origin`` is ALWAYS supplied and trip-specific (hotel coords/name
+# or YVR) so Maps never silently falls back to the user's detected location.
+def _gmaps(origin: str, destination: str, mode: str = "transit") -> str:
+    return (
+        "https://www.google.com/maps/dir/?api=1"
+        f"&origin={_urlquote(origin)}&destination={_urlquote(destination)}"
+        f"&travelmode={mode}"
+    )
+def _hotel_origin(h) -> str:
+    """Trip-specific origin for directions: hotel coords (precise) else its name."""
+    if h and getattr(h, "latitude", None) and getattr(h, "longitude", None):
+        return f"{h.latitude},{h.longitude}"
+    if h and getattr(h, "name", None):
+        return f"{h.name}, Vancouver"
+    return _YVR
+# Rotating local-day highlights (Layla L524-563 = uniquely-named days). The cycle
+# is longer than any realistic World Cup trip (≤40 days) so day titles never repeat.
+_LOCAL_DAYS = [
+    ("🏙️", "Stanley Park & the seawall",
+     "Loop the Stanley Park seawall by bike — totem poles, Siwash Rock and Lions Gate Bridge views."),
+    ("🍤", "Granville Island",
+     "Public market, artisan food stalls and the brewery/theatre scene under the Granville Bridge."),
+    ("🏮", "Gastown & Chinatown",
+     "Steam clock and Maple Tree Square, then dim sum and the Dr. Sun Yat-Sen Classical Garden."),
+    ("⛰️", "Grouse Mountain",
+     "Hike the Grouse Grind or take the Skyride — city-to-sea panorama and ranger shows at the top."),
+    ("🌉", "Capilano Suspension Bridge",
+     "Cliffwalk and Treetops Adventure over the Capilano River gorge, a short SeaBus + shuttle away."),
+    ("🏖️", "English Bay & Sunset Beach",
+     "Beachfront stroll to the A-Maze-ing Laughter statues, sunset over Burrard Inlet."),
+    ("🍦", "Main Street & Mount Pleasant",
+     "Indie boutiques, third-wave coffee and murals along Main Street south of Broadway."),
+    ("🛍️", "Robson Street & FIFA fan zone",
+     "Downtown shopping strip, then the official FIFA Fan Festival and live-match screens."),
+]
 # Per-label accent + matching soft tint (avoids color-mix for max compatibility).
 _LABEL_COLOR = {
     "Cheapest": "#16a34a",
     )
+def render_card(pkg: ScoredPackage, is_top: bool = False, idx: int = 0, trip=None) -> str:
     accent = _LABEL_COLOR.get(pkg.label, "#7c3aed")
     tint = _LABEL_TINT.get(pkg.label, "#ede9fe")
     icon = _LABEL_ICON.get(pkg.label, "✅")
     f = pkg.flight
     h = pkg.hotel
+    # Trip params for trip-specific, honestly-labeled action links (K5/U4).
+    ci = getattr(trip, "check_in", None)
+    co = getattr(trip, "check_out", None)
+    trav = getattr(trip, "travelers", 1) or 1
     # Hotel fact
     if h:
         bits = []
     topflag = '<span class="md-topflag">★ Best match</span>' if is_top else ""
+    # ── Flight action link: live deep link if SerpApi gave one, else an honest
+    # round-trip Skyscanner SEARCH for the exact route + check-in/check-out +
+    # travelers. Never labeled "Book confirmed" — prices aren't guaranteed (K5).
+    if getattr(f, "booking_url", None):
+        flight_url, flight_label = f.booking_url, "✈️ Open this flight"
+    else:
+        dep = (ci or f.arrival_time.date()).strftime("%y%m%d")
+        flight_url = (
+            f"https://www.skyscanner.com/transport/flights/{f.origin.lower()}/"
+            f"{f.destination.lower()}/{dep}"
+        )
+        if co is not None:
+            flight_url += f"/{co.strftime('%y%m%d')}/"
+        else:
+            flight_url += "/"
+        flight_url += f"?adults={int(trav)}"
+        flight_label = "✈️ Search this flight"
+    # ── Hotel action link: live Google-Hotels deep link if present, else an
+    # honest Booking.com SEARCH for this hotel + check-in/out + adults (K5).
     if h and getattr(h, "booking_url", None):
+        hotel_url, hotel_label = h.booking_url, "🏨 Open this hotel"
     elif h:
+        ss_q = h.name if "vancouver" in h.name.lower() else f"{h.name} Vancouver"
+        parts = [f"ss={_urlquote(ss_q)}"]
+        if ci is not None:
+            parts.append(f"checkin={ci.strftime('%Y-%m-%d')}")
+        if co is not None:
+            parts.append(f"checkout={co.strftime('%Y-%m-%d')}")
+        parts.append(f"group_adults={int(trav)}")
+        hotel_url = "https://www.booking.com/searchresults.html?" + "&".join(parts)
+        hotel_label = "🏨 Search this hotel"
     else:
         hotel_url = hotel_label = None
+    # ── Ground-transport links: EXPLICIT trip-specific origins so Maps never
+    # uses the user's current location (U2). Hotel→BC Place (walk if close, else
+    # transit), YVR→Hotel, Hotel→YVR (rideshare/taxi style). No booking claim.
+    horg = _hotel_origin(h)
+    walk_ok = bool(pkg.hotel_to_stadium_min and pkg.hotel_to_stadium_min <= 20)
+    transit_links = [
+        ("🚶 Hotel → BC Place" if walk_ok else "🚌 Hotel → BC Place",
+         _gmaps(horg, _STADIUM, "walking" if walk_ok else "transit")),
+        ("🚇 YVR → Hotel", _gmaps(_YVR, horg, "transit")),
+        ("🚕 Hotel → YVR", _gmaps(horg, _YVR, "driving")),
+    ]
+    cta: list[str] = [
+        f'<a class="md-cta md-cta-f" href="{_e(flight_url)}" target="_blank" '
+        f'rel="noopener noreferrer">{flight_label} →</a>'
+    ]
+    if hotel_url:
+        cta.append(
+            f'<a class="md-cta md-cta-h" href="{_e(hotel_url)}" target="_blank" '
+            f'rel="noopener noreferrer">{hotel_label} →</a>'
+        )
+    for lbl, url in transit_links:
+        cta.append(
+            f'<a class="md-cta md-cta-t" href="{_e(url)}" target="_blank" '
+            f'rel="noopener noreferrer">{lbl} →</a>'
+        )
     return f"""
     <article class="md-card{' is-top' if is_top else ''}" style="--accent:{accent};--tint:{tint}">
         <li><span class="md-fico">🚶</span><span class="md-fbody"><b>{pkg.hotel_to_stadium_min} min walk</b>
           <span class="md-fdet">hotel → BC Place · {len(pkg.amenities)} nearby spots</span></span></li>
       </ul>
+      <div class="md-card-cta"><div class="md-cta-row">{"".join(cta)}</div></div>
       </div>
     </article>
     """
+def render_cards(result: TripPackageResult, trip=None) -> str:
     if not result.packages:
         return '<div class="md-row" style="padding:14px;color:#6b7280">No packages could be formed from the available data.</div>'
+    cards = "".join(
+        render_card(p, is_top=(i == 0), idx=i, trip=trip)
+        for i, p in enumerate(result.packages)
+    )
     return f'{_CSS}<div class="md-wrap">{_section("Your 3 ranked packages")}<div class="md-cards">{cards}</div></div>'
 def render_timeline(trip, result: TripPackageResult) -> str:
+    """Day-by-day itinerary — unique, date-aware, realistic (A2 + Layla L509-569).
+    Each day is assigned ONE role by priority, so the same filler text never
+    repeats across days and departure language appears on exactly one day:
+      1. match_date  → MATCH DAY (hotel→BC Place, fan zone, weather, return)
+      2. check_out    → DEPARTURE (checkout, hotel→YVR, return flight)
+      3. check_in     → ARRIVAL (flight, YVR→hotel transfer, check-in, evening)
+      4. otherwise    → LOCAL EXPLORE (rotating named Vancouver highlight)
+    When check_in == match_date (land + match same day) the match role wins but
+    the body still notes the arrival flight. Weather is matched per date from the
+    top package's forecast. The selected flight / hotel / venue are referenced.
+    """
     from datetime import timedelta
     top = result.packages[0] if result.packages else None
+    wx_by_date = {}
+    if top and top.weather:
+        wx_by_date = {w.date: w for w in top.weather}
+    hotel_name = top.hotel.name if (top and top.hotel) else "your hotel"
+    flight_bit = (
+        f"<b>{_e(top.flight.airline)} {_e(top.flight.flight_number)}</b> "
+        f"({_e(top.flight.origin)} → YVR)"
+    ) if top else "your flight"
+    def _wx_note(d) -> str:
+        w = wx_by_date.get(d)
+        if not w:
+            return ""
+        icon = _WMO_ICON.get(w.weather_code, "🌡️")
+        return (
+            f' <span class="md-fdet" style="margin-left:6px">{icon} '
+            f"{w.temp_min_c:g}–{w.temp_max_c:g}°C · {w.precipitation_probability:g}% rain "
+            f'{_prov_badge(w.source)}</span>'
+        )
     items: list[str] = []
     d = trip.check_in
     idx = 0
+    local_i = 0
     while d <= trip.check_out:
         idx += 1
+        head = f"Day {idx} · {d:%a %b %d}"
+        if d == trip.match_date:
+            arrive = ""
+            if d == trip.check_in and top:
+                arrive = f"Land via {flight_bit}, drop bags at <b>{_e(hotel_name)}</b>, then "
             icon, lbl, title, body, cls = (
+                "🏟️", "Match day", f"{head} — MATCH DAY",
+                f"{arrive}<b>{_e(trip.match_name)}</b> at BC Place, ~7:00 PM PT. "
+                "Soak up the FIFA fan zone first, then it's a short "
+                f"{top.hotel_to_stadium_min if top else 'few'}-min walk from "
+                f"<b>{_e(hotel_name)}</b>.{_wx_note(d)} Head back after full-time.",
+                "is-match",
             )
+        elif d == trip.check_out:
             icon, lbl, title, body, cls = (
+                "🛫", "Departure", f"{head} — heading home",
+                f"Check out of <b>{_e(hotel_name)}</b>, grab a last Vancouver "
+                f"breakfast, then head to YVR for {flight_bit} home. Safe travels!",
+                "",
             )
+        elif d == trip.check_in and top:
             icon, lbl, title, body, cls = (
+                "✈️", "Arrival", head,
+                f"Land via {flight_bit} and take the Canada Line into town. "
+                f"Check in to <b>{_e(hotel_name)}</b>, then an easy first evening "
+                f"near the hotel.{_wx_note(d)}",
                 "",
             )
         else:
+            li, lname, ldesc = _LOCAL_DAYS[local_i % len(_LOCAL_DAYS)]
+            local_i += 1
             icon, lbl, title, body, cls = (
+                li, "Free day", f"{head} — {lname}",
+                f"{ldesc}{_wx_note(d)}",
                 "",
             )
         items.append(
             f'<div class="md-day {cls}"><div class="md-day-ico">{icon}</div>'
             f'<div class="md-day-lbl">{lbl}</div>'
 def render_full(result: TripPackageResult, trip=None, leaflet_preloaded: bool = False) -> str:
     out = (
         render_status_bar(result)
+        + render_cards(result, trip=trip)
         + render_map(result, leaflet_preloaded=leaflet_preloaded)
     )
     if trip is not None: