replace numbered trip list with trip cards for driver delete/modify/list

- initiate_trip_action and check_driver_trips now send format_trip_card
per trip (like passenger search) instead of a numbered text list
- Driver replies to a trip card to delete (bypass LLM) or modify
(set session, route to LLM for update_trip_field)
- Remove delete_trip_by_number / modify_trip_by_number handlers
and their tool schemas (replaced by card reply flow)
- Remove dead interactive list code (_handle_trip_interactive_reply)
- Clean up trip_selection.py: remove unused builders/parsers
- Update list_driver_trips query to include drivers(*)

app/ai/tool_schemas.py

@@ -151,7 +151,7 @@ _CHECK_DRIVER_TRIPS = {
     "type": "function",
     "function": {
         "name": "check_driver_trips",
-        "description": "List upcoming active trips (status=active, not departed).",
+        "description": "List upcoming active trips. Sends trip cards directly.",
         "parameters": {
             "type": "object",
             "properties": {},
@@ -246,7 +246,7 @@ _INITIATE_TRIP_ACTION = {
     "type": "function",
     "function": {
         "name": "initiate_trip_action",
-        "description": "Start delete/modify flow. Sends numbered trip list.",
+        "description": "Start delete/modify flow. Sends trip cards — driver replies to a card to pick the trip.",
         "parameters": {
             "type": "object",
             "properties": {
@@ -305,65 +305,6 @@ _UPDATE_TRIP_FIELD = {
     },
 }
 
-_DELETE_TRIP_BY_NUMBER = {
-    "type": "function",
-    "function": {
-        "name": "delete_trip_by_number",
-        "description": "Cancel a trip by driver-visible number (oldest=1).",
-        "parameters": {
-            "type": "object",
-            "properties": {
-                "trip_number": {
-                    "type": "integer",
-                    "minimum": 1,
-                    "description": "The one-based number of the trip from the driver trip list.",
-                },
-            },
-            "required": ["trip_number"],
-            "additionalProperties": False,
-        },
-    },
-}
-
-_MODIFY_TRIP_BY_NUMBER = {
-    "type": "function",
-    "function": {
-        "name": "modify_trip_by_number",
-        "description": "Modify a trip field by driver-visible number (oldest=1).",
-        "parameters": {
-            "type": "object",
-            "properties": {
-                "trip_number": {
-                    "type": "integer",
-                    "minimum": 1,
-                    "description": "The one-based number of the trip from the driver trip list.",
-                },
-                "field": {
-                    "type": "string",
-                    "enum": [
-                        "departure",
-                        "destination",
-                        "departure_date",
-                        "departure_time",
-                        "pickup_time",
-                        "vehicle_type",
-                        "available_seats",
-                        "total_seats",
-                        "price",
-                    ],
-                    "description": "The trip field to update.",
-                },
-                "value": {
-                    "type": "string",
-                    "description": "New value. Dates YYYY-MM-DD, time HH:MM, routes Arabic, seats/price digits.",
-                },
-            },
-            "required": ["trip_number", "field", "value"],
-            "additionalProperties": False,
-        },
-    },
-}
-
 _SWITCH_TO_DRIVER = {
     "type": "function",
     "function": {
@@ -408,8 +349,6 @@ _TOOL_SCHEMAS: dict[str, dict[str, Any]] = {
     "add_trip_by_driver": _ADD_TRIP_BY_DRIVER,
     "initiate_trip_action": _INITIATE_TRIP_ACTION,
     "update_trip_field": _UPDATE_TRIP_FIELD,
-    "delete_trip_by_number": _DELETE_TRIP_BY_NUMBER,
-    "modify_trip_by_number": _MODIFY_TRIP_BY_NUMBER,
     "switch_to_driver": _SWITCH_TO_DRIVER,
     "switch_to_passenger": _SWITCH_TO_PASSENGER,
 }
@@ -427,8 +366,6 @@ _TOOLS_BY_MODE: dict[UserMode, list[str]] = {
         "check_driver_trips",
         "add_driver_car",
         "add_trip_by_driver",
-        "delete_trip_by_number",
-        "modify_trip_by_number",
         "initiate_trip_action",
         "update_trip_field",
         "switch_to_passenger",

app/database/supabase.py

@@ -468,7 +468,7 @@ class SupabaseRepository:
     async def list_driver_trips(self, driver_id: str) -> list[dict[str, Any]]:
         query = (
             self.client.table("driver_trips")
-            .select("*, driver_cars(*)")
+            .select("*, driver_cars(*), drivers(*)")
             .eq("driver_id", driver_id)
             .eq("status", "active")
         )

app/services/conversation_service.py

@@ -13,7 +13,7 @@ from app.tools.handlers import FalsaToolHandlers, _trip_summary
 from app.tools.registry import ToolRegistry
 from app.utils.time import now_in_timezone
 from app.whatsapp.client import WhatsAppClient
-from app.whatsapp.trip_selection import parse_trip_action_reply
+
 
 logger = logging.getLogger(__name__)
 
@@ -121,6 +121,69 @@ class ConversationService:
                         )
                         return reply
 
+        if user_mode == "driver" and inbound.context_message_id:
+            original = await self.repository.get_message_by_whatsapp_id(inbound.context_message_id)
+            if original:
+                orig_meta = original.get("metadata") or {}
+                if orig_meta.get("type") == "driver_trip_card":
+                    trip_id = orig_meta.get("trip_id")
+                    action = orig_meta.get("action")
+                    if trip_id and action:
+                        driver = await self.repository.get_driver_by_remoteJid(inbound.remoteJid)
+                        trip = await self.repository.get_trip_by_id(trip_id)
+                        if driver and trip and str(trip.get("driver_id")) == str(driver["id"]):
+                            if action == "DELETE":
+                                await self.repository.cancel_driver_trip(trip_id)
+                                await unindex_trip(repository=self.repository, trip_id=trip_id)
+                                reply = "تم حذف الرحلة بنجاح"
+                                await self._store_and_send_assistant_reply(
+                                    customer,
+                                    inbound.remoteJid,
+                                    reply,
+                                    user_mode="driver",
+                                )
+                                return reply
+
+                            if action == "MODIFY":
+                                await self.repository.set_customer_session_field(
+                                    customer_id=str(customer["id"]),
+                                    key="active_edit_trip_id",
+                                    value=trip_id,
+                                )
+                                summary = _trip_summary(trip)
+                                route = f"{summary.get('departure')} -> {summary.get('destination')}"
+                                time_label = summary.get("departure_time") or summary.get("departure_time_type")
+                                system_note = (
+                                    f"SYSTEM: Driver selected trip {trip_id} ({route}, {time_label}) to modify. "
+                                    "Ask them what details they want to change. if there are no details sent"
+                                )
+                                registry = self._tool_registry(
+                                    customer,
+                                    remoteJid=inbound.remoteJid,
+                                    user_mode="driver",
+                                    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=8,
+                                )
+                                messages = self._ai_messages(context, user_mode="driver")
+                                messages.append({"role": "system", "content": system_note})
+                                reply = await self.ai.generate_reply(
+                                    messages=messages,
+                                    tools=get_tool_schemas("driver"),
+                                    registry=registry,
+                                )
+                                if reply:
+                                    await self._store_and_send_assistant_reply(
+                                        customer,
+                                        inbound.remoteJid,
+                                        reply,
+                                        user_mode="driver",
+                                    )
+                                return reply
+
         reply = await self.ai.generate_reply(
             messages=self._ai_messages(context, user_mode=user_mode),
             tools=get_tool_schemas(user_mode),
@@ -141,105 +204,6 @@ class ConversationService:
 
         return reply
 
-    async def _handle_trip_interactive_reply(
-        self,
-        inbound: WhatsAppInboundMessage,
-        customer: dict[str, Any],
-        *,
-        action: str,
-        trip_id: str,
-    ) -> str | None:
-        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,
-                "interactive_reply_id": inbound.interactive_reply_id,
-            },
-        )
-
-        driver = await self.repository.get_driver_by_remoteJid(inbound.remoteJid)
-        if not driver:
-            reply = (
-                "لا يوجد حساب سائق مرتبط بهذا الرفم"
-                "من فضللك, سجل كحساب سائق اولا"
-            )
-            await self._store_and_send_assistant_reply(
-                customer,
-                inbound.remoteJid,
-                reply,
-                user_mode=_resolve_user_mode(customer),
-            )
-            return reply
-
-        trip = await self.repository.get_trip_by_id(trip_id)
-        if not trip or str(trip.get("driver_id")) != str(driver["id"]):
-            reply = "That trip could not be found for your account."
-            await self._store_and_send_assistant_reply(
-                customer,
-                inbound.remoteJid,
-                reply,
-                user_mode=_resolve_user_mode(customer),
-            )
-            return reply
-
-        if action == "DELETE":
-            await self.repository.cancel_driver_trip(trip_id)
-            await unindex_trip(repository=self.repository, trip_id=trip_id)
-            reply = "Success! Your trip has been canceled."
-            await self._store_and_send_assistant_reply(
-                customer,
-                inbound.remoteJid,
-                reply,
-                user_mode="driver",
-            )
-            return reply
-
-        if action == "MODIFY":
-            await self.repository.set_customer_session_field(
-                customer_id=str(customer["id"]),
-                key="active_edit_trip_id",
-                value=trip_id,
-            )
-            summary = _trip_summary(trip)
-            route = f"{summary.get('departure')} -> {summary.get('destination')}"
-            time_label = summary.get("departure_time") or summary.get("departure_time_type")
-            system_note = (
-                f"SYSTEM: Driver selected trip {trip_id} ({route}, {time_label}) to modify. "
-                "Ask them what details they want to change."
-            )
-            user_mode = "driver"
-            registry = self._tool_registry(
-                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=8,
-            )
-            messages = self._ai_messages(context, user_mode=user_mode)
-            messages.append({"role": "system", "content": system_note})
-            reply = await self.ai.generate_reply(
-                messages=messages,
-                tools=get_tool_schemas(user_mode),
-                registry=registry,
-            )
-            await self._store_and_send_assistant_reply(
-                customer,
-                inbound.remoteJid,
-                reply,
-                user_mode=user_mode,
-            )
-            return reply
-
-        return None
-
     async def _store_and_send_assistant_reply(
         self,
         customer: dict[str, Any],

app/tools/handlers.py

@@ -12,7 +12,7 @@ _NO_DRIVER_ERROR = (
 from app.database.supabase import SupabaseRepository
 from app.models.domain import ToolResult
 from app.services.embedding_service import JinaEmbeddingService
-from app.services.trip_indexing import index_trip, unindex_trip
+from app.services.trip_indexing import index_trip
 from app.utils.departure import (
     _parse_date_value,
     normalize_departure_bucket,
@@ -23,7 +23,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_text, format_trip_card
+from app.whatsapp.trip_selection import format_trip_card
 
 
 class FalsaToolHandlers:
@@ -370,18 +370,52 @@ class FalsaToolHandlers:
             )
 
         trips = await self.repository.list_driver_trips(str(driver["id"]))
+
+        if not trips:
+            return ToolResult(
+                ok=True,
+                data={
+                    "count": 0,
+                    "message": "No upcoming active trips found.",
+                },
+            )
+
+        for trip in trips[:5]:
+            trip_id = trip.get("trip_id") or trip.get("id")
+            selection_count = await self.repository.count_trip_selections(trip_id)
+            trip["selection_count"] = selection_count
+            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": "driver_trip_card"},
+                    )
+            except WhatsAppClientError:
+                logger.warning("Failed to send trip card for trip %s", trip_id)
+
+        prompt = "هذه قائمة رحلاتك المسجلة"
+        await self.whatsapp.send_text(self.remoteJid, prompt)
+        await self.repository.create_message(
+            customer_id=str(self.customer["id"]),
+            sender_type="assistant",
+            message=prompt,
+            metadata={"type": "driver_trip_list_prompt"},
+        )
+
         return ToolResult(
             ok=True,
             data={
-                "driver_id": driver["id"],
-                "upcoming_trips": await self._summarize_trips(trips),
                 "count": len(trips),
-                "message": (
-                    "No upcoming active trips found."
-                    if not trips
-                    else "Upcoming active trips retrieved successfully."
-                ),
+                "sent_as_messages": True,
+                "note": "Trip cards sent. No text reply needed.",
             },
+            suppress_llm_reply=True,
         )
 
     async def add_driver_car(self, arguments: dict[str, Any]) -> ToolResult:
@@ -623,116 +657,44 @@ class FalsaToolHandlers:
                 },
             )
 
-        body = build_trip_selection_text(trips=trips, action_type=action_type)
-        try:
-            await self.whatsapp.send_text(self.remoteJid, body)
-        except WhatsAppClientError as exc:
-            return ToolResult(
-                ok=False,
-                data={"count": len(trips)},
-                error=f"Failed to send WhatsApp trip selection text: {exc}",
-            )
+        action_label = "حذفها" if action_type == "DELETE" else "تعديلها"
+        for trip in trips[:5]:
+            trip_id = trip.get("trip_id") or trip.get("id")
+            selection_count = await self.repository.count_trip_selections(trip_id)
+            trip["selection_count"] = selection_count
+            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": "driver_trip_card", "action": action_type},
+                    )
+            except WhatsAppClientError:
+                logger.warning("Failed to send trip card for trip %s", trip_id)
+
+        prompt = f"قم بالرد على بطاقة الرحلة التي تريد {action_label}"
+        await self.whatsapp.send_text(self.remoteJid, prompt)
+        await self.repository.create_message(
+            customer_id=str(self.customer["id"]),
+            sender_type="assistant",
+            message=prompt,
+            metadata={"type": "driver_trip_selection_prompt"},
+        )
 
         return ToolResult(
             ok=True,
             data={
                 "count": len(trips),
                 "action_type": action_type,
-                "message": (
-                    "Sent a numbered trip list to the driver via WhatsApp. "
-                    "Ask them to reply with the trip number."
-                ),
-            },
-        )
-
-    async def delete_trip_by_number(self, arguments: dict[str, Any]) -> ToolResult:
-        driver = await self.repository.get_driver_by_remoteJid(self.remoteJid)
-        if not driver:
-            return ToolResult(
-                ok=False,
-                data={"action": "create_driver_account"},
-                error=_NO_DRIVER_ERROR,
-            )
-
-        trip_number = _optional_int(arguments.get("trip_number"))
-        if trip_number is None or trip_number < 1:
-            return ToolResult(ok=False, data={}, error="trip_number must be an integer >= 1")
-
-        trips = await self.repository.list_driver_trips(str(driver["id"]))
-        if trip_number > len(trips):
-            return ToolResult(
-                ok=False,
-                data={"count": len(trips)},
-                error=f"trip_number must be between 1 and {len(trips)}",
-            )
-
-        trip = trips[trip_number - 1]
-        await self.repository.cancel_driver_trip(str(trip["id"]))
-        await unindex_trip(repository=self.repository, trip_id=str(trip["id"]))
-
-        return ToolResult(
-            ok=True,
-            data={
-                "trip_number": trip_number,
-                "trip_id": trip.get("id"),
-                "trip": _trip_summary(trip, trip_number=trip_number),
-                "message": "Success! Your trip has been canceled.",
-            },
-        )
-
-    async def modify_trip_by_number(self, arguments: dict[str, Any]) -> ToolResult:
-        print("\n  modefing our new \n")
-        driver = await self.repository.get_driver_by_remoteJid(self.remoteJid)
-        if not driver:
-            return ToolResult(
-                ok=False,
-                data={"action": "create_driver_account"},
-                error=_NO_DRIVER_ERROR,
-            )
-
-        trip_number = _optional_int(arguments.get("trip_number"))
-        field = _optional_string(arguments.get("field"))
-        value = _optional_string(arguments.get("value"))
-        if trip_number is None or trip_number < 1:
-            return ToolResult(ok=False, data={}, error="trip_number must be an integer >= 1")
-        if not field or value is None:
-            return ToolResult(ok=False, data={}, error="field and value are required")
-
-        trips = await self.repository.list_driver_trips(str(driver["id"]))
-        if trip_number > len(trips):
-            return ToolResult(
-                ok=False,
-                data={"count": len(trips)},
-                error=f"trip_number must be between 1 and {len(trips)}",
-            )
-
-        trip = trips[trip_number - 1]
-        updates, error = await self._build_trip_field_update(
-            driver_id=str(driver["id"]),
-            field=field,
-            value=value,
-        )
-        if error:
-            return ToolResult(ok=False, data={}, error=error)
-
-        updated_trip = await self.repository.update_driver_trip(str(trip["id"]), updates)
-        await index_trip(
-            repository=self.repository,
-            embeddings=self.embeddings,
-            embedding_model=self.embedding_model,
-            trip=updated_trip,
-        )
-
-        return ToolResult(
-            ok=True,
-            data={
-                "trip_number": trip_number,
-                "trip_id": updated_trip.get("id"),
-                "field": field,
-                "value": value,
-                "trip": _trip_summary(updated_trip, trip_number=trip_number),
-                "message": "Trip updated successfully.",
+                "sent_as_messages": True,
+                "note": "Trip cards sent. No text reply needed.",
             },
+            suppress_llm_reply=True,
         )
 
     async def update_trip_field(self, arguments: dict[str, Any]) -> ToolResult:

app/whatsapp/trip_selection.py

@@ -8,74 +8,6 @@ _BUCKET_LABELS = {
     "night": "مساء",
 }
 
-_ACTION_DESCRIPTIONS = {
-    "DELETE": "🗑️ اختر رقم الرحله التي تريد حذفها من فضلك",
-    "MODIFY": "✏️ يمكنك ارسال رقم الرحلة التي تريد تعديلها",
-}
-_PERFFIX= "قائمة الرحلات المسجله في حسابك لدينا\n\n"+("-"*7)
-
-
-def parse_trip_action_reply(reply_id: str) -> tuple[str, str] | None:
-    if "_" not in reply_id:
-        return None
-    action, trip_id = reply_id.split("_", 1)
-    if action not in {"DELETE", "MODIFY"} or not trip_id:
-        return None
-    return action, trip_id
-
-
-def build_trip_selection_list(
-    *,
-    trips: list[dict[str, Any]],
-    action_type: str,
-) -> dict[str, Any]:
-    action = action_type.upper()
-    suffix = _ACTION_DESCRIPTIONS.get(action, "")
-    rows = [
-        f"""
-        [{str(trips.index(trip))}] :الرحلة رقم
-        \n
-        {_trip_row_description(trip)}
-        """
-        for trip in trips[:10]
-    ]
-    rows_text = "\n".join(rows)
-    return {
-        "type": "text",
-        "text": {
-            "body": f"{_PERFFIX} {rows_text} {suffix}"
-
-        }
-    }
-
-
-def build_trip_selection_text(
-    *,
-    trips: list[dict[str, Any]],
-    action_type: str,
-) -> str:
-    action = action_type.upper()
-    suffix = {
-        "DELETE": "ارسل رقم الرحلة التي تريد حذفها.",
-        "MODIFY": "ارسل رقم الرحلة التي تريد تعديلها.",
-    }.get(action, "")
-
-    lines = [
-        f"قائمة الرحلات المسجلة لك:\n"
-    ]
-    for index, trip in enumerate(trips, start=1):
-        parsed_date = trip_departure_date(trip)
-        bucket = trip_departure_bucket(trip)
-        bucket_text = _BUCKET_LABELS.get(bucket, "") if bucket else ""
-        date_text = parsed_date.isoformat() if parsed_date else str(trip.get("departure_date") or "")
-        lines.append(
-            f"{index}. {trip.get('departure', '')} → {trip.get('destination', '')} | {date_text} | {bucket_text} | seats: {trip.get('available_seats')} / {trip.get('total_seats')} | price: {trip.get('price')}"
-        )
-    lines.append("")
-    lines.append(suffix)
-    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 "")
@@ -116,16 +48,3 @@ def _first_dict_value(value: Any) -> dict[str, Any] | None:
     return None
 
 
-def _trip_row_description(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 ""
-    
-    return (
-        f"🚌 {departure} → {destination}\n"
-        f"📅 التاريخ: {date_text}\n"
-        f"🕰️ الوقت: {bucket_text}"
-    )

tests/conftest.py

@@ -167,10 +167,16 @@ class FakeRepository:
                 return customer
         raise KeyError(customer_id)
 
-    async def get_customer_session(self, customer_id: str) -> dict[str, Any]:
-        for customer in self.customers_by_phone.values():
+    def _find_customer_by_id(self, customer_id: str) -> dict[str, Any] | None:
+        for customer in self.customers_by_remote_jid.values():
             if customer["id"] == customer_id:
-                return dict(customer.get("session_data") or {})
+                return customer
+        return None
+
+    async def get_customer_session(self, customer_id: str) -> dict[str, Any]:
+        customer = self._find_customer_by_id(customer_id)
+        if customer:
+            return dict(customer.get("session_data") or {})
         return {}
 
     async def update_customer_session(
@@ -179,10 +185,10 @@ class FakeRepository:
         customer_id: str,
         session_data: dict[str, Any],
     ) -> dict[str, Any]:
-        for customer in self.customers_by_phone.values():
-            if customer["id"] == customer_id:
-                customer["session_data"] = session_data
-                return customer
+        customer = self._find_customer_by_id(customer_id)
+        if customer:
+            customer["session_data"] = session_data
+            return customer
         raise KeyError(customer_id)
 
     async def set_customer_session_field(
@@ -312,6 +318,9 @@ class FakeRepository:
     async def get_driver_by_phone(self, remote_jid: str) -> dict[str, Any] | None:
         return self.drivers_by_remote_jid.get(remote_jid)
 
+    async def get_driver_by_remoteJid(self, remote_jid: str) -> dict[str, Any] | None:
+        return self.drivers_by_remote_jid.get(remote_jid)
+
     async def create_driver(self, *, customer_id: str) -> dict[str, Any]:
         customer = next(
             (customer for customer in self.customers_by_remote_jid.values() if customer["id"] == customer_id),
@@ -322,6 +331,7 @@ class FakeRepository:
         driver = {
             "id": f"driver-{len(self.drivers_by_remote_jid) + 1}",
             "customer_id": customer_id,
+            "name": customer.get("name"),
             "status": "active",
             "customers": customer,
         }
@@ -405,6 +415,22 @@ class FakeRepository:
         trip.update(updates)
         return trip
 
+    async def get_driver_trip_by_datetime(
+        self,
+        *,
+        driver_id: str,
+        departure_date: Any,
+        departure_time: str,
+    ) -> dict[str, Any] | None:
+        for trip in self.trips_by_id.values():
+            if (
+                str(trip.get("driver_id")) == str(driver_id)
+                and str(trip.get("departure_date")) == str(departure_date)
+                and str(trip.get("departure_time")) == departure_time
+            ):
+                return trip
+        return None
+
     async def cancel_driver_trip(self, trip_id: str) -> dict[str, Any]:
         trip = self.trips_by_id[trip_id]
         trip["status"] = "cancelled"

tests/test_conversation_service.py

@@ -28,7 +28,7 @@ async def test_conversation_stores_messages_uses_last_four_context_and_sends_rep
     reply = await service.handle_inbound_message(
         WhatsAppInboundMessage(
             message_id="wamid.new",
-            from_phone="967700000001",
+            remoteJid="967700000001",
             text="Aden to Mukalla tomorrow",
             profile_name="Customer",
         )
@@ -40,14 +40,10 @@ async def test_conversation_stores_messages_uses_last_four_context_and_sends_rep
 
     ai_messages = ai.calls[0]["messages"]
     assert ai_messages[0]["role"] == "system"
-    assert "not chosen a role yet" in ai_messages[0]["content"]
-    assert [message["content"] for message in ai_messages[1:]] == [
-        "prior-2",
-        "prior-3",
-        "prior-4",
-        "prior-5",
-        "Aden to Mukalla tomorrow",
-    ]
+    assert "travel as passenger" in ai_messages[0]["content"]
+    context_contents = [message["content"] for message in ai_messages[1:]]
+    assert context_contents[-1] == "Aden to Mukalla tomorrow"
+    assert len(context_contents) <= 9
     tool_names = {tool["function"]["name"] for tool in ai.calls[0]["tools"]}
     assert tool_names == {
         "about_falsa",
@@ -80,7 +76,7 @@ async def test_conversation_skips_duplicate_whatsapp_message(settings):
     result = await service.handle_inbound_message(
         WhatsAppInboundMessage(
             message_id="wamid.duplicate",
-            from_phone="967700000001",
+            remoteJid="967700000001",
             text="same message",
         )
     )
@@ -107,7 +103,7 @@ async def test_conversation_uses_passenger_tools_when_user_mode_is_passenger(set
     await service.handle_inbound_message(
         WhatsAppInboundMessage(
             message_id="wamid.passenger",
-            from_phone="967700000001",
+            remoteJid="967700000001",
             text="Aden to Mukalla tomorrow",
             profile_name="Customer",
         )
@@ -142,7 +138,7 @@ async def test_conversation_uses_driver_tools_when_user_mode_is_driver(settings)
     await service.handle_inbound_message(
         WhatsAppInboundMessage(
             message_id="wamid.driver",
-            from_phone="967700000010",
+            remoteJid="967700000010",
             text="Check my trips",
             profile_name="Ali",
         )
@@ -155,102 +151,10 @@ async def test_conversation_uses_driver_tools_when_user_mode_is_driver(settings)
         "check_driver_trips",
         "add_driver_car",
         "add_trip_by_driver",
-        "delete_trip_by_number",
-        "modify_trip_by_number",
         "initiate_trip_action",
         "update_trip_field",
         "switch_to_passenger",
     }
 
 
-@pytest.mark.asyncio
-async def test_conversation_handles_delete_interactive_reply(settings):
-    repository = FakeRepository()
-    customer = await repository.upsert_customer(phone_number="967700000010", name="Ali")
-    customer["user_mode"] = "driver"
-    repository.drivers_by_phone["967700000010"] = {
-        "id": "driver-1",
-        "name": "Ali",
-        "phone_number": "967700000010",
-    }
-    repository.trips_by_id["trip-1"] = {
-        "id": "trip-1",
-        "driver_id": "driver-1",
-        "departure": "Aden",
-        "destination": "Mukalla",
-        "departure_date": "2026-12-01",
-        "departure_time": "morning",
-        "status": "active",
-        "driver_cars": {"car_type": "SUV"},
-        "drivers": {"name": "Ali"},
-    }
-    repository.trip_embeddings.append({"trip_id": "trip-1"})
-    ai = FakeAI()
-    service = ConversationService(
-        repository=repository,
-        embeddings=FakeEmbeddings(),
-        whatsapp=FakeWhatsApp(),
-        ai=ai,
-        settings=settings,
-    )
-
-    reply = await service.handle_inbound_message(
-        WhatsAppInboundMessage(
-            message_id="wamid.delete",
-            from_phone="967700000010",
-            text="Noon - Mukalla",
-            message_type="interactive",
-            interactive_reply_id="DELETE_trip-1",
-        )
-    )
-
-    assert reply == "Success! Your trip has been canceled."
-    assert repository.trips_by_id["trip-1"]["status"] == "cancelled"
-    assert repository.trip_embeddings == []
-    assert ai.calls == []
-
-
-@pytest.mark.asyncio
-async def test_conversation_handles_modify_interactive_reply(settings):
-    repository = FakeRepository()
-    customer = await repository.upsert_customer(phone_number="967700000010", name="Ali")
-    customer["user_mode"] = "driver"
-    repository.drivers_by_phone["967700000010"] = {
-        "id": "driver-1",
-        "name": "Ali",
-        "phone_number": "967700000010",
-    }
-    repository.trips_by_id["trip-1"] = {
-        "id": "trip-1",
-        "driver_id": "driver-1",
-        "departure": "Aden",
-        "destination": "Mukalla",
-        "departure_date": "2026-12-01",
-        "departure_time": "morning",
-        "status": "active",
-        "driver_cars": {"car_type": "SUV"},
-        "drivers": {"name": "Ali"},
-    }
-    ai = FakeAI(reply="What would you like to change?")
-    service = ConversationService(
-        repository=repository,
-        embeddings=FakeEmbeddings(),
-        whatsapp=FakeWhatsApp(),
-        ai=ai,
-        settings=settings,
-    )
-
-    reply = await service.handle_inbound_message(
-        WhatsAppInboundMessage(
-            message_id="wamid.modify",
-            from_phone="967700000010",
-            text="Morning - Mukalla",
-            message_type="interactive",
-            interactive_reply_id="MODIFY_trip-1",
-        )
-    )
 
-    assert reply == "What would you like to change?"
-    session = await repository.get_customer_session(customer["id"])
-    assert session["active_edit_trip_id"] == "trip-1"
-    assert ai.calls[0]["messages"][-1]["content"].startswith("SYSTEM: Driver selected trip trip-1")

tests/test_tool_schemas.py

@@ -30,4 +30,4 @@ def test_passenger_tools_exclude_driver_management_tools():
 
 def test_all_tool_schemas_include_every_tool():
     names = {schema["function"]["name"] for schema in get_all_tool_schemas()}
-    assert len(names) == 14
+    assert len(names) == 12

tests/test_tools.py

@@ -12,11 +12,16 @@ def make_handlers(
     customer: dict | None = None,
     sender_phone: str = "967700000001",
 ) -> FalsaToolHandlers:
+    repo = repository or FakeRepository()
+    if customer is None:
+        cust = {"id": "cust-1", "remoteJid": sender_phone, "session_data": {}}
+        repo.customers_by_remote_jid[sender_phone] = cust
+        customer = cust
     return FalsaToolHandlers(
-        repository=repository or FakeRepository(),
+        repository=repo,
         embeddings=embeddings or FakeEmbeddings(),
         whatsapp=whatsapp or FakeWhatsApp(),
-        customer=customer or {"id": "cust-1", "remoteJid": sender_phone},
+        customer=customer,
         remoteJid=sender_phone,
         embedding_model="jina-embeddings-v5-text-small",
     )
@@ -302,7 +307,7 @@ async def test_create_driver_account_uses_sender_phone():
 
     assert result.ok is True
     assert repository.created_drivers[0]["customers"]["remoteJid"] == "967700000010"
-    assert repository.drivers_by_remote_jid["967700000010"]["name"] == "Ali Driver"
+    assert result.data["driver_id"] == "driver-1"
 
 
 @pytest.mark.asyncio
@@ -425,7 +430,7 @@ async def test_check_driver_trips_returns_upcoming_trips():
 
     assert result.ok is True
     assert result.data["count"] == 1
-    assert result.data["upcoming_trips"][0]["trip_id"] == "trip-1"
+    assert result.suppress_llm_reply is True
 
 
 @pytest.mark.asyncio
@@ -612,7 +617,7 @@ async def test_switch_to_passenger_without_name():
 
 
 def _driver_setup(repository: FakeRepository, *, phone: str = "967700000010") -> None:
-    repository.drivers_by_phone[phone] = {
+    repository.drivers_by_remote_jid[phone] = {
         "id": "driver-1",
         "name": "Ali",
         "phone_number": phone,
@@ -634,7 +639,7 @@ def _driver_setup(repository: FakeRepository, *, phone: str = "967700000010") ->
 
 
 @pytest.mark.asyncio
-async def test_initiate_trip_action_sends_whatsapp_list():
+async def test_initiate_trip_action_sends_trip_cards():
     repository = FakeRepository()
     whatsapp = FakeWhatsApp()
     _driver_setup(repository)
@@ -648,10 +653,11 @@ async def test_initiate_trip_action_sends_whatsapp_list():
 
     assert result.ok is True
     assert result.data["count"] == 1
-    assert "Pausing for response" in result.data["message"]
-    assert len(whatsapp.interactive_lists) == 1
-    _, interactive = whatsapp.interactive_lists[0]
-    assert interactive["action"]["sections"][0]["rows"][0]["id"] == "DELETE_trip-1"
+    assert result.suppress_llm_reply is True
+    assert len(whatsapp.sent) == 2  # card + prompt
+    card_text = whatsapp.sent[0][1]
+    assert "عدن" in card_text
+    assert "المكلا" in card_text
 
 
 @pytest.mark.asyncio
@@ -668,37 +674,6 @@ async def test_initiate_trip_action_returns_no_trips_message():
     assert "No trips found" in result.data["message"]
 
 
-@pytest.mark.asyncio
-async def test_delete_trip_by_number_cancels_trip():
-    repository = FakeRepository()
-    _driver_setup(repository)
-    handlers = make_handlers(repository=repository, sender_phone="967700000010")
-
-    result = await handlers.delete_trip_by_number({"trip_number": 1})
-
-    assert result.ok is True
-    assert result.data["trip_number"] == 1
-    assert result.data["trip_id"] == "trip-1"
-    assert repository.trips_by_id["trip-1"]["status"] == "cancelled"
-
-
-@pytest.mark.asyncio
-async def test_modify_trip_by_number_updates_trip_field():
-    repository = FakeRepository()
-    _driver_setup(repository)
-    handlers = make_handlers(repository=repository, sender_phone="967700000010")
-
-    result = await handlers.modify_trip_by_number(
-        {"trip_number": 1, "field": "departure", "value": "تعز"}
-    )
-
-    assert result.ok is True
-    assert result.data["trip_number"] == 1
-    assert result.data["field"] == "departure"
-    assert result.data["value"] == "تعز"
-    assert repository.trips_by_id["trip-1"]["departure"] == "تعز"
-
-
 @pytest.mark.asyncio
 async def test_update_trip_field_uses_active_session_and_clears_it():
     repository = FakeRepository()

tests/test_trip_selection.py

@@ -1,28 +1,27 @@
-from app.whatsapp.trip_selection import build_trip_selection_list, parse_trip_action_reply
+from app.whatsapp.trip_selection import format_trip_card
 
 
-def test_parse_trip_action_reply():
-    assert parse_trip_action_reply("DELETE_trip-1") == ("DELETE", "trip-1")
-    assert parse_trip_action_reply("MODIFY_abc-123") == ("MODIFY", "abc-123")
-    assert parse_trip_action_reply("bad") is None
-
-
-def test_build_trip_selection_list_text_message():
-    result = build_trip_selection_list(
-        trips=[
-            {
-                "id": "trip-1",
-                "departure": "Aden",
-                "destination": "Very Long Destination Name Here",
-                "departure_date": "2026-12-01",
-                "departure_time": "noon",
-            }
-        ],
-        action_type="DELETE",
-    )
-
-    assert result["type"] == "text"
-    body = result["text"]["body"]
-    assert "📋" in body
-    assert "🗑️" in body
-    assert "قائمة الرحلات" in body
+def test_format_trip_card():
+    trip = {
+        "id": "trip-1",
+        "departure": "صنعاء",
+        "destination": "تعز",
+        "departure_date": "2026-12-01",
+        "departure_time": "noon",
+        "available_seats": 3,
+        "total_seats": 4,
+        "price": 5000,
+        "driver_cars": [{"car_type": "باص"}],
+        "drivers": [{"name": "أحمد"}],
+        "selection_count": 2,
+    }
+    card = format_trip_card(trip)
+    assert "صنعاء" in card
+    assert "تعز" in card
+    assert "2026-12-01" in card
+    assert "ظهرا" in card
+    assert "3 من 4" in card
+    assert "5000" in card
+    assert "باص" in card
+    assert "أحمد" in card
+    assert "2" in card

tests/test_webhooks.py

@@ -123,7 +123,7 @@ def test_admin_driver_debug_returns_llm_and_tool_results(settings):
             )
 
     class DummyConversation:
-        def _tool_registry(self, customer, sender_phone, user_mode="driver"):
+        def _tool_registry(self, customer, *, remoteJid, user_mode="driver", current_message=None):
             class DummyRegistry:
                 async def execute(self, name, arguments):
                     return ToolResult(ok=True, data={"name": name, "arguments": arguments})