chore: CRM stabilization sprint completion

- Refactor: Decomposed CrmConversationalDashboard into modular components (Inbox, AIAssistant, StatsHeader)
- Fix: Centralized entity resolution with EntityResolver service (API & Worker)
- Fix: Strict Prisma typing, removed 'as any' casts in organization and whatsapp routes
- Fix: Implemented broadcast message persistence and accurate usage quota tracking
- Schema: Added MessageStatus and status field to Message model

apps/admin/src/components/crm/CrmAIAssistant.tsx

@@ -0,0 +1,198 @@
+import { useRef, useEffect } from 'react';
+import { Upload, Send, Bot, User, Loader2, FileText, CheckCircle2 } from 'lucide-react';
+import { motion } from 'framer-motion';
+
+interface Message {
+    id: string;
+    role: 'user' | 'assistant';
+    content: string;
+    timestamp: Date;
+}
+
+interface CrmAIAssistantProps {
+    messages: Message[];
+    input: string;
+    setInput: (val: string) => void;
+    isUploading: boolean;
+    isGenerating: boolean;
+    isDragging: boolean;
+    onFileUpload: (file: File) => void;
+    onDragOver: (e: React.DragEvent) => void;
+    onDragLeave: () => void;
+    onDrop: (e: React.DragEvent) => void;
+    onSendMessage: (e?: React.FormEvent) => void;
+    onValidateAndSend: (message: string) => void;
+}
+
+export default function CrmAIAssistant({
+    messages,
+    input,
+    setInput,
+    isUploading,
+    isGenerating,
+    isDragging,
+    onFileUpload,
+    onDragOver,
+    onDragLeave,
+    onDrop,
+    onSendMessage,
+    onValidateAndSend
+}: CrmAIAssistantProps) {
+    const messagesEndRef = useRef<HTMLDivElement>(null);
+
+    const scrollToBottom = () => {
+        messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
+    };
+
+    useEffect(() => {
+        scrollToBottom();
+    }, [messages]);
+
+    return (
+        <div className="flex-1 flex overflow-hidden h-full">
+            {/* Left Side: Context / Stats */}
+            <div className="w-1/3 p-8 border-r border-slate-200 bg-white/50 backdrop-blur-sm hidden lg:block overflow-y-auto">
+                <div className="h-full flex flex-col">
+                    <div className="mb-8">
+                        <h2 className="text-xl font-black text-slate-900 mb-2">Source de Données</h2>
+                        <p className="text-sm text-slate-500 font-medium leading-relaxed">
+                            Déposez votre fichier Excel pour créer une nouvelle liste de diffusion instantanément.
+                        </p>
+                    </div>
+
+                    <div 
+                        onDragOver={onDragOver}
+                        onDragLeave={onDragLeave}
+                        onDrop={onDrop}
+                        className={`flex-1 min-h-[300px] border-4 border-dashed rounded-[2.5rem] flex flex-col items-center justify-center p-10 transition-all duration-300 ${
+                            isDragging 
+                            ? 'border-indigo-500 bg-indigo-50 scale-[0.98]' 
+                            : 'border-slate-200 bg-slate-50 hover:border-slate-300 hover:bg-slate-100/50'
+                        }`}
+                    >
+                        {isUploading ? (
+                            <div className="flex flex-col items-center text-center">
+                                <div className="relative">
+                                    <Loader2 className="w-16 h-16 text-indigo-600 animate-spin mb-6" />
+                                    <div className="absolute inset-0 flex items-center justify-center">
+                                        <FileText className="w-6 h-6 text-indigo-400" />
+                                    </div>
+                                </div>
+                                <h3 className="text-lg font-black text-slate-900">Analyse de l'Excel...</h3>
+                                <p className="text-sm text-slate-500 mt-2">Nous normalisons les numéros et identifions les colonnes.</p>
+                            </div>
+                        ) : (
+                            <div className="flex flex-col items-center text-center">
+                                <div className="w-20 h-20 bg-white rounded-3xl shadow-xl flex items-center justify-center mb-6 group-hover:scale-110 transition-transform">
+                                    <Upload className={`w-10 h-10 ${isDragging ? 'text-indigo-600' : 'text-slate-400'}`} />
+                                </div>
+                                <h3 className="text-lg font-black text-slate-900">Glissez-déposez ici</h3>
+                                <p className="text-sm text-slate-400 mt-2 mb-8 font-medium">Fichiers .xlsx, .xls ou .csv</p>
+                                
+                                <label className="bg-slate-900 text-white px-8 py-4 rounded-2xl font-bold text-sm cursor-pointer hover:bg-slate-800 transition shadow-xl shadow-slate-200 active:scale-95">
+                                    Parcourir mes fichiers
+                                    <input 
+                                        type="file" 
+                                        className="hidden" 
+                                        accept=".xlsx,.xls,.csv" 
+                                        onChange={(e) => e.target.files?.[0] && onFileUpload(e.target.files[0])}
+                                    />
+                                </label>
+                            </div>
+                        )}
+                    </div>
+
+                    <div className="mt-8 p-6 bg-indigo-50 rounded-3xl border border-indigo-100">
+                        <h4 className="text-[10px] font-black text-indigo-400 uppercase tracking-widest mb-3">Conseil IA</h4>
+                        <p className="text-xs text-indigo-900 font-medium leading-relaxed">
+                            Assurez-vous que votre fichier contient une colonne "Téléphone" ou "Mobile". L'IA s'occupe de mapper le reste !
+                        </p>
+                    </div>
+                </div>
+            </div>
+
+            {/* Main View Area */}
+            <div className="flex-1 flex flex-col relative bg-slate-50 overflow-hidden">
+                <div className="flex-1 overflow-y-auto p-8 space-y-6 scrollbar-hide">
+                    {messages.map((msg) => (
+                        <motion.div 
+                            key={msg.id}
+                            initial={{ opacity: 0, y: 10 }}
+                            animate={{ opacity: 1, y: 0 }}
+                            className={`flex ${msg.role === 'user' ? 'justify-end' : 'justify-start'}`}
+                        >
+                            <div className={`flex gap-4 max-w-[80%] ${msg.role === 'user' ? 'flex-row-reverse' : ''}`}>
+                                <div className={`w-10 h-10 rounded-2xl flex items-center justify-center shadow-sm flex-shrink-0 ${
+                                    msg.role === 'user' ? 'bg-slate-900 text-white' : 'bg-indigo-600 text-white'
+                                }`}>
+                                    {msg.role === 'user' ? <User className="w-5 h-5" /> : <Bot className="w-6 h-6" />}
+                                </div>
+                                <div className="flex flex-col items-start gap-1">
+                                    <div className={`p-5 rounded-[1.8rem] text-sm font-medium leading-relaxed shadow-sm ${
+                                        msg.role === 'user' 
+                                        ? 'bg-indigo-600 text-white rounded-tr-none' 
+                                        : 'bg-white border border-slate-200 text-slate-800 rounded-tl-none'
+                                    }`}>
+                                        {msg.content}
+                                    </div>
+                                    {msg.role === 'assistant' && msg.id !== '1' && !isGenerating && messages[messages.length - 1].id === msg.id && (
+                                        <motion.button 
+                                            initial={{ opacity: 0, scale: 0.9 }}
+                                            animate={{ opacity: 1, scale: 1 }}
+                                            onClick={() => onValidateAndSend(msg.content)}
+                                            className="mt-3 bg-emerald-500 text-white px-6 py-3 rounded-2xl font-black text-xs shadow-lg shadow-emerald-100 hover:bg-emerald-600 hover:scale-105 active:scale-95 transition-all flex items-center gap-2"
+                                        >
+                                            <CheckCircle2 className="w-4 h-4" /> Valider et Envoyer à la liste
+                                        </motion.button>
+                                    )}
+                                </div>
+                            </div>
+                        </motion.div>
+                    ))}
+                    {isGenerating && (
+                        <motion.div 
+                            initial={{ opacity: 0, y: 10 }}
+                            animate={{ opacity: 1, y: 0 }}
+                            className="flex justify-start"
+                        >
+                            <div className="flex gap-4 max-w-[80%]">
+                                <div className="w-10 h-10 rounded-2xl flex items-center justify-center bg-indigo-600 text-white shadow-sm flex-shrink-0 animate-pulse">
+                                    <Bot className="w-6 h-6" />
+                                </div>
+                                <div className="bg-white border border-slate-200 p-5 rounded-[1.8rem] rounded-tl-none flex items-center gap-3 text-slate-400 font-bold text-xs animate-pulse">
+                                    <Loader2 className="w-4 h-4 animate-spin" /> L'IA rédige votre campagne...
+                                </div>
+                            </div>
+                        </motion.div>
+                    )}
+                    <div ref={messagesEndRef} />
+                </div>
+
+                {/* Chat Input */}
+                <div className="p-8 bg-gradient-to-t from-slate-50 via-slate-50 to-transparent">
+                    <form 
+                        onSubmit={onSendMessage}
+                        className="max-w-3xl mx-auto relative group"
+                    >
+                        <div className="absolute inset-0 bg-indigo-500 blur-3xl opacity-0 group-focus-within:opacity-10 transition-opacity duration-500" />
+                        <div className="relative bg-white border border-slate-200 rounded-[2.2rem] p-2 flex items-center shadow-2xl focus-within:border-indigo-500 transition-all duration-300">
+                            <input 
+                                className="flex-1 bg-transparent border-none focus:ring-0 px-6 py-4 font-medium text-slate-900 placeholder:text-slate-400"
+                                placeholder="Posez une question ou donnez un ordre à l'IA..."
+                                value={input}
+                                onChange={(e) => setInput(e.target.value)}
+                            />
+                            <button 
+                                type="submit"
+                                className="w-14 h-14 bg-indigo-600 text-white rounded-[1.8rem] flex items-center justify-center hover:bg-indigo-700 hover:rotate-6 transition-all shadow-xl shadow-indigo-100 disabled:opacity-50 disabled:rotate-0"
+                                disabled={!input.trim()}
+                            >
+                                <Send className="w-6 h-6" />
+                            </button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    );
+}

