feat: send trip cards as individual messages and resolve trip_id from replies

- Send each trip as a separate WhatsApp message with trip_id metadata
- Resolve trip_id automatically when customer replies to a trip card
- Store phone_number on customer upsert
- Parse context_message_id and phone_number from inbound messages
- Add get_message_by_whatsapp_id to repository
- Translate driver booking notification to Arabic
- Increase conversation context window to 8 messages

app/ai/tool_schemas.py

@@ -34,7 +34,9 @@ _SEARCH_TRIPS = {
         "name": "search_trips",
         "description": (
             "Search active car or bus trips. "
-            "Use when the customer asks for travel options."
+            "Use when the customer asks for travel options. "
+            "Each matching trip is sent as a separate WhatsApp message. "
+            "The customer can reply to a trip card to select it."
         ),
         "parameters": {
             "type": "object",
@@ -104,23 +106,25 @@ _CREATE_BOOKING_LEAD = {
         "name": "create_booking_lead",
         "description": (
             "Create a pending booking lead and notify the driver. "
-            "This does not reserve seats or confirm payment."
+            "This does not reserve seats or confirm payment. "
+            "If the customer replied to a trip card, trip_id is resolved automatically — "
+            "you can omit it and the system will detect which trip they meant."
         ),
         "parameters": {
             "type": "object",
             "properties": {
-                "trip_id": {"type": "string", "description": "Selected trip ID."},
+                "trip_id": {"type": "string", "description": "Selected trip ID. Optional if the customer replied to a trip card message."},
                 "requested_seats": {
                     "type": "integer",
                     "minimum": 1,
-                    "description": "Number of seats requested by the customer.",
+                    "description": "Number of seats requested. Defaults to 1 if not specified.",
                 },
                 "notes": {
                     "type": "string",
                     "description": "Optional customer notes or pickup details.",
                 },
             },
-            "required": ["trip_id", "requested_seats"],
+            "required": [],
             "additionalProperties": False,
         },
     },

app/database/supabase.py

@@ -38,11 +38,13 @@ class SupabaseRepository:
         remote_jid: str,
         name: str | None = None,
         preferred_language: str | None = None,
+        phone_number: str | None = None,
     ) -> dict[str, Any]:
         payload = {
             "remoteJid": remote_jid,
             "name": name,
             "preferred_language": preferred_language,
+            "phone_number": phone_number,
         }
         payload = {key: value for key, value in payload.items() if value is not None}
         response = await (
@@ -200,6 +202,19 @@ class SupabaseRepository:
         prior = _response_data(prior_response) or []
         return list(reversed(prior)) + [current]
 
+    async def get_message_by_whatsapp_id(
+        self,
+        whatsapp_message_id: str,
+    ) -> dict[str, Any] | None:
+        response = await (
+            self.client.table("messages")
+            .select("*")
+            .eq("whatsapp_message_id", whatsapp_message_id)
+            .maybe_single()
+            .execute()
+        )
+        return _response_data(response)
+
     async def list_active_trips(self) -> list[dict[str, Any]]:
         query = (
             self.client.table("driver_trips")

app/models/domain.py

@@ -15,6 +15,8 @@ class WhatsAppInboundMessage:
     phone_number_id: str | None = None
     message_type: str = "text"
     interactive_reply_id: str | None = None
+    context_message_id: str | None = None
+    phone_number: str | None = None
     raw: dict[str, Any] = field(default_factory=dict)
 
 

app/services/conversation_service.py

@@ -78,24 +78,37 @@ class ConversationService:
         customer = await self.repository.upsert_customer(
             remote_jid=inbound.remoteJid,
             name=inbound.profile_name,
+            phone_number=inbound.phone_number,
         )
 
+        metadata: dict[str, Any] = {
+            "whatsapp": inbound.raw,
+            "timestamp": inbound.timestamp,
+        }
+        if inbound.context_message_id:
+            metadata["context_message_id"] = inbound.context_message_id
+
         current_message = await self.repository.create_message(
             customer_id=str(customer["id"]),
             sender_type="customer",
             message=inbound.text,
             whatsapp_message_id=inbound.message_id,
-            metadata={"whatsapp": inbound.raw, "timestamp": inbound.timestamp},
+            metadata=metadata,
         )
 
         context = await self.repository.get_recent_context_messages(
             customer_id=str(customer["id"]),
             current_message_id=str(current_message["id"]),
-            limit=4,
+            limit=8,
         )
 
         user_mode = _resolve_user_mode(customer)
-        registry = self._tool_registry(customer, remoteJid=inbound.remoteJid, user_mode=user_mode)
+        registry = self._tool_registry(
+            customer,
+            remoteJid=inbound.remoteJid,
+            user_mode=user_mode,
+            current_message=current_message,
+        )
         reply = await self.ai.generate_reply(
             messages=self._ai_messages(context, user_mode=user_mode),
             tools=get_tool_schemas(user_mode),
@@ -188,11 +201,12 @@ class ConversationService:
                 customer,
                 remoteJid=inbound.remoteJid,
                 user_mode=user_mode,
+                current_message=current_message,
             )
             context = await self.repository.get_recent_context_messages(
                 customer_id=str(customer["id"]),
                 current_message_id=str(current_message["id"]),
-                limit=4,
+                limit=8,
             )
             messages = self._ai_messages(context, user_mode=user_mode)
             messages.append({"role": "system", "content": system_note})
@@ -233,6 +247,7 @@ class ConversationService:
         *,
         remoteJid: str,
         user_mode: UserMode,
+        current_message: dict[str, Any] | None = None,
     ) -> ToolRegistry:
         handlers = FalsaToolHandlers(
             repository=self.repository,
@@ -241,6 +256,7 @@ class ConversationService:
             customer=customer,
             remoteJid=remoteJid,
             embedding_model=self.settings.jina_embedding_model,
+            current_message=current_message,
         )
         registry = ToolRegistry()
         for tool_name in _TOOLS_BY_MODE[user_mode]:

app/tools/handlers.py

@@ -1,6 +1,9 @@
+import logging
 from decimal import Decimal, InvalidOperation
 from typing import Any
 
+logger = logging.getLogger(__name__)
+
 from app.database.supabase import SupabaseRepository
 from app.models.domain import ToolResult
 from app.services.embedding_service import JinaEmbeddingService
@@ -15,7 +18,7 @@ from app.utils.departure import (
     trip_satisfies_departure_request,
 )
 from app.whatsapp.client import WhatsAppClient, WhatsAppClientError
-from app.whatsapp.trip_selection import build_trip_selection_list, build_trip_selection_text
+from app.whatsapp.trip_selection import build_trip_selection_text, format_trip_card
 
 
 class FalsaToolHandlers:
@@ -28,6 +31,7 @@ class FalsaToolHandlers:
         customer: dict[str, Any],
         remoteJid: str,
         embedding_model: str,
+        current_message: dict[str, Any] | None = None,
     ) -> None:
         self.repository = repository
         self.embeddings = embeddings
@@ -35,6 +39,20 @@ class FalsaToolHandlers:
         self.customer = customer
         self.remoteJid = remoteJid
         self.embedding_model = embedding_model
+        self.current_message = current_message
+
+    async def _resolve_trip_id_from_reply(self) -> str | None:
+        if not self.current_message:
+            return None
+        metadata = self.current_message.get("metadata") or {}
+        context_message_id = metadata.get("context_message_id")
+        if not context_message_id:
+            return None
+        original = await self.repository.get_message_by_whatsapp_id(context_message_id)
+        if not original:
+            return None
+        original_meta = original.get("metadata") or {}
+        return original_meta.get("trip_id")
 
     async def about_falsa(self, arguments: dict[str, Any]) -> ToolResult:
         query = str(arguments.get("query") or "").strip()
@@ -143,16 +161,38 @@ class FalsaToolHandlers:
             )
         ])
 
