feat: implement whatsapp templates management with security hardening, audit logs, and crm integration

apps/admin/src/App.tsx

@@ -23,6 +23,7 @@ import ConversationalDashboard from '@/pages/ConversationalDashboard';
 import CrmConversationalDashboard from '@/pages/CrmConversationalDashboard';
 import KnowledgeBasePage from '@/pages/KnowledgeBasePage';
 import CampaignHistoryPage from '@/pages/CampaignHistoryPage';
+import TemplatesPage from '@/pages/TemplatesPage';
 import { useTenant } from '@/lib/tenant';
 import { api } from '@/lib/api';
 
@@ -92,6 +93,7 @@ function AppShell() {
                 <Route path="/reset-password" element={<ResetPasswordPage />} />
                 <Route path="/kb" element={<KnowledgeBasePage />} />
                 <Route path="/campaign-history" element={<CampaignHistoryPage />} />
+                <Route path="/whatsapp-templates" element={<TemplatesPage />} />
             </Routes>
         </MainLayout>
     );

apps/admin/src/components/LanguageSwitcher.tsx

@@ -0,0 +1,62 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { ChevronDown } from 'lucide-react';
+import { motion, AnimatePresence } from 'framer-motion';
+
+const languages = [
+    { code: 'en', label: 'English', flag: '🇺🇸' },
+    { code: 'fr', label: 'Français', flag: '🇫🇷' },
+    { code: 'es', label: 'Español', flag: '🇪🇸' },
+    { code: 'pt', label: 'Português', flag: '🇵🇹' }
+];
+
+export default function LanguageSwitcher() {
+    const { i18n } = useTranslation();
+    const [isOpen, setIsOpen] = React.useState(false);
+
+    const currentLanguage = languages.find(l => l.code === i18n.language) || languages[1];
+
+    const changeLanguage = (code: string) => {
+        i18n.changeLanguage(code);
+        setIsOpen(false);
+    };
+
+    return (
+        <div className="relative">
+            <button
+                onClick={() => setIsOpen(!isOpen)}
+                className="flex items-center gap-2 px-3 py-2 text-slate-300 hover:text-white transition bg-slate-800 rounded-xl text-xs w-full justify-between"
+            >
+                <div className="flex items-center gap-2">
+                    <span>{currentLanguage.flag}</span>
+                    <span className="font-medium">{currentLanguage.label}</span>
+                </div>
+                <ChevronDown className={`w-3 h-3 transition-transform ${isOpen ? 'rotate-180' : ''}`} />
+            </button>
+
+            <AnimatePresence>
+                {isOpen && (
+                    <motion.div
+                        initial={{ opacity: 0, y: 10 }}
+                        animate={{ opacity: 1, y: 0 }}
+                        exit={{ opacity: 0, y: 10 }}
+                        className="absolute bottom-full left-0 right-0 mb-2 bg-slate-800 border border-slate-700 rounded-xl overflow-hidden shadow-xl z-50"
+                    >
+                        {languages.map((lang) => (
+                            <button
+                                key={lang.code}
+                                onClick={() => changeLanguage(lang.code)}
+                                className={`w-full flex items-center gap-3 px-4 py-2.5 text-xs text-left transition hover:bg-slate-700 ${
+                                    i18n.language === lang.code ? 'text-white bg-slate-700/50' : 'text-slate-400'
+                                }`}
+                            >
+                                <span>{lang.flag}</span>
+                                <span>{lang.label}</span>
+                            </button>
+                        ))}
+                    </motion.div>
+                )}
+            </AnimatePresence>
+        </div>
+    );
+}

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

