feat: LLM-driven driver message cleanup for phone numbers and names

- Add driver_message parameter to add_trip_by_driver tool schema
- Update system_driver.md prompt to instruct LLM to clean messages
(remove phone numbers, surrounding text, and driver names)
- Update handler to use LLM-provided driver_message
- Add app/utils/phone.py with regex-based phone number detection
- Add tests/test_phone.py with 25 test cases
- Add test_add_trip_by_driver_uses_llm_cleaned_message test

app/ai/tool_schemas.py

@@ -243,6 +243,14 @@ _ADD_TRIP_BY_DRIVER = {
                     "minimum": 0,
                     "description": "Optional trip price.",
                 },
+                "driver_message": {
+                    "type": "string",
+                    "description": (
+                        "Optional cleaned version of the driver's original message. "
+                        "Remove phone numbers, personal info, and driver name. "
+                        "Keep emojis and decorations. Only set when >2 emojis."
+                    ),
+                },
             },
             "required": ["departure", "destination", "departure_date", "departure_time"],
             "additionalProperties": False,

app/tools/handlers.py

@@ -587,7 +587,8 @@ class FalsaToolHandlers:
         if self.current_message:
             raw_msg = self.current_message.get("message") or ""
             if count_emojis(raw_msg) > 2:
-                driver_message = raw_msg
+                llm_message = _optional_string(arguments.get("driver_message"))
+                driver_message = llm_message or raw_msg
                 use_driver_message = True
 
         trip = await self.repository.create_driver_trip(

app/utils/phone.py

@@ -0,0 +1,29 @@
+import re
+
+_PHONE_RE = re.compile(
+    r"(?:\+|00)\d[\d\s\-\.\(\)]{6,18}\d"
+)
+
+_LOCAL_PHONE_RE = re.compile(
+    r"(?<!\d)"
+    r"(?:\d[\d\s\-\.\(\)]{7,18}\d)"
+    r"(?!\d)"
+)
+
+
+def count_digits(text: str) -> int:
+    return sum(1 for c in text if c.isdigit())
+
+
+def strip_phone_numbers(text: str, replacement: str = "[رقم الهاتف]") -> str:
+    if not text:
+        return text
+
+    def _replace(match: re.Match) -> str:
+        if count_digits(match.group()) >= 7:
+            return replacement
+        return match.group()
+
+    result = _PHONE_RE.sub(_replace, text)
+    result = _LOCAL_PHONE_RE.sub(_replace, result)
+    return result

prompts/system_driver.md

@@ -8,3 +8,11 @@
 - For delete/modify: initiate_trip_action (sends numbered list). Driver replies with number.
   - delete_trip_by_number(trip_number) / modify_trip_by_number(trip_number, field, value). No trip_id.
 - To search/book as traveler: switch_to_passenger (name optional).
+
+Driver message cleanup:
+- When the driver's message has more than 2 emojis, set `driver_message` in add_trip_by_driver.
+- Remove ALL phone numbers AND the surrounding text (e.g. "للتواصل الاتصال على الرقم الآتي📞:-770026665" → remove entirely).
+- Remove the driver's name wherever it appears in the message.
+- Keep emojis, decorative elements, route info, dates, times, and seat info.
+- Example: "🚐بص فهد مريح 🚐. نازل الجمعة ٧ صباحا 👈تريم المكلا👉 بن بكر 📞770026665 💐بن بكر💐"
+  → "🚐بص فهد مريح 🚐. نازل الجمعة ٧ صباحا 👈تريم المكلا👉 🫵🏻 📞 💐"

tests/test_phone.py

@@ -0,0 +1,100 @@
+from app.utils.phone import count_digits, strip_phone_numbers
+
+
+class TestCountDigits:
+    def test_no_digits(self):
+        assert count_digits("hello world") == 0
+
+    def test_all_digits(self):
+        assert count_digits("1234567") == 7
+
+    def test_mixed(self):
+        assert count_digits("abc123def456") == 6
+
+    def test_empty(self):
+        assert count_digits("") == 0
+
+
+class TestStripPhoneNumbers:
+    def test_yemeni_number_with_plus(self):
+        result = strip_phone_numbers("اتصل على +967712345678")
+        assert result == "اتصل على [رقم الهاتف]"
+
+    def test_yemeni_number_with_00(self):
+        result = strip_phone_numbers("اتصل على 00967712345678")
+        assert result == "اتصل على [رقم الهاتف]"
+
+    def test_international_with_dashes(self):
+        result = strip_phone_numbers("Call +1-234-567-8901")
+        assert result == "Call [رقم الهاتف]"
+
+    def test_international_with_spaces(self):
+        result = strip_phone_numbers("Call +44 20 7946 0958")
+        assert result == "Call [رقم الهاتف]"
+
+    def test_international_with_dots(self):
+        result = strip_phone_numbers("Call +49.30.1234567")
+        assert result == "Call [رقم الهاتف]"
+
+    def test_international_with_parentheses(self):
+        result = strip_phone_numbers("Call +1 (234) 567-8901")
+        assert result == "Call [رقم الهاتف]"
+
+    def test_multiple_numbers(self):
+        result = strip_phone_numbers("Call +967712345678 or +967776543210")
+        assert result == "Call [رقم الهاتف] or [رقم الهاتف]"
+
+    def test_no_phone_numbers(self):
+        text = "رحلة من صنعاء إلى تعز"
+        result = strip_phone_numbers(text)
+        assert result == text
+
+    def test_short_number_not_matched(self):
+        result = strip_phone_numbers("Room 123")
+        assert result == "Room 123"
+
+    def test_empty_string(self):
+        assert strip_phone_numbers("") == ""
+
+    def test_none_returns_none(self):
+        assert strip_phone_numbers(None) is None
+
+    def test_custom_replacement(self):
+        result = strip_phone_numbers("Call +967712345678", replacement="***")
+        assert result == "Call ***"
+
+    def test_number_at_start(self):
+        result = strip_phone_numbers("+967712345678 اتصل")
+        assert result == "[رقم الهاتف] اتصل"
+
+    def test_number_at_end(self):
+        result = strip_phone_numbers("اتصل +967712345678")
+        assert result == "اتصل [رقم الهاتف]"
+
+    def test_number_in_middle_of_text(self):
+        result = strip_phone_numbers("اتصل على +967712345678 للحجز")
+        assert result == "اتصل على [رقم الهاتف] للحجز"
+
+    def test_yemeni_local_format(self):
+        result = strip_phone_numbers("0712345678")
+        assert result == "[رقم الهاتف]"
+
+    def test_number_with_country_code_no_plus(self):
+        result = strip_phone_numbers("967712345678")
+        assert result == "[رقم الهاتف]"
+
+    def test_long_number_with_separators(self):
+        result = strip_phone_numbers("+1 (555) 123-4567 ext 890")
+        assert result == "[رقم الهاتف] ext 890"
+
+    def test_local_yemeni_9_digit(self):
+        result = strip_phone_numbers("770026665")
+        assert result == "[رقم الهاتف]"
+
+    def test_local_yemeni_in_message(self):
+        result = strip_phone_numbers("للتواصل على الرقم 770026665")
+        assert result == "للتواصل على الرقم [رقم الهاتف]"
+
+    def test_local_yemeni_with_dash_prefix(self):
+        result = strip_phone_numbers("الرقم:-770026665")
+        assert result == "الرقم:-[رقم الهاتف]"

tests/test_tools.py

@@ -625,6 +625,43 @@ async def test_add_trip_by_driver_stores_driver_message_with_emojis():
     assert created_trip["driver_message"] == "باص من عدن الى المكلا 😊😊😊"
 
 
+@pytest.mark.asyncio
+async def test_add_trip_by_driver_uses_llm_cleaned_message():
+    repository = FakeRepository()
+    repository.drivers_by_remote_jid["967700000010"] = {
+        "id": "driver-1",
+        "name": "Ali",
+        "remoteJid": "967700000010",
+    }
+    repository.driver_cars_by_driver["driver-1"] = [
+        {"id": "car-1", "car_type": "SUV", "seat_count": 4},
+    ]
+    raw_msg = "🚐بص فهد مريح 🚐. نازل الجمعة ٧ صباحا 👈تريم المكلا👉 بن بكر 📞770026665 💐بن بكر💐"
+    cleaned_msg = "🚐بص فهد مريح 🚐. نازل الجمعة ٧ صباحا 👈تريم المكلا👉 💐"
+    current_message = {"message": raw_msg}
+    handlers = make_handlers(repository=repository, sender_phone="967700000010")
+    handlers.current_message = current_message
+
+    result = await handlers.add_trip_by_driver(
+        {
+            "departure": "تريم",
+            "destination": "المكلا",
+            "departure_date": "2026-06-10",
+            "departure_time": "morning",
+            "vehicle_type": "SUV",
+            "available_seats": 2,
+            "total_seats": 4,
+            "price": 50,
+            "driver_message": cleaned_msg,
+        }
+    )
+
+    assert result.ok is True
+    created_trip = repository.created_trips[-1]
+    assert created_trip["use_driver_message"] is True
+    assert created_trip["driver_message"] == cleaned_msg
+
+
 @pytest.mark.asyncio
 async def test_add_trip_by_driver_no_driver_message_with_few_emojis():
     repository = FakeRepository()