+        top_trips = filtered[:5]
+
+        if top_trips:
+            for trip_summary in top_trips:
+                trip_id = trip_summary["trip_id"]
+                trip = next((t for t in trips if (t.get("trip_id") or t.get("id")) == trip_id), {})
+                card = format_trip_card(trip)
+                try:
+                    resp = await self.whatsapp.send_text(self.remoteJid, card)
+                    wam_id = resp.get("messages", [{}])[0].get("id")
+                    if wam_id:
+                        await self.repository.create_message(
+                            customer_id=str(self.customer["id"]),
+                            sender_type="assistant",
+                            message=card,
+                            whatsapp_message_id=wam_id,
+                            metadata={"trip_id": trip_id, "type": "trip_card"},
+                        )
+                except WhatsAppClientError:
+                    logger.warning("Failed to send trip card for trip %s", trip_id)
+
         return ToolResult(
             ok=True,
             data={
-                "matches": filtered[:5],
-                "count": len(filtered[:5]),
+                "count": len(top_trips),
                 "alternate_alert": alternate_alert,
+                "sent_as_messages": bool(top_trips),
                 "note": (
                     "No active matching trips were found."
-                    if not filtered
-                    else _trip_search_note(alternate_alert)
+                    if not top_trips
+                    else "Trips were sent as separate WhatsApp messages. "
+                          "Ask the user to reply to a trip card to select it."
                 ),
             },
         )
