feat: welcome returning drivers discovered from WhatsApp groups

- Detect unregistered drivers (from group trips) who later DM the bot
- Send personalized welcome with their name and explanation of FALSA benefits
- Upgrade user_mode from new_user to driver automatically
- Improve driver phone lookup to handle /-separated numbers

app/database/supabase.py

@@ -631,6 +631,18 @@ class SupabaseRepository:
             .maybe_single()
             .execute()
         )
+        result = _response_data(response)
+        if result:
+            return result
+
+        # Check if any stored customer has a /-separated phone_number containing our phone
+        response = await (
+            self.client.table("drivers")
+            .select("*, customers!inner(*)")
+            .like("customers.phone_number", f"%{phone}%")
+            .maybe_single()
+            .execute()
+        )
         return _response_data(response)
 
     async def create_driver(self, *, customer_id: str) -> dict[str, Any]:

app/services/conversation_service.py

@@ -75,6 +75,16 @@ class ConversationService:
         )
 
         user_mode = _resolve_user_mode(customer)
+
+        is_returning_driver = False
+        if user_mode == "new_user" and customer.get("phone_number"):
+            existing_driver = await self.repository.get_driver_by_phone_number(
+                customer["phone_number"],
+            )
+            if existing_driver:
+                is_returning_driver = True
+                user_mode = "driver"
+
         registry = self._tool_registry(
             customer,
             remoteJid=inbound.remoteJid,
@@ -185,11 +195,35 @@ class ConversationService:
                                     )
                                 return reply
 
-        reply = await self.ai.generate_reply(
-            messages=self._ai_messages(context, user_mode=user_mode),
-            tools=get_tool_schemas(user_mode),
-            registry=registry,
-        )
+        if is_returning_driver:
+            driver_name = customer.get("name") or ""
+            system_note = (
+                f"SYSTEM: This is the first message from driver \"{driver_name}\". "
+                "They were previously tracked from WhatsApp group trip posts. "
+                "Welcome them warmly by name. Tell them we have been following their trips "
+                "in the groups and we are impressed. Explain that we have registered them in "
+                "FALSA so they can now send trips directly here instead of posting in groups. "
+                "Show them how: just send the trip details (route, date, time) in chat. "
+                "Explain the benefits: passengers find their trips via AI search, they get "
+                "notified immediately when a passenger selects their trip, and registered "
+                "drivers get priority visibility in search results. Tell them we will no "
+                "longer add their trips from groups — they are in full control now. "
+                "Keep it warm, personal, and exciting. Use emojis. Write in Arabic. "
+                "8-10 lines max. Do NOT call any tools."
+            )
+            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,
+            )
+        else:
+            reply = await self.ai.generate_reply(
+                messages=self._ai_messages(context, user_mode=user_mode),
+                tools=get_tool_schemas(user_mode),
+                registry=registry,
+            )
 
         if not reply:
             return reply
@@ -203,6 +237,12 @@ class ConversationService:
             metadata={"provider_flow": "groq_primary_hf_fallback", "user_mode": user_mode},
         )
 
+        if is_returning_driver:
+            await self.repository.update_customer_user_mode(
+                customer_id=str(customer["id"]),
+                user_mode="driver",
+            )
+
         return reply
 
     async def _store_and_send_assistant_reply(

tests/test_conversation_service.py

@@ -120,6 +120,74 @@ async def test_conversation_uses_passenger_tools_when_user_mode_is_passenger(set
     assert "travel booking assistant" in ai.calls[0]["messages"][0]["content"]
 
 
+@pytest.mark.asyncio
+async def test_returning_driver_gets_welcome_and_upgraded_to_driver(settings):
+    """An unregistered driver saved from group trips who later DMs the bot
+    should get a personalized welcome system note, use driver tools, and
+    have their user_mode upgraded to 'driver'."""
+    repository = FakeRepository()
+
+    # Step 1: Simulate group-trip extraction creating an unregistered driver
+    customer = await repository.upsert_customer(
+        remote_jid=None,
+        name="فهد",
+        phone_number="967712345678",
+        registered=False,
+    )
+    await repository.create_driver(customer_id=customer["id"])
+
+    assert customer["user_mode"] is None
+    assert customer["remoteJid"] is None
+
+    # Step 2: Same driver sends a DM
+    ai = FakeAI(reply="مرحباً فهد! نتابع رحلاتك...")
+    whatsapp = FakeWhatsApp()
+    service = ConversationService(
+        repository=repository,
+        embeddings=FakeEmbeddings(),
+        whatsapp=whatsapp,
+        ai=ai,
+        settings=settings,
+    )
+
+    reply = await service.handle_inbound_message(
+        WhatsAppInboundMessage(
+            message_id="wamid.returning",
+            remoteJid="967712345678",
+            text="مرحبا، أبي أضيف رحلة",
+            phone_number="967712345678",
+            profile_name="فهد",
+        )
+    )
+
+    assert reply == "مرحباً فهد! نتابع رحلاتك..."
+
+    # Should use driver tools (not new_user tools)
+    tool_names = {tool["function"]["name"] for tool in ai.calls[0]["tools"]}
+    assert tool_names == {
+        "about_falsa",
+        "check_driver_info",
+        "check_driver_trips",
+        "add_driver_car",
+        "add_trip_by_driver",
+        "initiate_trip_action",
+        "update_trip_field",
+        "switch_to_passenger",
+    }
+
+    # System note should be appended with returning-driver context
+    ai_messages = ai.calls[0]["messages"]
+    system_contents = [m["content"] for m in ai_messages if m["role"] == "system"]
+    assert any("فهد" in msg for msg in system_contents)
+    assert any("group" in msg.lower() or "مجموعات" in msg for msg in system_contents)
+
+    # user_mode should be upgraded to 'driver'
+    assert customer["user_mode"] == "driver"
+
+    # WhatsApp message was sent
+    assert len(whatsapp.sent) == 1
+
+
 @pytest.mark.asyncio
 async def test_conversation_uses_driver_tools_when_user_mode_is_driver(settings):
     repository = FakeRepository()