@@ -1,4 +1,5 @@
 import { useRef, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 import { Upload, Send, Bot, User, Loader2, FileText, CheckCircle2, Mic } from 'lucide-react';
 import { motion } from 'framer-motion';
 
@@ -27,6 +28,10 @@ interface CrmAIAssistantProps {
     onStartRecording: () => void;
     onStopRecording: () => void;
     isSendingBroadcast?: boolean;
+    approvedTemplates?: any[];
+    selectedTemplateName?: string;
+    onSelectTemplate?: (name: string) => void;
+    isLoadingTemplates?: boolean;
     suggestions?: Array<{
         id: string;
         label: string;
@@ -53,8 +58,13 @@ export default function CrmAIAssistant({
     onStartRecording,
     onStopRecording,
     isSendingBroadcast,
+    approvedTemplates = [],
+    selectedTemplateName = '',
+    onSelectTemplate = () => {},
+    isLoadingTemplates = false,
     suggestions = []
 }: CrmAIAssistantProps) {
+    const { t } = useTranslation();
     const messagesEndRef = useRef<HTMLDivElement>(null);
 
     const scrollToBottom = () => {
@@ -153,23 +163,52 @@ export default function CrmAIAssistant({
                                         {msg.content}
                                     </div>
                                     {msg.role === 'assistant' && msg.id !== '1' && !isGenerating && messages[messages.length - 1].id === msg.id && msg.type === 'campaign' && (
-                                        <motion.button 
-                                            initial={{ opacity: 0, scale: 0.9 }}
-                                            animate={{ opacity: 1, scale: 1 }}
-                                            onClick={() => onValidateAndSend(msg.content)}
-                                            disabled={isSendingBroadcast}
-                                            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 disabled:opacity-50 disabled:scale-100"
-                                        >
-                                            {isSendingBroadcast ? (
-                                                <>
-                                                    <Loader2 className="w-4 h-4 animate-spin" /> Envoi en cours...
-                                                </>
-                                            ) : (
-                                                <>
-                                                    <CheckCircle2 className="w-4 h-4" /> Valider et Envoyer à la liste
-                                                </>
-                                            )}
-                                        </motion.button>
+                                        <div className="mt-4 w-full max-w-sm">
+                                            <div className="bg-slate-50 border border-slate-200 rounded-2xl p-4 mb-3">
+                                                <label className="block text-[10px] font-bold text-slate-400 uppercase tracking-widest mb-2">
+                                                    {t('crm.campaigns.select_template')}
+                                                </label>
+                                                <select 
+                                                    value={selectedTemplateName}
+                                                    onChange={(e) => onSelectTemplate(e.target.value)}
+                                                    disabled={isLoadingTemplates || isSendingBroadcast}
+                                                    className="w-full bg-white border border-slate-200 rounded-xl px-3 py-2 text-xs font-bold outline-none focus:ring-2 focus:ring-indigo-500/20 transition-all disabled:opacity-50"
+                                                >
+                                                    <option value="">{t('crm.campaigns.use_ai_text')}</option>
+                                                    {approvedTemplates.map((tpl: any) => (
+                                                        <option key={tpl.name} value={tpl.name}>
+                                                            {tpl.name} ({tpl.language})
+                                                        </option>
+                                                    ))}
+                                                </select>
+                                                {approvedTemplates.length === 0 && !isLoadingTemplates && (
+                                                    <p className="text-[10px] text-amber-600 mt-2 font-medium italic">
+                                                        {t('crm.campaigns.no_approved_templates')}
+                                                    </p>
+                                                )}
+                                            </div>
+
+                                            <motion.button 
+                                                initial={{ opacity: 0, scale: 0.9 }}
+                                                animate={{ opacity: 1, scale: 1 }}
+                                                onClick={() => onValidateAndSend(msg.content)}
+                                                disabled={isSendingBroadcast}
+                                                className="w-full bg-emerald-500 text-white px-6 py-4 rounded-2xl font-black text-xs shadow-lg shadow-emerald-100 hover:bg-emerald-600 hover:scale-[1.02] active:scale-[0.98] transition-all flex items-center justify-center gap-2 disabled:opacity-50 disabled:scale-100"
+                                            >
+                                                {isSendingBroadcast ? (
+                                                    <>
+                                                        <Loader2 className="w-4 h-4 animate-spin" /> Envoi en cours...
+                                                    </>
+                                                ) : (
+                                                    <>
+                                                        <CheckCircle2 className="w-5 h-5" /> 
+                                                        {selectedTemplateName 
+                                                            ? `Envoyer Template: ${selectedTemplateName}` 
+                                                            : 'Valider et Envoyer à la liste'}
+                                                    </>
+                                                )}
+                                            </motion.button>
+                                        </div>
                                     )}
                                 </div>
                             </div>

apps/admin/src/components/layouts/MainLayout.tsx

@@ -1,10 +1,12 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
+import { useTranslation } from 'react-i18next';
 import { useAuth } from '@/lib/auth';
 import { useTenant } from '@/lib/tenant';
-import { BarChart2, TrendingUp, Users, BookOpen, Mic, Building2, Activity, Lightbulb, Database, Megaphone } from 'lucide-react';
+import { BarChart2, TrendingUp, Users, BookOpen, Mic, Building2, Activity, Lightbulb, Database, Megaphone, LogOut, LayoutTemplate } from 'lucide-react';
 
 import RoleGuard from '@/components/RoleGuard';
+import LanguageSwitcher from '@/components/LanguageSwitcher';
 
 interface MainLayoutProps {
     children: React.ReactNode;
@@ -13,6 +15,7 @@ interface MainLayoutProps {
 }
 
 export default function MainLayout({ children, isSuperAdmin, orgs }: MainLayoutProps) {
+    const { t } = useTranslation();
     const { logout, user } = useAuth();
     const { selectedOrgId, setSelectedOrgId, currentOrg } = useTenant();
 
@@ -21,17 +24,18 @@ export default function MainLayout({ children, isSuperAdmin, orgs }: MainLayoutP
     const isSuperAdminLocal = !!isSuperAdmin;
 
     const allNavItems = [
-        { to: '/', label: 'Dashboard', icon: <BarChart2 className="w-4 h-4" /> },
-        { to: '/analytics', label: 'Statistiques', icon: <TrendingUp className="w-4 h-4 text-amber-500" /> },
-        { to: '/contacts', label: 'Clients', icon: <Users className="w-4 h-4 text-blue-400" />, show: isCrmActive },
-        { to: '/campaign-history', label: 'Campagnes', icon: <Megaphone className="w-4 h-4 text-amber-500" />, show: isCrmActive },
-        { to: '/kb', label: 'Base de connaissance', icon: <Database className="w-4 h-4 text-violet-400" /> },
-        { to: '/content', label: 'Parcours', icon: <BookOpen className="w-4 h-4" />, show: isEdTechActive },
+        { to: '/', label: t('nav.home'), icon: <BarChart2 className="w-4 h-4" /> },
+        { to: '/analytics', label: t('common.analytics'), icon: <TrendingUp className="w-4 h-4 text-amber-500" /> },
+        { to: '/contacts', label: t('common.clients'), icon: <Users className="w-4 h-4 text-blue-400" />, show: isCrmActive },
+        { to: '/campaign-history', label: t('nav.campaigns'), icon: <Megaphone className="w-4 h-4 text-amber-500" />, show: isCrmActive },
+        { to: '/whatsapp-templates', label: t('nav.templates'), icon: <LayoutTemplate className="w-4 h-4 text-indigo-400" />, show: isCrmActive },
+        { to: '/kb', label: t('nav.inbox'), icon: <Database className="w-4 h-4 text-violet-400" /> },
+        { to: '/content', label: t('nav.organizations'), icon: <BookOpen className="w-4 h-4" />, show: isEdTechActive },
         { to: '/live-feed', label: 'Modération', icon: <Mic className="w-4 h-4 text-emerald-500" />, show: isEdTechActive },
         { to: '/clients', label: 'Clients B2B', icon: <Building2 className="w-4 h-4 text-indigo-400" />, superOnly: true, show: isSuperAdminLocal },
         { to: '/training', label: 'Training Lab', icon: <Activity className="w-4 h-4 text-purple-400" />, superOnly: true, show: isSuperAdminLocal },
         { to: '/users', label: 'Utilisateurs', icon: <Users className="w-4 h-4" />, show: isEdTechActive },
-        { to: '/settings', label: 'Paramètres', icon: <Lightbulb className="w-4 h-4" /> },
+        { to: '/settings', label: t('common.settings'), icon: <Lightbulb className="w-4 h-4" /> },
     ];
 
     const navItems = allNavItems.filter(item => {
@@ -81,6 +85,11 @@ export default function MainLayout({ children, isSuperAdmin, orgs }: MainLayoutP
                 </nav>
                 
                 <div className="pt-6 mt-6 border-t border-slate-800">
+                    <div className="mb-6">
+                        <label className="block text-[10px] uppercase font-bold text-slate-500 tracking-wider mb-2">Interface Language</label>
+                        <LanguageSwitcher />
+                    </div>
+
                     <div className="flex items-center gap-3 px-4 mb-4">
                         <div className="w-8 h-8 rounded-full bg-indigo-500 flex items-center justify-center font-bold text-xs">
                             {user?.name?.[0] || 'U'}
@@ -90,8 +99,9 @@ export default function MainLayout({ children, isSuperAdmin, orgs }: MainLayoutP
                             <p className="text-[10px] text-slate-500 truncate capitalize">{user?.role?.toLowerCase()}</p>
                         </div>
                     </div>
-                    <button onClick={logout} className="w-full flex items-center gap-3 px-4 py-2 text-xs text-slate-500 hover:text-white transition">
-                        🔓 Se déconnecter
+                    <button onClick={logout} className="w-full flex items-center gap-3 px-4 py-2 text-xs text-slate-500 hover:text-white transition group">
+                        <LogOut className="w-3.5 h-3.5 group-hover:text-red-400 transition" />
+                        {t('common.logout')}
                     </button>
                 </div>
             </aside>

apps/admin/src/lib/i18n.ts

@@ -1,29 +1,24 @@
-
 import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
 import LanguageDetector from 'i18next-browser-languagedetector';
 
+import en from '../locales/en.json';
+import fr from '../locales/fr.json';
+import es from '../locales/es.json';
+import pt from '../locales/pt.json';
+
 i18n
   .use(LanguageDetector)
   .use(initReactI18next)
   .init({
     resources: {
-      fr: {
-        translation: {
-          "welcome": "Bienvenue",
-          "dashboard": "Tableau de Bord",
-          "clients": "Gestion des Clients",
-          "analytics": "Analyses",
-          "settings": "Paramètres",
-          "logout": "Déconnexion",
-          "onboarding": {
-            "title": "Bienvenue sur Xamlé.Studio",
-            "subtitle": "Configurons votre école en quelques secondes."
-          }
-        }
-      }
+      en: { translation: en },
+      fr: { translation: fr },
+      es: { translation: es },
+      pt: { translation: pt }
     },
-    fallbackLng: 'fr',
+    fallbackLng: 'en',
+    debug: false,
     interpolation: {
       escapeValue: false,
     }

apps/admin/src/locales/en.json

@@ -0,0 +1,103 @@
+{
+  "common": {
+    "welcome": "Welcome",
+    "dashboard": "Dashboard",
+    "clients": "Client Management",
+    "analytics": "Analytics",
+    "settings": "Settings",
+    "logout": "Logout",
+    "save": "Save Changes",
+    "cancel": "Cancel",
+    "loading": "Loading...",
+    "error": "An error occurred",
+    "success": "Action successful",
+    "create": "Create",
+    "delete": "Delete",
+    "edit": "Edit",
+    "search": "Search...",
+    "actions": "Actions"
+  },
+  "nav": {
+    "home": "Home",
+    "inbox": "Conversations",
+    "campaigns": "Campaign History",
+    "templates": "WhatsApp Templates",
+    "organizations": "Organizations",
+    "users": "Users",
+    "training": "Training Lab",
+    "moderation": "Moderation",
+    "b2b": "B2B Clients"
+  },
+  "onboarding": {
+    "title": "Welcome to Xamlé.Studio",
+    "subtitle": "Set up your WhatsApp school in a few minutes.",
+    "step_welcome": "Welcome",
+    "step_legal": "Contract",
+    "step_whatsapp": "WhatsApp",
+    "step_ai": "AI Brain",
+    "connect_fb": "Connect with Facebook",
+    "fb_connected": "Facebook Account Connected!",
+    "setup_waba": "Setting up your WhatsApp Business Account...",
+    "cta_launch": "Launch my platform",
+    "legal_text": "By accepting, you agree to our Platform Solution Provider terms and Meta's Business Policies."
+  },
+  "crm": {
+    "stats": {
+      "total_contacts": "Total Contacts",
+      "messages_sent": "Messages Sent",
+      "open_rate": "Open Rate",
+      "conversion": "Conversion"
+    },
+    "inbox": {
+      "title": "Conversations",
+      "no_messages": "No conversations found.",
+      "reply_placeholder": "Type your message here...",
+      "send": "Send Reply"
+    },
+    "campaigns": {
+      "title": "Campaign History",
+      "subtitle": "Track all your outgoing broadcasts and their performance.",
+      "new_campaign": "New Campaign",
+      "select_template": "WhatsApp Template (Optional)",
+      "choose_approved": "Select an approved template...",
+      "no_approved_templates": "No approved templates found. Sync them first.",
+      "use_ai_text": "Use AI Generated Text",
+      "status_sent": "Sent",
+      "status_delivered": "Delivered",
+      "status_read": "Read",
+      "status_failed": "Failed"
+    }
+  },
+  "settings": {
+    "profile": "Organization Profile",
+    "branding": "Branding & Colors",
+    "ai_config": "AI Configuration",
+    "whatsapp_config": "WhatsApp Technical State",
+    "billing": "Billing & Subscription"
+  },
+  "whatsapp": {
+    "templates": {
+      "title": "WhatsApp Message Templates",
+      "subtitle": "Manage and synchronize your pre-approved Meta templates.",
+      "sync_button": "Sync with Meta",
+      "create_button": "Create Template",
+      "no_templates": "No templates found. Synchronize or create your first one.",
+      "table": {
+        "name": "Template Name",
+        "category": "Category",
+        "language": "Language",
+        "status": "Status"
+      },
+      "create_modal": {
+        "title": "Create New Template",
+        "name_label": "Template Name (lowercase, no spaces)",
+        "category_label": "Category",
+        "language_label": "Language",
+        "body_label": "Body Text",
+        "submit": "Submit for Approval",
+        "success": "Template submitted successfully!",
+        "error": "Failed to submit template."
+      }
+    }
+  }
+}

apps/admin/src/locales/es.json

@@ -0,0 +1,29 @@
+{
+  "common": {
+    "welcome": "Bienvenido",
+    "dashboard": "Tablero",
+    "clients": "Clientes",
+    "analytics": "Análisis",
+    "settings": "Configuración",
+    "logout": "Cerrar sesión",
+    "save": "Guardar",
+    "cancel": "Cancelar",
+    "loading": "Cargando...",
+    "error": "Ocurrió un error",
+    "success": "Éxito"
+  },
+  "onboarding": {
+    "title": "Bienvenido a Xamlé.Studio",
+    "subtitle": "Configuremos tu escuela en unos segundos.",
+    "connect_fb": "Conectar con Facebook",
+    "fb_connected": "¡Cuenta de Facebook conectada!",
+    "setup_waba": "Configurando tu cuenta de WhatsApp Business..."
+  },
+  "nav": {
+    "home": "Inicio",
+    "inbox": "Bandeja de entrada",
+    "campaigns": "Campañas",
+    "templates": "Plantillas",
+    "organizations": "Organizaciones"
+  }
+}

apps/admin/src/locales/fr.json

@@ -0,0 +1,29 @@
+{
+  "common": {
+    "welcome": "Bienvenue",
+    "dashboard": "Tableau de Bord",
+    "clients": "Gestion des Clients",
+    "analytics": "Analyses",
+    "settings": "Paramètres",
+    "logout": "Déconnexion",
+    "save": "Enregistrer",
+    "cancel": "Annuler",
+    "loading": "Chargement...",
+    "error": "Une erreur est survenue",
+    "success": "Succès"
+  },
+  "onboarding": {
+    "title": "Bienvenue sur Xamlé.Studio",
+    "subtitle": "Configurons votre école en quelques secondes.",
+    "connect_fb": "Se connecter avec Facebook",
+    "fb_connected": "Compte Facebook connecté !",
+    "setup_waba": "Configuration de votre compte WhatsApp Business..."
+  },
+  "nav": {
+    "home": "Accueil",
+    "inbox": "Messagerie",
+    "campaigns": "Campagnes",
+    "templates": "Modèles",
+    "organizations": "Organisations"
+  }
+}

apps/admin/src/locales/pt.json

@@ -0,0 +1,29 @@
+{
+  "common": {
+    "welcome": "Bem-vindo",
+    "dashboard": "Painel",
+    "clients": "Clientes",
+    "analytics": "Análises",
+    "settings": "Configurações",
+    "logout": "Sair",
+    "save": "Salvar",
+    "cancel": "Cancelar",
+    "loading": "Carregando...",
+    "error": "Ocorreu um erro",
+    "success": "Sucesso"
+  },
+  "onboarding": {
+    "title": "Bem-vindo ao Xamlé.Studio",
+    "subtitle": "Vamos configurar sua escola em alguns segundos.",
+    "connect_fb": "Conectar com Facebook",
+    "fb_connected": "Conta do Facebook conectada!",
+    "setup_waba": "Configurando sua conta do WhatsApp Business..."
+  },
+  "nav": {
+    "home": "Início",
+    "inbox": "Caixa de entrada",
+    "campaigns": "Campanhas",
+    "templates": "Modelos",
+    "organizations": "Organizações"
+  }
+}

apps/admin/src/pages/CrmConversationalDashboard.tsx

@@ -41,6 +41,34 @@ export default function CrmConversationalDashboard() {
     const [isDragging, setIsDragging] = useState(false);
     const [isSendingBroadcast, setIsSendingBroadcast] = useState(false);
     const [uploadedFile, setUploadedFile] = useState<{ name: string, listId: string, listName: string } | null>(null);
+    const [approvedTemplates, setApprovedTemplates] = useState<any[]>([]);
+    const [selectedTemplateName, setSelectedTemplateName] = useState<string>('');
+    const [isLoadingTemplates, setIsLoadingTemplates] = useState(false);
+
+    const fetchTemplates = async () => {
+        if (!token || !selectedOrgId) return;
+        setIsLoadingTemplates(true);
+        try {
+            const data = await fetch(`${import.meta.env.VITE_API_URL}/v1/whatsapp/templates`, {
+                headers: { 
+                    'Authorization': `Bearer ${token}`,
+                    'x-organization-id': selectedOrgId
+                }
+            }).then(r => r.json());
+            
+            if (Array.isArray(data)) {
+                setApprovedTemplates(data.filter((t: any) => t.status === 'APPROVED'));
+            }
+        } catch (err) {
+            console.error("Templates fetch failed:", err);
+        } finally {
+            setIsLoadingTemplates(false);
+        }
+    };
+
+    useEffect(() => {
+        if (view === 'assistant') fetchTemplates();
+    }, [view, selectedOrgId]);
 
     // Recording & Transcription logic moved to useAudioRecorder hook
     // Real-time streaming transcription logic
@@ -142,7 +170,8 @@ export default function CrmConversationalDashboard() {
                 },
                 body: JSON.stringify({ 
                     listId: uploadedFile.listId,
-                    message: message 
+                    message: message,
+                    templateName: selectedTemplateName || undefined
                 })
             });
 
@@ -240,6 +269,10 @@ export default function CrmConversationalDashboard() {
                             onStopRecording={stopRecording}
                             isSendingBroadcast={isSendingBroadcast}
                             suggestions={SUGGESTED_ACTIONS}
+                            approvedTemplates={approvedTemplates}
+                            selectedTemplateName={selectedTemplateName}
+                            onSelectTemplate={setSelectedTemplateName}
+                            isLoadingTemplates={isLoadingTemplates}
                         />
                         
                         <FileImporter 

apps/admin/src/pages/TemplatesPage.tsx

@@ -0,0 +1,347 @@
+import { useState, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
+import { 
+    LayoutTemplate, 
+    RefreshCw, 
+    Plus, 
+    CheckCircle2, 
+    Clock, 
+    XCircle, 
+    ChevronRight, 
+    Search,
+    MessageSquare,
+    Globe,
+    Tag,
+    Loader2
+} from 'lucide-react';
+import { motion, AnimatePresence } from 'framer-motion';
+import { api } from '../lib/api';
+import { useAuth } from '../lib/auth';
+import { useTenant } from '../lib/tenant';
+
+interface TemplateComponent {
+    type: string;
+    text?: string;
+    format?: string;
+}
+
+interface WhatsAppTemplate {
+    name: string;
+    status: 'APPROVED' | 'PENDING' | 'REJECTED' | 'PAUSED' | 'DISABLED';
+    category: 'MARKETING' | 'UTILITY' | 'AUTHENTICATION';
+    language: string;
+    components: TemplateComponent[];
+    id: string;
+}
+
+const STATUS_CONFIG = {
+    APPROVED: { icon: CheckCircle2, color: 'text-green-500', bg: 'bg-green-50', label: 'whatsapp.templates.status_approved' },
+    PENDING:  { icon: Clock,        color: 'text-amber-500', bg: 'bg-amber-50', label: 'whatsapp.templates.status_pending' },
+    REJECTED: { icon: XCircle,      color: 'text-red-500',   bg: 'bg-red-50',   label: 'whatsapp.templates.status_rejected' },
+    PAUSED:   { icon: Clock,        color: 'text-slate-400', bg: 'bg-slate-50',  label: 'whatsapp.templates.status_paused' },
+    DISABLED: { icon: XCircle,      color: 'text-slate-400', bg: 'bg-slate-50',  label: 'whatsapp.templates.status_disabled' },
+};
+
+export default function TemplatesPage() {
+    const { t } = useTranslation();
+    const { token } = useAuth();
+    const { selectedOrgId } = useTenant();
+    
+    const [templates, setTemplates] = useState<WhatsAppTemplate[]>([]);
+    const [loading, setLoading] = useState(true);
+    const [syncing, setSyncing] = useState(false);
+    const [search, setSearch] = useState('');
+    const [isModalOpen, setIsModalOpen] = useState(false);
+
+    // Form State
+    const [newTemplate, setNewTemplate] = useState({
+        name: '',
+        category: 'MARKETING',
+        language: 'fr',
+        body: ''
+    });
+
+    const fetchTemplates = async () => {
+        if (!token || !selectedOrgId) return;
+        setLoading(true);
+        try {
+            const data = await api.get(`/v1/whatsapp/templates`, token, selectedOrgId);
+            setTemplates(data);
+        } catch (err) {
+            console.error('[TEMPLATES] Fetch failed:', err);
+        } finally {
+            setLoading(false);
+        }
+    };
+
+    useEffect(() => {
+        fetchTemplates();
+    }, [token, selectedOrgId]);
+
+    const handleSync = async () => {
+        setSyncing(true);
+        await fetchTemplates();
+        setSyncing(false);
+    };
+
+    const handleCreate = async (e: React.FormEvent) => {
+        e.preventDefault();
+        if (!token || !selectedOrgId) return;
+
+        try {
+            const payload = {
+                name: newTemplate.name.toLowerCase().replace(/\s+/g, '_'),
+                language: newTemplate.language,
+                category: newTemplate.category,
+                components: [
+                    {
+                        type: 'BODY',
+                        text: newTemplate.body
+                    }
+                ]
+            };
+            await api.post(`/v1/whatsapp/templates`, payload, token, selectedOrgId);
+            setIsModalOpen(false);
+            fetchTemplates();
+            setNewTemplate({ name: '', category: 'MARKETING', language: 'fr', body: '' });
+        } catch (err) {
+            alert(t('whatsapp.templates.create_modal.error'));
+        }
+    };
+
+    const filteredTemplates = templates.filter(tpl => 
+        tpl.name.toLowerCase().includes(search.toLowerCase())
+    );
+
+    return (
+        <div className="p-8 max-w-6xl mx-auto min-h-screen">
+            {/* Header */}
+            <div className="flex flex-col md:flex-row md:items-center justify-between gap-4 mb-10">
+                <motion.div 
+                    initial={{ opacity: 0, x: -20 }}
+                    animate={{ opacity: 1, x: 0 }}
+                >
+                    <div className="flex items-center gap-3 mb-2">
+                        <div className="w-12 h-12 bg-indigo-600 rounded-2xl flex items-center justify-center shadow-lg shadow-indigo-200">
+                            <LayoutTemplate className="w-6 h-6 text-white" />
+                        </div>
+                        <h1 className="text-3xl font-bold text-slate-900 tracking-tight">
+                            {t('whatsapp.templates.title')}
+                        </h1>
+                    </div>
+                    <p className="text-slate-500 font-medium ml-1">
+                        {t('whatsapp.templates.subtitle')}
+                    </p>
+                </motion.div>
+
+                <div className="flex items-center gap-3">
+                    <button 
+                        onClick={handleSync}
+                        disabled={syncing}
+                        className="flex items-center gap-2 px-5 py-2.5 bg-white border border-slate-200 text-slate-700 rounded-xl font-semibold hover:bg-slate-50 transition-all active:scale-95 disabled:opacity-50"
+                    >
+                        <RefreshCw className={`w-4 h-4 ${syncing ? 'animate-spin' : ''}`} />
+                        {t('whatsapp.templates.sync_button')}
+                    </button>
+                    <button 
+                        onClick={() => setIsModalOpen(true)}
+                        className="flex items-center gap-2 px-5 py-2.5 bg-indigo-600 text-white rounded-xl font-semibold hover:bg-indigo-700 transition-all shadow-lg shadow-indigo-100 active:scale-95"
+                    >
+                        <Plus className="w-4 h-4" />
+                        {t('whatsapp.templates.create_button')}
+                    </button>
+                </div>
+            </div>
+
+            {/* Filters & Search */}
+            <div className="relative mb-8">
+                <Search className="absolute left-4 top-1/2 -translate-y-1/2 w-5 h-5 text-slate-400" />
+                <input 
+                    type="text"
+                    placeholder={t('common.search')}
+                    value={search}
+                    onChange={(e) => setSearch(e.target.value)}
+                    className="w-full pl-12 pr-6 py-4 bg-white border border-slate-100 rounded-2xl shadow-sm outline-none focus:ring-2 focus:ring-indigo-500/20 focus:border-indigo-500 transition-all text-slate-700"
+                />
+            </div>
+
+            {/* Content Area */}
+            {loading ? (
+                <div className="flex flex-col items-center justify-center py-32 text-slate-400">
+                    <Loader2 className="w-12 h-12 animate-spin mb-4 text-indigo-600" />
+                    <p className="font-medium animate-pulse">{t('common.loading')}</p>
+                </div>
+            ) : filteredTemplates.length === 0 ? (
+                <motion.div 
+                    initial={{ opacity: 0, y: 20 }}
+                    animate={{ opacity: 1, y: 0 }}
+                    className="bg-white border border-slate-100 rounded-3xl p-20 text-center shadow-sm"
+                >
+                    <div className="w-20 h-20 bg-slate-50 rounded-full flex items-center justify-center mx-auto mb-6">
+                        <LayoutTemplate className="w-10 h-10 text-slate-200" />
+                    </div>
+                    <h3 className="text-xl font-bold text-slate-800 mb-2">
+                        {t('whatsapp.templates.no_templates')}
+                    </h3>
+                </motion.div>
+            ) : (
+                <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+                    <AnimatePresence mode="popLayout">
+                        {filteredTemplates.map((tpl, idx) => {
+                            const status = STATUS_CONFIG[tpl.status] || STATUS_CONFIG.PAUSED;
+                            const bodyText = tpl.components.find(c => c.type === 'BODY')?.text || '';
+                            
+                            return (
+                                <motion.div 
+                                    key={tpl.name}
+                                    layout
+                                    initial={{ opacity: 0, y: 20 }}
+                                    animate={{ opacity: 1, y: 0 }}
+                                    transition={{ delay: idx * 0.05 }}
+                                    className="group bg-white border border-slate-100 rounded-3xl p-6 shadow-sm hover:shadow-xl hover:shadow-indigo-500/5 transition-all duration-300 relative overflow-hidden"
+                                >
+                                    <div className="flex justify-between items-start mb-6">
+                                        <div className={`px-3 py-1.5 rounded-full ${status.bg} ${status.color} flex items-center gap-2 text-[10px] font-bold uppercase tracking-wider`}>
+                                            <status.icon className="w-3.5 h-3.5" />
+                                            {t(status.label)}
+                                        </div>
+                                        <div className="px-3 py-1.5 bg-slate-50 text-slate-500 rounded-full text-[10px] font-bold flex items-center gap-1.5">
+                                            <Globe className="w-3.5 h-3.5" />
+                                            {tpl.language}
+                                        </div>
+                                    </div>
+
+                                    <div className="mb-4">
+                                        <h4 className="text-lg font-bold text-slate-800 break-words line-clamp-1 mb-1 group-hover:text-indigo-600 transition-colors">
+                                            {tpl.name}
+                                        </h4>
+                                        <div className="flex items-center gap-1.5 text-slate-400 text-xs font-medium">
+                                            <Tag className="w-3.5 h-3.5" />
+                                            {tpl.category}
+                                        </div>
+                                    </div>
+
+                                    <div className="bg-slate-50/50 rounded-2xl p-4 min-h-[100px] mb-4 relative">
+                                        <MessageSquare className="absolute right-4 top-4 w-4 h-4 text-slate-200" />
+                                        <p className="text-slate-600 text-sm leading-relaxed line-clamp-4 italic">
+                                            "{bodyText}"
+                                        </p>
+                                    </div>
+
+                                    <button className="w-full py-3 bg-slate-50 text-slate-600 rounded-2xl text-sm font-bold flex items-center justify-center gap-2 hover:bg-indigo-50 hover:text-indigo-600 transition-all opacity-0 group-hover:opacity-100 translate-y-2 group-hover:translate-y-0">
+                                        View Full Preview
+                                        <ChevronRight className="w-4 h-4" />
+                                    </button>
+                                </motion.div>
+                            );
+                        })}
+                    </AnimatePresence>
+                </div>
+            )}
+
+            {/* Create Modal */}
+            <AnimatePresence>
+                {isModalOpen && (
+                    <div className="fixed inset-0 z-50 flex items-center justify-center p-4">
+                        <motion.div 
+                            initial={{ opacity: 0 }}
+                            animate={{ opacity: 1 }}
+                            exit={{ opacity: 0 }}
+                            onClick={() => setIsModalOpen(false)}
+                            className="absolute inset-0 bg-slate-900/40 backdrop-blur-sm"
+                        />
+                        <motion.div 
+                            initial={{ opacity: 0, scale: 0.9, y: 20 }}
+                            animate={{ opacity: 1, scale: 1, y: 0 }}
+                            exit={{ opacity: 0, scale: 0.9, y: 20 }}
+                            className="bg-white rounded-[32px] w-full max-w-xl shadow-2xl relative overflow-hidden z-10"
+                        >
+                            <div className="p-8">
+                                <h2 className="text-2xl font-bold text-slate-900 mb-6">
+                                    {t('whatsapp.templates.create_modal.title')}
+                                </h2>
+
+                                <form onSubmit={handleCreate} className="space-y-6">
+                                    <div>
+                                        <label className="block text-sm font-bold text-slate-700 mb-2">
+                                            {t('whatsapp.templates.create_modal.name_label')}
+                                        </label>
+                                        <input 
+                                            required
+                                            type="text"
+                                            value={newTemplate.name}
+                                            onChange={e => setNewTemplate({...newTemplate, name: e.target.value})}
+                                            className="w-full px-5 py-3.5 bg-slate-50 border border-slate-200 rounded-2xl outline-none focus:ring-2 focus:ring-indigo-500/20 focus:border-indigo-500 transition-all font-medium"
+                                            placeholder="welcome_message"
+                                        />
+                                    </div>
+
+                                    <div className="grid grid-cols-2 gap-4">
+                                        <div>
+                                            <label className="block text-sm font-bold text-slate-700 mb-2">
+                                                {t('whatsapp.templates.create_modal.category_label')}
+                                            </label>
+                                            <select 
+                                                value={newTemplate.category}
+                                                onChange={e => setNewTemplate({...newTemplate, category: e.target.value})}
+                                                className="w-full px-5 py-3.5 bg-slate-50 border border-slate-200 rounded-2xl outline-none focus:ring-2 focus:ring-indigo-500/20 focus:border-indigo-500 transition-all font-medium"
+                                            >
+                                                <option value="MARKETING">Marketing</option>
+                                                <option value="UTILITY">Utility</option>
+                                            </select>
+                                        </div>
+                                        <div>
+                                            <label className="block text-sm font-bold text-slate-700 mb-2">
+                                                {t('whatsapp.templates.create_modal.language_label')}
+                                            </label>
+                                            <select 
+                                                value={newTemplate.language}
+                                                onChange={e => setNewTemplate({...newTemplate, language: e.target.value})}
+                                                className="w-full px-5 py-3.5 bg-slate-50 border border-slate-200 rounded-2xl outline-none focus:ring-2 focus:ring-indigo-500/20 focus:border-indigo-500 transition-all font-medium"
+                                            >
+                                                <option value="fr">French</option>
+                                                <option value="en">English</option>
+                                                <option value="es">Spanish</option>
+                                                <option value="pt_BR">Portuguese (BR)</option>
+                                            </select>
+                                        </div>
+                                    </div>
+
+                                    <div>
+                                        <label className="block text-sm font-bold text-slate-700 mb-2">
+                                            {t('whatsapp.templates.create_modal.body_label')}
+                                        </label>
+                                        <textarea 
+                                            required
+                                            rows={4}
+                                            value={newTemplate.body}
+                                            onChange={e => setNewTemplate({...newTemplate, body: e.target.value})}
+                                            className="w-full px-5 py-3.5 bg-slate-50 border border-slate-200 rounded-2xl outline-none focus:ring-2 focus:ring-indigo-500/20 focus:border-indigo-500 transition-all font-medium resize-none"
+                                            placeholder="Hello {{1}}, welcome to our school!"
+                                        />
+                                    </div>
+
+                                    <div className="flex gap-4 pt-4">
+                                        <button 
+                                            type="button"
+                                            onClick={() => setIsModalOpen(false)}
+                                            className="flex-1 py-4 bg-slate-50 text-slate-600 rounded-2xl font-bold hover:bg-slate-100 transition-all active:scale-95"
+                                        >
+                                            {t('common.cancel')}
+                                        </button>
+                                        <button 
+                                            type="submit"
+                                            className="flex-1 py-4 bg-indigo-600 text-white rounded-2xl font-bold hover:bg-indigo-700 transition-all shadow-lg shadow-indigo-100 active:scale-95"
+                                        >
+                                            {t('whatsapp.templates.create_modal.submit')}
+                                        </button>
+                                    </div>
+                                </form>
+                            </div>
+                        </motion.div>
+                    </div>
+                )}
+            </AnimatePresence>
+        </div>
+    );
+}

apps/api/src/logger.ts

@@ -29,27 +29,33 @@ const baseLogger = pino({
     }
 });
 
-/**
- * Compatible Logger Wrapper
- * 
- * Provides a more permissive interface to match existing codebase usage:
- * logger.error("Message", errorObject) -> logger.error({ err: errorObject }, "Message")
- */
-const wrap = (level: 'info' | 'error' | 'warn' | 'debug') => (arg1: any, arg2?: any, ...args: any[]) => {
-    if (typeof arg1 === 'string' && arg2 !== undefined) {
-        // Handle (msg, data) pattern by flipping it for Pino
-        return baseLogger[level]({ err: arg2, data: args.length > 0 ? args : undefined }, arg1);
-    }
-    return baseLogger[level](arg1, arg2, ...args);
-};
+type LogFn = (arg1: Record<string, unknown> | string, arg2?: unknown, ...args: unknown[]) => void;
+
+export interface AppLogger {
+    info: LogFn;
+    error: LogFn;
+    warn: LogFn;
+    debug: LogFn;
+    child: (bindings: pino.Bindings) => pino.Logger;
+    pino: pino.Logger;
+}
 
-export const logger = {
+// Bridges (msg, data) call pattern to pino's ({data}, msg) convention.
+const wrap = (level: 'info' | 'error' | 'warn' | 'debug'): LogFn =>
+    (arg1: Record<string, unknown> | string, arg2?: unknown, ...args: unknown[]) => {
+        if (typeof arg1 === 'string' && arg2 !== undefined) {
+            return baseLogger[level]({ err: arg2, data: args.length > 0 ? args : undefined }, arg1);
+        }
+        return baseLogger[level](arg1 as Record<string, unknown>, arg2 as string);
+    };
+
+export const logger: AppLogger = {
     info: wrap('info'),
     error: wrap('error'),
     warn: wrap('warn'),
     debug: wrap('debug'),
     child: (bindings: pino.Bindings) => baseLogger.child(bindings),
-    pino: baseLogger // Access to raw instance if needed
-} as any;
+    pino: baseLogger
+};
 
 export const log = logger;

apps/api/src/middleware/tenant.ts

@@ -1,25 +0,0 @@
-import { FastifyReply } from 'fastify';
-import { runWithTenant } from '@repo/database';
-
-/**
- * Middleware to wrap request execution in a tenant context.
- * It looks for organizationId in:
- * 1. request.organizationId (set by previous auth middleware)
- * 2. x-organization-id header (for internal/admin calls)
- */
-export const tenantMiddleware = async (request: any, _reply: FastifyReply) => {
-  const organizationId = request.organizationId || request.headers['x-organization-id'] || 'default-org-id';
-  
-  // Wrap the entire request execution in the tenant context
-  return runWithTenant(organizationId, async () => {
-    // We don't call 'done()' here because we want to wrap the remaining lifecycle
-  });
-};
-
-// Since Fastify hooks don't easily allow wrapping the whole lifecycle with AsyncLocalStorage.run
-// without some tricks, we might need a different approach for Fastify.
-// The best way in Fastify is to use a 'preHandler' hook that starts the context, 
-// but it's tricky to keep it alive across the route handler.
-
-// Better approach for Fastify + AsyncLocalStorage:
-// Use a 'addHook('onRequest', ...)' but we need to ensure the context is preserved.

apps/api/src/routes/admin.ts

@@ -48,19 +48,25 @@ const PaginationSchema = z.object({
 export async function adminRoutes(fastify: FastifyInstance) {
 
     // ── Dashboard Stats ────────────────────────────────────────────────────────
-    fastify.get('/stats', async () => {
+    fastify.get('/stats', async (req, reply) => {
+        const organizationId = req.organizationId;
+        if (!organizationId) return reply.code(400).send({ error: 'Organization ID required' });
+
         const [totalUsers, activeEnrollments, completedEnrollments, totalTracks, totalRevenue] = await Promise.all([
-            prisma.user.count(),
-            prisma.enrollment.count({ where: { status: 'ACTIVE' } }),
-            prisma.enrollment.count({ where: { status: 'COMPLETED' } }),
-            prisma.track.count(),
-            prisma.payment.aggregate({ where: { status: 'COMPLETED' }, _sum: { amount: true } }),
+            prisma.user.count({ where: { organizationId } }),
+            prisma.enrollment.count({ where: { status: 'ACTIVE', organizationId } }),
+            prisma.enrollment.count({ where: { status: 'COMPLETED', organizationId } }),
+            prisma.track.count({ where: { organizationId } }),
+            prisma.payment.aggregate({ where: { status: 'COMPLETED', organizationId }, _sum: { amount: true } }),
         ]);
         return { totalUsers, activeEnrollments, completedEnrollments, totalTracks, totalRevenue: totalRevenue._sum.amount || 0 };
     });
 
     // ── Users ──────────────────────────────────────────────────────────────────
     fastify.get('/users', async (req, reply) => {
+        const organizationId = req.organizationId;
+        if (!organizationId) return reply.code(400).send({ error: 'Organization ID required' });
+
         const parsed = PaginationSchema.safeParse(req.query);
         if (!parsed.success) return reply.code(400).send({ error: 'Invalid query parameters', details: parsed.error.flatten() });
 
@@ -68,6 +74,7 @@ export async function adminRoutes(fastify: FastifyInstance) {
 
         const [users, total] = await Promise.all([
             prisma.user.findMany({
+                where: { organizationId },
                 orderBy: { createdAt: 'desc' },
                 skip: (page - 1) * limit,
                 take: limit,
@@ -76,31 +83,38 @@ export async function adminRoutes(fastify: FastifyInstance) {
                     _count: { select: { enrollments: true, responses: true } }
                 }
             }),
-            prisma.user.count()
+            prisma.user.count({ where: { organizationId } })
         ]);
         return { users, total, page, limit };
     });
 
     fastify.get('/users/:userId/messages', async (req, reply) => {
+        const organizationId = req.organizationId;
+        if (!organizationId) return reply.code(400).send({ error: 'Organization ID required' });
+
         const { userId } = req.params as { userId: string };
         const messages = await prisma.message.findMany({
-            where: { userId },
+            where: { userId, organizationId },
             orderBy: { createdAt: 'asc' },
         });
 
-        const user = await prisma.user.findUnique({
-            where: { id: userId },
+        const user = await prisma.user.findFirst({
+            where: { id: userId, organizationId },
             select: { id: true, name: true, phone: true }
         });
 
-        if (!user) return reply.status(404).send({ error: 'User not found' });
+        if (!user) return reply.status(404).send({ error: 'User not found or access denied' });
 
         return { user, messages };
     });
 
     // ── Enrollments ────────────────────────────────────────────────────────────
-    fastify.get('/enrollments', async () => {
+    fastify.get('/enrollments', async (req, reply) => {
+        const organizationId = req.organizationId;
+        if (!organizationId) return reply.code(400).send({ error: 'Organization ID required' });
+
         const enrollments = await prisma.enrollment.findMany({
+            where: { organizationId },
             include: { user: true, track: true },
             orderBy: { startedAt: 'desc' },
             take: 100,
@@ -112,9 +126,13 @@ export async function adminRoutes(fastify: FastifyInstance) {
 
     // LIVE FEED : Students blocked waiting for manual review
     // LIVE FEED : Students blocked waiting for manual review
-    fastify.get('/live-feed', async () => {
+    fastify.get('/live-feed', async (req, reply) => {
+        const organizationId = req.organizationId;
+        if (!organizationId) return reply.code(400).send({ error: 'Organization ID required' });
+
         const pendingReviews = await prisma.userProgress.findMany({
             where: {
+                organizationId,
                 exerciseStatus: 'PENDING_REVIEW',
                 user: { language: 'WOLOF' } // Currently only focusing on Wolof interceptions
             },
@@ -128,7 +146,7 @@ export async function adminRoutes(fastify: FastifyInstance) {
         // Map the raw payload to find the actual response audio for each pending review
         const liveFeed = await Promise.all(pendingReviews.map(async (progress) => {
             const enrollment = await prisma.enrollment.findFirst({
-                where: { userId: progress.userId, trackId: progress.trackId, status: 'ACTIVE' }
+                where: { userId: progress.userId, trackId: progress.trackId, status: 'ACTIVE', organizationId }
             });
 
             // If no active enrollment found, fallback gracefully
@@ -136,7 +154,7 @@ export async function adminRoutes(fastify: FastifyInstance) {
 
             // Find the most recent inbound message with an audioUrl for this user
             const lastMessage = await prisma.message.findFirst({
-                where: { userId: progress.userId, direction: 'INBOUND', mediaUrl: { not: null } },
+                where: { userId: progress.userId, direction: 'INBOUND', mediaUrl: { not: null }, organizationId },
                 orderBy: { createdAt: 'desc' }
             });
 
@@ -233,8 +251,12 @@ export async function adminRoutes(fastify: FastifyInstance) {
     // ══════════════════════════════════════════════════════════════════════════
 
     // List tracks
-    fastify.get('/tracks', async () => {
+    fastify.get('/tracks', async (req, reply) => {
+        const organizationId = req.organizationId;
+        if (!organizationId) return reply.code(400).send({ error: 'Organization ID required' });
+
         return prisma.track.findMany({
+            where: { organizationId },
             include: { _count: { select: { days: true, enrollments: true } } },
             orderBy: { createdAt: 'desc' }
         });
@@ -242,11 +264,14 @@ export async function adminRoutes(fastify: FastifyInstance) {
 
     // Get single track with all days
     fastify.get<{ Params: { id: string } }>('/tracks/:id', async (req, reply) => {
-        const track = await prisma.track.findUnique({
-            where: { id: req.params.id },
+        const organizationId = req.organizationId;
+        if (!organizationId) return reply.code(400).send({ error: 'Organization ID required' });
+
+        const track = await prisma.track.findFirst({
+            where: { id: req.params.id, organizationId },
             include: { days: { orderBy: { dayNumber: 'asc' } } }
         });
-        if (!track) return reply.code(404).send({ error: 'Track not found' });
+        if (!track) return reply.code(404).send({ error: 'Track not found or access denied' });
         return track;
     });
 
@@ -262,21 +287,34 @@ export async function adminRoutes(fastify: FastifyInstance) {
 
     // Update track
     fastify.put<{ Params: { id: string } }>('/tracks/:id', async (req, reply) => {
+        const organizationId = req.organizationId;
+        if (!organizationId) return reply.code(400).send({ error: 'Organization ID required' });
+
         const body = TrackSchema.partial().safeParse(req.body);
         if (!body.success) return reply.code(400).send({ error: body.error.flatten() });
         try {
-            const track = await prisma.track.update({ where: { id: req.params.id }, data: body.data });
+            const track = await prisma.track.update({
+                where: { id: req.params.id, organizationId },
+                data: body.data
+            });
             return track;
         } catch {
-            return reply.code(404).send({ error: 'Track not found' });
+            return reply.code(404).send({ error: 'Track not found or access denied' });
         }
     });
 
     // Delete track
     fastify.delete<{ Params: { id: string } }>('/tracks/:id', async (req, reply) => {
+        const organizationId = req.organizationId;
+        if (!organizationId) return reply.code(400).send({ error: 'Organization ID required' });
+
         try {
-            await prisma.trackDay.deleteMany({ where: { trackId: req.params.id } });
-            await prisma.track.delete({ where: { id: req.params.id } });
+            // Ensure organization owns the track before deleting children and track
+            const track = await prisma.track.findFirst({ where: { id: req.params.id, organizationId } });
+            if (!track) return reply.code(404).send({ error: 'Track not found or access denied' });
+
+            await prisma.trackDay.deleteMany({ where: { trackId: req.params.id, organizationId } });
+            await prisma.track.delete({ where: { id: req.params.id, organizationId } });
             return { ok: true };
         } catch {
             return reply.code(404).send({ error: 'Track not found' });
@@ -304,9 +342,12 @@ export async function adminRoutes(fastify: FastifyInstance) {
     // ══════════════════════════════════════════════════════════════════════════
 
     // List days for a track
-    fastify.get<{ Params: { trackId: string } }>('/tracks/:trackId/days', async (req) => {
+    fastify.get<{ Params: { trackId: string } }>('/tracks/:trackId/days', async (req, reply) => {
+        const organizationId = req.organizationId;
+        if (!organizationId) return reply.code(400).send({ error: 'Organization ID required' });
+
         return prisma.trackDay.findMany({
-            where: { trackId: req.params.trackId },
+            where: { trackId: req.params.trackId, organizationId },
             orderBy: { dayNumber: 'asc' }
         });
     });
@@ -331,26 +372,32 @@ export async function adminRoutes(fastify: FastifyInstance) {
 
     // Update day
     fastify.put<{ Params: { trackId: string; dayId: string } }>('/tracks/:trackId/days/:dayId', async (req, reply) => {
+        const organizationId = req.organizationId;
+        if (!organizationId) return reply.code(400).send({ error: 'Organization ID required' });
+
         const body = TrackDaySchema.partial().safeParse(req.body);
         if (!body.success) return reply.code(400).send({ error: body.error.flatten() });
         try {
             const day = await prisma.trackDay.update({
-                where: { id: req.params.dayId },
+                where: { id: req.params.dayId, organizationId },
                 data: { ...body.data, audioUrl: body.data.audioUrl === '' ? null : body.data.audioUrl }
             });
             return day;
         } catch {
-            return reply.code(404).send({ error: 'Day not found' });
+            return reply.code(404).send({ error: 'Day not found or access denied' });
         }
     });
 
     // Delete day
     fastify.delete<{ Params: { trackId: string; dayId: string } }>('/tracks/:trackId/days/:dayId', async (req, reply) => {
+        const organizationId = req.organizationId;
+        if (!organizationId) return reply.code(400).send({ error: 'Organization ID required' });
+
         try {
-            await prisma.trackDay.delete({ where: { id: req.params.dayId } });
+            await prisma.trackDay.delete({ where: { id: req.params.dayId, organizationId } });
             return { ok: true };
         } catch {
-            return reply.code(404).send({ error: 'Day not found' });
+            return reply.code(404).send({ error: 'Day not found or access denied' });
         }
     });
 

apps/api/src/routes/ai.ts

@@ -261,18 +261,33 @@ export async function aiRoutes(fastify: FastifyInstance) {
 
             if (feedback.isQualified === false) {
                 // ÉCHEC (Branching 1)
-                formattedFeedback += `${feedback.validation}\n\n` +
-                    (userLanguage === 'WOLOF'
-                        ? `🚨 Am na yenn mbir yu laaj gëna dëgër. Xoolal li ma la digal te fexe tontu waat ci exercice bi !`
-                        : `🚨 Certains points sont encore à renforcer. Regarde mes conseils et réessaie de répondre à l'exercice !`);
+                const failMsg = userLanguage === 'WOLOF'
+                    ? `🚨 Am na yenn mbir yu laaj gëna dëgër. Xoolal li ma la digal te fexe tontu waat ci exercice bi !`
+                    : userLanguage === 'EN'
+                    ? `🚨 Some points still need strengthening. Check my advice and try the exercise again!`
+                    : userLanguage === 'ES'
+                    ? `🚨 Algunos puntos aún necesitan reforzarse. ¡Mira mis consejos e intenta el ejercicio de nuevo!`
+                    : userLanguage === 'PT'
+                    ? `🚨 Alguns pontos ainda precisam ser reforçados. Veja meus conselhos e tente o exercício novamente!`
+                    : `🚨 Certains points sont encore à renforcer. Regarde mes conseils et réessaie de répondre à l'exercice !`;
+                
+                formattedFeedback += `${feedback.validation}\n\n${failMsg}`;
             } else {
                 // SUCCÈS (Branching 2)
+                const successMsg = userLanguage === 'WOLOF'
+                    ? `Soo bëggé gëna xóotal pënd bi ak li ngay dund ci yaw ci terrain bi, bindal 1️⃣ *APPROFONDIR*, soo ko bëggul bindal 2️⃣ *SUITE*.`
+                    : userLanguage === 'EN'
+                    ? `If you want to refine this point with data from your own experience, type 1️⃣ *DEEP DIVE*, otherwise type 2️⃣ *CONTINUE*.`
+                    : userLanguage === 'ES'
+                    ? `Si quieres profundizar en este punto con datos de tu propia experiencia, escribe 1️⃣ *PROFUNDIZAR*, de lo contrario escribe 2️⃣ *CONTINUAR*.`
+                    : userLanguage === 'PT'
+                    ? `Se você quiser refinar este ponto com dados de sua própria experiência, digite 1️⃣ *APROFUNDAR*, caso contrário, digite 2️⃣ *CONTINUAR*.`
+                    : `Si tu veux affiner ce point avec une donnée de ton propre terrain, tape 1️⃣ *APPROFONDIR*, sinon tape 2️⃣ *SUITE*.`;
+
                 formattedFeedback += `🌟 ${feedback.validation}\n\n` +
                     `🚀 ${feedback.enrichedVersion}\n\n` +
                     `💡 ${feedback.actionableAdvice}\n\n` +
-                    (userLanguage === 'WOLOF'
-                        ? `Soo bëggé gëna xóotal pënd bi ak li ngay dund ci yaw ci terrain bi, bindal 1️⃣ *APPROFONDIR*, soo ko bëggul bindal 2️⃣ *SUITE*.`
-                        : `Si tu veux affiner ce point avec une donnée de ton propre terrain, tape 1️⃣ *APPROFONDIR*, sinon tape 2️⃣ *SUITE*.`);
+                    successMsg;
             }
 
 

apps/api/src/routes/internal.ts

@@ -60,6 +60,11 @@ export async function internalRoutes(fastify: FastifyInstance) {
                     const phoneNumberId = change.value.metadata?.phone_number_id || 'unknown';
                     const organizationId = await getOrganizationByPhoneNumberId(phoneNumberId);
 
+                    if (!organizationId) {
+                        logger.warn(`[INTERNAL-WEBHOOK] Unknown phone_number_id ${phoneNumberId} — skipping`);
+                        continue;
+                    }
+
                     for (const message of change.value.messages || []) {
                         const phone = message.from;
                         let text = '';

apps/api/src/routes/whatsapp.ts

@@ -157,4 +157,103 @@ export async function whatsappRoutes(fastify: FastifyInstance) {
             return reply.code(200).send('EVENT_RECEIVED');
         }
     });
+
+    /**
+     * PROTECTED ROUTES (Requires Auth)
+     */
+    fastify.register(async (sub) => {
+        sub.addHook('onRequest', async (req, reply) => {
+            try {
+                await req.jwtVerify();
+            } catch (err) {
+                return reply.code(401).send({ error: 'Unauthorized' });
+            }
+        });
+
+        sub.get('/templates', async (req, reply) => {
+            const organizationId = req.headers['x-organization-id'] as string;
+            if (!organizationId) return reply.code(400).send({ error: 'Organization ID required' });
+
+            const { whatsappService } = await import('../services/whatsapp');
+            const { decryptSecrets } = await import('../services/organization');
+            const prisma = fastify.prisma;
+
+            const org = await prisma.organization.findUnique({ where: { id: organizationId } });
+            if (!org || !org.wabaId || !org.systemUserToken) {
+                return reply.code(400).send({ error: 'WhatsApp Business Account not configured for this organization' });
+            }
+
+            const decryptedOrg = decryptSecrets(org);
+            try {
+                const templates = await whatsappService.fetchMetaTemplates({
+                    accessToken: decryptedOrg.systemUserToken!,
+                    wabaId: org.wabaId
+                });
+
+                // Audit Log
+                await prisma.auditLog.create({
+                    data: {
+                        action: 'SYNC_WHATSAPP_TEMPLATES',
+                        actorId: (req.user as any)?.id,
+                        resourceId: organizationId,
+                        details: { count: templates.length, message: 'Templates successfully synchronized with Meta' }
+                    }
+                }).catch(e => logger.warn({ e }, '[AUDIT] Failed to log template sync'));
+
+                return templates;
+            } catch (err: any) {
+                return reply.code(500).send({ error: 'Failed to fetch templates from Meta', detail: err.message });
+            }
+        });
+
+        sub.post('/templates', async (req, reply) => {
+            const organizationId = req.headers['x-organization-id'] as string;
+            if (!organizationId) return reply.code(400).send({ error: 'Organization ID required' });
+
+            const schema = z.object({
+                name: z.string().regex(/^[a-z0-9_]+$/, 'Only lowercase, numbers and underscores allowed'),
+                language: z.string().default('fr'),
+                category: z.enum(['MARKETING', 'UTILITY', 'AUTHENTICATION']).default('MARKETING'),
+                components: z.array(z.any())
+            });
+
+            const body = schema.safeParse(req.body);
+            if (!body.success) return reply.code(400).send({ error: body.error.flatten() });
+
+            const { whatsappService } = await import('../services/whatsapp');
+            const { decryptSecrets } = await import('../services/organization');
+            const prisma = fastify.prisma;
+
+            const org = await prisma.organization.findUnique({ where: { id: organizationId } });
+            if (!org || !org.wabaId || !org.systemUserToken) {
+                return reply.code(400).send({ error: 'WhatsApp Business Account not configured' });
+            }
+
+            const decryptedOrg = decryptSecrets(org);
+            try {
+                const result = await whatsappService.createMetaTemplate({
+                    accessToken: decryptedOrg.systemUserToken!,
+                    wabaId: org.wabaId
+                }, body.data);
+
+                // Audit Log
+                await prisma.auditLog.create({
+                    data: {
+                        action: 'CREATE_WHATSAPP_TEMPLATE',
+                        actorId: (req.user as any)?.id,
+                        resourceId: organizationId,
+                        details: { 
+                            templateName: body.data.name,
+                            category: body.data.category,
+                            language: body.data.language
+                        }
+                    }
+                }).catch(e => logger.warn({ e }, '[AUDIT] Failed to log template creation'));
+
+                return result;
+            } catch (err: any) {
+                return reply.code(500).send({ error: 'Failed to create template on Meta', detail: err.message });
+            }
+        });
+    });
 }

apps/api/src/services/organization.ts

@@ -11,7 +11,7 @@ redis.on('error', (err) => logger.error({ err }, '[REDIS] Organization service e
 
 const CACHE_TTL = 86400; // 24 hours (routing is stable)
 
-export async function getOrganizationByPhoneNumberId(phoneNumberId: string): Promise<string> {
+export async function getOrganizationByPhoneNumberId(phoneNumberId: string): Promise<string | null> {
     const cacheKey = `org:phone:${phoneNumberId}`;
     
     // 1. Check Redis Cache
@@ -37,10 +37,8 @@ export async function getOrganizationByPhoneNumberId(phoneNumberId: string): Pro
         return phoneRecord.organizationId;
     }
 
-    // 3. Fallback to default organization
-    const defaultOrgId = 'default-org-id';
-    logger.warn(`[ORG-SERVICE] No organization found for phone_number_id: ${phoneNumberId}. Falling back to ${defaultOrgId}`);
-    return defaultOrgId;
+    logger.warn(`[ORG-SERVICE] No organization found for phone_number_id: ${phoneNumberId} — rejecting`);
+    return null;
 }
 
 /**

apps/api/src/services/whatsapp.ts

@@ -61,6 +61,48 @@ export class WhatsAppService {
         return results;
     }
 
+    /**
+     * Fetches message templates from Meta Graph API
+     */
+    async fetchMetaTemplates(config: { accessToken: string; wabaId: string }) {
+        try {
+            const url = `${this.baseUrl}/${config.wabaId}/message_templates`;
+            const response = await axios.get(url, {
+                headers: { 'Authorization': `Bearer ${config.accessToken}` },
+                params: { limit: 100 }
+            });
+            return response.data.data;
+        } catch (err: any) {
+            logger.error({ 
+                error: err.response?.data || err.message,
+                wabaId: config.wabaId 
+            }, '[WHATSAPP_SERVICE] Failed to fetch templates');
+            throw err;
+        }
+    }
+
+    /**
+     * Submits a new message template to Meta for approval
+     */
+    async createMetaTemplate(config: { accessToken: string; wabaId: string }, template: any) {
+        try {
+            const url = `${this.baseUrl}/${config.wabaId}/message_templates`;
+            const response = await axios.post(url, template, {
+                headers: { 
+                    'Authorization': `Bearer ${config.accessToken}`,
+                    'Content-Type': 'application/json'
+                }
+            });
+            return response.data;
+        } catch (err: any) {
+            logger.error({ 
+                error: err.response?.data || err.message,
+                wabaId: config.wabaId 
+            }, '[WHATSAPP_SERVICE] Failed to create template');
+            throw err;
+        }
+    }
+
     /**
      * Orchestrates the AI response loop and notifications for an incoming message
      */

apps/api/src/tests/tenant-isolation.test.ts

@@ -49,9 +49,9 @@ async function testTenantIsolation() {
             console.log(`❌ Org B routing failed. Expected ${orgB.id}, got ${detectedB}`);
         }
 
-        // 4. Test Unknown Routing (should fallback to default)
+        // 4. Test Unknown Routing (should return null for unregistered phone IDs)
         const detectedUnknown = await getOrganizationByPhoneNumberId("unknown-id");
-        console.log(`ℹ️ Unknown ID routed to: ${detectedUnknown} (Default fallback)`);
+        console.log(`ℹ️ Unknown ID result: ${detectedUnknown} (null = correctly rejected)`);
 
     } finally {
         // Cleanup

apps/whatsapp-worker/src/fix-types.ts

@@ -1,19 +0,0 @@
-import { logger } from './logger';
-import * as fs from 'fs';
-import * as path from 'path';
-
-function replaceInFile(filePath: string, replacements: [RegExp, string][]) {
-    const fullPath = path.resolve(__dirname, '..', filePath);
-    if (!fs.existsSync(fullPath)) return;
-    let content = fs.readFileSync(fullPath, 'utf8');
-    for (const [regex, replacement] of replacements) {
-        content = content.replace(regex, replacement);
-    }
-    fs.writeFileSync(fullPath, content);
-    logger.info(`Fixed: ${filePath}`);
-}
-
-replaceInFile('src/whatsapp-cloud.ts', [
-    [/err\.response\?\.data\?\.error\?\.(?:message|error_user_msg)/g, '(err as any)?.response?.data?.error?.message']
-]);
-

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

@@ -17,7 +17,9 @@ export class AIAgentHandler implements MessageHandler {
 
         try {
             // 1. Prepare the system prompt
+            const userLang = ctx.user?.language || 'FR';
             let systemPrompt = organization.customPrompt || "Tu es un assistant virtuel utile et poli.";
+            systemPrompt += `\n\nIMPORTANT: Réponds TOUJOURS en langue: ${userLang}.`;
             
             // 2. RAG / Knowledge Base logic
             if (organization.knowledgeBaseUrl) {

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

@@ -2,8 +2,7 @@ import { MessageContext, MessageHandler } from './types';
 import { isFuzzyMatch } from '../services/utils';
 import { prisma } from '../services/prisma';
 import { logger } from '../logger';
-
-
+import { getT } from '../services/i18n';
 
 export class CommandHandler implements MessageHandler {
     async canHandle(ctx: MessageContext): Promise<boolean> {
@@ -22,11 +21,10 @@ export class CommandHandler implements MessageHandler {
         const { user, normalizedText, whatsappQueue, traceId, activeEnrollment } = ctx;
         if (!user) return false;
 
-        const isWolof = user.language === 'WOLOF';
+        const t = getT(user.language);
 
         // --- 1. SEED ---
         if (isFuzzyMatch(normalizedText, 'SEED')) {
-            // ... (existing seed logic)
             logger.info({ traceId, userId: user.id }, "Database Seeding requested");
             try {
                 type SeedModule = { seedDatabase: (prisma: any) => Promise<{ seeded: boolean }> };
@@ -35,14 +33,12 @@ export class CommandHandler implements MessageHandler {
                 await prisma.businessProfile.deleteMany({ where: { userId: user.id } });
                 await prisma.user.update({ where: { id: user.id }, data: { activity: null } });
 
-                const msg = result.seeded
-                    ? "✅ Seeding terminé ! Le Cache Cognitif a été réinitialisé.\nEnvoie INSCRIPTION pour commencer."
-                    : "ℹ️ Les données existent déjà. Cache Cognitif purgé. Envoie INSCRIPTION.";
-                await whatsappQueue.add('send-message', { userId: user.id, text: msg });
+                const msg = result.seeded ? t('seed_success') : t('seed_exists');
+                await whatsappQueue.add('send-message', { userId: user.id, text: msg, organizationId: ctx.organizationId });
                 logger.info({ traceId, userId: user.id, success: true }, "Database SEED completed");
             } catch (err) {
                 logger.error({ traceId, userId: user.id, err }, "Database SEED failed");
-                await whatsappQueue.add('send-message', { userId: user.id, text: `❌ Erreur seed` });
+                await whatsappQueue.add('send-message', { userId: user.id, text: t('seed_error'), organizationId: ctx.organizationId });
             }
             return true;
         }
@@ -62,28 +58,26 @@ export class CommandHandler implements MessageHandler {
             });
 
             if (pastDays.length === 0) {
-                const msg = isWolof ? "Amul bés yu passé ba pare !" : "Tu n'as pas encore d'anciennes leçons !";
-                await whatsappQueue.add('send-message', { userId: user.id, text: msg });
+                await whatsappQueue.add('send-message', { userId: user.id, text: t('no_past_lessons'), organizationId: ctx.organizationId });
                 return true;
             }
 
             const rows = pastDays.map(day => ({
                 id: `DAY${day.dayNumber}_REPLAY`,
-                title: isWolof ? `Bés ${day.dayNumber}` : `Leçon ${day.dayNumber}`,
-                description: isWolof ? "Revoir cette leçon" : "Revoir cette leçon"
+                title: `${t('lesson_title')} ${day.dayNumber}`,
+                description: t('replay_description')
             }));
 
-            // WhatsApp list limit is 10 per section. Let's take the last 10 if too many.
             const limitedRows = rows.slice(-10);
 
             const { sendInteractiveListMessage } = await import('../whatsapp-cloud');
             await sendInteractiveListMessage(
                 user.phone || '',
-                isWolof ? "Sa njàng" : "Ton parcours",
-                isWolof ? "Tànnal bés bi nga bëgg tontu waat :" : "Choisis la leçon que tu souhaites revoir :",
-                isWolof ? "Seeti" : "Parcourir",
+                t('history_menu_title'),
+                t('history_menu_body'),
+                t('history_menu_button'),
                 [{
-                    title: isWolof ? "Bés yu passé" : "Leçons passées",
+                    title: t('history_section_title'),
                     rows: limitedRows
                 }]
             );
@@ -99,21 +93,18 @@ export class CommandHandler implements MessageHandler {
             logger.info({ traceId, userId: user.id, action, day: dayActionMatch[1] }, "Day action triggered");
 
             if (action === 'REPLAY' && enrollment) {
-                // Important: Trigger a full content send for the historical day
                 await whatsappQueue.add('send-content', { 
                     userId: user.id, 
                     trackId: enrollment.trackId, 
                     dayNumber: parseFloat(dayActionMatch[1]),
-                    isHistorical: true, // Signal to skip progress update
+                    isHistorical: true,
                     organizationId: ctx.organizationId
                 });
                 return true;
             } else if (action === 'EXERCISE') {
-                const msg = isWolof ? "🎙️ J'écoute ta réponse (vocal wala mbind) :" : "🎙️ J'écoute ta réponse (vocal ou texte) :";
-                await whatsappQueue.add('send-message', { userId: user.id, text: msg });
+                await whatsappQueue.add('send-message', { userId: user.id, text: t('exercise_prompt'), organizationId: ctx.organizationId });
                 return true;
             } else if (action === 'CONTINUE' && enrollment) {
-                // On ajoute l'envoi de la suite du contenu dans la file d'attente
                 await whatsappQueue.add('send-content', {
                     userId: user.id, 
                     trackId: enrollment.trackId,
@@ -122,20 +113,11 @@ export class CommandHandler implements MessageHandler {
                 });
                 return true;
             } else if (action === 'PROMPT') {
-                // On demande à l'utilisateur de répondre, avec gestion du Wolof si besoin
-                const msg = isWolof 
-                    ? "🖊️ Dafa neex ma xam sa xibaar..." 
-                    : "🖊️ Envoie ta réponse texte ou vocale :";
-                    
-                await whatsappQueue.add('send-message', { 
-                    userId: user.id, 
-                    text: msg 
-                });
+                await whatsappQueue.add('send-message', { userId: user.id, text: t('text_prompt'), organizationId: ctx.organizationId });
                 return true;
             }
         }
 
-
         return false;
     }
 }

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

@@ -75,7 +75,7 @@ export class EnrollHandler implements JobHandler {
                         trackId: trackId || '', 
                         status: 'ACTIVE', 
                         currentDay: 1, 
-                        organizationId: organizationId || 'default-org-id' 
+                        organizationId: organizationId as string
                     }
                 });
                 const user = await prisma.user.findUnique({ where: { id: userId } });

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

@@ -15,7 +15,10 @@ export class InboundHandler implements JobHandler {
             return;
         }
 
-        organizationId = organizationId || 'default-org-id';
+        if (!organizationId) {
+            logger.error({ phone }, `[INBOUND_HANDLER] Missing organizationId — skipping to prevent cross-tenant contamination`);
+            return;
+        }
 
         // 🎙️ Handle Inbound Audio Transcription
         if (audioUrl && (!text || text.trim() === '')) {

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

@@ -37,7 +37,11 @@ export class MessageHandler implements JobHandler {
 
     async handle(job: Job<JobData>, connection: Redis): Promise<void> {
         const { organizationId } = job.data;
-        const tenantConfig = await this.getTenantConfig(organizationId || 'default-org-id', connection);
+        if (!organizationId) {
+            logger.error({ jobId: job.id, jobName: job.name }, '[MESSAGE_HANDLER] Missing organizationId — skipping');
+            return;
+        }
+        const tenantConfig = await this.getTenantConfig(organizationId, connection);
 
         switch (job.name) {
             case 'send-message': {

apps/whatsapp-worker/src/index.ts

@@ -83,18 +83,18 @@ server.post('/v1/internal/whatsapp/inbound', async (req: FastifyRequest, reply:
         return reply.code(401).send({ error: 'Unauthorized' });
     }
 
-    let organizationId = req.headers['x-organization-id'] as string;
+    let organizationId: string | null = req.headers['x-organization-id'] as string || null;
     const payload = req.body as { entry?: Array<{ changes?: Array<{ value?: { metadata?: { phone_number_id?: string } } }> }> };
 
-    // 🏢 Multi-Tenant Routing Hardening: 
-    // If we're coming from the Gateway (HF), the header might be missing or generic.
+    // 🏢 Multi-Tenant Routing Hardening:
+    // If we're coming from the Gateway (HF), the header might be missing.
     // We MUST resolve it from the phone_number_id in the metadata to ensure isolation.
-    if (!organizationId || organizationId === 'default-org-id') {
+    if (!organizationId) {
         const phoneNumberId = payload.entry?.[0]?.changes?.[0]?.value?.metadata?.phone_number_id;
         if (phoneNumberId) {
             const { getOrganizationByPhoneNumberId } = await import('./services/organization');
             organizationId = await getOrganizationByPhoneNumberId(phoneNumberId);
-            logger.info(`[BRIDGE] Resolved Org: ${organizationId} from Phone: ${phoneNumberId}`);
+            if (organizationId) logger.info(`[BRIDGE] Resolved Org: ${organizationId} from Phone: ${phoneNumberId}`);
         }
     }
     
@@ -182,7 +182,11 @@ server.get('/health', async () => ({ status: 'ok' }));
 
 // ─── WORKER ──────────────────────────────────────────────────────────────────
 const worker = new Worker('whatsapp-queue', async (job: Job<JobData>) => {
-    const organizationId = job.data.organizationId || 'default-org-id';
+    const organizationId = job.data.organizationId;
+    if (!organizationId) {
+        logger.error({ jobId: job.id, jobName: job.name }, '[WORKER] Job missing organizationId — skipping to prevent cross-tenant contamination');
+        return { skipped: true, reason: 'missing_org_id' };
+    }
 
     // ─── USAGE LIMIT ENFORCEMENT ─────────────────────────────────────────────
     // Only limit outbound message jobs

apps/whatsapp-worker/src/logger.ts

@@ -13,47 +13,46 @@ const pinoLogger = pino({
   } : undefined
 });
 
-function getEnrichedObject(obj: any = {}) {
+type LogArg = string | Error | Record<string, unknown>;
+
+function getEnrichedObject(obj: Record<string, unknown> = {}): Record<string, unknown> {
     const organizationId = getOrganizationId();
-    if (organizationId) {
-        return { ...obj, organizationId };
-    }
-    return obj;
+    return organizationId ? { ...obj, organizationId } : obj;
 }
 
 export const logger = {
-    info: (first: any, ...rest: any[]) => {
+    info: (first: LogArg, ...rest: unknown[]) => {
         const orgId = getOrganizationId();
         if (typeof first === 'string') {
             pinoLogger.info(orgId ? { organizationId: orgId } : {}, first, ...rest);
         } else {
-            pinoLogger.info(getEnrichedObject(first), rest[0] || '', ...rest.slice(1));
+            pinoLogger.info(getEnrichedObject(first as Record<string, unknown>), (rest[0] as string) || '', ...rest.slice(1));
         }
     },
-    error: (first: any, ...rest: any[]) => {
+    error: (first: LogArg, ...rest: unknown[]) => {
         const orgId = getOrganizationId();
         if (first instanceof Error) {
-            pinoLogger.error(getEnrichedObject({ err: first }), rest[0] || first.message, ...rest.slice(1));
+            pinoLogger.error(getEnrichedObject({ err: first }), (rest[0] as string) || first.message, ...rest.slice(1));
         } else if (typeof first === 'string') {
             pinoLogger.error(orgId ? { organizationId: orgId } : {}, first, ...rest);
         } else {
-            pinoLogger.error(getEnrichedObject(first), rest[0] || '', ...rest.slice(1));
+            pinoLogger.error(getEnrichedObject(first as Record<string, unknown>), (rest[0] as string) || '', ...rest.slice(1));
         }
     },
-    warn: (first: any, ...rest: any[]) => {
+    warn: (first: LogArg, ...rest: unknown[]) => {
         const orgId = getOrganizationId();
         if (typeof first === 'string') {
             pinoLogger.warn(orgId ? { organizationId: orgId } : {}, first, ...rest);
         } else {
-            pinoLogger.warn(getEnrichedObject(first), rest[0] || '', ...rest.slice(1));
+            pinoLogger.warn(getEnrichedObject(first as Record<string, unknown>), (rest[0] as string) || '', ...rest.slice(1));
         }
     },
-    debug: (first: any, ...rest: any[]) => {
+    debug: (first: LogArg, ...rest: unknown[]) => {
         const orgId = getOrganizationId();
         if (typeof first === 'string') {
             pinoLogger.debug(orgId ? { organizationId: orgId } : {}, first, ...rest);
         } else {
-            pinoLogger.debug(getEnrichedObject(first), rest[0] || '', ...rest.slice(1));
+            pinoLogger.debug(getEnrichedObject(first as Record<string, unknown>), (rest[0] as string) || '', ...rest.slice(1));
         }
     },
 };

apps/whatsapp-worker/src/pedagogy.ts

@@ -7,6 +7,10 @@ import { ButtonsJson } from './handlers/types';
 import { castJson } from '@repo/shared-types';
 import { AIPedagogyService } from './services/ai-pedagogy';
 
+import { getT } from './services/i18n';
+
+import { Language } from '@repo/database';
+
 const BADGE_EMOJIS: Record<string, string> = {
     "CLARTÉ": "🏅", "CONFIANCE": "🌟", "CLIENT": "👥", "OFFRE": "📦", "PITCH": "🎙️"
 };
@@ -18,14 +22,13 @@ function generateProgressBar(current: number, total: number): string {
     return `[${bar}] ${Math.round((current / total) * 100)}%`;
 }
 
-function generateLessonHeader(isWolof: boolean, trackTitle: string, dayNumber: number, totalDays: number, badgeName?: string): string {
+function generateLessonHeader(lang: Language, trackTitle: string, dayNumber: number, totalDays: number, badgeName?: string): string {
+    const t = getT(lang);
     const progressBar = isFeatureEnabled('FEATURE_PROGRESS_BAR') ? `\n${generateProgressBar(dayNumber, totalDays)}` : '';
     const badgeText = badgeName ? `\nBadge : ${badgeName} ${BADGE_EMOJIS[badgeName] || '🏅'}` : '';
     const dayDisplay = dayNumber === 1.5 ? '1bis' : Math.floor(dayNumber).toString();
 
-    return isWolof
-        ? `*${trackTitle}*\n*Bés ${dayDisplay}* 🗓️${progressBar}${badgeText}\n\n`
-        : `*${trackTitle}*\n*Jour ${dayDisplay}* 🗓️${progressBar}${badgeText}\n\n`;
+    return `*${trackTitle}*\n*${t('day_label')} ${dayDisplay}* 🗓️${progressBar}${badgeText}\n\n`;
 }
 
 export async function sendLessonDay(
@@ -45,7 +48,7 @@ export async function sendLessonDay(
     });
 
     if (!user || !user.phone) return;
-    const isWolof = user.language === 'WOLOF';
+    const t = getT(user.language);
     const activeEnrollment = user.enrollments[0];
     const tenantConfig = {
         accessToken: user.organization?.systemUserToken || '',
@@ -94,14 +97,14 @@ export async function sendLessonDay(
     const badges = (userProgress?.badges as string[]) || [];
     const lastBadge = badges.length > 0 ? (badges[badges.length - 1] === 'REPRISE' && dayNumber % 1 === 0 ? badges[badges.length - 2] : badges[badges.length - 1]) : undefined;
 
-    lessonText = generateLessonHeader(isWolof, activeEnrollment?.track?.title || 'XAMLÉ', dayNumber, totalDays, lastBadge) + lessonText;
+    lessonText = generateLessonHeader(user.language, activeEnrollment?.track?.title || 'XAMLÉ', dayNumber, totalDays, lastBadge) + lessonText;
 
     // Visuals Dispatch
     if (trackDay.videoUrl) {
         try {
-            await sendVideoMessage(user.phone, trackDay.videoUrl, trackDay.videoCaption || (isWolof ? "Xoolal vidéo bi !" : "Regarde cette vidéo !"), tenantConfig);
+            await sendVideoMessage(user.phone, trackDay.videoUrl, trackDay.videoCaption || t('video_caption'), tenantConfig);
         } catch (err) {
-            const fallbackMsg = isWolof ? `⚠️ Vidéo bi mënul neex léegi. Klikal fii :\n${trackDay.videoUrl}` : `⚠️ La vidéo ne peut être affichée directement. Clique ici :\n${trackDay.videoUrl}`;
+            const fallbackMsg = `${t('video_fallback')}\n${trackDay.videoUrl}`;
             await sendTextMessage(user.phone, fallbackMsg, tenantConfig);
             if (trackDay.imageUrl) await sendImageMessage(user.phone, trackDay.imageUrl, undefined, tenantConfig);
         }
@@ -135,13 +138,13 @@ export async function sendLessonDay(
     // Action Menu
     const isHistorical = options?.skipProgressUpdate === true || dayNumber < (activeEnrollment?.currentDay || 1);
     if (dayNumber === 1 && !isHistorical) {
-        await sendTextMessage(user.phone, isWolof ? "🎙️ Tontul kàddu gi ci vocal walla mbind." : "🎙️ Réponds par message vocal ou texte.", tenantConfig);
+        await sendTextMessage(user.phone, t('exercise_prompt_hint'), tenantConfig);
     } else {
-        const rows = isHistorical ? [{ id: `DAY${dayNumber}_REPLAY`, title: isWolof ? `🎧 Refaire Bés ${dayNumber}` : `🎧 Refaire Leçon ${dayNumber}` }] : [
-            { id: `DAY${dayNumber}_EXERCISE`, title: isWolof ? "📝 Tontul" : "📝 Répondre" },
-            { id: `MENU_HISTORIQUE`, title: isWolof ? "📚 Li nekk ci ginnaaw" : "📚 Revoir leçons" }
+        const rows = isHistorical ? [{ id: `DAY${dayNumber}_REPLAY`, title: `🎧 ${t('replay_lesson_title')} ${dayNumber}` }] : [
+            { id: `DAY${dayNumber}_EXERCISE`, title: `📝 ${t('reply_button')}` },
+            { id: `MENU_HISTORIQUE`, title: `📚 ${t('review_lessons_button')}` }
         ];
-        await sendInteractiveListMessage(user.phone, isWolof ? "Sa Mbir" : "Actions", isWolof ? "Tànnal :" : "Choisis :", isWolof ? "Tànn" : "Menu", [{ title: "Menu", rows }], undefined, tenantConfig);
+        await sendInteractiveListMessage(user.phone, t('action_menu_header'), t('action_menu_body'), t('action_menu_label'), [{ title: "Menu", rows }], undefined, tenantConfig);
     }
 }
 

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

@@ -0,0 +1,141 @@
+import { Language } from '@repo/database';
+
+export const translations: Record<Language, any> = {
+  FR: {
+    seed_success: "✅ Seeding terminé ! Le Cache Cognitif a été réinitialisé.\nEnvoie INSCRIPTION pour commencer.",
+    seed_exists: "ℹ️ Les données existent déjà. Cache Cognitif purgé. Envoie INSCRIPTION.",
+    seed_error: "❌ Erreur lors de la réinitialisation.",
+    no_past_lessons: "Tu n'as pas encore d'anciennes leçons !",
+    lesson_title: "Leçon",
+    replay_description: "Revoir cette leçon",
+    history_menu_title: "Ton parcours",
+    history_menu_body: "Choisis la leçon que tu souhaites revoir :",
+    history_menu_button: "Parcourir",
+    history_section_title: "Leçons passées",
+    exercise_prompt: "🎙️ J'écoute ta réponse (vocal ou texte) :",
+    text_prompt: "🖊️ Envoie ta réponse texte ou vocale :",
+    short_message_error: "Je n'ai pas bien compris. Peux-tu me réexpliquer en quelques mots ?",
+    welcome_fallback: "🎓 Bienvenue chez XAMLÉ !\nPour commencer ta formation gratuite, envoie le mot : *INSCRIPTION*",
+    day_label: "Jour",
+    video_caption: "Regarde cette vidéo !",
+    video_fallback: "⚠️ La vidéo ne peut être affichée directement. Clique ici :",
+    replay_lesson_title: "Refaire Leçon",
+    reply_button: "Répondre",
+    review_lessons_button: "Revoir leçons",
+    action_menu_header: "Actions",
+    action_menu_body: "Choisis :",
+    action_menu_label: "Menu",
+    exercise_prompt_hint: "🎙️ Réponds par message vocal ou texte."
+  },
+  EN: {
+    seed_success: "✅ Seeding completed! Cognitive Cache has been reset.\nSend ENROLL to start.",
+    seed_exists: "ℹ️ Data already exists. Cognitive Cache purged. Send ENROLL.",
+    seed_error: "❌ Seed error.",
+    no_past_lessons: "You don't have any past lessons yet!",
+    lesson_title: "Lesson",
+    replay_description: "Review this lesson",
+    history_menu_title: "Your Journey",
+    history_menu_body: "Choose the lesson you want to review:",
+    history_menu_button: "Browse",
+    history_section_title: "Past Lessons",
+    exercise_prompt: "🎙️ I'm listening to your answer (voice or text):",
+    text_prompt: "🖊️ Send your text or voice reply:",
+    short_message_error: "I didn't quite understand. Could you explain it to me in a few more words?",
+    welcome_fallback: "🎓 Welcome to XAMLÉ!\nTo start your free training, send the word: *ENROLL*",
+    day_label: "Day",
+    video_caption: "Watch this video!",
+    video_fallback: "⚠️ The video cannot be displayed directly. Click here:",
+    replay_lesson_title: "Replay Lesson",
+    reply_button: "Reply",
+    review_lessons_button: "Review lessons",
+    action_menu_header: "Actions",
+    action_menu_body: "Choose:",
+    action_menu_label: "Menu",
+    exercise_prompt_hint: "🎙️ Reply with a voice or text message."
+  },
+  ES: {
+    seed_success: "✅ ¡Seeding completado! El Caché Cognitivo ha sido reiniciado.\nEnvía INSCRIPCIÓN para comenzar.",
+    seed_exists: "ℹ️ Los datos ya existen. Caché Cognitivo purgado. Envía INSCRIPCIÓN.",
+    seed_error: "❌ Error de semilla.",
+    no_past_lessons: "¡Aún no tienes lecciones pasadas!",
+    lesson_title: "Lección",
+    replay_description: "Repasar esta lección",
+    history_menu_title: "Tu Recorrido",
+    history_menu_body: "Elige la lección que deseas repasar:",
+    history_menu_button: "Explorar",
+    history_section_title: "Lecciones pasadas",
+    exercise_prompt: "🎙️ Estoy escuchando tu respuesta (voz o texto):",
+    text_prompt: "🖊️ Envía tu respuesta por texto o voz:",
+    short_message_error: "No he entendido bien. ¿Podrías explicármelo con unas palabras más?",
+    welcome_fallback: "🎓 ¡Bienvenido a XAMLÉ!\nPara comenzar tu formación gratuita, envía la palabra: *INSCRIPCIÓN*",
+    day_label: "Día",
+    video_caption: "¡Mira este video!",
+    video_fallback: "⚠️ El video no se puede mostrar directamente. Haz clic aquí:",
+    replay_lesson_title: "Repetir Lección",
+    reply_button: "Responder",
+    review_lessons_button: "Revisar lecciones",
+    action_menu_header: "Acciones",
+    action_menu_body: "Elegir:",
+    action_menu_label: "Menú",
+    exercise_prompt_hint: "🎙️ Responde con un mensaje de voz o texto."
+  },
+  PT: {
+    seed_success: "✅ Seeding concluído! O Cache Cognitivo foi reiniciado.\nEnvie INSCRIÇÃO para começar.",
+    seed_exists: "ℹ️ Os dados já existem. Cache Cognitivo purgado. Envie INSCRIÇÃO.",
+    seed_error: "❌ Erro de semente.",
+    no_past_lessons: "Você ainda não tem lições passadas!",
+    lesson_title: "Lição",
+    replay_description: "Rever esta lição",
+    history_menu_title: "Sua Jornada",
+    history_menu_body: "Escolha a lição que deseja rever:",
+    history_menu_button: "Navegar",
+    history_section_title: "Lições passadas",
+    exercise_prompt: "🎙️ Estou ouvindo sua resposta (voz ou texto):",
+    text_prompt: "🖊️ Envie sua resposta por texto ou voz:",
+    short_message_error: "Não entendi muito bem. Poderia explicar em mais algumas palavras?",
+    welcome_fallback: "🎓 Bem-vindo à XAMLÉ!\nPara iniciar sua formação gratuita, envie a palavra: *INSCRIÇÃO*",
+    day_label: "Dia",
+    video_caption: "Assista a este vídeo!",
+    video_fallback: "⚠️ O vídeo não pode ser exibido diretamente. Clique aqui:",
+    replay_lesson_title: "Repetir Lição",
+    reply_button: "Responder",
+    review_lessons_button: "Revisar lições",
+    action_menu_header: "Ações",
+    action_menu_body: "Escolha:",
+    action_menu_label: "Menu",
+    exercise_prompt_hint: "🎙️ Responda com uma mensagem de voz ou texto."
+  },
+  WOLOF: {
+    seed_success: "✅ Seeding terminé ! Le Cache Cognitif a été réinitialisé.\nEnvoie INSCRIPTION pour commencer.",
+    seed_exists: "ℹ️ Les données existent déjà. Cache Cognitif purgé. Envoie INSCRIPTION.",
+    seed_error: "❌ Erreur seed",
+    no_past_lessons: "Amul bés yu passé ba pare !",
+    lesson_title: "Bés",
+    replay_description: "Revoir cette leçon",
+    history_menu_title: "Sa njàng",
+    history_menu_body: "Tànnal bés bi nga bëgg tontu waat :",
+    history_menu_button: "Seeti",
+    history_section_title: "Bés yu passé",
+    exercise_prompt: "🎙️ J'écoute ta réponse (vocal wala mbind) :",
+    text_prompt: "🖊️ Dafa neex ma xam sa xibaar...",
+    short_message_error: "Dama lay xaar nga wax ma lu gën a yaatu ci sa mbir. Waxtaanal ak man !",
+    welcome_fallback: "🎓 Bienvenue chez XAMLÉ !\nPour commencer ta formation gratuite, envoie le mot : *INSCRIPTION*",
+    day_label: "Bés",
+    video_caption: "Xoolal vidéo bi !",
+    video_fallback: "⚠️ Vidéo bi mënul neex léegi. Klikal fii :",
+    replay_lesson_title: "Refaire Bés",
+    reply_button: "Tontul",
+    review_lessons_button: "Li nekk ci ginnaaw",
+    action_menu_header: "Sa Mbir",
+    action_menu_body: "Tànnal :",
+    action_menu_label: "Tànn",
+    exercise_prompt_hint: "🎙️ Tontul kàddu gi ci vocal walla mbind."
+  }
+};
+
+export function getT(lang: Language = 'FR') {
+  return (key: string) => {
+    const langStrings = translations[lang] || translations['FR'];
+    return langStrings[key] || key;
+  };
+}

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

@@ -87,7 +87,7 @@ export async function invalidateOrgCache(id: string) {
     }
 }
 
-export async function getOrganizationByPhoneNumberId(phoneNumberId: string): Promise<string> {
+export async function getOrganizationByPhoneNumberId(phoneNumberId: string): Promise<string | null> {
     const cacheKey = `org:phone:${phoneNumberId}`;
     
     // 1. Check L1 Cache
@@ -122,8 +122,6 @@ export async function getOrganizationByPhoneNumberId(phoneNumberId: string): Pro
         return orgId;
     }
 
-    // 4. Fallback to default organization
-    const defaultOrgId = 'default-org-id';
-    logger.warn(`[ORG-SERVICE] No organization found for phone_number_id: ${phoneNumberId}. Falling back to ${defaultOrgId}`);
-    return defaultOrgId;
+    logger.warn(`[ORG-SERVICE] No organization found for phone_number_id: ${phoneNumberId} — rejecting`);
+    return null;
 }

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

@@ -11,6 +11,7 @@ import { CommandHandler } from '../handlers/CommandHandler';
 import { NavigationHandler } from '../handlers/NavigationHandler';
 import { ExerciseHandler } from '../handlers/ExerciseHandler';
 import { AIAgentHandler } from '../handlers/AIAgentHandler';
+import { getT } from './i18n';
 
 const connection = process.env.REDIS_URL
     ? new Redis(process.env.REDIS_URL, { maxRetriesPerRequest: null })
@@ -46,10 +47,14 @@ export class WhatsAppLogic {
         text: string, 
         audioUrl?: string, 
         imageUrl?: string, 
-        organizationId: string = 'default-org-id',
+        organizationId?: string,
         mediaType?: string,
         mediaId?: string
     ) {
+        if (!organizationId) {
+            logger.error({ phone }, '[WHATSAPP_LOGIC] Missing organizationId — refusing to process to prevent cross-tenant contamination');
+            return;
+        }
         const traceId = audioUrl ? `[STT-FLOW-${phone.slice(-4)}]` : imageUrl ? `[IMG-FLOW-${phone.slice(-4)}]` : `[TXT-FLOW-${phone.slice(-4)}]`;
         const normalizedText = this.normalizeCommand(text);
         logger.info(`${traceId} Orchestrating Inbound: ${normalizedText}`);
@@ -97,14 +102,13 @@ export class WhatsAppLogic {
         };
 
         // 3. Short Message Guard (Safety)
-        const systemCommands = ['1', '2', 'SUITE', 'APPROFONDIR', 'INSCRIPTION', 'SEED'];
+        const systemCommands = ['1', '2', 'SUITE', 'APPROFONDIR', 'INSCRIPTION', 'SEED', 'ENROLL', 'INSCRIÇÃO'];
         const isSystemCommand = systemCommands.some(cmd => isFuzzyMatch(normalizedText, cmd)) || normalizedText.includes('INSCRI');
         
+        const t = getT(user?.language || 'FR');
+
         if (text.length < 2 && !isSystemCommand) {
-             const lang = user?.language || 'FR';
-             const msg = lang === 'WOLOF'
-                ? "Dama lay xaar nga wax ma lu gën a yaatu ci sa mbir. Waxtaanal ak man !"
-                : "Je n'ai pas bien compris. Peux-tu me réexpliquer en quelques mots ?";
+             const msg = t('short_message_error');
              
              if (user) {
                 await whatsappQueue.add('send-message', { userId: user.id, text: msg, organizationId });
@@ -133,7 +137,7 @@ export class WhatsAppLogic {
         if (!user) {
             await whatsappQueue.add('send-message-direct', {
                 phone,
-                text: "🎓 Bienvenue chez XAMLÉ !\nPour commencer ta formation gratuite, envoie le mot : *INSCRIPTION*",
+                text: t('welcome_fallback'),
                 organizationId
             });
         } else {

docs/audit_dette_technique_03052026.md

@@ -146,6 +146,49 @@ La fonction existe dans `apps/api/src/services/organization.ts` ET `apps/whatsap
 | R4 | 🟡 | `process.exit(1)` dans config | ✅ Corrigé |
 | R5 | 🟢 | Logique dupliquée WhatsApp/org service | 📋 Backlog |
 | R6 | 🟢 | Catch vide silencieux dans whatsapp.ts | ✅ Corrigé |
-| R1b | 🟢 | ~75 casts `as any` résiduels (plugins Fastify, etc.) | 📋 Backlog |
-
-**9/12 problèmes corrigés. 2 en backlog (non-critiques).**
+| R1b | 🟢 | ~75 casts `as any` résiduels | ✅ Corrigé (session 3) |
+| S2b | 🔴 | Fallback `default-org-id` côté worker (InboundHandler, MessageHandler, WhatsAppLogic, EnrollHandler, index.ts) | ✅ Corrigé (session 3) |
+| S2c | 🔴 | Fallback `default-org-id` côté API (services/organization.ts + internal.ts) | ✅ Corrigé (session 4) |
+
+**13/13 problèmes corrigés. R5 reste en backlog (non-critique, extraction package).**
+
+### Session 4 — Détail des corrections supplémentaires
+
+**S2c — Élimination des derniers `default-org-id` côté API :**
+- `apps/api/src/services/organization.ts` : `getOrganizationByPhoneNumberId` → retourne `string | null` au lieu de `'default-org-id'`
+- `apps/api/src/routes/internal.ts` : guard `if (!organizationId) { continue }` — aucun job enqueué pour un téléphone inconnu
+- `apps/api/src/middleware/tenant.ts` : fichier mort supprimé (jamais importé nulle part)
+- Idem côté worker : `apps/whatsapp-worker/src/services/organization.ts` + `index.ts` (type `string | null`, guard simplifié)
+
+**Logger typé :**
+- `apps/api/src/logger.ts` : interface `AppLogger` + `LogFn` — suppression du `as any` sur l'export
+- `apps/whatsapp-worker/src/logger.ts` : type `LogArg = string | Error | Record<string, unknown>` sur tous les paramètres
+- `apps/whatsapp-worker/src/fix-types.ts` : script de migration obsolète supprimé
+
+### Session 3 — Détail des corrections supplémentaires
+
+**R1b — Nettoyage `as any` complet :**
+- `withTenantIsolation` → retourne `TenantClient extends PrismaClient` (élimine tous les `(prisma as any).modelName`)
+- `ioredis` dédupliqué à `5.9.3` via override pnpm (élimine `connection as any` dans BullMQ)
+- `QuotaExceededError` interface + `isQuotaExceeded()` guard dans `ai.ts` et `openai-provider.ts`
+- `parsePersonalityConfig()` / `PersonalityConfig` utilisés à la place des casts `personalityConfig as any`
+- `getWAErrorMessage(AxiosError<>)` helper dans `whatsapp-cloud.ts`
+- `TranscriptionVerbose` pour le retour de Whisper `verbose_json`
+- `MultipartValue` correctement inféré via discriminant `part.type === 'field'`
+- `cors`, `rateLimit`, `BullMQAdapter` — casts plugin supprimés (tous compilent maintenant sans)
+- Redis `.set()` avec `'EX'` littéral au lieu de `mode as any`
+- `previousResponses.flatMap(r => r.response !== null ? [...] : [])` pour le null safety
+
+**S2c — Isolation multi-tenant API :**
+- `apps/api/src/services/organization.ts` : `getOrganizationByPhoneNumberId` retourne `null` au lieu de `'default-org-id'`
+- `apps/api/src/routes/internal.ts` : guard `if (!organizationId) { continue }` — le job n'est jamais enqueué pour un téléphone inconnu
+- `apps/api/src/middleware/tenant.ts` : fichier mort supprimé (jamais importé)
+- `apps/whatsapp-worker/src/services/organization.ts` : même correction, retourne `null`
+- `apps/whatsapp-worker/src/index.ts` : suppression du check `=== 'default-org-id'`, type `string | null`
+
+**S2b — Isolation multi-tenant worker :**
+- `index.ts` job processor : fail-fast si `organizationId` manquant (return `{ skipped: true }`)
+- `InboundHandler` : guard explicite, log + return si org manquante
+- `MessageHandler` : guard + early return si org manquante
+- `WhatsAppLogic.handleIncomingMessage` : `organizationId?: string` + guard interne
+- `EnrollHandler` : suppression du fallback `|| 'default-org-id'` sur le create

docs/audit_meta_app_review_2026-05-04.md

@@ -0,0 +1,79 @@
+# Audit Technique : App Review Meta (WhatsApp Business API)
+**Date :** 04 mai 2026  
+**Objectif :** État des lieux pour la validation des permissions Meta (App Review).
+
+---
+
+## 1. Flux de Connexion et Permissions (`business_management`)
+**Statut : ✅ OPÉRATIONNEL (Côté Code)**
+
+*   **Analyse :** Contrairement à une architecture purement Server-to-Server manuelle, nous avons implémenté le **Meta Embedded Signup**.
+*   **Frontend :** Un bouton "Se connecter avec Facebook" existe dans `OnboardingWizard.tsx` (Ligne 170). Il appelle la fonction `launchEmbeddedSignup()`.
+*   **API :** L'endpoint `POST /v1/organizations/:id/whatsapp-setup` est prêt à recevoir et chiffrer le `systemUserToken` et le `wabaId` renvoyés par Meta.
+*   **Action pour le Screencast :** Il faut filmer le parcours dans l'Onboarding Wizard, du clic sur le bouton jusqu'à l'apparition du badge "Compte Facebook connecté !".
+
+---
+
+## 2. Messagerie de bout en bout (`whatsapp_business_messaging`)
+**Statut : ✅ OPÉRATIONNEL**
+
+*   **Analyse :** Meta veut voir l'envoi et la réception réelle.
+*   **Frontend :** La page `CrmConversationalDashboard.tsx` dispose de deux modes :
+    *   `assistant` : Pour envoyer des messages (Broadcast/Campagnes).
+    *   `inbox` : Pour voir les messages entrants et y répondre manuellement (`handleReply`).
+*   **API :** Les routes `/messages/reply` et `/campaigns/broadcast` sont fonctionnelles.
+*   **Action pour le Screencast :** Filmer un écran scindé ou alterné : 
+    1. Un utilisateur envoie un message depuis son téléphone vers le bot.
+    2. Le message apparaît dans l' `inbox` du Dashboard.
+    3. L'admin répond depuis le Dashboard et le message arrive sur le téléphone.
+
+---
+
+## 3. Gestion des Templates (`whatsapp_business_management`)
+**Statut : ❌ NON IMPLÉMENTÉ**
+
+*   **Analyse :** C'est le point de blocage majeur identifié par Meta. Nous n'avons actuellement **aucune interface** ni **aucune route API** pour gérer les modèles de messages (Message Templates).
+*   **Tâches de développement nécessaires :**
+    *   **API :** Créer des routes pour lister les templates Meta (`GET /v1/whatsapp/templates`), en créer de nouveaux et vérifier leur statut de validation.
+    *   **Frontend :** Créer une page `TemplatesPage.tsx` permettant de visualiser la liste des modèles approuvés par Meta.
+*   **Action :** Ce module doit être développé en priorité pour le prochain screencast.
+
+---
+
+## 4. Vérification d'accès (`manage_app_solution`)
+**Statut : 🟡 EN ATTENTE (Administratif/Config)**
+
+*   **Analyse :** Ce rejet est souvent lié au fait que l'application est toujours en "Mode Développement" dans le dashboard Meta ou que l'entité Business Manager n'est pas encore totalement vérifiée.
+*   **Point Technique :** Il n'y a pas de blocage de code ici, mais Meta attend que l'App soit associée à une "Solution" de fournisseur de technologie validée.
+*   **Action :** Vérifier les paramètres de "Solution" dans le portail Meta Developers.
+
+---
+
+## 5. Internationalisation (i18n)
+**Statut : 🔄 EN COURS**
+
+*   **Analyse :** Meta exige que l'interface de démonstration soit en anglais pour la validation internationale.
+*   **Frontend :** 
+    *   `react-i18next` est initialisé avec support EN, FR, ES, PT.
+    *   Le fichier `en.json` a été enrichi pour couvrir l'intégralité du parcours utilisateur.
+    *   Un composant `LanguageSwitcher` (Premium UI) est actif dans la Navbar.
+*   **Backend (Bot WhatsApp) :**
+    *   Le schéma Prisma est **déjà compatible** : les modèles `Contact` et `User` possèdent un champ `language` (Enum: EN, FR, ES, PT, WOLOF).
+    *   La logique du `CommandHandler` est prête à être migrée vers une gestion multilingue dynamique (remplacement du flag binaire `isWolof`).
+
+---
+
+## 🚀 Liste des tâches de développement (Roadmap Screencast)
+
+### Frontend (Dashboard Admin)
+1.  **Internationalisation (i18n) :** (🔄 En cours) - Interface prête pour le tournage en Anglais.
+2.  **Création de la page Templates :** Créer `apps/admin/src/pages/TemplatesPage.tsx` pour lister les modèles WhatsApp.
+3.  **Amélioration de l'Inbox :** S'assurer que le statut des messages (Envoyé/Délivré/Lu) est bien visible.
+
+### API (Backend)
+1.  **Logique Multilingue Worker :** Adapter le `CommandHandler` et le service IA pour répondre selon la préférence `language` de l'utilisateur. (🔄 Prochaine étape)
+2.  **Service Template :** Implémenter les appels au Meta Graph API pour récupérer les templates dans `apps/api/src/services/whatsapp.ts`.
+3.  **Routes Template :** Exposer ces données via de nouvelles routes dans `apps/api/src/routes/whatsapp.ts`.
+
+### Documentation / Vidéo
+1.  Préparer un script de démonstration fluide en **Anglais** incluant l'étape d'onboarding (Embedded Signup).

docs/global_audit_report_2026-05-04.md

@@ -0,0 +1,25 @@
+# Global Code Audit Report - May 4, 2026
+
+## 1. Security & Multi-Tenancy (CRITICAL)
+- **Finding**: Several administrative routes in `apps/api/src/routes/admin.ts` (e.g., `/stats`, `/users`, `/enrollments`) do not enforce tenant isolation.
+- **Impact**: An `ORG_ADMIN` from Organization A could potentially see data (counts, lists) from Organization B by making direct API calls.
+- **Required Action**: Refactor all `prisma.model.findMany()` and `prisma.model.count()` calls in `admin.ts` to include a `where: { organizationId }` clause using the `request.organizationId` injected by the `onRequest` hook.
+
+## 2. Internationalization (High Priority)
+- **Finding**: While the i18n infrastructure (`react-i18next`) is correctly initialized and `en.json` exists, the majority of the Admin UI (Campaign History, Contacts, Dashboard) still contains hardcoded French strings.
+- **Impact**: Unprofessional experience for non-French speakers and potential rejection during Meta App Review if the screencast shows mixed languages.
+- **Required Action**: Systematically replace hardcoded strings with the `t()` function from `useTranslation`.
+
+## 3. WhatsApp Templates Module (Missing)
+- **Finding**: No logic exists for fetching or creating Meta Message Templates.
+- **Impact**: Blocking for the Meta App Review "whatsapp_business_management" permission.
+- **Required Action**: Proceed with the implementation plan after fixing the critical security issues.
+
+## 4. Technical Debt & Cleanup
+- **Finding**: Minor TypeScript error in `src/components/LanguageSwitcher.tsx` (unused import).
+- **Finding**: Duplicated code was found and fixed in `CommandHandler.ts` during the previous turn.
+
+---
+
+## Conclusion
+The codebase is structurally sound but lacks rigorous tenant isolation in the admin module. Fixing this is a prerequisite for adding the WhatsApp Templates module to ensure the new routes don't introduce further vulnerabilities.

docs/implementation_plan_whatsapp_templates.md

@@ -0,0 +1,58 @@
+# Implementation Plan: WhatsApp Templates Management & Security Hardening
+
+This document outlines the technical implementation for the WhatsApp Message Templates management interface and the prerequisite security hardening of the administrative routes.
+
+## 1. Objectives
+- **Security First**: Fix tenant isolation vulnerabilities in administrative routes.
+- **Meta Compliance**: Provide a UI to Sync and **Create** templates to justify `whatsapp_business_management` permission.
+- **Global Readiness**: Ensure 100% i18n coverage (EN/FR) for the Meta App Review screencast.
+
+## 2. Step 0: Security Hardening (Prerequisite)
+Audit findings revealed that `apps/api/src/routes/admin.ts` lacks tenant isolation in several GET/POST handlers.
+- **Action**: Update all queries to include `where: { organizationId: request.organizationId }`.
+- **Affected Endpoints**: `/stats`, `/users`, `/enrollments`, `/live-feed`.
+
+## 3. Backend Architecture (API)
+
+### 3.1 Service Layer (`apps/api/src/services/whatsapp.ts`)
+- **`fetchMetaTemplates`**: Fetches existing templates from Meta.
+- **`createMetaTemplate`**: New method to submit a template for approval.
+```typescript
+async createMetaTemplate(config: { accessToken: string; wabaId: string }, template: any) {
+    const url = `${this.baseUrl}/${config.wabaId}/message_templates`;
+    return axios.post(url, template, {
+        headers: { 'Authorization': `Bearer ${config.accessToken}` }
+    });
+}
+```
+
+### 3.2 API Routes (`apps/api/src/routes/whatsapp.ts`)
+- `GET /v1/whatsapp/templates`: Lists and syncs templates.
+- `POST /v1/whatsapp/templates`: Accepts `name`, `language`, `category`, and `components` to create a new template on Meta.
+
+---
+
+## 4. Frontend Architecture (Admin)
+
+### 4.1 Templates Page (`TemplatesPage.tsx`)
+- **i18n Implementation**: Mandatory use of `useTranslation()` for all labels.
+- **Template Creation Form**:
+    - Fields: Name (uppercase/underscores), Category (MARKETING/UTILITY), Language, Body Text.
+    - Submit: Triggers the Meta approval workflow.
+- **Sync Logic**: Integration with React Query `invalidateQueries` to refresh the table after creation or manual sync.
+
+### 4.2 Translation Keys (`en.json`)
+Add keys for:
+- `whatsapp.templates.title`
+- `whatsapp.templates.sync_button`
+- `whatsapp.templates.create_button`
+- `whatsapp.templates.status_approved`
+- etc.
+
+---
+
+## 5. Implementation Steps
+1. **Phase 1: Security**: Patch `admin.ts` routes.
+2. **Phase 2: Backend**: Extend `WhatsAppService` and add Template routes.
+3. **Phase 3: Frontend**: Build `TemplatesPage.tsx` with creation form and full i18n.
+4. **Phase 4: Validation**: Verify the flow with a real Meta Business account for the screencast.

packages/database/prisma/schema.prisma

@@ -60,6 +60,7 @@ model Contact {
   campaigns         CampaignHistory[]
   broadcastLists    BroadcastList[] @relation("ContactBroadcastLists")
   messages          Message[]
+  language          Language     @default(FR)
 
   @@unique([phoneNumber, organizationId])
   @@index([organizationId])
@@ -437,6 +438,9 @@ enum EnrollmentStatus {
 
 enum Language {
   FR
+  EN
+  ES
+  PT
   WOLOF
 }
 

packages/prompts/src/index.ts

@@ -36,7 +36,7 @@ export class PromptLoader {
      * Compiles a template with variables and organization personality
      */
     static compile(
-        templateName: string, 
+        templateName: string,
         variables: Record<string, string | number | boolean>,
         personality: Partial<PersonalityConfig> = {}
     ): string {
@@ -59,12 +59,12 @@ export class PromptLoader {
             toneDescription: config.toneDescription,
             constraints: config.constraints?.join('. ') || ''
         };
-        
+
         for (const [key, value] of Object.entries(allVariables)) {
             const placeholder = new RegExp(`{{${key}}}`, 'g');
             template = template.replace(placeholder, String(value));
         }
-        
+
         return template;
     }
 }