apps/admin/src/components/crm/CrmInbox.tsx

@@ -0,0 +1,126 @@
+import { Bot, Loader2, Send } from 'lucide-react';
+import { motion } from 'framer-motion';
+
+interface CrmInboxProps {
+    inboxMessages: any[];
+    isLoadingInbox: boolean;
+    selectedContactId: string | null;
+    setSelectedContactId: (id: string | null) => void;
+    replyInput: string;
+    setReplyInput: (val: string) => void;
+    isSendingReply: boolean;
+    onFetchInbox: () => void;
+    onReply: (e: React.FormEvent) => void;
+}
+
+export default function CrmInbox({
+    inboxMessages,
+    isLoadingInbox,
+    selectedContactId,
+    setSelectedContactId,
+    replyInput,
+    setReplyInput,
+    isSendingReply,
+    onFetchInbox,
+    onReply
+}: CrmInboxProps) {
+    return (
+        <div className="flex-1 overflow-y-auto p-8 bg-slate-50 h-full">
+            <div className="max-w-5xl mx-auto">
+                <div className="flex items-center justify-between mb-8">
+                    <h2 className="text-2xl font-black text-slate-900">Conversations Récentes</h2>
+                    <button 
+                        onClick={onFetchInbox}
+                        className="p-2 hover:bg-slate-200 rounded-xl transition-all"
+                    >
+                        <Loader2 className={`w-5 h-5 text-slate-400 ${isLoadingInbox ? 'animate-spin' : ''}`} />
+                    </button>
+                </div>
+
+                {inboxMessages.length === 0 && !isLoadingInbox ? (
+                    <div className="bg-white rounded-[2rem] border border-slate-200 p-20 flex flex-col items-center text-center shadow-sm">
+                        <div className="w-20 h-20 bg-slate-50 rounded-3xl flex items-center justify-center mb-6">
+                            <Bot className="w-10 h-10 text-slate-200" />
+                        </div>
+                        <h3 className="text-lg font-black text-slate-900 mb-2">Aucun message pour le moment</h3>
+                        <p className="text-sm text-slate-400 max-w-xs mx-auto font-medium">
+                            Les réponses de vos clients apparaîtront ici dès qu'ils interagiront avec vos campagnes.
+                        </p>
+                    </div>
+                ) : (
+                    <div className="flex flex-col h-full relative">
+                        <div className="flex-1 space-y-4 pb-32">
+                            {inboxMessages.map((msg: any) => (
+                                <motion.div 
+                                    key={msg.id}
+                                    initial={{ opacity: 0, x: -10 }}
+                                    animate={{ opacity: 1, x: 0 }}
+                                    onClick={() => setSelectedContactId(msg.contactId)}
+                                    className={`p-6 rounded-3xl border transition-all cursor-pointer ${
+                                        selectedContactId === msg.contactId 
+                                        ? 'bg-indigo-50 border-indigo-200 shadow-md ring-2 ring-indigo-500/10' 
+                                        : 'bg-white border-slate-200 shadow-sm hover:shadow-md'
+                                    } flex items-center justify-between group`}
+                                >
+                                    <div className="flex items-center gap-5">
+                                        <div className={`w-12 h-12 rounded-2xl flex items-center justify-center font-black text-white ${
+                                            msg.direction === 'INBOUND' ? 'bg-indigo-600' : 'bg-slate-400'
+                                        }`}>
+                                            {msg.contact?.name?.[0] || msg.contact?.phoneNumber?.slice(-1)}
+                                        </div>
+                                        <div>
+                                            <div className="flex items-center gap-2 mb-1">
+                                                <span className="font-black text-slate-900">{msg.contact?.name || msg.contact?.phoneNumber}</span>
+                                                <span className={`text-[10px] px-2 py-0.5 rounded-full font-black ${
+                                                    msg.direction === 'INBOUND' ? 'bg-indigo-50 text-indigo-600' : 'bg-slate-50 text-slate-400'
+                                                }`}>
+                                                    {msg.direction === 'INBOUND' ? 'REÇU' : 'ENVOYÉ'}
+                                                </span>
+                                            </div>
+                                            <p className="text-sm text-slate-500 font-medium line-clamp-1">{msg.content}</p>
+                                        </div>
+                                    </div>
+                                    <div className="text-right">
+                                        <p className="text-[10px] font-black text-slate-400 uppercase">
+                                            {new Date(msg.createdAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}
+                                        </p>
+                                        <p className="text-[10px] font-bold text-slate-300">
+                                            {new Date(msg.createdAt).toLocaleDateString()}
+                                        </p>
+                                    </div>
+                                </motion.div>
+                            ))}
+                        </div>
+
+                        {/* Reply Floating Bar */}
+                        {selectedContactId && (
+                            <div className="fixed bottom-8 right-8 left-[35%] lg:left-[40%] z-10 p-4">
+                                <form 
+                                    onSubmit={onReply}
+                                    className="max-w-3xl mx-auto relative group"
+                                >
+                                    <div className="absolute inset-0 bg-indigo-500 blur-3xl opacity-5 group-focus-within:opacity-20 transition-opacity duration-500" />
+                                    <div className="relative bg-white border-2 border-indigo-500 rounded-[2.2rem] p-2 flex items-center shadow-2xl transition-all duration-300">
+                                        <input 
+                                            className="flex-1 bg-transparent border-none focus:ring-0 px-6 py-4 font-bold text-slate-900 placeholder:text-slate-400"
+                                            placeholder={`Répondre à ${inboxMessages.find(m => m.contactId === selectedContactId)?.contact?.name || 'ce contact'}...`}
+                                            value={replyInput}
+                                            onChange={(e) => setReplyInput(e.target.value)}
+                                        />
+                                        <button 
+                                            type="submit"
+                                            disabled={!replyInput.trim() || isSendingReply}
+                                            className="w-14 h-14 bg-indigo-600 text-white rounded-[1.8rem] flex items-center justify-center hover:bg-indigo-700 hover:rotate-6 transition-all shadow-xl shadow-indigo-100 disabled:opacity-50"
+                                        >
+                                            {isSendingReply ? <Loader2 className="w-6 h-6 animate-spin" /> : <Send className="w-6 h-6" />}
+                                        </button>
+                                    </div>
+                                </form>
+                            </div>
+                        )}
+                    </div>
+                )}
+            </div>
+        </div>
+    );
+}

apps/admin/src/components/crm/CrmStatsHeader.tsx

@@ -0,0 +1,59 @@
+import { Sparkles, CheckCircle2, X } from 'lucide-react';
+import { motion, AnimatePresence } from 'framer-motion';
+
+interface CrmStatsHeaderProps {
+    view: 'assistant' | 'inbox';
+    setView: (view: 'assistant' | 'inbox') => void;
+    uploadedFile: { name: string, listName: string } | null;
+    onClearFile: () => void;
+}
+
+export default function CrmStatsHeader({ view, setView, uploadedFile, onClearFile }: CrmStatsHeaderProps) {
+    return (
+        <div className="bg-white border-b border-slate-200 px-8 py-4 flex items-center justify-between shadow-sm z-10">
+            <div className="flex items-center gap-3">
+                <div className="w-10 h-10 bg-indigo-600 rounded-xl flex items-center justify-center text-white shadow-lg shadow-indigo-100">
+                    <Sparkles className="w-6 h-6" />
+                </div>
+                <div>
+                    <h1 className="text-lg font-black text-slate-900 tracking-tight">Assistant CRM Intelligent</h1>
+                    <p className="text-[10px] font-bold text-slate-400 uppercase tracking-widest">Workspace WhatsApp Business</p>
+                </div>
+            </div>
+
+            <div className="flex items-center gap-4">
+                <div className="flex bg-slate-100 p-1 rounded-2xl">
+                    <button 
+                        onClick={() => setView('assistant')}
+                        className={`px-4 py-2 rounded-xl text-xs font-black transition-all ${view === 'assistant' ? 'bg-white shadow-sm text-indigo-600' : 'text-slate-400'}`}
+                    >
+                        Assistant IA
+                    </button>
+                    <button 
+                        onClick={() => setView('inbox')}
+                        className={`px-4 py-2 rounded-xl text-xs font-black transition-all ${view === 'inbox' ? 'bg-white shadow-sm text-indigo-600' : 'text-slate-400'}`}
+                    >
+                        Boîte de réception
+                    </button>
+                </div>
+
+                <AnimatePresence>
+                    {uploadedFile && (
+                        <motion.div 
+                            initial={{ opacity: 0, x: 20 }}
+                            animate={{ opacity: 1, x: 0 }}
+                            exit={{ opacity: 0, x: 20 }}
+                            className="flex items-center gap-3 bg-emerald-50 border border-emerald-100 px-4 py-2 rounded-xl"
+                        >
+                            <CheckCircle2 className="w-4 h-4 text-emerald-500" />
+                            <span className="text-xs font-bold text-emerald-700">Liste active : {uploadedFile.listName}</span>
+                            <button onClick={onClearFile} className="p-1 hover:bg-emerald-100 rounded-full transition">
+                                <X className="w-3 h-3 text-emerald-400" />
+                            </button>
+                        </motion.div>
+                    )}
+                </AnimatePresence>
+            </div>
+        </div>
+    );
+}

apps/admin/src/pages/CrmConversationalDashboard.tsx

@@ -1,8 +1,9 @@
-import { useState, useRef, useEffect } from 'react';
-import { Upload, Send, Bot, User, Loader2, FileText, CheckCircle2, X, Sparkles } from 'lucide-react';
-import { motion, AnimatePresence } from 'framer-motion';
+import { useState, useEffect } from 'react';
 import { useAuth } from '../lib/auth';
 import { useTenant } from '../lib/tenant';
+import CrmStatsHeader from '../components/crm/CrmStatsHeader';
+import CrmAIAssistant from '../components/crm/CrmAIAssistant';
+import CrmInbox from '../components/crm/CrmInbox';
 
 interface Message {
     id: string;
@@ -33,15 +34,6 @@ export default function CrmConversationalDashboard() {
     const [isGenerating, setIsGenerating] = useState(false);
     const [isDragging, setIsDragging] = useState(false);
     const [uploadedFile, setUploadedFile] = useState<{ name: string, listId: string, listName: string } | null>(null);
-    const messagesEndRef = useRef<HTMLDivElement>(null);
-
-    const scrollToBottom = () => {
-        messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
-    };
-
-    useEffect(() => {
-        scrollToBottom();
-    }, [messages]);
 
     const fetchInbox = async () => {
         if (!token || !selectedOrgId) return;
@@ -103,26 +95,6 @@ export default function CrmConversationalDashboard() {
         }
     };
 
-    const handleDragOver = (e: React.DragEvent) => {
-        e.preventDefault();
-        setIsDragging(true);
-    };
-
-    const handleDragLeave = () => {
-        setIsDragging(false);
-    };
-
-    const handleDrop = (e: React.DragEvent) => {
-        e.preventDefault();
-        setIsDragging(false);
-        const file = e.dataTransfer.files[0];
-        if (file && (file.name.endsWith('.xlsx') || file.name.endsWith('.csv'))) {
-            handleFileUpload(file);
-        } else {
-            alert("Veuillez déposer un fichier Excel (.xlsx) ou CSV.");
-        }
-    };
-
     const handleSendMessage = async (e?: React.FormEvent) => {
         e?.preventDefault();
         if (!input.trim() || !token || !selectedOrgId) return;
@@ -197,7 +169,6 @@ export default function CrmConversationalDashboard() {
 
             if (res.ok) {
                 alert("🚀 Votre campagne est en cours de distribution !");
-                // Reset state for a new campaign
                 setUploadedFile(null);
                 setMessages([
                     {
@@ -248,300 +219,51 @@ export default function CrmConversationalDashboard() {
 
     return (
         <div className="flex flex-col h-[calc(100vh-64px)] bg-slate-50">
-            {/* Header / Stats Bar */}
-            <div className="bg-white border-b border-slate-200 px-8 py-4 flex items-center justify-between shadow-sm z-10">
-                <div className="flex items-center gap-3">
-                    <div className="w-10 h-10 bg-indigo-600 rounded-xl flex items-center justify-center text-white shadow-lg shadow-indigo-100">
-                        <Sparkles className="w-6 h-6" />
-                    </div>
-                    <div>
-                        <h1 className="text-lg font-black text-slate-900 tracking-tight">Assistant CRM Intelligent</h1>
-                        <p className="text-[10px] font-bold text-slate-400 uppercase tracking-widest">Workspace WhatsApp Business</p>
-                    </div>
-                </div>
-
-                <div className="flex items-center gap-4">
-                    <div className="flex bg-slate-100 p-1 rounded-2xl">
-                        <button 
-                            onClick={() => setView('assistant')}
-                            className={`px-4 py-2 rounded-xl text-xs font-black transition-all ${view === 'assistant' ? 'bg-white shadow-sm text-indigo-600' : 'text-slate-400'}`}
-                        >
-                            Assistant IA
-                        </button>
-                        <button 
-                            onClick={() => setView('inbox')}
-                            className={`px-4 py-2 rounded-xl text-xs font-black transition-all ${view === 'inbox' ? 'bg-white shadow-sm text-indigo-600' : 'text-slate-400'}`}
-                        >
-                            Boîte de réception
-                        </button>
-                    </div>
-
-                    <AnimatePresence>
-                        {uploadedFile && (
-                            <motion.div 
-                                initial={{ opacity: 0, x: 20 }}
-                                animate={{ opacity: 1, x: 0 }}
-                                className="flex items-center gap-3 bg-emerald-50 border border-emerald-100 px-4 py-2 rounded-xl"
-                            >
-                                <CheckCircle2 className="w-4 h-4 text-emerald-500" />
-                                <span className="text-xs font-bold text-emerald-700">Liste active : {uploadedFile.listName}</span>
-                                <button onClick={() => setUploadedFile(null)} className="p-1 hover:bg-emerald-100 rounded-full transition">
-                                    <X className="w-3 h-3 text-emerald-400" />
-                                </button>
-                            </motion.div>
-                        )}
-                    </AnimatePresence>
-                </div>
-            </div>
+            <CrmStatsHeader 
+                view={view} 
+                setView={setView} 
+                uploadedFile={uploadedFile} 
+                onClearFile={() => setUploadedFile(null)} 
+            />
 
             <div className="flex-1 flex overflow-hidden">
-                {/* Left Side: Context / Stats (Only show in Assistant mode) */}
-                {view === 'assistant' && (
-                    <div className="w-1/3 p-8 border-r border-slate-200 bg-white/50 backdrop-blur-sm hidden lg:block">
-                        <div className="h-full flex flex-col">
-                            <div className="mb-8">
-                                <h2 className="text-xl font-black text-slate-900 mb-2">Source de Données</h2>
-                                <p className="text-sm text-slate-500 font-medium leading-relaxed">
-                                    Déposez votre fichier Excel pour créer une nouvelle liste de diffusion instantanément.
-                                </p>
-                            </div>
-
-                            <div 
-                                onDragOver={handleDragOver}
-                                onDragLeave={handleDragLeave}
-                                onDrop={handleDrop}
-                                className={`flex-1 border-4 border-dashed rounded-[2.5rem] flex flex-col items-center justify-center p-10 transition-all duration-300 ${
-                                    isDragging 
-                                    ? 'border-indigo-500 bg-indigo-50 scale-[0.98]' 
-                                    : 'border-slate-200 bg-slate-50 hover:border-slate-300 hover:bg-slate-100/50'
-                                }`}
-                            >
-                                {isUploading ? (
-                                    <div className="flex flex-col items-center text-center">
-                                        <div className="relative">
-                                            <Loader2 className="w-16 h-16 text-indigo-600 animate-spin mb-6" />
-                                            <div className="absolute inset-0 flex items-center justify-center">
-                                                <FileText className="w-6 h-6 text-indigo-400" />
-                                            </div>
-                                        </div>
-                                        <h3 className="text-lg font-black text-slate-900">Analyse de l'Excel...</h3>
-                                        <p className="text-sm text-slate-500 mt-2">Nous normalisons les numéros et identifions les colonnes.</p>
-                                    </div>
-                                ) : (
-                                    <div className="flex flex-col items-center text-center">
-                                        <div className="w-20 h-20 bg-white rounded-3xl shadow-xl flex items-center justify-center mb-6 group-hover:scale-110 transition-transform">
-                                            <Upload className={`w-10 h-10 ${isDragging ? 'text-indigo-600' : 'text-slate-400'}`} />
-                                        </div>
-                                        <h3 className="text-lg font-black text-slate-900">Glissez-déposez ici</h3>
-                                        <p className="text-sm text-slate-400 mt-2 mb-8 font-medium">Fichiers .xlsx, .xls ou .csv</p>
-                                        
-                                        <label className="bg-slate-900 text-white px-8 py-4 rounded-2xl font-bold text-sm cursor-pointer hover:bg-slate-800 transition shadow-xl shadow-slate-200 active:scale-95">
-                                            Parcourir mes fichiers
-                                            <input 
-                                                type="file" 
-                                                className="hidden" 
-                                                accept=".xlsx,.xls,.csv" 
-                                                onChange={(e) => e.target.files?.[0] && handleFileUpload(e.target.files[0])}
-                                            />
-                                        </label>
-                                    </div>
-                                )}
-                            </div>
-
-                            <div className="mt-8 p-6 bg-indigo-50 rounded-3xl border border-indigo-100">
-                                <h4 className="text-[10px] font-black text-indigo-400 uppercase tracking-widest mb-3">Conseil IA</h4>
-                                <p className="text-xs text-indigo-900 font-medium leading-relaxed">
-                                    Assurez-vous que votre fichier contient une colonne "Téléphone" ou "Mobile". L'IA s'occupe de mapper le reste !
-                                </p>
-                            </div>
-                        </div>
-                    </div>
+                {view === 'assistant' ? (
+                    <CrmAIAssistant 
+                        messages={messages}
+                        input={input}
+                        setInput={setInput}
+                        isUploading={isUploading}
+                        isGenerating={isGenerating}
+                        isDragging={isDragging}
+                        onFileUpload={handleFileUpload}
+                        onDragOver={(e) => { e.preventDefault(); setIsDragging(true); }}
+                        onDragLeave={() => setIsDragging(false)}
+                        onDrop={(e) => {
+                            e.preventDefault();
+                            setIsDragging(false);
+                            const file = e.dataTransfer.files[0];
+                            if (file && (file.name.endsWith('.xlsx') || file.name.endsWith('.csv'))) {
+                                handleFileUpload(file);
+                            } else {
+                                alert("Veuillez déposer un fichier Excel (.xlsx) ou CSV.");
+                            }
+                        }}
+                        onSendMessage={handleSendMessage}
+                        onValidateAndSend={handleValidateAndSend}
+                    />
+                ) : (
+                    <CrmInbox 
+                        inboxMessages={inboxMessages}
+                        isLoadingInbox={isLoadingInbox}
+                        selectedContactId={selectedContactId}
+                        setSelectedContactId={setSelectedContactId}
+                        replyInput={replyInput}
+                        setReplyInput={setReplyInput}
+                        isSendingReply={isSendingReply}
+                        onFetchInbox={fetchInbox}
+                        onReply={handleReply}
+                    />
                 )}
-
-                {/* Main View Area */}
-                <div className="flex-1 flex flex-col relative bg-slate-50">
-                    {view === 'assistant' ? (
-                        <>
-                            <div className="flex-1 overflow-y-auto p-8 space-y-6 scrollbar-hide">
-                                {messages.map((msg) => (
-                                    <motion.div 
-                                        key={msg.id}
-                                        initial={{ opacity: 0, y: 10 }}
-                                        animate={{ opacity: 1, y: 0 }}
-                                        className={`flex ${msg.role === 'user' ? 'justify-end' : 'justify-start'}`}
-                                    >
-                                        <div className={`flex gap-4 max-w-[80%] ${msg.role === 'user' ? 'flex-row-reverse' : ''}`}>
-                                            <div className={`w-10 h-10 rounded-2xl flex items-center justify-center shadow-sm flex-shrink-0 ${
-                                                msg.role === 'user' ? 'bg-slate-900 text-white' : 'bg-indigo-600 text-white'
-                                            }`}>
-                                                {msg.role === 'user' ? <User className="w-5 h-5" /> : <Bot className="w-6 h-6" />}
-                                            </div>
-                                            <div className="flex flex-col items-start gap-1">
-                                                <div className={`p-5 rounded-[1.8rem] text-sm font-medium leading-relaxed shadow-sm ${
-                                                    msg.role === 'user' 
-                                                    ? 'bg-indigo-600 text-white rounded-tr-none' 
-                                                    : 'bg-white border border-slate-200 text-slate-800 rounded-tl-none'
-                                                }`}>
-                                                    {msg.content}
-                                                </div>
-                                                {msg.role === 'assistant' && msg.id !== '1' && !isGenerating && messages[messages.length - 1].id === msg.id && (
-                                                    <motion.button 
-                                                        initial={{ opacity: 0, scale: 0.9 }}
-                                                        animate={{ opacity: 1, scale: 1 }}
-                                                        onClick={() => handleValidateAndSend(msg.content)}
-                                                        className="mt-3 bg-emerald-500 text-white px-6 py-3 rounded-2xl font-black text-xs shadow-lg shadow-emerald-100 hover:bg-emerald-600 hover:scale-105 active:scale-95 transition-all flex items-center gap-2"
-                                                    >
-                                                        <CheckCircle2 className="w-4 h-4" /> Valider et Envoyer à la liste
-                                                    </motion.button>
-                                                )}
-                                            </div>
-                                        </div>
-                                    </motion.div>
-                                ))}
-                                {isGenerating && (
-                                    <motion.div 
-                                        initial={{ opacity: 0, y: 10 }}
-                                        animate={{ opacity: 1, y: 0 }}
-                                        className="flex justify-start"
-                                    >
-                                        <div className="flex gap-4 max-w-[80%]">
-                                            <div className="w-10 h-10 rounded-2xl flex items-center justify-center bg-indigo-600 text-white shadow-sm flex-shrink-0 animate-pulse">
-                                                <Bot className="w-6 h-6" />
-                                            </div>
-                                            <div className="bg-white border border-slate-200 p-5 rounded-[1.8rem] rounded-tl-none flex items-center gap-3 text-slate-400 font-bold text-xs animate-pulse">
-                                                <Loader2 className="w-4 h-4 animate-spin" /> L'IA rédige votre campagne...
-                                            </div>
-                                        </div>
-                                    </motion.div>
-                                )}
-                                <div ref={messagesEndRef} />
-                            </div>
-
-                            {/* Chat Input */}
-                            <div className="p-8 bg-gradient-to-t from-slate-50 via-slate-50 to-transparent">
-                                <form 
-                                    onSubmit={handleSendMessage}
-                                    className="max-w-3xl mx-auto relative group"
-                                >
-                                    <div className="absolute inset-0 bg-indigo-500 blur-3xl opacity-0 group-focus-within:opacity-10 transition-opacity duration-500" />
-                                    <div className="relative bg-white border border-slate-200 rounded-[2.2rem] p-2 flex items-center shadow-2xl focus-within:border-indigo-500 transition-all duration-300">
-                                        <input 
-                                            className="flex-1 bg-transparent border-none focus:ring-0 px-6 py-4 font-medium text-slate-900 placeholder:text-slate-400"
-                                            placeholder="Posez une question ou donnez un ordre à l'IA..."
-                                            value={input}
-                                            onChange={(e) => setInput(e.target.value)}
-                                        />
-                                        <button 
-                                            type="submit"
-                                            className="w-14 h-14 bg-indigo-600 text-white rounded-[1.8rem] flex items-center justify-center hover:bg-indigo-700 hover:rotate-6 transition-all shadow-xl shadow-indigo-100 disabled:opacity-50 disabled:rotate-0"
-                                            disabled={!input.trim()}
-                                        >
-                                            <Send className="w-6 h-6" />
-                                        </button>
-                                    </div>
-                                </form>
-                            </div>
-                        </>
-                    ) : (
-                        <div className="flex-1 overflow-y-auto p-8">
-                            <div className="max-w-5xl mx-auto">
-                                <div className="flex items-center justify-between mb-8">
-                                    <h2 className="text-2xl font-black text-slate-900">Conversations Récentes</h2>
-                                    <button 
-                                        onClick={fetchInbox}
-                                        className="p-2 hover:bg-slate-200 rounded-xl transition-all"
-                                    >
-                                        <Loader2 className={`w-5 h-5 text-slate-400 ${isLoadingInbox ? 'animate-spin' : ''}`} />
-                                    </button>
-                                </div>
-
-                                {inboxMessages.length === 0 && !isLoadingInbox ? (
-                                    <div className="bg-white rounded-[2rem] border border-slate-200 p-20 flex flex-col items-center text-center shadow-sm">
-                                        <div className="w-20 h-20 bg-slate-50 rounded-3xl flex items-center justify-center mb-6">
-                                            <Bot className="w-10 h-10 text-slate-200" />
-                                        </div>
-                                        <h3 className="text-lg font-black text-slate-900 mb-2">Aucun message pour le moment</h3>
-                                        <p className="text-sm text-slate-400 max-w-xs mx-auto font-medium">
-                                            Les réponses de vos clients apparaîtront ici dès qu'ils interagiront avec vos campagnes.
-                                        </p>
-                                    </div>
-                                ) : (
-                                    <div className="flex flex-col h-full">
-                                        <div className="flex-1 space-y-4 pb-20">
-                                            {inboxMessages.map((msg: any) => (
-                                                <motion.div 
-                                                    key={msg.id}
-                                                    initial={{ opacity: 0, x: -10 }}
-                                                    animate={{ opacity: 1, x: 0 }}
-                                                    onClick={() => setSelectedContactId(msg.contactId)}
-                                                    className={`p-6 rounded-3xl border transition-all cursor-pointer ${
-                                                        selectedContactId === msg.contactId 
-                                                        ? 'bg-indigo-50 border-indigo-200 shadow-md ring-2 ring-indigo-500/10' 
-                                                        : 'bg-white border-slate-200 shadow-sm hover:shadow-md'
-                                                    } flex items-center justify-between group`}
-                                                >
-                                                    <div className="flex items-center gap-5">
-                                                        <div className={`w-12 h-12 rounded-2xl flex items-center justify-center font-black text-white ${
-                                                            msg.direction === 'INBOUND' ? 'bg-indigo-600' : 'bg-slate-400'
-                                                        }`}>
-                                                            {msg.contact?.name?.[0] || msg.contact?.phoneNumber?.slice(-1)}
-                                                        </div>
-                                                        <div>
-                                                            <div className="flex items-center gap-2 mb-1">
-                                                                <span className="font-black text-slate-900">{msg.contact?.name || msg.contact?.phoneNumber}</span>
-                                                                <span className={`text-[10px] px-2 py-0.5 rounded-full font-black ${
-                                                                    msg.direction === 'INBOUND' ? 'bg-indigo-50 text-indigo-600' : 'bg-slate-50 text-slate-400'
-                                                                }`}>
-                                                                    {msg.direction === 'INBOUND' ? 'REÇU' : 'ENVOYÉ'}
-                                                                </span>
-                                                            </div>
-                                                            <p className="text-sm text-slate-500 font-medium line-clamp-1">{msg.content}</p>
-                                                        </div>
-                                                    </div>
-                                                    <div className="text-right">
-                                                        <p className="text-[10px] font-black text-slate-400 uppercase">
-                                                            {new Date(msg.createdAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}
-                                                        </p>
-                                                        <p className="text-[10px] font-bold text-slate-300">
-                                                            {new Date(msg.createdAt).toLocaleDateString()}
-                                                        </p>
-                                                    </div>
-                                                </motion.div>
-                                            ))}
-                                        </div>
-
-                                        {/* Reply Floating Bar */}
-                                        {selectedContactId && (
-                                            <div className="fixed bottom-8 right-8 left-[35%] lg:left-[40%] z-10 p-4">
-                                                <form 
-                                                    onSubmit={handleReply}
-                                                    className="max-w-3xl mx-auto relative group"
-                                                >
-                                                    <div className="absolute inset-0 bg-indigo-500 blur-3xl opacity-5 group-focus-within:opacity-20 transition-opacity duration-500" />
-                                                    <div className="relative bg-white border-2 border-indigo-500 rounded-[2.2rem] p-2 flex items-center shadow-2xl transition-all duration-300">
-                                                        <input 
-                                                            className="flex-1 bg-transparent border-none focus:ring-0 px-6 py-4 font-bold text-slate-900 placeholder:text-slate-400"
-                                                            placeholder={`Répondre à ${inboxMessages.find(m => m.contactId === selectedContactId)?.contact?.name || 'ce contact'}...`}
-                                                            value={replyInput}
-                                                            onChange={(e) => setReplyInput(e.target.value)}
-                                                        />
-                                                        <button 
-                                                            type="submit"
-                                                            disabled={!replyInput.trim() || isSendingReply}
-                                                            className="w-14 h-14 bg-indigo-600 text-white rounded-[1.8rem] flex items-center justify-center hover:bg-indigo-700 hover:rotate-6 transition-all shadow-xl shadow-indigo-100 disabled:opacity-50"
-                                                        >
-                                                            {isSendingReply ? <Loader2 className="w-6 h-6 animate-spin" /> : <Send className="w-6 h-6" />}
-                                                        </button>
-                                                    </div>
-                                                </form>
-                                            </div>
-                                        )}
-                                    </div>
-                                )}
-                            </div>
-                        </div>
-                    )}
-                </div>
             </div>
         </div>
     );

apps/api/src/routes/organizations.ts

@@ -275,7 +275,7 @@ export async function organizationRoutes(fastify: FastifyInstance) {
         logger.info(`[CRM-IMPORT] Creating list "${listName}" with ${rows.length} potential contacts for Org: ${organizationId}`);
 
         // 1. Create the Broadcast List
-        const broadcastList = await (prisma as any).broadcastList.create({
+        const broadcastList = await prisma.broadcastList.create({
             data: {
                 name: listName,
                 organizationId
@@ -313,7 +313,7 @@ export async function organizationRoutes(fastify: FastifyInstance) {
                 if (nameKey) delete attributes[nameKey];
 
                 // Upsert contact and connect to list
-                await (prisma as any).contact.upsert({
+                await prisma.contact.upsert({
                     where: {
                         phoneNumber_organizationId: { phoneNumber, organizationId }
                     },
@@ -368,7 +368,7 @@ export async function organizationRoutes(fastify: FastifyInstance) {
     // 11. CRM: List Messages (Inbox)
     fastify.get('/:id/messages', async (req) => {
         const { id: organizationId } = req.params as { id: string };
-        const messages = await (prisma.message as any).findMany({
+        const messages = await prisma.message.findMany({
             where: { organizationId },
             include: { contact: true },
             orderBy: { createdAt: 'desc' },
@@ -411,7 +411,7 @@ export async function organizationRoutes(fastify: FastifyInstance) {
 
         try {
             // 1. Create message record
-            const newMessage = await (prisma.message as any).create({
+            const newMessage = await prisma.message.create({
                 data: {
                     organizationId,
                     contactId,

apps/api/src/routes/whatsapp.ts

@@ -131,33 +131,19 @@ export async function whatsappRoutes(fastify: FastifyInstance) {
                         return reply.code(200).send('EVENT_RECEIVED');
                     }
 
-                    if (text) {
-                        logger.info({ from, wabaId, orgName: org.name }, '[WHATSAPP-WEBHOOK] Processing automated response');
-                        
-                        const { aiService } = await import('../services/ai');
-                        const { response } = await aiService.handleCrmConversation(from, org.id, text);
+                    // 🤖 AUTOMATED RESPONSE LOOP (AI CLOSING)
+                    const audioUrl = message.audio?.id; // Note: In a real flow, we'd need to fetch the media URL from Meta first
+                    const imageUrl = message.image?.id;
 
-                        const { pushService } = await import('../services/push');
-                        await pushService.notifyOrganization(
-                            org.id, 
-                            "Nouveau message WhatsApp", 
-                            `Le client ${from} a répondu : "${text.substring(0, 50)}..."`
-                        ).catch(e => logger.warn({ e }, "[PUSH] Failed to notify"));
-
-                        const phoneNumberId = org.phoneNumbers?.[0]?.id;
-                        if (phoneNumberId && org.systemUserToken) {
-                            const { decryptSecrets } = await import('../services/organization');
-                            const { whatsappService } = await import('../services/whatsapp');
-                            const decryptedOrg = decryptSecrets(org);
-                            
-                            await whatsappService.sendMessage({
-                                accessToken: decryptedOrg.systemUserToken,
-                                phoneNumberId
-                            }, { to: from, text: response });
-                            
-                            logger.info({ to: from }, '[WHATSAPP-WEBHOOK] Response sent successfully');
-                        }
-                    }
+                    const { whatsappService } = await import('../services/whatsapp');
+                    await whatsappService.handleIncomingMessage(
+                        from, 
+                        text || '', 
+                        audioUrl, 
+                        imageUrl, 
+                        undefined, 
+                        org.id
+                    );
                 }
             }
 

apps/api/src/services/EntityResolver.ts

@@ -0,0 +1,49 @@
+import { prisma } from './prisma';
+import { logger } from '../logger';
+
+export interface ResolvedEntity {
+    user: any | null;
+    contact: any | null;
+    organization: any | null;
+    activeEnrollment: any | null;
+}
+
+export class EntityResolver {
+    /**
+     * Resolves User, Contact, Organization and Active Enrollment for a given phone number and organization.
+     */
+    static async resolve(phone: string, organizationId: string): Promise<ResolvedEntity> {
+        try {
+            const [user, contact, organization] = await Promise.all([
+                prisma.user.findFirst({ 
+                    where: { phone, organizationId },
+                    include: { organization: true } 
+                }),
+                prisma.contact.findFirst({ 
+                    where: { phoneNumber: phone, organizationId } 
+                }),
+                prisma.organization.findUnique({ 
+                    where: { id: organizationId } 
+                })
+            ]);
+
+            let activeEnrollment = null;
+            if (user) {
+                activeEnrollment = await prisma.enrollment.findFirst({
+                    where: { userId: user.id, status: 'ACTIVE' },
+                    include: { track: true }
+                });
+            }
+
+            return {
+                user,
+                contact,
+                organization: organization || user?.organization || null,
+                activeEnrollment
+            };
+        } catch (err) {
+            logger.error({ err, phone, organizationId }, '[EntityResolver] Failed to resolve entity');
+            return { user: null, contact: null, organization: null, activeEnrollment: null };
+        }
+    }
+}

apps/api/src/services/whatsapp.ts

@@ -64,37 +64,50 @@ export class WhatsAppService {
     /**
      * Orchestrates the AI response loop and notifications for an incoming message
      */
-    async handleIncomingMessage(phone: string, text: string, _audioId?: string, _imageId?: string, _videoId?: string, organizationId?: string) {
+    async handleIncomingMessage(phone: string, text: string, audioUrl?: string, imageUrl?: string, _videoId?: string, organizationId?: string) {
         if (!organizationId) {
             logger.warn({ phone }, '[WHATSAPP_SERVICE] Cannot handle message without organizationId');
             return;
         }
 
         try {
-            const { prisma } = await import('./prisma');
+            const { EntityResolver } = await import('./EntityResolver');
             const { aiService } = await import('./ai');
             const { pushService } = await import('./push');
             const { decryptSecrets } = await import('./organization');
+            const { prisma } = await import('./prisma');
 
-            // 1. Process via AI Closing Engine
+            // 1. Resolve Entities (Standardized logic)
+            const { user, contact, organization } = await EntityResolver.resolve(phone, organizationId);
+
+            // 2. Log Message (Non-blocking)
+            if (user || contact) {
+                prisma.message.create({
+                    data: {
+                        content: text || '[Media]',
+                        mediaUrl: audioUrl || imageUrl,
+                        direction: 'INBOUND',
+                        userId: user?.id,
+                        contactId: contact?.id,
+                        organizationId
+                    }
+                }).catch(err => logger.warn({ err }, '[WHATSAPP_SERVICE] Failed to log message'));
+            }
+
+            // 3. Process via AI Closing Engine
             const { response } = await aiService.handleCrmConversation(phone, organizationId, text || '[Médias Reçus]');
 
-            // 2. Trigger Push Notification to the team
+            // 4. Trigger Push Notification to the team
             await pushService.notifyOrganization(
                 organizationId, 
                 "Nouveau message WhatsApp", 
                 `Le client ${phone} a répondu : "${(text || '').substring(0, 50)}..."`
             ).catch(e => logger.warn({ e }, "[PUSH] Failed to notify"));
 
-            // 3. Send automated response if possible
-            const org = await prisma.organization.findUnique({
-                where: { id: organizationId },
-                include: { phoneNumbers: true }
-            });
-
-            const phoneNumberId = org?.phoneNumbers?.[0]?.id;
-            if (org && phoneNumberId && org.systemUserToken) {
-                const decryptedOrg = decryptSecrets(org);
+            // 5. Send automated response if possible
+            const phoneNumberId = organization?.phoneNumbers?.[0]?.id;
+            if (organization && phoneNumberId && organization.systemUserToken) {
+                const decryptedOrg = decryptSecrets(organization);
                 await this.sendMessage({
                     accessToken: decryptedOrg.systemUserToken,
                     phoneNumberId

apps/whatsapp-worker/src/handlers/BroadcastHandler.ts

@@ -86,7 +86,7 @@ export class BroadcastHandler implements JobHandler {
                     successCount++;
                     // P0 Fix: Persist broadcast message for history
                     try {
-                        await (prisma as any).message.create({
+                        await prisma.message.create({
                             data: {
                                 organizationId,
                                 contactId: contact.id,

apps/whatsapp-worker/src/handlers/DirectMessageHandler.ts

@@ -75,7 +75,7 @@ export class DirectMessageHandler implements JobHandler {
                 logger.info({ contactId }, '[DirectMessageHandler] 1-to-1 reply sent');
                 // Update status if model exists in types, else use any
                 try {
-                    await (prisma as any).message.update({
+                    await prisma.message.update({
                         where: { id: messageId },
                         data: { status: 'SENT' }
                     });

apps/whatsapp-worker/src/services/EntityResolver.ts

@@ -0,0 +1,49 @@
+import { prisma } from './prisma';
+import { logger } from '../logger';
+
+export interface ResolvedEntity {
+    user: any | null;
+    contact: any | null;
+    organization: any | null;
+    activeEnrollment: any | null;
+}
+
+export class EntityResolver {
+    /**
+     * Resolves User, Contact, Organization and Active Enrollment for a given phone number and organization.
+     */
+    static async resolve(phone: string, organizationId: string): Promise<ResolvedEntity> {
+        try {
+            const [user, contact, organization] = await Promise.all([
+                prisma.user.findFirst({ 
+                    where: { phone, organizationId },
+                    include: { organization: true } 
+                }),
+                prisma.contact.findFirst({ 
+                    where: { phoneNumber: phone, organizationId } 
+                }),
+                prisma.organization.findUnique({ 
+                    where: { id: organizationId } 
+                })
+            ]);
+
+            let activeEnrollment = null;
+            if (user) {
+                activeEnrollment = await prisma.enrollment.findFirst({
+                    where: { userId: user.id, status: 'ACTIVE' },
+                    include: { track: true }
+                });
+            }
+
+            return {
+                user,
+                contact,
+                organization: organization || user?.organization || null,
+                activeEnrollment
+            };
+        } catch (err) {
+            logger.error({ err, phone, organizationId }, '[EntityResolver] Failed to resolve entity');
+            return { user: null, contact: null, organization: null, activeEnrollment: null };
+        }
+    }
+}

apps/whatsapp-worker/src/services/whatsapp-logic.ts

@@ -1,4 +1,5 @@
 import { logger } from '../logger';
+import { EntityResolver } from './EntityResolver';
 import { prisma } from './prisma';
 import { Queue } from 'bullmq';
 import Redis from 'ioredis';
@@ -44,21 +45,12 @@ export class WhatsAppLogic {
         const normalizedText = this.normalizeCommand(text);
         logger.info(`${traceId} Orchestrating Inbound: ${normalizedText}`);
 
-        // 1. Find User, Contact, Enrollment & Organization
-        const [user, contact, organization] = await Promise.all([
-            prisma.user.findFirst({ where: { phone, organizationId } }),
-            prisma.contact.findFirst({ where: { phoneNumber: phone, organizationId } }),
-            prisma.organization.findUnique({ where: { id: organizationId } })
-        ]);
-
-        const activeEnrollment = user ? await prisma.enrollment.findFirst({
-            where: { userId: user.id, status: 'ACTIVE' },
-            include: { track: true }
-        }) : null;
+        // 1. Resolve Entities (User, Contact, Org, Enrollment)
+        const { user, contact, organization, activeEnrollment } = await EntityResolver.resolve(phone, organizationId);
 
         // 2. Log Message (Non-blocking)
         if (user || contact) {
-            (prisma as any).message.create({
+            prisma.message.create({
                 data: {
                     content: text,
                     mediaUrl: audioUrl || imageUrl,
@@ -80,7 +72,7 @@ export class WhatsAppLogic {
             imageUrl,
             traceId,
             user: user || undefined,
-            activeEnrollment: (activeEnrollment as any) || undefined, // Casting only for internal context mapping if schema mismatch
+            activeEnrollment: activeEnrollment || undefined,
             redis: connection,
             whatsappQueue,
             organizationId,

packages/database/prisma/schema.prisma

@@ -338,6 +338,7 @@ model Message {
   mediaUrl       String?
   payload        Json?
   createdAt      DateTime     @default(now())
+  status         MessageStatus @default(SENT)
   organizationId String       @default("default-org-id")
   organization   Organization @relation(fields: [organizationId], references: [id])
   user           User?        @relation(fields: [userId], references: [id])
@@ -441,6 +442,13 @@ enum ContentType {
   VIDEO
 }
 
+enum MessageStatus {
+  SENT
+  DELIVERED
+  READ
+  RECEIVED
+}
+
 enum Direction {
   INBOUND
   OUTBOUND