@@ -163,7 +203,9 @@ class FalsaToolHandlers:
         notes = _optional_string(arguments.get("notes"))
 
         if not trip_id:
-            return ToolResult(ok=False, data={}, error="trip_id is required")
+            trip_id = await self._resolve_trip_id_from_reply()
+        if not trip_id:
+            return ToolResult(ok=False, data={}, error="trip_id is required. Ask the user to reply to a trip card message or provide the trip ID.")
         if requested_seats < 1:
             return ToolResult(ok=False, data={}, error="requested_seats must be at least 1")
 
@@ -186,6 +228,7 @@ class FalsaToolHandlers:
             notes=notes,
         )
 
+        driver_phone: str | None = None
         notification_status = "sent"
         notification_error = None
         try:
@@ -194,6 +237,7 @@ class FalsaToolHandlers:
             driver_remote_jid = driver_customer.get("remoteJid") or driver_record.get("remoteJid")
             if not driver_remote_jid:
                 raise WhatsAppClientError("Driver remoteJid is missing")
+            driver_phone = driver_remote_jid.split("@")[0]
             await self.whatsapp.send_text(
                 driver_remote_jid,
                 _driver_notification_text(
@@ -220,6 +264,7 @@ class FalsaToolHandlers:
                 "status": "pending",
                 "driver_notification_status": notification_status,
                 "driver_notification_error": notification_error,
+                "driver_phone": driver_phone,
                 "message": "Booking lead created. Seats are not reserved until confirmed.",
             },
         )
@@ -1033,12 +1078,11 @@ def _driver_notification_text(
     notes: str | None,
 ) -> str:
     return (
-        "New FALSA booking lead\n"
-        f"Customer: {customer.get('name') or customer.get('remoteJid')}\n"
-        f"Remote JID: {customer.get('remoteJid')}\n"
-        f"Trip: {trip.get('departure')} -> {trip.get('destination')}\n"
-        f"Departure: {trip_departure_date(trip)} {trip_departure_bucket(trip)}\n"
-        f"Seats requested: {requested_seats}\n"
-        f"Notes: {notes or '-'}\n"
-        "Status: pending confirmation"
+        "🔔 حجز جديد في فلسا\n"
+        f"العميل: {customer.get('name') or 'عميل جديد'}\n"
+        f"الرحلة: {trip.get('departure')} ← {trip.get('destination')}\n"
+        f"التاريخ: {trip_departure_date(trip)} {trip_departure_bucket(trip)}\n"
+        f"المقاعد المطلوبة: {requested_seats}\n"
+        f"ملاحظات: {notes or 'لا يوجد'}\n"
+        "الحالة: قيد الانتظار"
     )

app/whatsapp/parser.py

@@ -24,6 +24,8 @@ def parse_inbound_messages(payload: dict[str, Any]) -> list[WhatsAppInboundMessa
 
                 remoteJid = message.get("from")
                 message_id = message.get("id")
+                phone_number = message.get("remote_jid_alt")
+                context_message_id = message.get("context", {}).get("id")
 
                 text = message.get("text", {}).get("body")
                 if not remoteJid or not message_id or text is None:
@@ -42,6 +44,8 @@ def parse_inbound_messages(payload: dict[str, Any]) -> list[WhatsAppInboundMessa
                             profile_name=contacts_by_wa_id.get(remoteJid),
                             phone_number_id=phone_number_id,
                             message_type="text",
+                            context_message_id=context_message_id,
+                            phone_number=phone_number,
                             raw=message,
                         )
                     )
@@ -67,6 +71,8 @@ def parse_inbound_messages(payload: dict[str, Any]) -> list[WhatsAppInboundMessa
                         phone_number_id=phone_number_id,
                         message_type="interactive",
                         interactive_reply_id=reply_id,
+                        context_message_id=context_message_id,
+                        phone_number=phone_number,
                         raw=message,
                     )
                 )

app/whatsapp/trip_selection.py

