make trip search fields optional; update LLM prompts to search/book immediately with partial info

app/ai/tool_schemas.py

@@ -35,6 +35,8 @@ _SEARCH_TRIPS = {
         "description": (
             "Search active car or bus trips. "
             "Use when the customer asks for travel options. "
+            "You can search with only departure or only destination"
+            " — the other will match any location. "
             "Each matching trip is sent as a separate WhatsApp message. "
             "The customer can reply to a trip card to select it."
         ),
@@ -43,11 +45,17 @@ _SEARCH_TRIPS = {
             "properties": {
                 "departure": {
                     "type": "string",
-                    "description": "Departure city or area in Arabic.",
+                    "description": (
+                        "Departure city or area in Arabic. At least one of departure or"
+                        " destination is required — the other can be omitted to match anywhere."
+                    ),
                 },
                 "destination": {
                     "type": "string",
-                    "description": "Destination city or area in Arabic.",
+                    "description": (
+                        "Destination city or area in Arabic. At least one of departure or"
+                        " destination is required — the other can be omitted to match anywhere."
+                    ),
                 },
                 "travel_datetime": {
                     "type": "string",
@@ -89,12 +97,12 @@ _SEARCH_TRIPS = {
                 "vector_query_text": {
                     "type": "string",
                     "description": (
-                        "Natural-language semantic search text containing the route, date, "
-                        "time, seats, and vehicle preferences extracted from the customer."
+                        "Optional natural-language semantic search text. "
+                        "Automatically constructed from the other fields if not provided."
                     ),
                 },
             },
-            "required": ["departure", "destination", "vector_query_text"],
+            "required": [],
             "additionalProperties": False,
         },
     },
@@ -105,10 +113,10 @@ _CREATE_BOOKING_LEAD = {
     "function": {
         "name": "create_booking_lead",
         "description": (
-            "Create a pending booking lead and notify the driver. "
-            "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."
+            "Create a pending booking lead (1 seat by default) and notify the driver. "
+            "Call this immediately when the user replies to a trip card — trip_id is "
+            "auto-detected and requested_seats defaults to 1. "
+            "Does not reserve seats or confirm payment."
         ),
         "parameters": {
             "type": "object",

app/database/supabase.py

@@ -289,8 +289,8 @@ class SupabaseRepository:
         self,
         *,
         query_embedding: list[float],
-        departure: str,
-        destination: str,
+        departure: str | None = None,
+        destination: str | None = None,
         departure_date: date | None = None,
         departure_time: str | None = None,
         requested_time: time | None = None,

app/tools/handlers.py

@@ -109,11 +109,11 @@ class FalsaToolHandlers:
             exact_time=travel_time_exact,
         )
 
-        if not departure or not destination:
+        if not departure and not destination:
             return ToolResult(
                 ok=False,
                 data={},
-                error="departure and destination are required before searching trips",
+                error="At least departure or destination is required before searching trips",
             )
 
         query = vector_query_text or _trip_vector_query_text(
@@ -186,6 +186,7 @@ class FalsaToolHandlers:
             ok=True,
             data={
                 "count": len(top_trips),
+                "matches": top_trips,
                 "alternate_alert": alternate_alert,
                 "sent_as_messages": bool(top_trips),
                 "note": (
@@ -949,8 +950,8 @@ def _resolve_driver_car(
 
 def _trip_vector_query_text(
     *,
-    departure: str,
-    destination: str,
+    departure: str | None,
+    destination: str | None,
     travel_date: str | None,
     travel_time: str | None,
     travel_time_exact: str | None,
@@ -977,8 +978,8 @@ def _trip_vector_query_text(
 def _is_trip_match(
     trip: dict[str, Any],
     *,
-    departure: str,
-    destination: str,
+    departure: str | None,
+    destination: str | None,
     seats: int,
     vehicle_type: str | None,
     departure_request: Any,
@@ -987,9 +988,9 @@ def _is_trip_match(
         return False
     if int(trip.get("available_seats") or 0) < seats:
         return False
-    if departure.lower() not in str(trip.get("departure") or "").lower():
+    if departure and departure.lower() not in str(trip.get("departure") or "").lower():
         return False
-    if destination.lower() not in str(trip.get("destination") or "").lower():
+    if destination and destination.lower() not in str(trip.get("destination") or "").lower():
         return False
     if vehicle_type:
         car = _first_or_dict(trip.get("driver_cars")) or {}

prompts/system_passenger.md

@@ -1,7 +1,6 @@
-- search_trips for travel options. Include vector_query_text (natural-language search phrase).
+- search_trips as soon as the user mentions a departure or destination. You do not need all details — the tool accepts partial info. Only ask a follow-up if neither departure nor destination was mentioned.
 - 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.
+- When the user replies to a trip card, immediately call create_booking_lead — trip_id is auto-detected and seats default to 1. Do not ask for seat count or other details.
 - 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.

tests/test_tools.py

@@ -127,6 +127,69 @@ async def test_search_trips_reports_no_matches():
     assert "No active" in result.data["note"]
 
 
+@pytest.mark.asyncio
+async def test_search_trips_requires_at_least_departure_or_destination():
+    handlers = make_handlers()
+
+    result = await handlers.search_trips({"seats": 2})
+
+    assert result.ok is False
+    assert "departure or destination" in (result.error or "")
+
+
+@pytest.mark.asyncio
+async def test_search_trips_with_departure_only():
+    repository = FakeRepository()
+    repository.trip_vector_search_results = [
+        trip(trip_id="trip-1", departure="Aden", destination="Mukalla"),
+        trip(trip_id="trip-2", departure="Aden", destination="Taiz"),
+    ]
+    embeddings = FakeEmbeddings()
+    handlers = make_handlers(repository=repository, embeddings=embeddings)
+
+    result = await handlers.search_trips({"departure": "Aden"})
+
+    assert result.ok is True
+    assert result.data["count"] == 2
+    assert result.data["matches"][0]["trip_id"] == "trip-1"
+    assert result.data["matches"][1]["trip_id"] == "trip-2"
+    assert repository.vector_trip_search_calls[0]["departure"] == "Aden"
+    assert repository.vector_trip_search_calls[0]["destination"] is None
+
+
+@pytest.mark.asyncio
+async def test_search_trips_with_destination_only():
+    repository = FakeRepository()
+    repository.trip_vector_search_results = [
+        trip(trip_id="trip-1", departure="Aden", destination="Mukalla"),
+        trip(trip_id="trip-2", departure="Taiz", destination="Mukalla"),
+    ]
+    embeddings = FakeEmbeddings()
+    handlers = make_handlers(repository=repository, embeddings=embeddings)
+
+    result = await handlers.search_trips({"destination": "Mukalla"})
+
+    assert result.ok is True
+    assert result.data["count"] == 2
+    assert repository.vector_trip_search_calls[0]["departure"] is None
+    assert repository.vector_trip_search_calls[0]["destination"] == "Mukalla"
+
+
+@pytest.mark.asyncio
+async def test_search_trips_defaults_seats_to_one():
+    repository = FakeRepository()
+    repository.trip_vector_search_results = [
+        trip(trip_id="trip-1", available_seats=1),
+    ]
+    handlers = make_handlers(repository=repository)
+
+    result = await handlers.search_trips({"departure": "Aden", "destination": "Mukalla"})
+
+    assert result.ok is True
+    assert result.data["count"] == 1
+    assert repository.vector_trip_search_calls[0]["seats"] == 1
+
+
 @pytest.mark.asyncio
 async def test_search_trips_includes_alternate_alert_when_first_result_is_over_one_hour():
     repository = FakeRepository()