@@ -76,6 +76,44 @@ def build_trip_selection_text(
     return "\n".join(lines)
 
 
+def format_trip_card(trip: dict[str, Any]) -> str:
+    departure = str(trip.get("departure") or "")
+    destination = str(trip.get("destination") or "")
+    parsed_date = trip_departure_date(trip)
+    date_text = parsed_date.isoformat() if parsed_date else ""
+    bucket = trip_departure_bucket(trip)
+    bucket_text = _BUCKET_LABELS.get(bucket, "") if bucket else ""
+
+    driver = _first_dict_value(trip.get("drivers")) or {}
+    car = _first_dict_value(trip.get("driver_cars")) or {}
+    driver_name = driver.get("name") or trip.get("driver_name") or ""
+    car_type = car.get("car_type") or trip.get("car_type") or ""
+
+    available = trip.get("available_seats") or 0
+    total = trip.get("total_seats") or 0
+    price = trip.get("price") or ""
+
+    lines = [
+        "─" * 14,
+        f"من: {departure} ← إلى: {destination}",
+        f"التاريخ: {date_text} | الوقت: {bucket_text}",
+        f"المقاعد: {available} من {total} متاحة",
+        f"السعر: {price}" if price else "",
+        f"السيارة: {car_type}" if car_type else "",
+        f"السائق: {driver_name}" if driver_name else "",
+        "─" * 14,
+    ]
+    return "\n".join(line for line in lines if line)
+
+
+def _first_dict_value(value: Any) -> dict[str, Any] | None:
+    if isinstance(value, list):
+        return value[0] if value else None
+    if isinstance(value, dict):
+        return value
+    return None
+
+
 def _trip_row_description(trip: dict[str, Any]) -> str:
     departure = str(trip.get("departure") or "")
     destination = str(trip.get("destination") or "")

prompts/system_passenger.md

@@ -1,6 +1,7 @@
 - search_trips for travel options. Include vector_query_text (natural-language search phrase).
-- Show alternate_alert before listing trips.
-- create_booking_lead only after trip + seat count selected.
+- When search_trips returns matches, trips are sent as separate WhatsApp messages. The user can reply to a trip card to select it — the system will detect which trip they meant automatically, without needing a trip_id or short_id.
+- create_booking_lead only after trip + seat count selected. If the user replied to a trip card, trip_id is resolved automatically and you can omit it.
 - Ask short follow-up if details missing.
 - Booking leads are pending — seats not reserved.
+- After successful create_booking_lead, tell the passenger the driver's phone number from driver_phone so they can contact the driver directly.
 - To drive: switch_to_driver. If no account: name -> create_driver_account -> switch_to_driver. Never before account exists.

supabase/migrations/202607010001_customer_phone_number.sql

@@ -0,0 +1,4 @@
+alter table public.customers add column if not exists phone_number text;
+
+create index if not exists idx_customers_phone_number
+  on public.customers(phone_number);

tests/conftest.py

@@ -117,23 +117,30 @@ class FakeRepository:
     async def upsert_customer(
         self,
         *,
-        remote_jid: str,
+        remote_jid: str | None = None,
         name: str | None = None,
         preferred_language: str | None = None,
+        phone_number: str | None = None,
     ) -> dict[str, Any]:
-        customer = self.customers_by_remote_jid.get(remote_jid)
+        jid = remote_jid or phone_number
+        if not jid:
+            raise ValueError("remote_jid or phone_number is required")
+        customer = self.customers_by_remote_jid.get(jid)
         if customer is None:
             customer = {
                 "id": f"cust-{len(self.customers_by_remote_jid) + 1}",
-                "remoteJid": remote_jid,
+                "remoteJid": jid,
                 "name": name,
                 "preferred_language": preferred_language,
+                "phone_number": phone_number,
                 "user_mode": None,
                 "session_data": {},
             }
-            self.customers_by_remote_jid[remote_jid] = customer
+            self.customers_by_remote_jid[jid] = customer
         elif name:
             customer["name"] = name
+        if phone_number:
+            customer["phone_number"] = phone_number
         return customer
 
     async def update_customer_user_mode(

tests/test_tools.py

@@ -17,7 +17,7 @@ def make_handlers(
         embeddings=embeddings or FakeEmbeddings(),
         whatsapp=whatsapp or FakeWhatsApp(),
         customer=customer or {"id": "cust-1", "remoteJid": sender_phone},
-        sender_phone=sender_phone,
+        remoteJid=sender_phone,
         embedding_model="jina-embeddings-v5-text-small",
     )