feat: B2B SaaS Multi-tenant architecture & Tech Debt Resolution

apps/admin/src/App.tsx

@@ -3,6 +3,7 @@ import { BrowserRouter as Router, Routes, Route, Link, Navigate } from 'react-ro
 import { Users, BookOpen, Lightbulb, BarChart2, Mic, Activity, Building2 } from 'lucide-react';
 
 import { AuthProvider, useAuth } from './lib/auth';
+import { TenantProvider } from './lib/tenant';
 
 import LoginPage from './pages/LoginPage';
 import DashboardPage from './pages/DashboardPage';
@@ -14,6 +15,8 @@ import SettingsPage from './pages/SettingsPage';
 import LiveFeed from './pages/LiveFeed';
 import TrainingLab from './pages/TrainingLab';
 import ClientsManagementView from './pages/ClientsManagementView';
+import { useTenant } from './lib/tenant';
+import { API_URL } from './lib/api';
 
 function ProtectedRoute({ children }: { children: React.ReactNode }) {
     const { apiKey } = useAuth();
@@ -22,7 +25,17 @@ function ProtectedRoute({ children }: { children: React.ReactNode }) {
 }
 
 function AppShell() {
-    const { logout } = useAuth();
+    const { logout, apiKey } = useAuth();
+    const { selectedOrgId, setSelectedOrgId } = useTenant();
+    const [orgs, setOrgs] = React.useState<any[]>([]);
+
+    React.useEffect(() => {
+        if (!apiKey) return;
+        fetch(`${API_URL}/v1/organizations`, {
+            headers: { 'Authorization': `Bearer ${apiKey}` }
+        }).then(r => r.json()).then(setOrgs).catch(console.error);
+    }, [apiKey]);
+
     const navItems = [
         { to: '/', label: 'Dashboard', icon: <BarChart2 className="w-4 h-4" /> },
         { to: '/content', label: 'Parcours', icon: <BookOpen className="w-4 h-4" /> },
@@ -36,7 +49,22 @@ function AppShell() {
     return (
         <div className="min-h-screen bg-gray-50 flex">
             <aside className="w-56 bg-slate-900 text-white p-5 flex flex-col shrink-0">
-                <div className="text-lg font-bold mb-8 flex items-center gap-2"><span className="text-2xl">🎓</span>EdTech Admin</div>
+                <div className="text-lg font-bold mb-4 flex items-center gap-2"><span className="text-2xl">🎓</span>EdTech Admin</div>
+                
+                <div className="mb-8">
+                    <label className="block text-[10px] uppercase font-bold text-slate-500 tracking-wider mb-2">Organisation Active</label>
+                    <select 
+                        value={selectedOrgId || ''} 
+                        onChange={e => setSelectedOrgId(e.target.value)}
+                        className="w-full bg-slate-800 text-slate-200 text-xs px-3 py-2.5 rounded-xl outline-none focus:ring-1 focus:ring-slate-600 appearance-none cursor-pointer"
+                    >
+                        <option value="">Sélectionner...</option>
+                        {orgs.map(o => (
+                            <option key={o.id} value={o.id}>{o.name}</option>
+                        ))}
+                    </select>
+                </div>
+
                 <nav className="space-y-1 flex-1">
                     {navItems.map(n => (
                         <Link key={n.to} to={n.to} className="flex items-center gap-3 px-3 py-2.5 rounded-xl text-sm font-medium text-slate-300 hover:text-white hover:bg-slate-800 transition">
@@ -67,12 +95,14 @@ function AppShell() {
 function App() {
     return (
         <AuthProvider>
-            <Router>
-                <Routes>
-                    <Route path="/login" element={<LoginPage />} />
-                    <Route path="/*" element={<ProtectedRoute><AppShell /></ProtectedRoute>} />
-                </Routes>
-            </Router>
+            <TenantProvider>
+                <Router>
+                    <Routes>
+                        <Route path="/login" element={<LoginPage />} />
+                        <Route path="/*" element={<ProtectedRoute><AppShell /></ProtectedRoute>} />
+                    </Routes>
+                </Router>
+            </TenantProvider>
         </AuthProvider>
     );
 }

apps/admin/src/lib/tenant.tsx

@@ -0,0 +1,33 @@
+import React, { useState, createContext, useContext, useEffect } from 'react';
+
+const TENANT_KEY = 'edtech_selected_org';
+
+interface TenantContextType {
+    selectedOrgId: string | null;
+    setSelectedOrgId: (id: string | null) => void;
+}
+
+export const TenantContext = createContext<TenantContextType>({
+    selectedOrgId: null,
+    setSelectedOrgId: () => {}
+});
+
+export function TenantProvider({ children }: { children: React.ReactNode }) {
+    const [selectedOrgId, setSelectedOrgId] = useState<string | null>(() => sessionStorage.getItem(TENANT_KEY));
+
+    useEffect(() => {
+        if (selectedOrgId) {
+            sessionStorage.setItem(TENANT_KEY, selectedOrgId);
+        } else {
+            sessionStorage.removeItem(TENANT_KEY);
+        }
+    }, [selectedOrgId]);
+
+    return (
+        <TenantContext.Provider value={{ selectedOrgId, setSelectedOrgId }}>
+            {children}
+        </TenantContext.Provider>
+    );
+}
+
+export const useTenant = () => useContext(TenantContext);

apps/admin/src/pages/ClientsManagementView.tsx

@@ -11,6 +11,17 @@ interface Organization {
     wabaId?: string;
     phoneNumbers?: { id: string, phoneNumber: string }[];
     lastActivity?: string;
+    personalityConfig?: {
+        botName?: string;
+        coreMission?: string;
+        toneDescription?: string;
+    };
+}
+
+interface PersonalityModalProps {
+    org: Organization;
+    onClose: () => void;
+    onSave: (config: any) => void;
 }
 
 export default function ClientsManagementView() {
@@ -18,6 +29,7 @@ export default function ClientsManagementView() {
     const [clients, setClients] = useState<Organization[]>([]);
     const [loading, setLoading] = useState(true);
     const [isModalOpen, setIsModalOpen] = useState(false);
+    const [selectedOrgForPersonality, setSelectedOrgForPersonality] = useState<Organization | null>(null);
     const [newOrgName, setNewOrgName] = useState('');
     const [isCreating, setIsCreating] = useState(false);
 
@@ -156,6 +168,12 @@ export default function ClientsManagementView() {
                                         <MessageSquare className="w-4 h-4" /> Connecter WhatsApp (Meta)
                                     </button>
                                 )}
+                                <button 
+                                    onClick={() => setSelectedOrgForPersonality(client)}
+                                    className="flex items-center gap-2 bg-slate-100 text-slate-700 px-4 py-2.5 rounded-xl font-semibold hover:bg-slate-200 transition"
+                                >
+                                    <Activity className="w-4 h-4" /> Personality Studio
+                                </button>
                             </div>
                         </div>
 
@@ -222,6 +240,30 @@ export default function ClientsManagementView() {
                 </div>
             )}
 
+            {/* Personality Studio Modal */}
+            {selectedOrgForPersonality && (
+                <PersonalityStudioModal 
+                    org={selectedOrgForPersonality} 
+                    onClose={() => setSelectedOrgForPersonality(null)} 
+                    onSave={async (config) => {
+                        try {
+                            const res = await fetch(`${API_URL}/v1/organizations/${selectedOrgForPersonality.id}/personality`, {
+                                method: 'PATCH',
+                                headers: ah(apiKey || ''),
+                                body: JSON.stringify(config)
+                            });
+                            if (res.ok) {
+                                alert("Personnalité mise à jour !");
+                                fetchClients();
+                                setSelectedOrgForPersonality(null);
+                            }
+                        } catch (err) {
+                            console.error(err);
+                        }
+                    }}
+                />
+            )}
+
             {/* Meta Compliance Footer */}
             <div className="mt-12 p-6 bg-slate-50 rounded-2xl border border-slate-100">
                 <h4 className="text-xs font-bold text-slate-400 uppercase tracking-widest mb-4">Meta Tech Provider Compliance</h4>
@@ -233,3 +275,93 @@ export default function ClientsManagementView() {
         </div>
     );
 }
+
+function PersonalityStudioModal({ org, onClose, onSave }: PersonalityModalProps) {
+    const [config, setConfig] = useState(org.personalityConfig || {
+        botName: '',
+        coreMission: '',
+        toneDescription: ''
+    });
+    const [isSaving, setIsSaving] = useState(false);
+
+    const handleSubmit = async (e: React.FormEvent) => {
+        e.preventDefault();
+        setIsSaving(true);
+        await onSave(config);
+        setIsSaving(false);
+    };
+
+    return (
+        <div className="fixed inset-0 bg-slate-900/60 backdrop-blur-md flex items-center justify-center p-4 z-[60]">
+            <div className="bg-white rounded-[2.5rem] shadow-2xl w-full max-w-2xl p-10 animate-in fade-in zoom-in-95 duration-300">
+                <div className="flex items-center justify-between mb-8">
+                    <div className="flex items-center gap-4">
+                        <div className="w-12 h-12 bg-indigo-50 rounded-2xl flex items-center justify-center">
+                            <Activity className="w-6 h-6 text-indigo-600" />
+                        </div>
+                        <div>
+                            <h2 className="text-2xl font-black text-slate-900">Personality Studio</h2>
+                            <p className="text-slate-500 font-medium text-sm">Configuring IA Identity for {org.name}</p>
+                        </div>
+                    </div>
+                    <button onClick={onClose} className="p-3 hover:bg-slate-100 rounded-full transition">
+                        <X className="w-6 h-6 text-slate-400" />
+                    </button>
+                </div>
+
+                <form onSubmit={handleSubmit} className="space-y-8">
+                    <div className="grid gap-6">
+                        <div>
+                            <label className="block text-sm font-bold text-slate-700 mb-2.5">Bot Name</label>
+                            <input 
+                                type="text"
+                                placeholder="e.g. XAMLÉ, Coach Sarah..."
+                                value={config.botName}
+                                onChange={e => setConfig({...config, botName: e.target.value})}
+                                className="w-full border border-slate-200 rounded-2xl px-5 py-4 outline-none focus:ring-4 focus:ring-indigo-50 transition font-medium"
+                            />
+                        </div>
+
+                        <div>
+                            <label className="block text-sm font-bold text-slate-700 mb-2.5">Core Mission</label>
+                            <textarea 
+                                placeholder="What is the main goal of this AI? e.g. Help entrepreneurs master financial literacy..."
+                                value={config.coreMission}
+                                onChange={e => setConfig({...config, coreMission: e.target.value})}
+                                className="w-full border border-slate-200 rounded-2xl px-5 py-4 outline-none focus:ring-4 focus:ring-indigo-50 transition min-h-[120px] font-medium leading-relaxed"
+                            />
+                        </div>
+
+                        <div>
+                            <label className="block text-sm font-bold text-slate-700 mb-2.5">Tone & Personality Description</label>
+                            <textarea 
+                                placeholder="e.g. Professional yet encouraging, uses local metaphors, strict on concepts but friendly..."
+                                value={config.toneDescription}
+                                onChange={e => setConfig({...config, toneDescription: e.target.value})}
+                                className="w-full border border-slate-200 rounded-2xl px-5 py-4 outline-none focus:ring-4 focus:ring-indigo-50 transition min-h-[120px] font-medium leading-relaxed"
+                            />
+                        </div>
+                    </div>
+
+                    <div className="flex gap-4 pt-4">
+                        <button 
+                            type="button"
+                            onClick={onClose}
+                            className="flex-1 px-6 py-4 rounded-2xl font-bold text-slate-600 hover:bg-slate-50 transition"
+                        >
+                            Cancel
+                        </button>
+                        <button 
+                            type="submit"
+                            disabled={isSaving}
+                            className="flex-[2] bg-slate-900 text-white py-4 rounded-2xl font-bold hover:bg-slate-800 transition disabled:opacity-50 flex items-center justify-center gap-3 shadow-xl shadow-slate-200"
+                        >
+                            {isSaving ? <Loader2 className="w-5 h-5 animate-spin" /> : <ShieldCheck className="w-5 h-5" />}
+                            Deploy Personality
+                        </button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    );
+}

apps/admin/src/pages/TrackDaysPage.tsx

@@ -2,10 +2,12 @@ import React, { useEffect, useState } from 'react';
 import { useParams, useNavigate } from 'react-router-dom';
 import { Plus, Edit2, Trash2, ArrowLeft, X, Save } from 'lucide-react';
 import { useAuth } from '../lib/auth';
+import { useTenant } from '../lib/tenant';
 import { API_URL } from '../lib/api';
 
 export default function TrackDaysPage() {
     const { apiKey } = useAuth(); 
+    const { selectedOrgId } = useTenant();
     const { trackId } = useParams<{ trackId: string }>(); 
     const navigate = useNavigate();
     
@@ -14,7 +16,11 @@ export default function TrackDaysPage() {
     const [editing, setEditing] = useState<any>(null); 
     const [saving, setSaving] = useState(false);
     
-    const ah = (k: string) => ({ 'Authorization': `Bearer ${k}`, 'Content-Type': 'application/json' });
+    const ah = (k: string) => ({ 
+        'Authorization': `Bearer ${k}`, 
+        'Content-Type': 'application/json',
+        ...(selectedOrgId ? { 'x-organization-id': selectedOrgId } : {})
+    });
 
     const load = async () => { 
         const [tR, dR] = await Promise.all([

apps/admin/src/pages/TrackFormPage.tsx

@@ -2,10 +2,12 @@ import React, { useEffect, useState } from 'react';
 import { useParams, useNavigate } from 'react-router-dom';
 import { ArrowLeft, Save } from 'lucide-react';
 import { useAuth } from '../lib/auth';
+import { useTenant } from '../lib/tenant';
 import { API_URL } from '../lib/api';
 
 export default function TrackFormPage() {
     const { apiKey } = useAuth(); 
+    const { selectedOrgId } = useTenant();
     const { id } = useParams<{ id: string }>(); 
     const navigate = useNavigate();
     const isNew = id === 'new';
@@ -15,7 +17,11 @@ export default function TrackFormPage() {
         isPremium: false, priceAmount: 0, stripePriceId: '' 
     });
     const [saving, setSaving] = useState(false);
-    const ah = (k: string) => ({ 'Authorization': `Bearer ${k}`, 'Content-Type': 'application/json' });
+    const ah = (k: string) => ({ 
+        'Authorization': `Bearer ${k}`, 
+        'Content-Type': 'application/json',
+        ...(selectedOrgId ? { 'x-organization-id': selectedOrgId } : {})
+    });
 
     useEffect(() => { 
         if (!isNew) {
@@ -78,8 +84,13 @@ export default function TrackFormPage() {
                 </div>}
                 <div className="flex gap-3 pt-2">
                     <button type="button" onClick={() => navigate('/content')} className="flex-1 border border-slate-200 text-slate-600 py-2.5 rounded-xl text-sm hover:bg-slate-50">Annuler</button>
-                    <button type="submit" disabled={saving} className="flex-1 bg-slate-900 text-white py-2.5 rounded-xl text-sm font-bold flex items-center justify-center gap-2 hover:bg-slate-700 disabled:opacity-50">
-                        <Save className="w-4 h-4" />{saving ? 'Enregistrement...' : 'Enregistrer'}
+                    <button 
+                        type="submit" 
+                        disabled={saving || (isNew && !selectedOrgId)} 
+                        className="flex-[2] bg-slate-900 text-white py-2.5 rounded-xl text-sm font-bold flex items-center justify-center gap-2 hover:bg-slate-700 disabled:opacity-50"
+                    >
+                        <Save className="w-4 h-4" />
+                        {saving ? 'Enregistrement...' : (!selectedOrgId && isNew ? 'Sélect. Organisation' : 'Enregistrer')}
                     </button>
                 </div>
             </form>

apps/admin/src/pages/TrackListPage.tsx

@@ -2,15 +2,21 @@ import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { BookOpen, Plus, Edit2, Trash2, ChevronRight } from 'lucide-react';
 import { useAuth } from '../lib/auth';
+import { useTenant } from '../lib/tenant';
 import { API_URL } from '../lib/api';
 
 export default function TrackListPage() {
     const { apiKey } = useAuth(); 
+    const { selectedOrgId } = useTenant();
     const navigate = useNavigate();
     const [tracks, setTracks] = useState<any[]>([]); 
     const [loading, setLoading] = useState(true);
 
-    const ah = (k: string) => ({ 'Authorization': `Bearer ${k}`, 'Content-Type': 'application/json' });
+    const ah = (k: string) => ({ 
+        'Authorization': `Bearer ${k}`, 
+        'Content-Type': 'application/json',
+        ...(selectedOrgId ? { 'x-organization-id': selectedOrgId } : {})
+    });
 
     const load = async () => { 
         const r = await fetch(`${API_URL}/v1/admin/tracks`, { headers: ah(apiKey!) }); 
@@ -18,7 +24,11 @@ export default function TrackListPage() {
         setLoading(false); 
     };
 
-    useEffect(() => { load(); }, []);
+    useEffect(() => { 
+        if (selectedOrgId || !apiKey) {
+            load(); 
+        }
+    }, [selectedOrgId, apiKey]);
 
     const del = async (id: string) => { 
         if (!confirm('Supprimer ce parcours ?')) return; 

apps/api/src/config.ts

@@ -0,0 +1,30 @@
+import { z } from 'zod';
+import dotenv from 'dotenv';
+import path from 'path';
+
+dotenv.config({ path: path.join(__dirname, '../../../../.env') });
+
+const envSchema = z.object({
+    DATABASE_URL: z.string().url(),
+    REDIS_URL: z.string().url(),
+    ADMIN_API_KEY: z.string().min(32),
+    WHATSAPP_ACCESS_TOKEN: z.string().optional(),
+    WHATSAPP_PHONE_NUMBER_ID: z.string().optional(),
+    OPENAI_API_KEY: z.string().optional(),
+    GOOGLE_AI_API_KEY: z.string().optional(),
+    R2_ACCOUNT_ID: z.string().optional(),
+    R2_ACCESS_KEY_ID: z.string().optional(),
+    R2_SECRET_ACCESS_KEY: z.string().optional(),
+    R2_BUCKET: z.string().optional(),
+    PORT: z.string().default('3001').transform(Number),
+    NODE_ENV: z.enum(['development', 'production', 'test']).default('development')
+});
+
+const result = envSchema.safeParse(process.env);
+
+if (!result.success) {
+    console.error('❌ Invalid environment variables:', JSON.stringify(result.error.format(), null, 2));
+    process.exit(1);
+}
+
+export const config = result.data;

apps/api/src/index.ts

@@ -12,11 +12,11 @@ import { internalRoutes } from './routes/internal';
 import { studentRoutes } from './routes/student';
 import { organizationRoutes } from './routes/organizations';
 import { startCleanupCron } from './services/cleanup';
-import { PrismaClient } from '@repo/database';
+import { runWithTenant } from '@repo/database';
 
 declare module 'fastify' {
     interface FastifyInstance {
-        prisma: PrismaClient;
+        prisma: any; // Using any because of Prisma extensions complex types
     }
     interface FastifyRequest {
         rawBody?: Buffer;
@@ -102,6 +102,23 @@ server.register(async function guardedRoutes(scope) {
         if (token !== apiKey) {
             return reply.code(401).send({ error: 'Unauthorized', message: 'Invalid API key' });
         }
+
+        // 🏢 Multi-Tenant Context Injection
+        const orgId = request.headers['x-organization-id'] as string;
+        if (orgId) {
+            request.log.info(`[CONTEXT] Setting Organization Context: ${orgId}`);
+            // We use a trick to keep the context alive for the duration of the request
+            // In Fastify 4, calling done() inside run() works for subsequent hooks and the handler
+        }
+    });
+
+    scope.addHook('preHandler', (request, _reply, done) => {
+        const orgId = request.headers['x-organization-id'] as string;
+        if (orgId) {
+            runWithTenant(orgId, done);
+        } else {
+            done();
+        }
     });
 
     scope.register(adminRoutes, { prefix: '/v1/admin' });
@@ -112,8 +129,8 @@ server.register(async function guardedRoutes(scope) {
 });
 
 // ── Health Routes (public) ─────────────────────────────────────────────────────
-server.get('/', async (_req, reply) => {
-    return reply.code(200).type('application/json').send({ ok: true });
+server.get('/', async (_req) => {
+    return { ok: true };
 });
 
 server.get('/debug/net', async (_req, reply) => {

apps/api/src/logger.ts

@@ -1,4 +1,5 @@
 import pino from 'pino';
+import { getOrganizationId } from '@repo/database';
 
 const pinoLogger = pino({
   level: process.env.LOG_LEVEL || 'info',
@@ -12,38 +13,47 @@ const pinoLogger = pino({
   } : undefined
 });
 
+function getEnrichedObject(obj: any = {}) {
+    const organizationId = getOrganizationId();
+    if (organizationId) {
+        return { ...obj, organizationId };
+    }
+    return obj;
+}
+
 export const logger = {
     info: (first: any, ...rest: any[]) => {
+        const orgId = getOrganizationId();
         if (typeof first === 'string') {
-            pinoLogger.info(first, ...rest);
+            pinoLogger.info(orgId ? { organizationId: orgId } : {}, first, ...rest);
         } else {
-            pinoLogger.info(first, rest[0] || '', ...rest.slice(1));
+            pinoLogger.info(getEnrichedObject(first), rest[0] || '', ...rest.slice(1));
         }
     },
     error: (first: any, ...rest: any[]) => {
+        const orgId = getOrganizationId();
         if (first instanceof Error) {
-            pinoLogger.error(first, rest[0] || first.message, ...rest.slice(1));
+            pinoLogger.error(getEnrichedObject({ err: first }), rest[0] || first.message, ...rest.slice(1));
         } else if (typeof first === 'string') {
-            pinoLogger.error(first, ...rest);
+            pinoLogger.error(orgId ? { organizationId: orgId } : {}, first, ...rest);
         } else {
-            pinoLogger.error(first, rest[0] || '', ...rest.slice(1));
+            pinoLogger.error(getEnrichedObject(first), rest[0] || '', ...rest.slice(1));
         }
     },
     warn: (first: any, ...rest: any[]) => {
+        const orgId = getOrganizationId();
         if (typeof first === 'string') {
-            pinoLogger.warn(first, ...rest);
+            pinoLogger.warn(orgId ? { organizationId: orgId } : {}, first, ...rest);
         } else {
-            pinoLogger.warn(first, rest[0] || '', ...rest.slice(1));
+            pinoLogger.warn(getEnrichedObject(first), rest[0] || '', ...rest.slice(1));
         }
     },
     debug: (first: any, ...rest: any[]) => {
+        const orgId = getOrganizationId();
         if (typeof first === 'string') {
-            pinoLogger.debug(first, ...rest);
+            pinoLogger.debug(orgId ? { organizationId: orgId } : {}, first, ...rest);
         } else {
-            pinoLogger.debug(first, rest[0] || '', ...rest.slice(1));
+            pinoLogger.debug(getEnrichedObject(first), rest[0] || '', ...rest.slice(1));
         }
     },
 };
-
-
-

apps/api/src/middleware/tenant.ts

@@ -0,0 +1,25 @@
+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/ai.ts

@@ -98,11 +98,11 @@ export async function aiRoutes(fastify: FastifyInstance) {
                 response: z.string()
             })).optional()
         });
-        const { lessonText, userActivity, userLanguage, businessProfile, previousResponses } = bodySchema.parse(request.body);
+        const { lessonText, userActivity, userLanguage, previousResponses } = bodySchema.parse(request.body);
 
         logger.info(`[AI] Personalizing lesson for activity: ${userActivity} (Lang: ${userLanguage}) with ${previousResponses?.length || 0} prev responses.`);
 
-        const { lessonText: personalizedText, aiSource } = await aiService.generatePersonalizedLesson(lessonText, userActivity, userLanguage, businessProfile, previousResponses);
+        const { lessonText: personalizedText, aiSource } = await aiService.generatePersonalizedLesson(lessonText, userActivity, userLanguage, previousResponses);
 
         return { success: true, text: personalizedText, aiSource };
     });
@@ -240,7 +240,7 @@ export async function aiRoutes(fastify: FastifyInstance) {
             const feedback = await aiService.generateFeedback(
                 answers, exercisePrompt, lessonText, userLanguage, businessProfile ?? undefined, exerciseCriteria ?? undefined,
                 userActivity ?? undefined, userRegion ?? undefined, dayNumber ?? undefined, previousResponses ?? undefined,
-                isDeepDive, iterationCount, imageUrl ?? undefined, isButtonChoice
+                isDeepDive, iterationCount, imageUrl ?? undefined
             );
 
             // 🌟 Standard Feedback UX: 2-stage branching (Lead UX Requirement) 🌟

apps/api/src/routes/internal.ts

@@ -1,30 +1,8 @@
 import { FastifyInstance } from 'fastify';
 import { WhatsAppService } from '../services/whatsapp';
-import { prisma } from '../services/prisma';
 import { z } from 'zod';
 import { getOrganizationByPhoneNumberId } from '../services/organization';
-// ─── Zod Schema for WhatsApp Webhook Payload ─────────────────────────────────
-const WhatsAppMessageSchema = z.object({
-    from: z.string(),
-    id: z.string(),
-    timestamp: z.string(),
-    type: z.enum(['text', 'audio', 'image', 'video', 'document', 'sticker', 'reaction', 'interactive']),
-    text: z.object({ body: z.string() }).optional(),
-    audio: z.object({ id: z.string(), mime_type: z.string().optional() }).optional(),
-    image: z.object({ id: z.string(), caption: z.string().optional() }).optional(),
-    interactive: z.object({
-        type: z.enum(['button_reply', 'list_reply']),
-        button_reply: z.object({
-            id: z.string(),
-            title: z.string(),
-        }).optional(),
-        list_reply: z.object({
-            id: z.string(),
-            title: z.string(),
-            description: z.string().optional()
-        }).optional(),
-    }).optional()
-});
+import { logger } from '../logger';
 
 const WebhookPayloadSchema = z.object({
     object: z.literal('whatsapp_business_account'),
@@ -32,137 +10,52 @@ const WebhookPayloadSchema = z.object({
         id: z.string(),
         changes: z.array(z.object({
             value: z.object({
-                messaging_product: z.string().optional(),
                 metadata: z.object({ phone_number_id: z.string() }).optional(),
-                contacts: z.array(z.any()).optional(),
-                messages: z.array(WhatsAppMessageSchema).optional(),
-                statuses: z.array(z.any()).optional(),
+                messages: z.array(z.any()).optional(),
             }),
             field: z.string(),
         })),
     })),
 });
 
-/**
- * Internal-only routes — protected by ADMIN_API_KEY, not exposed publicly.
- * Used by the Railway worker to call handleIncomingMessage after audio transcription.
- */
 export async function internalRoutes(fastify: FastifyInstance) {
     // ── Handle Webhook Forwarding from Gateway (HF -> Railway) ───────────────
     fastify.post('/v1/internal/whatsapp/inbound', {
         config: { requireAuth: true }
     }, async (request, reply) => {
-        // We received the raw webhook payload that was forwarded.
-        // Send a 200 immediately to release HF Gateway
         reply.code(200).send({ ok: true });
 
-        // Process message parsing outside the request loop
         setImmediate(async () => {
             try {
                 const parsed = WebhookPayloadSchema.safeParse(request.body);
+                if (!parsed.success) return;
 
-                if (!parsed.success) {
-                    fastify.log.warn(`[INTERNAL-WEBHOOK] Invalid payload schema: ${JSON.stringify(parsed.error.flatten())}`);
-                    return;
-                }
-
-                const payload = parsed.data;
-
-                for (const entry of payload.entry) {
+                for (const entry of parsed.data.entry) {
                     for (const change of entry.changes) {
-                        const messages = change.value.messages ?? [];
+                        const phoneNumberId = change.value.metadata?.phone_number_id || 'unknown';
+                        const organizationId = await getOrganizationByPhoneNumberId(phoneNumberId);
 
-                        for (const message of messages) {
+                        for (const message of change.value.messages || []) {
                             const phone = message.from;
                             let text = '';
-                            
-                            const phoneNumberId = change.value.metadata?.phone_number_id || 'unknown';
-                            const organizationId = await getOrganizationByPhoneNumberId(phoneNumberId);
-
-                            if (message.type === 'text' && message.text) {
-                                text = message.text.body;
-
-                            } else if (message.type === 'interactive' && message.interactive) {
-                                if (message.interactive.type === 'button_reply' && message.interactive.button_reply) {
-                                    text = message.interactive.button_reply.id;
-                                    fastify.log.info(`[INTERNAL-WEBHOOK] Button reply: ${text}`);
-                                } else if (message.interactive.type === 'list_reply' && message.interactive.list_reply) {
-                                    text = message.interactive.list_reply.id;
-                                    fastify.log.info(`[INTERNAL-WEBHOOK] List reply: ${text}`);
-                                }
-
-                            } else if (message.type === 'audio' && message.audio) {
-                                // ─── Audio inbound: delegate download to Railway worker ────────────
-                                const accessToken = process.env.WHATSAPP_ACCESS_TOKEN || '';
-                                const { Queue } = await import('bullmq');
-                                const Redis = (await import('ioredis')).default;
-                                const conn = process.env.REDIS_URL
-                                    ? new Redis(process.env.REDIS_URL, { maxRetriesPerRequest: null })
-                                    : new Redis({ host: process.env.REDIS_HOST || 'localhost', port: parseInt(process.env.REDIS_PORT || '6379'), maxRetriesPerRequest: null });
-                                // @ts-ignore - version mismatch between bullmq and app ioredis
-                                const q = new Queue('whatsapp-queue', { connection: conn });
 
-                                await q.add('download-media', {
-                                    mediaId: message.audio.id,
-                                    mimeType: message.audio.mime_type || 'audio/ogg',
-                                    phone,
-                                    organizationId,
-                                    ...(accessToken ? { accessToken } : {})
-                                }, { priority: 1, attempts: 3, backoff: { type: 'exponential', delay: 2000 } });
-
-                                await q.add('send-message-direct', {
-                                    phone,
-                                    text: "⏳ J'analyse ton audio..."
-                                });
-
-                                fastify.log.info(`[INTERNAL-WEBHOOK] Audio ${message.audio.id} enqueued for Railway download`);
-                                continue;
-                            } else if (message.type === 'image' && message.image) {
-                                // ─── Image inbound: delegate download to Railway worker ────────────
-                                const accessToken = process.env.WHATSAPP_ACCESS_TOKEN || '';
-                                const { Queue } = await import('bullmq');
-                                const Redis = (await import('ioredis')).default;
-                                const conn = process.env.REDIS_URL
-                                    ? new Redis(process.env.REDIS_URL, { maxRetriesPerRequest: null })
-                                    : new Redis({ host: process.env.REDIS_HOST || 'localhost', port: parseInt(process.env.REDIS_PORT || '6379'), maxRetriesPerRequest: null });
-                                // @ts-ignore - version mismatch between bullmq and app ioredis
-                                const q = new Queue('whatsapp-queue', { connection: conn });
-
-                                fastify.log.info(`[INTERNAL-WEBHOOK] Image ${message.image.id} detected. Enqueuing download.`);
-                                
-                                await q.add('download-media', {
-                                    mediaId: message.image.id,
-                                    mimeType: 'image/jpeg',
-                                    phone,
-                                    organizationId,
-                                    caption: message.image.caption || undefined,
-                                    ...(accessToken ? { accessToken } : {})
-                                }, { priority: 1, attempts: 3, backoff: { type: 'exponential', delay: 2000 } });
-
-                                await q.add('send-message-direct', {
-                                    phone,
-                                    text: "⏳ J'analyse ton image..."
-                                });
-
-                                fastify.log.info(`[INTERNAL-WEBHOOK] Image ${message.image.id} enqueued for Railway download`);
+                            if (message.type === 'text') text = message.text?.body;
+                            else if (message.type === 'interactive') {
+                                text = message.interactive?.button_reply?.id || message.interactive?.list_reply?.id;
+                            } else if (message.type === 'audio' || message.type === 'image') {
+                                // Delegate media to worker via service
+                                await WhatsAppService.handleIncomingMessage(phone, '', message.audio?.id || undefined, message.image?.id || undefined, undefined, organizationId);
                                 continue;
                             }
 
                             if (phone && text) {
-                                // 🕰️ TIME-TRAVEL: Detect if user is in replay mode before routing to service
-                                const user = await prisma.user.findUnique({ where: { phone } });
-                                let ttDay: number | undefined;
-                                if (user) {
-                                    const { getTimeTravelContext } = await import('../services/queue');
-                                    ttDay = (await getTimeTravelContext(user.id)) ?? undefined;
-                                }
-                                await WhatsAppService.handleIncomingMessage(phone, text, undefined, undefined, ttDay, organizationId);
+                                await WhatsAppService.handleIncomingMessage(phone, text, undefined, undefined, undefined, organizationId);
                             }
                         }
                     }
                 }
             } catch (error) {
-                fastify.log.error(`[INTERNAL-WEBHOOK] Async processing error: ${error instanceof Error ? error.message : String(error)}`);
+                logger.error(`[INTERNAL-WEBHOOK] Async processing error: ${error}`);
             }
         });
     });
@@ -171,51 +64,16 @@ export async function internalRoutes(fastify: FastifyInstance) {
     fastify.post<{
         Body: { phone: string; text: string; audioUrl?: string; imageUrl?: string; organizationId?: string }
     }>('/v1/internal/handle-message', {
-        config: { requireAuth: true },
-        schema: {
-            body: {
-                type: 'object',
-                required: ['phone', 'text'],
-                properties: {
-                    phone: { type: 'string' },
-                    text: { type: 'string' },
-                    audioUrl: { type: 'string' },
-                    imageUrl: { type: 'string' },
-                    organizationId: { type: 'string' }
-                }
-            }
-        }
+        config: { requireAuth: true }
     }, async (request, reply) => {
         const { phone, text, audioUrl, imageUrl, organizationId } = request.body;
-        const traceId = `[INTERNAL-TX-${phone.slice(-4)}]`;
-
-        if (!phone || text === undefined) {
-            request.log.warn(`${traceId} Missing phone or text in handle-message request`);
-            return reply.code(400).send({ error: 'phone and text are required' });
-        }
-
-        request.log.info(`${traceId} Received message text: "${text.substring(0, 100)}..." (Image: ${!!imageUrl})`);
-
-        // Fire and await - ensuring the worker knows if it failed
         try {
             await WhatsAppService.handleIncomingMessage(phone, text, audioUrl, imageUrl, undefined, organizationId);
-            request.log.info(`${traceId} Successfully processed message`);
-        } catch (err: unknown) {
-            const errorMsg = err instanceof Error ? err.message : String(err);
-            request.log.error(`${traceId} handleIncomingMessage error: ${errorMsg}`);
-            return reply.code(500).send({ error: errorMsg });
+            return reply.send({ ok: true });
+        } catch (err: any) {
+            return reply.code(500).send({ error: err.message });
         }
-
-
-        return reply.send({ ok: true });
     });
 
-    // ── Simple Ping for Token/Connectivity Verification ──────────────────────
-    fastify.get('/v1/internal/ping', {
-        config: { requireAuth: true }
-    }, async () => {
-        return { ok: true, message: 'Pong! Railway Internal API is reachable and authorized.', timestamp: new Date().toISOString() };
-    });
+    fastify.get('/v1/internal/ping', { config: { requireAuth: true } }, async () => ({ ok: true }));
 }
-
-

apps/api/src/routes/organizations.ts

@@ -1,8 +1,8 @@
 import { FastifyInstance } from 'fastify';
 import { prisma } from '../services/prisma';
-import { redis } from '../services/queue';
 import { z } from 'zod';
 import { logger } from '../logger';
+import { invalidateOrganizationCache } from '../services/organization';
 
 const OrganizationSchema = z.object({
     name: z.string().min(1),
@@ -10,6 +10,13 @@ const OrganizationSchema = z.object({
     customPrompt: z.string().optional(),
 });
 
+const PersonalityConfigSchema = z.object({
+    botName: z.string().optional(),
+    coreMission: z.string().optional(),
+    toneDescription: z.string().optional(),
+    languageConstraints: z.string().optional()
+});
+
 export async function organizationRoutes(fastify: FastifyInstance) {
     // 1. List all organizations
     fastify.get('/', async () => {
@@ -63,7 +70,7 @@ export async function organizationRoutes(fastify: FastifyInstance) {
                 data: body.data
             });
             // 🚨 INVALIDATE CACHE
-            await redis.del(`org:config:${id}`);
+            await invalidateOrganizationCache(id);
             return org;
         } catch (err) {
             return reply.code(404).send({ error: 'Organization not found' });
@@ -83,7 +90,7 @@ export async function organizationRoutes(fastify: FastifyInstance) {
         const body = schema.safeParse(req.body);
         if (!body.success) return reply.code(400).send({ error: body.error.flatten() });
 
-        const { wabaId, accessToken, phoneNumber, phoneNumberId } = body.data;
+        const { accessToken, phoneNumber, phoneNumberId } = body.data;
 
         // Update Organization with the permanent token
         await prisma.organization.update({
@@ -94,7 +101,7 @@ export async function organizationRoutes(fastify: FastifyInstance) {
         });
 
         // 🚨 INVALIDATE CACHE
-        await redis.del(`org:config:${id}`);
+        await invalidateOrganizationCache(id, phoneNumberId);
 
         // Upsert the Phone Number associated with this organization
         if (phoneNumberId) {
@@ -114,4 +121,33 @@ export async function organizationRoutes(fastify: FastifyInstance) {
 
         return { ok: true, message: 'WhatsApp configuration updated successfully' };
     });
+
+    // 6. Update AI Personality Configuration
+    fastify.patch('/:id/personality', async (req, reply) => {
+        const { id } = req.params as { id: string };
+        const body = PersonalityConfigSchema.partial().safeParse(req.body);
+
+        if (!body.success) return reply.code(400).send({ error: body.error.flatten() });
+
+        try {
+            const org = await prisma.organization.findUnique({ where: { id } });
+            if (!org) return reply.code(404).send({ error: 'Organization not found' });
+
+            const currentConfig = (org.personalityConfig as any) || {};
+            const newConfig = { ...currentConfig, ...body.data };
+
+            const updatedOrg = await prisma.organization.update({
+                where: { id },
+                data: { personalityConfig: newConfig }
+            });
+
+            // 🚨 INVALIDATE CACHE
+            await invalidateOrganizationCache(id);
+
+            return updatedOrg;
+        } catch (err) {
+            logger.error('[ORG_ROUTE] Personality update failed:', err);
+            return reply.code(500).send({ error: 'Failed to update personality' });
+        }
+    });
 }

apps/api/src/services/ai/ProviderRegistry.ts

@@ -0,0 +1,40 @@
+import { LLMProvider } from './types';
+import { logger } from '../../logger';
+
+export enum ProviderCapability {
+    TEXT = 'TEXT',
+    VISION = 'VISION',
+    AUDIO_TRANSCRIPTION = 'AUDIO_TRANSCRIPTION',
+    SPEECH_GENERATION = 'SPEECH_GENERATION',
+    IMAGE_GENERATION = 'IMAGE_GENERATION'
+}
+
+export interface RegisteredProvider {
+    name: string;
+    instance: LLMProvider;
+    priority: number;
+    capabilities: ProviderCapability[];
+}
+
+export class ProviderRegistry {
+    private providers: RegisteredProvider[] = [];
+
+    register(name: string, instance: LLMProvider, priority: number, capabilities: ProviderCapability[]) {
+        this.providers.push({ name, instance, priority, capabilities });
+        // Sort by priority descending (higher priority first)
+        this.providers.sort((a, b) => b.priority - a.priority);
+        logger.info(`[PROVIDER_REGISTRY] Registered ${name} (Priority: ${priority}, Capabilities: ${capabilities.join(', ')})`);
+    }
+
+    getProvidersFor(capability: ProviderCapability): RegisteredProvider[] {
+        return this.providers.filter(p => p.capabilities.includes(capability));
+    }
+
+    getPrimary(capability: ProviderCapability = ProviderCapability.TEXT): RegisteredProvider | undefined {
+        return this.getProvidersFor(capability)[0];
+    }
+
+    getAll(): RegisteredProvider[] {
+        return [...this.providers];
+    }
+}

apps/api/src/services/ai/index.ts

@@ -1,119 +1,131 @@
 import { logger } from '../../logger';
 import { z } from 'zod';
-import { LLMProvider, OnePagerData, OnePagerSchema, PitchDeckData, PitchDeckSchema, PersonalizedLessonSchema, FeedbackSchema, FeedbackData } from './types';
+import { 
+    OnePagerData, OnePagerSchema, 
+    PitchDeckData, PitchDeckSchema, 
+    PersonalizedLessonSchema, 
+    FeedbackSchema, FeedbackData 
+} from './types';
 import { MockLLMProvider } from './mock-provider';
 import { OpenAIProvider } from './openai-provider';
 import { searchService } from './search';
 import { GeminiProvider } from './gemini-provider';
-import { PromptLoader } from '@repo/prompts';
+import { PromptLoader, PersonalityConfig } from '@repo/prompts';
+import { getOrganizationId } from '@repo/database';
+import { prisma } from '../prisma';
+import { redis } from '../queue';
+import { ProviderRegistry, ProviderCapability } from './ProviderRegistry';
 
 class AIService {
-    private primaryProvider: LLMProvider;
-    private fallbackProvider: LLMProvider | null = null;
-    private avProvider: LLMProvider | null = null; // Specifically for Audio/Video/Image (OpenAI)
-    private mockProvider: LLMProvider;
+    private registry: ProviderRegistry;
 
     constructor() {
-        this.mockProvider = new MockLLMProvider();
+        this.registry = new ProviderRegistry();
+        this.initializeProviders();
+    }
 
+    private initializeProviders() {
         const geminiApiKey = process.env.GOOGLE_AI_API_KEY;
         const openAiApiKey = process.env.OPENAI_API_KEY;
 
         if (geminiApiKey) {
-            logger.info('[AI_SERVICE] Initializing Gemini as Primary Provider...');
-            this.primaryProvider = new GeminiProvider(geminiApiKey);
-            if (openAiApiKey) {
-                logger.info('[AI_SERVICE] Initializing OpenAI as Fallback & A/V Provider...');
-                const openai = new OpenAIProvider(openAiApiKey);
-                this.fallbackProvider = openai;
-                this.avProvider = openai;
-            }
-        } else if (openAiApiKey) {
-            logger.info('[AI_SERVICE] Gemini Key missing. Initializing OpenAI as Primary & A/V Provider...');
+            this.registry.register('GEMINI', new GeminiProvider(geminiApiKey), 100, [
+                ProviderCapability.TEXT,
+                ProviderCapability.VISION
+            ]);
+        }
+
+        if (openAiApiKey) {
             const openai = new OpenAIProvider(openAiApiKey);
-            this.primaryProvider = openai;
-            this.avProvider = openai;
-        } else {
-            logger.info('[AI_SERVICE] No AI API Keys found. Initializing MOCK Provider...');
-            this.primaryProvider = this.mockProvider;
-            this.avProvider = this.mockProvider;
+            this.registry.register('OPENAI', openai, 50, [
+                ProviderCapability.TEXT,
+                ProviderCapability.VISION,
+                ProviderCapability.AUDIO_TRANSCRIPTION,
+                ProviderCapability.SPEECH_GENERATION,
+                ProviderCapability.IMAGE_GENERATION
+            ]);
+        }
+
+        this.registry.register('MOCK', new MockLLMProvider(), 0, Object.values(ProviderCapability) as ProviderCapability[]);
+    }
+
+    private async getTenantPersonality(): Promise<Partial<PersonalityConfig>> {
+        const organizationId = getOrganizationId();
+        if (!organizationId) return {};
+
+        const cacheKey = `org:config:${organizationId}`;
+        try {
+            const cached = await redis.get(cacheKey);
+            if (cached) return JSON.parse(cached);
+        } catch (err) {
+            logger.error('[AI_SERVICE] Redis error:', err);
+        }
+
+        try {
+            const org = await prisma.organization.findUnique({
+                where: { id: organizationId },
+                select: { personalityConfig: true }
+            });
+            const personality = (org?.personalityConfig as any) || {};
+            await redis.set(cacheKey, JSON.stringify(personality), 'EX', 3600);
+            return personality;
+        } catch (err) {
+            logger.error('[AI_SERVICE] Failed to fetch tenant personality:', err);
+            return {};
         }
     }
 
-    /**
-     * Internal wrapper for structured data calls with failover logic.
-     */
     private async callWithFailover<T>(
         prompt: string,
         schema: z.ZodSchema<T>,
         temperature?: number,
         imageUrl?: string
     ): Promise<{ data: T, source: string }> {
-        try {
-            const data = await this.primaryProvider.generateStructuredData(prompt, schema, temperature, imageUrl);
-            const source = (this.primaryProvider instanceof GeminiProvider) ? 'GEMINI' :
-                (this.primaryProvider instanceof OpenAIProvider) ? 'OPENAI' : 'MOCK';
-            logger.info(`[AI_INFO] ${source} used successfully. (Vision: ${!!imageUrl})`);
-            return { data, source };
-        } catch (err) {
-            if (this.fallbackProvider) {
-                logger.warn('[AI_WARNING] Primary provider failed, falling back to OpenAI...', (err as Error).message);
-                const data = await this.fallbackProvider.generateStructuredData(prompt, schema, temperature, imageUrl);
-                logger.info('[AI_INFO] OPENAI used as fallback.');
-                return { data, source: 'OPENAI' };
+        const capability = imageUrl ? ProviderCapability.VISION : ProviderCapability.TEXT;
+        const providers = this.registry.getProvidersFor(capability);
+
+        for (const provider of providers) {
+            try {
+                const data = await provider.instance.generateStructuredData(prompt, schema, temperature, imageUrl);
+                logger.info(`[AI_INFO] ${provider.name} used successfully. (Capability: ${capability})`);
+                return { data, source: provider.name };
+            } catch (err) {
+                logger.warn(`[AI_WARNING] ${provider.name} failed: ${(err as Error).message}. Trying next provider...`);
             }
-            throw err;
         }
+
+        throw new Error(`[AI_ERROR] All providers for ${capability} failed.`);
     }
 
-    /**
-     * Extracts a One-Pager JSON structure from raw user data.
-     */
     async generateOnePagerData(userContext: string, language: string = 'FR', businessProfile?: any): Promise<OnePagerData> {
-        const marketDataInjected = businessProfile?.marketData
-            ? `\n🌐 DONNÉES DE MARCHÉ RÉELLES (Google Search) :\n${JSON.stringify(businessProfile.marketData, null, 2)}\n`
-            : '';
-
+        const personality = await this.getTenantPersonality();
         const prompt = PromptLoader.compile('one-pager', {
             activityLabel: businessProfile?.activityLabel || 'non précisé',
             userContext,
-            marketDataInjected,
-            languageLabel: language === 'WOLOF' ? 'WOLOF standardisé v4.0' : 'Français institutionnel',
-            languageInstruction: language === 'WOLOF' ? 'WOLOF (ñ, ë, é) suivi de la traduction FR' : 'French'
-        });
+            marketDataInjected: businessProfile?.marketData ? `\n🌐 DONNÉES DE MARCHÉ :\n${JSON.stringify(businessProfile.marketData)}\n` : '',
+            languageLabel: language === 'WOLOF' ? 'WOLOF standardisé' : 'Français institutionnel',
+            languageInstruction: language === 'WOLOF' ? 'WOLOF (ñ, ë, é) suivi du FR' : 'French'
+        }, personality);
 
         const { data, source } = await this.callWithFailover(prompt, OnePagerSchema);
         return { ...data, aiSource: source };
     }
 
-    /**
-     * Extracts a Slide Deck JSON structure from raw user data.
-     */
     async generatePitchDeckData(userContext: string, language: string = 'FR', businessProfile?: any): Promise<PitchDeckData & { aiSource?: string }> {
-        const marketDataInjected = businessProfile?.marketData
-            ? `\n🌐 DONNÉES DE MARCHÉ (RECHERCHE WEB) :\n${JSON.stringify(businessProfile.marketData, null, 2)}\n`
-            : '';
-
-        const teamDataInjected = businessProfile?.teamMembers && Array.isArray(businessProfile.teamMembers) && businessProfile.teamMembers.length > 0
-            ? `\n👥 MEMBRES DE L'ÉQUIPE (PHOTOS/BDD) :\n${JSON.stringify(businessProfile.teamMembers, null, 2)}\n`
-            : '';
-
+        const personality = await this.getTenantPersonality();
         const prompt = PromptLoader.compile('pitch-deck', {
             activityLabel: businessProfile?.activityLabel || 'Entrepreneuriat',
             locationCity: businessProfile?.locationCity || 'Sénégal',
             userContext,
-            marketDataInjected,
-            teamDataInjected,
+            marketDataInjected: businessProfile?.marketData ? `\n🌐 MARCHÉ :\n${JSON.stringify(businessProfile.marketData)}\n` : '',
+            teamDataInjected: businessProfile?.teamMembers?.length > 0 ? `\n👥 ÉQUIPE :\n${JSON.stringify(businessProfile.teamMembers)}\n` : '',
             languageLabel: language === 'WOLOF' ? 'WOLOF' : 'FRENCH'
-        });
+        }, personality);
 
         const { data, source } = await this.callWithFailover(prompt, PitchDeckSchema);
         return { ...data, aiSource: source };
     }
 
-    /**
-     * Generates a short pedagogical feedback for the student's answer based on v1.0 criteria.
-     */
     async generateFeedback(
         userInput: string,
         expectedExercise: string,
@@ -121,221 +133,95 @@ class AIService {
         userLanguage: string = 'FR',
         businessProfile?: any,
         exerciseCriteria?: any,
-        // Expert coaching context
         userActivity?: string,
         userRegion?: string,
         dayNumber?: number,
         previousResponses?: Array<{ day: number; response: string }>,
         isDeepDive: boolean = false,
         iterationCount: number = 0,
-        imageUrl?: string,
-        isButtonChoice: boolean = false
+        imageUrl?: string
     ): Promise<FeedbackData & { searchResults?: any[] }> {
-        // 🚀 Question Detection Logic (Lead AI Engineer Requirement)
-        const questionKeywords = ['?', 'avis', 'penses', 'conseil', 'aider', 'comment', 'pourquoi', 'idée', 'prix', 'standard'];
-        const lowerInput = userInput.toLowerCase();
-        const hasQuestion = questionKeywords.some(kw => lowerInput.includes(kw));
-
-        logger.info(`[AI_INTERACTION] User asked a question: ${hasQuestion}`);
-
+        const hasQuestion = ['?', 'avis', 'penses', 'conseil', 'aider'].some(kw => userInput.toLowerCase().includes(kw));
         const activityLabel = userActivity || businessProfile?.activityLabel || 'non précisé';
-        const region = userRegion || businessProfile?.region || 'Sénégal';
-        const customer = businessProfile?.mainCustomer || '';
-        const offer = businessProfile?.offerSimple || '';
-        const promise = businessProfile?.promise || '';
-        const problem = businessProfile?.mainProblem || '';
-
-        const businessContext = [
-            `🏪 BUSINESS DE L'ÉTUDIANT :`,
-            `- Activité : ${activityLabel}`,
-            `- Région : ${region}`,
-            customer ? `- Client principal : ${customer}` : '',
-            offer ? `- Offre : ${offer}` : '',
-            problem ? `- Problème résolu : ${problem}` : '',
-            promise ? `- Promesse unique : ${promise}` : '',
-        ].filter(Boolean).join('\n');
-
-        const prevContext = previousResponses && previousResponses.length > 0
-            ? `\nCONTEXTE HISTORIQUE DU BUSINESS :\n${previousResponses.map(r => `[Jour ${r.day}]: "${r.response}"`).join('\n')}`
-            : '';
-
-        const previousResponsesContext = previousResponses && previousResponses.length > 0
-            ? `\n\nHISTORIQUE DES RÉPONSES PRÉCÉDENTES :\n${previousResponses.map(r => `Jour ${r.day}: ${r.response}`).join('\n')}`
-            : '';
-
-        let searchContext = '';
-        let searchResults: any[] | undefined = undefined;
-        // 🚀 Brique 1: Activation du Browsing (Optimized for Day 7)
-        const isDay7Choice = dayNumber === 7 && (userInput.length < 15 || ['whatsapp', 'boutique', 'digital', 'physique'].includes(lowerInput));
         
-        if (!isDay7Choice) {
-            logger.info(`[AI_SERVICE] 🔍 Triggering Market Search for Day ${dayNumber}...`);
-            // Remove hallucinatory generic fallback words
-            const cleanActivity = activityLabel.replace(/non précisé|e-commerce/i, '').trim() || 'Entrepreneuriat';
-            let query = `${cleanActivity} ${region} Sénégal marché chiffres statistiques data`;
-
-            if (dayNumber === 10) {
-                query = `startups concurrents ${cleanActivity} ${region} Sénégal solutions paiement UEMOA`;
-            } else if (dayNumber === 11) {
-                query = `benchmarks marges rentabilité ${cleanActivity} Afrique de l'Ouest tech business model`;
-            } else if (dayNumber === 12) {
-                query = `benchmarks revenus levée de fonds analyse concurrents locaux ${cleanActivity} Afrique de l'Ouest`;
-            }
+        let searchContext = '';
+        let searchResults: any[] | undefined;
 
+        if (dayNumber !== 7) {
             try {
-                const results = await searchService.search(query);
-                if (results && results.length > 0) {
+                const results = await searchService.search(`${activityLabel} Sénégal marché`);
+                if (results?.length > 0) {
                     searchResults = results;
-                    searchContext = `\n🌐 DONNÉES DE MARCHÉ RÉELLES (Google Search) :\n${results.map(r => `- ${r.title}: ${r.snippet}`).join('\n')}\n`;
-                    logger.info(`[AI_SERVICE] ✅ Search enrichment added (Query: ${query}).`);
+                    searchContext = `\n🌐 MARCHÉ :\n${results.map(r => `- ${r.title}: ${r.snippet}`).join('\n')}\n`;
                 }
-            } catch (err) {
-                logger.error('[AI_SERVICE] Search enrichment failed:', err);
-            }
-        } else {
-            logger.info(`[AI_SERVICE] ⚡ Bypassing search for Day 7 choice (Speed-up).`);
+            } catch (err) {}
         }
 
-        const criteriaContext = exerciseCriteria
-            ? `CRITÈRES D'ÉVALUATION :\n${JSON.stringify(exerciseCriteria, null, 2)}`
-            : 'CRITÈRES : Réponse concrète, personnelle, et spécifique à son business réel.';
-
+        const personality = await this.getTenantPersonality();
         let actionPrompt = '';
         if (isDeepDive) {
-            if (iterationCount >= 3) {
-                actionPrompt = PromptLoader.compile('action-feedback-deepdive-limit', {});
-            } else if (dayNumber === 11) {
-                actionPrompt = PromptLoader.compile('action-feedback-teambuilding', {
-                    iterationCount,
-                    imageUrl: imageUrl || '',
-                    userInput
-                });
-            } else {
-                actionPrompt = PromptLoader.compile('action-feedback-deepdive', {
-                    iterationCount,
-                    activityLabel
-                });
-            }
+            actionPrompt = iterationCount >= 3 
+                ? PromptLoader.compile('action-feedback-deepdive-limit', {}, personality)
+                : PromptLoader.compile('action-feedback-deepdive', { iterationCount, activityLabel }, personality);
         } else {
             actionPrompt = PromptLoader.compile('action-feedback-standard', {
                 dayNumber: dayNumber || 0,
-                expectedExercise: expectedExercise || '',
-                previousResponsesContext,
-                questionDetectionBlock: hasQuestion ? '🚨 DOUBLE INTENTION DÉTECTÉE...' : '',
-                day8VisualBlock: dayNumber === 8 ? '🚨 COACHING VISUEL...' : '',
-                visionMultimodalBlock: imageUrl ? '📸 ANALYSE VISUELLE...' : '',
-                questionDeepDiveBlock: hasQuestion ? "L'utilisateur ayant posé une question..." : '',
-                buttonBypassBlock: isButtonChoice ? '🚨 PROMPT HOOK...' : ''
-            });
+                expectedExercise,
+                previousResponsesContext: previousResponses?.map(r => `J${r.day}: ${r.response}`).join('\n') || '',
+                questionDetectionBlock: hasQuestion ? '🚨 QUESTION DÉTECTÉE...' : '',
+                visionMultimodalBlock: imageUrl ? '📸 ANALYSE VISUELLE...' : ''
+            }, personality);
         }
 
         const prompt = PromptLoader.compile('feedback-base', {
             dayNumber: dayNumber || 0,
             activityLabel,
-            region,
-            businessContext,
-            prevContext,
-            criteriaContext,
+            region: userRegion || businessProfile?.region || 'Sénégal',
+            businessContext: `🏪 Activité: ${activityLabel}`,
+            prevContext: previousResponses?.map(r => `[J${r.day}]: "${r.response}"`).join('\n') || '',
+            criteriaContext: JSON.stringify(exerciseCriteria || {}),
             searchContext,
-            previousResponsesContext,
             lessonContentContent: lessonContent.substring(0, 500),
             expectedExercise,
             userInput,
             actionPrompt,
-            userLanguage,
-            languageSpecificInstruction: userLanguage === 'WOLOF' ? 'ALERTE MAXIMALE : Wolof Only...' : 'ALERTE MAXIMALE : French Only...'
-        });
+            userLanguage
+        }, personality);
 
-        // 📸 VISION HARDENING: Always use OpenAI (GPT-4o) for image-based feedback (more reliable multimodal JSON)
-        let result;
-        if (imageUrl && this.avProvider) {
-            logger.info(`[AI_SERVICE] 📸 Image detected. Forcing OpenAI/AV-Provider for Day ${dayNumber}.`);
-            const data = await this.avProvider.generateStructuredData(prompt, FeedbackSchema, 0.7, imageUrl);
-            result = { data, source: 'OPENAI' };
-        } else {
-            result = await this.callWithFailover(prompt, FeedbackSchema, 0.7, imageUrl);
-        }
-        const { data, source } = result;
-        
-        // 🚨 Day 11 Guard: Ensure team members are not returned for earlier days
-        if (dayNumber !== undefined && dayNumber < 11 && (data as any).teamMembers) {
-            logger.info(`[AI_SERVICE] Pruning teamMembers from feedback (Day ${dayNumber} < 11)`);
-            delete (data as any).teamMembers;
-        }
-
-        return {
-            ...data,
-            searchResults,
-            aiSource: source
-        };
+        const { data, source } = await this.callWithFailover(prompt, FeedbackSchema, 0.7, imageUrl);
+        return { ...data, searchResults, aiSource: source };
     }
 
-    /**
-     * Rewrites a daily lesson to use analogies relevant to the user's business sector.
-     */
     async generatePersonalizedLesson(
         lessonText: string,
         userActivity: string,
         userLanguage: string = 'FR',
-        businessProfile?: any,
         previousResponses?: Array<{ day: number; response: string }>
     ): Promise<{ lessonText: string, aiSource: string }> {
-        const activityLabel = userActivity || businessProfile?.activityLabel || 'entrepreneuriat';
-        const customer = businessProfile?.mainCustomer || '';
-        const region = businessProfile?.region || 'Sénégal';
-        const problem = businessProfile?.mainProblem || '';
-
-        const businessContext = [
-            `🏪 BUSINESS DE L'ÉTUDIANT :`,
-            `- Activité : ${activityLabel}`,
-            `- Région : ${region}`,
-            customer ? `- Client : ${customer}` : '',
-            problem ? `- Problème résolu : ${problem}` : '',
-        ].filter(Boolean).join('\n');
-
-        // Inject real exercise responses so lesson examples match the user's actual business
-        const prevContext = previousResponses && previousResponses.length > 0
-            ? `\n📝 CE QUE L'ÉTUDIANT A DÉJÀ DIT SUR SON BUSINESS (utilise ces infos exactes pour les exemples) :\n${previousResponses.map(r => `  Jour ${r.day}: "${r.response.substring(0, 200)}"`).join('\n')}\n`
-            : '';
-
+        const personality = await this.getTenantPersonality();
         const prompt = PromptLoader.compile('personalized-lesson', {
-            businessContext,
-            prevContext,
-            activityLabel,
+            businessContext: `🏪 Activité: ${userActivity}`,
+            prevContext: previousResponses?.map(r => `J${r.day}: "${r.response.substring(0, 100)}"`).join('\n') || '',
+            activityLabel: userActivity,
             lessonText,
-            languageLabel: userLanguage === 'WOLOF' ? 'WOLOF (avec ñ, ë, é). Wolof en priorité, suivi de la traduction française précédée de (FR)' : 'Français'
-        });
+            languageLabel: userLanguage === 'WOLOF' ? 'WOLOF (ñ, ë, é)' : 'Français'
+        }, personality);
 
         const { data, source } = await this.callWithFailover(prompt, PersonalizedLessonSchema);
         return { lessonText: data.lessonText, aiSource: source };
     }
 
-    /**
-     * Transcribes an audio buffer to text (useful for Wolof/FR voice messages) and returns confidence score.
-     */
     async transcribeAudio(audioBuffer: Buffer, filename: string, language?: string): Promise<{ text: string, confidence: number }> {
-        // Transcriptions are currently exclusively via OpenAI Whisper (or mock)
-        const provider = this.avProvider || this.mockProvider;
-        return provider.transcribeAudio(audioBuffer, filename, language);
+        const provider = this.registry.getPrimary(ProviderCapability.AUDIO_TRANSCRIPTION);
+        if (!provider) throw new Error('[AI_ERROR] No provider for audio transcription.');
+        return provider.instance.transcribeAudio(audioBuffer, filename, language);
     }
 
-    /**
-     * Extracts business profile details from user input based on the current day.
-     */
-    async extractBusinessProfile(userInput: string, dayNumber: number, userLanguage: string = 'FR'): Promise<{
-        activityLabel: string | null,
-        activityType: string | null,
-        mainCustomer: string | null,
-        mainProblem: string | null,
-        offerSimple: string | null,
-        promise: string | null,
-        aiSource?: string
-    }> {
+    async extractBusinessProfile(userInput: string, dayNumber: number, userLanguage: string = 'FR'): Promise<any> {
+        const personality = await this.getTenantPersonality();
         const prompt = PromptLoader.compile('business-profile-extraction', {
-            userInput,
-            dayNumber,
-            languageLabel: userLanguage === 'WOLOF' ? 'WOLOF' : 'Français'
-        });
+            userInput, dayNumber, languageLabel: userLanguage === 'WOLOF' ? 'WOLOF' : 'Français'
+        }, personality);
 
         const schema = z.object({
             activityLabel: z.string().nullable(),
@@ -350,22 +236,17 @@ class AIService {
         return { ...data, aiSource: source };
     }
 
-    /**
-     * Converts text into an audio MP3 buffer (TTS).
-     */
     async generateSpeech(text: string): Promise<Buffer> {
-        const provider = this.avProvider || this.mockProvider;
-        return provider.generateSpeech(text);
+        const provider = this.registry.getPrimary(ProviderCapability.SPEECH_GENERATION);
+        if (!provider) throw new Error('[AI_ERROR] No provider for speech generation.');
+        return provider.instance.generateSpeech(text);
     }
 
-    /**
-     * Generates a realistic image based on a prompt.
-     */
     async generateImage(prompt: string): Promise<string> {
-        const provider = this.avProvider || this.mockProvider;
-        return provider.generateImage(prompt);
+        const provider = this.registry.getPrimary(ProviderCapability.IMAGE_GENERATION);
+        if (!provider) throw new Error('[AI_ERROR] No provider for image generation.');
+        return provider.instance.generateImage(prompt);
     }
 }
 
-// Export a singleton instance
 export const aiService = new AIService();

apps/api/src/services/organization.ts

@@ -7,14 +7,18 @@ const redis = process.env.REDIS_URL
     ? new Redis(process.env.REDIS_URL)
     : new Redis({ host: process.env.REDIS_HOST || 'localhost', port: parseInt(process.env.REDIS_PORT || '6379') });
 
-const CACHE_TTL = 3600; // 1 hour
+const CACHE_TTL = 86400; // 24 hours (routing is stable)
 
 export async function getOrganizationByPhoneNumberId(phoneNumberId: string): Promise<string> {
     const cacheKey = `org:phone:${phoneNumberId}`;
     
     // 1. Check Redis Cache
-    const cached = await redis.get(cacheKey);
-    if (cached) return cached;
+    try {
+        const cached = await redis.get(cacheKey);
+        if (cached) return cached;
+    } catch (err) {
+        logger.error('[ORG-SERVICE] Redis error:', err);
+    }
 
     // 2. Lookup in DB
     const phoneRecord = await (prisma as any).whatsAppPhoneNumber.findUnique({
@@ -23,14 +27,32 @@ export async function getOrganizationByPhoneNumberId(phoneNumberId: string): Pro
     });
 
     if (phoneRecord) {
-        await redis.set(cacheKey, phoneRecord.organizationId, 'EX', CACHE_TTL);
+        try {
+            await redis.set(cacheKey, phoneRecord.organizationId, 'EX', CACHE_TTL);
+        } catch (err) {
+            logger.error('[ORG-SERVICE] Redis set error:', err);
+        }
         return phoneRecord.organizationId;
     }
 
     // 3. Fallback to default organization
-    // In a strict multi-tenant environment, we might want to throw an error here.
-    // For now, we use the default for backward compatibility.
     const defaultOrgId = 'default-org-id';
     logger.warn(`[ORG-SERVICE] No organization found for phone_number_id: ${phoneNumberId}. Falling back to ${defaultOrgId}`);
     return defaultOrgId;
 }
+
+/**
+ * Invalidates all cache entries related to an organization
+ */
+export async function invalidateOrganizationCache(organizationId: string, phoneNumberId?: string) {
+    try {
+        const keys = [`org:config:${organizationId}`];
+        if (phoneNumberId) {
+            keys.push(`org:phone:${phoneNumberId}`);
+        }
+        await redis.del(keys);
+        logger.info(`[ORG-SERVICE] Cache invalidated for Organization: ${organizationId}`);
+    } catch (err) {
+        logger.error('[ORG-SERVICE] Cache invalidation failed:', err);
+    }
+}

apps/api/src/services/prisma.ts

@@ -1,3 +1,4 @@
-import { PrismaClient } from '@repo/database';
+import { PrismaClient, withTenantIsolation } from '@repo/database';
 
-export const prisma = new PrismaClient();
+const basePrisma = new PrismaClient();
+export const prisma = withTenantIsolation(basePrisma);

apps/api/src/services/whatsapp-utils.ts

@@ -0,0 +1,50 @@
+export function normalizeCommand(text: string): string {
+    return text
+        .trim()
+        .toLowerCase()
+        .replace(/[.,!?;:]+$/, "") // Remove trailing punctuation
+        .toUpperCase();
+}
+
+export function detectIntent(text: string): 'YES' | 'NO' | 'UNKNOWN' {
+    const normalized = text.trim().toLowerCase().replace(/[.,!?;:]+$/, "");
+    const yesWords = ['oui', 'ouais', 'wi', 'waaw', 'yes', 'yep', 'ok', 'd’accord', 'daccord', 'da’accord'];
+    const noWords = ['non', 'déet', 'deet', 'no', 'nah', 'nein'];
+
+    if (yesWords.some(w => normalized.includes(w))) return 'YES';
+    if (noWords.some(w => normalized.includes(w))) return 'NO';
+    return 'UNKNOWN';
+}
+
+export function levenshteinDistance(a: string, b: string): number {
+    const matrix: number[][] = [];
+    for (let i = 0; i <= b.length; i++) matrix[i] = [i];
+    for (let j = 0; j <= a.length; j++) matrix[0][j] = j;
+
+    for (let i = 1; i <= b.length; i++) {
+        for (let j = 1; j <= a.length; j++) {
+            if (b.charAt(i - 1) === a.charAt(j - 1)) {
+                matrix[i][j] = matrix[i - 1][j - 1];
+            } else {
+                matrix[i][j] = Math.min(
+                    matrix[i - 1][j - 1] + 1, // substitution
+                    matrix[i][j - 1] + 1,     // insertion
+                    matrix[i - 1][j] + 1      // deletion
+                );
+            }
+        }
+    }
+    return matrix[b.length][a.length];
+}
+
+export function isFuzzyMatch(text: string, target: string, threshold = 0.8): boolean {
+    const normalized = text.trim().toUpperCase();
+    const tar = target.toUpperCase();
+    if (normalized === tar) return true;
+    if (normalized.includes(tar) || tar.includes(normalized)) return true;
+
+    const distance = levenshteinDistance(normalized, tar);
+    const maxLength = Math.max(normalized.length, tar.length);
+    const similarity = 1 - distance / maxLength;
+    return similarity >= threshold;
+}

apps/api/src/services/whatsapp.ts

@@ -1,680 +1,34 @@
 import { logger } from '../logger';
-import { prisma } from './prisma';
-import { scheduleMessage, enrollUser, whatsappQueue, scheduleInteractiveList, setTimeTravelContext, getTimeTravelContext, clearTimeTravelContext } from './queue';
+import { whatsappQueue } from './queue';
 
 export class WhatsAppService {
-    private static normalizeCommand(text: string): string {
-        return text
-            .trim()
-            .toLowerCase()
-            .replace(/[.,!?;:]+$/, "") // Remove trailing punctuation
-            .toUpperCase();
-    }
-
-    private static detectIntent(text: string): 'YES' | 'NO' | 'UNKNOWN' {
-        const normalized = text.trim().toLowerCase().replace(/[.,!?;:]+$/, "");
-        const yesWords = ['oui', 'ouais', 'wi', 'waaw', 'yes', 'yep', 'ok', 'd’accord', 'daccord', 'da’accord'];
-        const noWords = ['non', 'déet', 'deet', 'no', 'nah', 'nein'];
-
-        if (yesWords.some(w => normalized.includes(w))) return 'YES';
-        if (noWords.some(w => normalized.includes(w))) return 'NO';
-        return 'UNKNOWN';
-    }
-
-    private static levenshteinDistance(a: string, b: string): number {
-        const matrix: number[][] = [];
-        for (let i = 0; i <= b.length; i++) matrix[i] = [i];
-        for (let j = 0; j <= a.length; j++) matrix[0][j] = j;
-
-        for (let i = 1; i <= b.length; i++) {
-            for (let j = 1; j <= a.length; j++) {
-                if (b.charAt(i - 1) === a.charAt(j - 1)) {
-                    matrix[i][j] = matrix[i - 1][j - 1];
-                } else {
-                    matrix[i][j] = Math.min(
-                        matrix[i - 1][j - 1] + 1, // substitution
-                        matrix[i][j - 1] + 1,     // insertion
-                        matrix[i - 1][j] + 1      // deletion
-                    );
-                }
-            }
-        }
-        return matrix[b.length][a.length];
-    }
-
-    private static isFuzzyMatch(text: string, target: string, threshold = 0.8): boolean {
-        const normalized = text.trim().toUpperCase();
-        const tar = target.toUpperCase();
-        if (normalized === tar) return true;
-        if (normalized.includes(tar) || tar.includes(normalized)) return true;
-
-        const distance = this.levenshteinDistance(normalized, tar);
-        const maxLength = Math.max(normalized.length, tar.length);
-        const similarity = 1 - distance / maxLength;
-        return similarity >= threshold;
-    }
-
-    static async handleIncomingMessage(phone: string, text: string, audioUrl?: string, imageUrl?: string, timeTravelDayOverride?: number, organizationId: string = 'default-org-id') {
+    /**
+     * Unified entry point for incoming messages.
+     * Delegates all business logic to the background worker via BullMQ.
+     */
+    static async handleIncomingMessage(
+        phone: string, 
+        text: string, 
+        audioUrl?: string, 
+        imageUrl?: string, 
+        timeTravelDayOverride?: number, 
+        organizationId: string = 'default-org-id'
+    ) {
         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} Received: ${normalizedText} (Audio: ${audioUrl || 'N/A'}, Image: ${imageUrl || 'N/A'})`);
-
-        // 1. Find or Create User
-        let user = await prisma.user.findUnique({ where: { phone } });
-
-        if (!user) {
-            const isInscription = this.isFuzzyMatch(normalizedText, 'INSCRIPTION') || normalizedText.includes('INSCRI') || normalizedText.includes('INSCRI');
-
-            if (isInscription) {
-                logger.info(`${traceId} New user registration triggered for ${phone}`);
-                user = await prisma.user.create({ data: { phone, organizationId } });
-                const { scheduleInteractiveButtons } = await import('./queue');
-                await scheduleInteractiveButtons(
-                    user.id,
-                    "Bienvenue sur Xamlé ! Quelle langue préférez-vous pour votre formation ?",
-                    [
-                        { id: 'LANG_FR', title: 'Français 🇫🇷' },
-                        { id: 'LANG_WO', title: 'Wolof 🇸🇳' }
-                    ],
-                    organizationId
-                );
-                return;
-            } else {
-                logger.info(`${traceId} Unregistered user ${phone} sent: "${normalizedText}". Sending instructions.`);
-                // Anti-silence: Nudge them to register
-                const { whatsappQueue } = await import('./queue');
-                await whatsappQueue.add('send-message-direct', {
-                    phone,
-                    text: "🎓 Bienvenue chez XAMLÉ !\nPour commencer ta formation gratuite, envoie le mot : *INSCRIPTION*\n\n(WO) Dalal jàmm ! Ngir tàmbali sa njàng mburu, bindal : *INSCRIPTION*"
-                });
-                return;
-            }
-        }
-
-        // 1.2 Log the incoming message in the DB
-        try {
-            await prisma.message.create({
-                data: {
-                    content: text,
-                    mediaUrl: audioUrl || imageUrl,
-                    direction: 'INBOUND',
-                    userId: user.id,
-                    organizationId
-                }
-            });
-        } catch (err: unknown) {
-            logger.error('[WhatsAppService] Failed to log incoming message:', (err instanceof Error ? (err instanceof Error ? err.message : String(err)) : String(err)));
-        }
-
-        // 1.5. Testing / Cheat Codes (Only for registered users)
-        if (this.isFuzzyMatch(normalizedText, 'INSCRIPTION')) {
-            // 🚨 COUPE-CIRCUIT #1: Kill any active Time-Travel context BEFORE resetting progression
-            await clearTimeTravelContext(user.id);
-            await (prisma as any).userBadge.deleteMany({ where: { userProgress: { userId: user.id } } });
-            await (prisma as any).teamMember.deleteMany({ where: { businessProfile: { userId: user.id } } });
-            await prisma.enrollment.deleteMany({ where: { userId: user.id } });
-            await prisma.userProgress.deleteMany({ where: { userId: user.id } });
-            await prisma.response.deleteMany({ where: { userId: user.id } });
-            await prisma.message.deleteMany({ where: { userId: user.id } }); // Purge totale historique des messages
-            // Also explicitly clear business AI profile to prevent context leak on restart
-            await prisma.businessProfile.deleteMany({ where: { userId: user.id } });
-            user = await prisma.user.update({
-                where: { id: user.id },
-                data: { city: null, activity: null }
-            });
-            const { scheduleInteractiveButtons } = await import('./queue');
-            await scheduleInteractiveButtons(
-                user.id,
-                "Réinitialisation réussie. Quelle langue préférez-vous ?",
-                [
-                    { id: 'LANG_FR', title: 'Français 🇫🇷' },
-                    { id: 'LANG_WO', title: 'Wolof 🇸🇳' }
-                ],
-                organizationId
-            );
-            return;
-        }
-
-        if (normalizedText === 'TEST_IMAGE') {
-            await whatsappQueue.add('send-image', {
-                to: user.phone,
-                imageUrl: 'https://r2.xamle.sn/branding/branding_xamle.png',
-                caption: 'Branding XAMLÉ - Industrialisation 2026'
-            });
-            return;
-        }
-
-        if (normalizedText.startsWith('TEST_VIDEO')) {
-            const parts = normalizedText.split(' ');
-            if (parts.length < 3) {
-                await scheduleMessage(user.id, "Usage: TEST_VIDEO <TrackId> <DayNumber>", 0, organizationId);
-                return;
-            }
-            const trackId = parts[1];
-            const dayNumber = parseFloat(parts[2]);
-
-            await scheduleMessage(user.id, `🧪 Test Video pour ${trackId} J${dayNumber}...`, 0, organizationId);
-            await whatsappQueue.add('send-content', {
-                userId: user.id,
-                trackId,
-                dayNumber
-            });
-            return;
-        }
-
-        const systemCommands = ['1', '2', 'SUITE', 'APPROFONDIR', 'INSCRIPTION', 'SEED'];
-        const isSystemCommand = systemCommands.some(cmd => this.isFuzzyMatch(normalizedText, cmd)) || normalizedText.includes('INSCRI');
-
-        // 🚨 Guardrail "Gibberish" Lite (Global)
-        if (text.length < 2 && !isSystemCommand) {
-             await scheduleMessage(user.id, user.language === '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 ?", 0, organizationId);
-             return;
-        }
-
-        if (this.isFuzzyMatch(normalizedText, 'SEED')) {
-            // Reply immediately so the webhook doesn't time out
-            logger.info(`[SEED] Triggered by user ${user.id}`);
-            try {
-                // @ts-ignore - dynamic import of sub-module
-                const { seedDatabase } = await import('@repo/database/seed');
-                const result = await seedDatabase(prisma);
-                logger.info('[SEED] Result:', result.message);
-
-                // 🚨 COGNITIVE CACHE CLEAR: Delete old BusinessProfile contexts to prevent agricultural hallucinations
-                try {
-                    await prisma.businessProfile.deleteMany({ where: { userId: user.id } });
-                    await prisma.user.update({ where: { id: user.id }, data: { activity: null } });
-                    logger.info(`[SEED] Cleared cognitive cache for User ${user.id}`);
-                } catch (cacheErr: unknown) {
-                    logger.error('[SEED] Failed to clear cognitive cache:', (cacheErr as Error).message);
-                }
-
-                await scheduleMessage(user.id, 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.",
-                    0, organizationId
-                );
-            } catch (err: unknown) {
-                logger.error('[SEED] Error:', (err instanceof Error ? (err instanceof Error ? err.message : String(err)) : String(err)));
-                await scheduleMessage(user.id, `❌ Erreur seed : ${(err instanceof Error ? (err instanceof Error ? err.message : String(err)) : String(err))?.substring(0, 200)}`, 0, organizationId);
-            }
-            return;
-        }
-
-        // ─── Interactive LIST action IDs ──────────────────────────────────────
-        // Format: DAY{N}_EXERCISE | DAY{N}_REPLAY | DAY{N}_CONTINUE | DAY{N}_PROMPT
-        const dayActionMatch = normalizedText.match(/^DAY(\d+)_(EXERCISE|REPLAY|CONTINUE|PROMPT)$/);
-        if (dayActionMatch) {
-            const action = dayActionMatch[2];
-
-            if (action === 'REPLAY') {
-                const replayDay = parseFloat(dayActionMatch[1]);  // DAY11_REPLAY → 11
-                const enrollment = await prisma.enrollment.findFirst({
-                    where: { userId: user.id, status: 'ACTIVE' }
-                });
-                if (enrollment) {
-                    // 🕰️ TIME-TRAVEL: Persist the replay context in Redis (30 min TTL)
-                    await setTimeTravelContext(user.id, replayDay);
-                    // ✅ UX: Confirmation FIRST, content delayed — message order guaranteed
-                    await scheduleMessage(user.id, user.language === 'WOLOF'
-                        ? `🔁 Dinanu la yëgël lexon Bés ${Math.floor(replayDay)} ci kanam...`
-                        : `🔁 Je te renvoie la Leçon ${Math.floor(replayDay)} dans quelques secondes...`,
-                        0, organizationId
-                    );
-                    await whatsappQueue.add('send-content', {
-                        userId: user.id,
-                        trackId: enrollment.trackId,
-                        dayNumber: replayDay,
-                        skipProgressUpdate: true
-                    }, { delay: 2000 });
-                }
-                return;
-            } else if (action === 'EXERCISE') {
-                await scheduleMessage(user.id, user.language === 'WOLOF'
-                    ? "🎙️ Yónnee sa tontu (audio walla bind) :"
-                    : "🎙️ Envoie ta réponse (audio ou texte) :",
-                    0, organizationId
-                );
-                return;
-            } else if (action === 'PROMPT') {
-                const enrollment = await prisma.enrollment.findFirst({
-                    where: { userId: user.id, status: 'ACTIVE' }
-                });
-                if (enrollment) {
-                    const trackDay = await prisma.trackDay.findFirst({
-                        where: { trackId: enrollment.trackId, dayNumber: enrollment.currentDay }
-                    });
-                    if (trackDay?.exercisePrompt) {
-                        await scheduleMessage(user.id, trackDay.exercisePrompt, 0, organizationId);
-                    } else {
-                        await scheduleMessage(user.id, user.language === 'WOLOF' ? "Amul lëjj" : "Pas d'exercice pour ce jour", 0, organizationId);
-                    }
-                }
-                return;
-            } else if (action === 'CONTINUE') {
-                // Determine if there is a pending exercise before advancing
-                const pendingProgress = await prisma.userProgress.findFirst({
-                    where: { userId: user.id, exerciseStatus: { in: ['PENDING', 'PENDING_REMEDIATION'] } }
-                });
-                if (pendingProgress) {
-                    await scheduleMessage(user.id, user.language === 'WOLOF'
-                        ? "Danga wara tontu lëjj bi balaa nga dem ci kanam. Tànnal 'Yónni tontu'."
-                        : "Tu dois d'abord répondre à l'exercice avant de continuer. Choisis 'Faire l'exercice' ou 'Répondre'.",
-                        0, organizationId
-                    );
-                } else {
-                    // Safe to advance (either completed or dropped or already handled)
-                    await scheduleMessage(user.id, user.language === 'WOLOF'
-                        ? "Waaw, ñuy dem ci kanam !"
-                        : "C'est noté, on avance !",
-                        0, organizationId
-                    );
-                    // To do: if advance needs to trigger scheduleTrackDay directly, it could be done here instead of tracking. 
-                    // However, normally `SUITE` moves the day forward. 
-                }
-                return;
-            }
-        }
-
-        // 1.7. Language Selection (Interactive Buttons)
-        if (normalizedText === 'LANG_FR' || normalizedText === 'LANG_WO') {
-            const newLang = normalizedText === 'LANG_FR' ? 'FR' : 'WOLOF';
-            user = await prisma.user.update({
-                where: { id: user.id },
-                data: { language: newLang }
-            });
-
-            const promptText = newLang === 'FR'
-                ? "Parfait, nous allons continuer en Français ! 🇫🇷\nDans quel domaine d'activité te trouves-tu ?"
-                : "Baax na, dinanu wéy ci Wolof ! 🇸🇳\nCi ban mbir ngay yëngu ?";
-
-            await scheduleInteractiveList(
-                user.id,
-                newLang === 'FR' ? "Ton secteur" : "Sa Mbir",
-                promptText,
-                newLang === 'FR' ? "Secteurs" : "Tànn",
-                [
-                    {
-                        title: newLang === 'FR' ? "Secteurs" : "Tànn",
-                        rows: [
-                            { id: 'SEC_COMMERCE', title: newLang === 'FR' ? 'Commerce / Vente' : 'Njaay' },
-                            { id: 'SEC_AGRI', title: newLang === 'FR' ? 'Agriculture / Élevage' : 'Mbay' },
-                            { id: 'SEC_FOOD', title: newLang === 'FR' ? 'Alimentation / Restauration' : 'Lekk / Restauration' },
-                            { id: 'SEC_TECH', title: newLang === 'FR' ? 'Tech / Digital' : 'Tech / Digital' },
-                            { id: 'SEC_BEAUTE', title: newLang === 'FR' ? 'Beauté / Bien-être' : 'Rafet' },
-                            { id: 'SEC_COUTURE', title: newLang === 'FR' ? 'Couture / Mode' : 'Couture' },
-                            { id: 'SEC_TRANSPORT', title: newLang === 'FR' ? 'Transport / Livraison' : 'Transport / Yëgël' },
-                            { id: 'SEC_AUTRE', title: newLang === 'FR' ? 'Autre secteur' : 'Beneen mbir' }
-                        ]
-                    }
-                ],
-                organizationId
-            );
-            return;
-        }
-
-        // 2. Check Pending Exercise (User Progress)
-        // 2. Resolve sector LIST reply IDs → human-readable label
-        const SECTOR_LABELS: Record<string, { fr: string; wo: string }> = {
-            SEC_COMMERCE: { fr: 'Commerce / Vente', wo: 'Njaay' },
-            SEC_AGRI: { fr: 'Agriculture / Élevage', wo: 'Mbay' },
-            SEC_FOOD: { fr: 'Alimentation / Restauration', wo: 'Lekk / Restauration' },
-            SEC_TECH: { fr: 'Tech / Digital', wo: 'Tech / Digital' },
-            SEC_BEAUTE: { fr: 'Beauté / Bien-être', wo: 'Rafet' },
-            SEC_COUTURE: { fr: 'Couture / Mode', wo: 'Couture' },
-            SEC_TRANSPORT: { fr: 'Transport / Livraison', wo: 'Transport / Yëgël' },
-        };
-
-        if (normalizedText === 'SEC_AUTRE') {
-            await scheduleMessage(user.id, user.language === 'WOLOF'
-                ? 'Waaw ! Wax ma ban mbir ngay def ci ab kàddu gatt :'
-                : 'Parfait ! Décris ton activité en quelques mots :',
-                0, organizationId
-            );
-            return;
-        }
-
-        const sectorLabel = SECTOR_LABELS[normalizedText];
-
-        // 🚨 Brique 1 (Immuabilité) : Vérifier si l'utilisateur est déjà inscrit.
-        const existingEnrollment = await prisma.enrollment.findFirst({
-            where: { userId: user.id, status: 'ACTIVE' }
-        });
-
-        if (existingEnrollment && (sectorLabel || normalizedText.startsWith('SEC_'))) {
-            logger.info(`[IMMUTABILITY] User ${user.id} tried to change sector but is already enrolled.`);
-            return; // Ignore and do not allow re-routing here
-        }
-
-        if (!existingEnrollment && (sectorLabel || (!user.activity && text.length > 2))) {
-            const activity = sectorLabel
-                ? (user.language === 'WOLOF' ? sectorLabel.wo : sectorLabel.fr)
-                : text.trim();
-
-            user = await prisma.user.update({
-                where: { id: user.id },
-                data: { activity }
-            });
-
-            const welcomeMsg = user.language === 'FR'
-                ? `Parfait ! Secteur noté : *${activity}*.\nJe t'inscris à ta formation personnalisée !`
-                : `Baax na ! Bind nanu la ci: *${activity}*.\nLéegi dinanu la dugal ci njàng mi !`;
-
-            await scheduleMessage(user.id, welcomeMsg, 0, organizationId);
-
-            const trackId = user.language === 'FR' ? "T1-FR" : "T1-WO";
-            const defaultTrack = await prisma.track.findUnique({ where: { id: trackId } });
-            if (defaultTrack) await enrollUser(user.id, defaultTrack.id, organizationId);
-            return;
-        }
-
-        // 3. Check Active Enrollment (Commands Priority)
-        const activeEnrollment = await prisma.enrollment.findFirst({
-            where: { userId: user.id, status: 'ACTIVE' },
-            include: { track: true }
+        logger.info(`${traceId} Enqueueing message for worker: "${text.substring(0, 50)}..." (Org: ${organizationId})`);
+
+        await whatsappQueue.add('handle-inbound', {
+            phone,
+            text,
+            audioUrl,
+            imageUrl,
+            isTimeTravelMode: timeTravelDayOverride !== undefined,
+            realCurrentDay: timeTravelDayOverride,
+            organizationId
+        }, {
+            priority: 1,
+            attempts: 3,
+            backoff: { type: 'exponential', delay: 2000 }
         });
-
-        if (activeEnrollment) {
-            const intent = this.detectIntent(text);
-            const isSuite = this.isFuzzyMatch(normalizedText, 'SUITE') || normalizedText === '2';
-            const isApproforcir = this.isFuzzyMatch(normalizedText, 'APPROFONDIR') || normalizedText === '1';
-
-            // Handle SUITE Priority
-            if (isSuite) {
-                // 🚨 COUPE-CIRCUIT #2: Kill Time-Travel context BEFORE any progression logic
-                await clearTimeTravelContext(user.id);
-
-                const userProgress = await prisma.userProgress.findUnique({
-                    where: { userId_trackId: { userId: user.id, trackId: activeEnrollment.trackId } }
-                });
-
-                // 🚨 UNBLOCKING GUARD: Allow SUITE if a response has been recorded for the current day OR if status is valid.
-                const lastResponse = await prisma.response.findFirst({
-                    where: { userId: user.id, dayNumber: activeEnrollment.currentDay },
-                    orderBy: { createdAt: 'desc' }
-                });
-
-                if (userProgress?.exerciseStatus !== 'COMPLETED' && userProgress?.exerciseStatus !== 'PENDING_DEEPDIVE' && !lastResponse) {
-                    logger.info(`[SUITE-BLOCKED] User ${user.id} tried SUITE but status is ${userProgress?.exerciseStatus || 'null'} and no response found.`);
-                    await scheduleMessage(user.id, user.language === 'WOLOF'
-                        ? "Dafa laaj nga tontu laaj bi ci kaw dëbb (audio walla texte) balaa nga dem ci kanam ! 🎙️"
-                        : "Tu dois d'abord répondre à l'exercice ci-dessus pour continuer ! 🎙️",
-                        0, organizationId
-                    );
-                    return;
-                }
-
-                logger.info(`[SUITE-ALLOWED] User ${user.id} advancing from day ${activeEnrollment.currentDay}`);
-                const nextDay = activeEnrollment.currentDay % 1 !== 0
-                    ? Math.floor(activeEnrollment.currentDay) + 1
-                    : activeEnrollment.currentDay + 1;
-
-                await prisma.enrollment.update({ where: { id: activeEnrollment.id }, data: { currentDay: nextDay } });
-                await prisma.userProgress.update({
-                    where: { userId_trackId: { userId: user.id, trackId: activeEnrollment.trackId } },
-                    data: {
-                        exerciseStatus: 'PENDING',
-                        iterationCount: 0 // Reset iteration count for the new day
-                    }
-                });
-                await whatsappQueue.add('send-content', { userId: user.id, trackId: activeEnrollment.trackId, dayNumber: nextDay });
-                return;
-            }
-
-            // Handle APPROFONDIR (Deep Dive Initiation)
-            if (isApproforcir) {
-                const userProgress = await prisma.userProgress.findUnique({
-                    where: { userId_trackId: { userId: user.id, trackId: activeEnrollment.trackId } }
-                });
-
-                // 🕰️ TIME-TRAVEL: Compute effective day — use override if provided (from HF gateway)
-                const timeTravelDay = timeTravelDayOverride ?? await getTimeTravelContext(user.id);
-                const effectiveDay = timeTravelDay ?? activeEnrollment.currentDay;
-
-                // 🚨 UNBLOCKING GUARD: Allow 1/APPROFONDIR strictly if a response exists for that effective day.
-                const lastResponse = await prisma.response.findFirst({
-                    where: { userId: user.id, dayNumber: effectiveDay },
-                    orderBy: { createdAt: 'desc' }
-                });
-
-                if (lastResponse) {
-                    await prisma.userProgress.update({
-                        where: { id: userProgress!.id },
-                        data: { exerciseStatus: 'PENDING_DEEPDIVE' }
-                    });
-                    
-                    await scheduleMessage(user.id, user.language === 'WOLOF'
-                        ? "Baax na ! Wax ma ndox mi nga yor ci sa mbir (njëg, jafe-jafe, njëgëndal, njàngat, etc.) ngir ma gën a deesi njàngat bi :"
-                        : "Très bien ! Quelle information précise issue de ton terrain veux-tu ajouter ? (ex: un prix précis, un obstacle, un fournisseur, etc.) :",
-                        0, organizationId
-                    );
-                    return;
-                } else {
-                    await scheduleMessage(user.id, user.language === 'WOLOF'
-                        ? "Dafa laaj nga tontu laaj bi ci kaw dëbb balaa nga natt nga tontu !"
-                        : "Réponds d'abord à l'exercice principal avant d'approfondir !",
-                        0, organizationId
-                    );
-                    return;
-                }
-            }
-
-            // Handle YES/NO Intents
-            if (intent === 'YES' && normalizedText.length < 15) {
-                const userProgress = await prisma.userProgress.findUnique({
-                    where: { userId_trackId: { userId: user.id, trackId: activeEnrollment.trackId } }
-                });
-                if (userProgress?.exerciseStatus === 'COMPLETED') {
-                    await scheduleMessage(user.id, user.language === 'WOLOF' ? "Waaw ! Lexon bi mu ngi ñëw..." : "C'est parti ! Voici la suite...", 0, organizationId);
-                    await whatsappQueue.add('send-content', { userId: user.id, trackId: activeEnrollment.trackId, dayNumber: activeEnrollment.currentDay + 1, organizationId });
-                    return;
-                }
-            }
-
-            if (intent === 'NO' && normalizedText.length < 15) {
-                await scheduleMessage(user.id, user.language === 'WOLOF' ? "Baax na, bu la neexee nga tontu laaj bi." : "Pas de souci, tu peux répondre à l'exercice quand tu es prêt.", 0, organizationId);
-                return;
-            }
-
-            // Fallback to Exercise Response if nothing else matched
-            // 🚨 COACHING GUARDRAIL: AI Coach only activated if profile (sector + language) is complete
-            if (!user.activity) {
-                await scheduleMessage(user.id, user.language === 'WOLOF'
-                    ? "Danga wara tànn sa mbiru liggeey balaa ñuy tàmbali coaching bi."
-                    : "Tu dois d'abord définir ton activité avant que le coach AI ne puisse t'aider.",
-                    0, organizationId
-                );
-                return;
-            }
-
-            // 🕰️ TIME-TRAVEL: Compute effectiveDay — single source of truth for AI prompt + Prisma saves
-            const timeTravelDay = timeTravelDayOverride ?? await getTimeTravelContext(user.id);
-            const effectiveDay = timeTravelDay ?? activeEnrollment.currentDay;
-            const isTimeTravelMode = timeTravelDay !== null && timeTravelDay !== activeEnrollment.currentDay;
-            if (isTimeTravelMode) {
-                logger.info(`[TIME-TRAVEL] 🕰️ User ${user.id} responding to replay Day ${effectiveDay} (real currentDay: ${activeEnrollment.currentDay})`);
-            }
-
-            // 🚨 TEXT RE-VALIDATION: Mirror the Worker-side `shouldForceRevalidation` logic.
-            // Image/Audio flows reset PENDING via WhatsAppLogic. For text, we do it here.
-            const userProgressState = await prisma.userProgress.findUnique({
-                where: { userId_trackId: { userId: user.id, trackId: activeEnrollment.trackId } }
-            });
-            const tenMinutesAgo = new Date(Date.now() - 10 * 60 * 1000);
-            const isRecentlyCompleted = userProgressState?.exerciseStatus === 'COMPLETED'
-                && userProgressState.updatedAt > tenMinutesAgo;
-
-            if (isRecentlyCompleted && !audioUrl && !imageUrl && text.length > 5 && !isSystemCommand) {
-                logger.info(`[TXT-FLOW] 🔄 Re-validation User ${user.id} Day ${activeEnrollment.currentDay} (COMPLETED → PENDING)`);
-                await prisma.userProgress.update({
-                    where: { id: userProgressState!.id },
-                    data: { exerciseStatus: 'PENDING' }
-                });
-            }
-
-            const pendingProgress = await prisma.userProgress.findFirst({
-                where: { userId: user.id, exerciseStatus: { in: ['PENDING', 'PENDING_REMEDIATION', 'PENDING_DEEPDIVE'] }, trackId: activeEnrollment.trackId },
-            });
-
-            if (pendingProgress) {
-                const isDeepDiveAction = pendingProgress.exerciseStatus === 'PENDING_DEEPDIVE';
-
-                const trackDay = await prisma.trackDay.findFirst({
-                    where: { trackId: activeEnrollment.trackId, dayNumber: effectiveDay }
-                });
-
-                if (trackDay) {
-                    // 🚨 Flexible Guardrail (Day 7 Fix)
-                    const wordCount = (text || '').trim().split(/\s+/).length;
-                    const validationKeyword = trackDay.validationKeyword || '';
-                    const isOptionMatch = validationKeyword && this.isFuzzyMatch(normalizedText, validationKeyword);
-                    
-                    // Specific bypass for known short answers in modules (WhatsApp, Boutique, etc.)
-                    const commonOptions = ['WHATSAPP', 'BOUTIQUE', 'APPEL', 'VENTE', 'SERVICE', 'PRODUCTION'];
-                    const isCommonOption = commonOptions.some(opt => this.isFuzzyMatch(normalizedText, opt));
-
-                    if (wordCount < 3 && !isOptionMatch && !isCommonOption) {
-                        await scheduleMessage(user.id, user.language === 'WOLOF'
-                            ? "Dama lay xaar nga wax ma lu gën a yaatu ci sa mbir (mbebetu 3 baat). Waxtaanal ak man !"
-                            : "Ta réponse est un peu courte. Peux-tu m'en dire plus ? (Minimum 3 mots)", 0, organizationId);
-                        return;
-                    }
-
-                    await scheduleMessage(user.id, user.language === 'WOLOF' ? "⏳ Defar ak sa tontu..." : "⏳ Analyse de votre réponse...", 0, organizationId);
-
-                    // Update iteration count if it's a deep dive
-                    let currentIterationCount = pendingProgress.iterationCount || 0;
-                    if (isDeepDiveAction) {
-                        currentIterationCount += 1;
-                        await prisma.userProgress.update({
-                            where: { id: pendingProgress.id },
-                            data: { iterationCount: currentIterationCount } // Save the increment
-                        });
-                    }
-
-                    // 🚨 Store response under effectiveDay (real day OR Time-Travel override day)
-                    await prisma.response.create({
-                        data: {
-                            enrollmentId: activeEnrollment.id,
-                            userId: user.id,
-                            dayNumber: effectiveDay,
-                            content: text,
-                            organizationId
-                        }
-                    });
-
-                    // Fetch previous responses to provide context to the AI Coach
-                    const previousResponsesData = await prisma.response.findMany({
-                        where: { userId: user.id, enrollmentId: activeEnrollment.id },
-                        orderBy: { dayNumber: 'asc' },
-                        take: 5 // Keep context size reasonable
-                    });
-                    const previousResponses = previousResponsesData.map(r => ({ day: r.dayNumber, response: r.content }));
-
-                    await whatsappQueue.add('generate-feedback', {
-                        userId: user.id, text, trackId: activeEnrollment.trackId, trackDayId: trackDay.id,
-                        exercisePrompt: trackDay.exercisePrompt || '', lessonText: trackDay.lessonText || '',
-                        exerciseCriteria: trackDay.exerciseCriteria, pendingProgressId: pendingProgress.id,
-                        dayNumber: effectiveDay,          // ← effectiveDay: single source of truth
-                        currentDay: effectiveDay,         // ← worker reads job.data.currentDay
-                        totalDays: activeEnrollment.track.duration, language: user.language,
-                        userActivity: user.activity,
-                        userRegion: user.city,
-                        previousResponses,
-                        isDeepDive: isDeepDiveAction,
-                        iterationCount: currentIterationCount,
-                        imageUrl: imageUrl,
-                        isTimeTravelMode,                  // ← Worker uses this to skip COMPLETED update
-                        realCurrentDay: activeEnrollment.currentDay,  // ← For logging only
-                        organizationId
-                    }, { attempts: 3, backoff: { type: 'exponential', delay: 2000 } });
-                    return;
-                }
-            }
-
-            // Handle daily response (Fallback if no PENDING found earlier)
-            logger.info(`${traceId} User ${user.id} fallback daily response to effectiveDay ${effectiveDay}`);
-            await prisma.response.create({
-                data: {
-                    enrollmentId: activeEnrollment.id,
-                    userId: user.id,
-                    dayNumber: effectiveDay,
-                    content: text,
-                    organizationId
-                }
-            });
-
-            const trackDayFallback = await prisma.trackDay.findFirst({
-                where: { trackId: activeEnrollment.trackId, dayNumber: effectiveDay }
-            });
-
-            if (trackDayFallback) {
-                // 🚨 Guardrail: Contenu Vide / Gibberish 🚨
-                const wordCount = text.trim().split(/\s+/).length;
-                if (wordCount < 3 || text.length < 5) {
-                    logger.info(`${traceId} Guardrail: Input too short or potential gibberish: "${text}"`);
-                    await scheduleMessage(user.id, user.language === 'WOLOF'
-                        ? "Ma déggul li nga wax mbir mi... Mën nga ko gën a firi ci ab kàddu gatt (3-4 kàddu) ?"
-                        : "Je n'ai pas bien compris ton activité. Peux-tu me réexpliquer en quelques mots ce que tu vends et à qui ?",
-                        0, organizationId
-                    );
-                    return;
-                }
-
-                // 🚨 Guardrail: Enrollment Priority 🚨
-                if (!user.activity || !user.language) {
-                    logger.info(`${traceId} Blocking AI feedback: Enrollment incomplete for User ${user.id}`);
-                    await scheduleMessage(user.id, user.language === 'WOLOF'
-                        ? "Baax na, waaye laaj bi des na... Bindal 'INSCRIPTION' ngir tàmbali."
-                        : "C'est noté, mais il faut d'abord terminer ton inscription. Envoie 'INSCRIPTION' pour commencer.",
-                        0, organizationId
-                    );
-                    return;
-                }
-
-                // Fetch previous responses to provide context to the AI Coach
-                const previousResponsesData = await prisma.response.findMany({
-                    where: { userId: user.id, enrollmentId: activeEnrollment.id },
-                    orderBy: { dayNumber: 'asc' },
-                    take: 5
-                });
-                const previousResponses = previousResponsesData.map(r => ({ day: r.dayNumber, response: r.content }));
-
-                await whatsappQueue.add('generate-feedback', {
-                    userId: user.id, text, trackId: activeEnrollment.trackId, trackDayId: trackDayFallback.id,
-                    exercisePrompt: trackDayFallback.exercisePrompt || '', lessonText: trackDayFallback.lessonText || '',
-                    exerciseCriteria: trackDayFallback.exerciseCriteria,
-                    enrollmentId: activeEnrollment.id,
-                    currentDay: effectiveDay,              // ← effectiveDay: single source of truth
-                    dayNumber: effectiveDay,
-                    totalDays: activeEnrollment.track.duration, language: user.language,
-                    userActivity: user.activity,
-                    userRegion: user.city,
-                    previousResponses,
-                    imageUrl: imageUrl,
-                    isTimeTravelMode,
-                    realCurrentDay: activeEnrollment.currentDay,
-                    organizationId
-                });
-                return;
-            }
-
-            await scheduleMessage(user.id, user.language === 'WOLOF'
-                ? "Baax na ! Yónnee *SUITE* ngir dem ci kanam walla tontul laaj bi ci kaw."
-                : "✅ Message reçu ! Envoie *SUITE* pour avancer ou réponds à l'exercice ci-dessus.",
-                0, organizationId
-            );
-            return;
-        }
-
-        // 4. Default: fallback for generic unknown messages (not in onboarding, not in active enrollment)
-        logger.info(`${traceId} Unknown command from user ${user.id}: "${normalizedText}"`);
-        await scheduleMessage(user.id, user.language === 'WOLOF'
-            ? "Bañ ma dégg. Yónnee *INSCRIPTION* ngir tàmbalee ci kanam walla bind *SUITE*."
-            : "Je n'ai pas compris. Envoie *INSCRIPTION* pour recommencer ou *SUITE* pour avancer.",
-            0, organizationId
-        );
     }
 }

apps/whatsapp-worker/package.json

@@ -5,7 +5,8 @@
     "scripts": {
         "dev": "tsx watch src/index.ts",
         "build": "pnpm --filter @repo/database generate && tsc --build",
-        "start": "npx tsx ../api/src/index.ts & sleep 7 && node dist/index.js & wait"
+        "start": "npx tsx ../api/src/index.ts & sleep 7 && node dist/index.js & wait",
+        "test": "vitest run"
     },
     "dependencies": {
         "@aws-sdk/client-s3": "^3.995.0",
@@ -17,13 +18,16 @@
         "dotenv": "^16.0.0",
         "ioredis": "^5.9.3",
         "node-cron": "^4.2.1",
+        "node-fetch": "^2.6.7",
         "sharp": "^0.34.5"
     },
     "devDependencies": {
         "@repo/tsconfig": "workspace:*",
         "@types/node": "^20.0.0",
         "@types/node-cron": "^3.0.11",
+        "@types/node-fetch": "^2.6.2",
         "tsx": "^3.0.0",
-        "typescript": "^5.0.0"
+        "typescript": "^5.0.0",
+        "vitest": "^1.0.0"
     }
 }

apps/whatsapp-worker/scratch/check_orgs.js

@@ -0,0 +1,9 @@
+const { PrismaClient } = require('../../packages/database');
+const prisma = new PrismaClient();
+
+async function main() {
+  const orgs = await prisma.organization.findMany();
+  console.log('Organizations:', JSON.stringify(orgs, null, 2));
+}
+
+main().catch(console.error).finally(() => prisma.$disconnect());

apps/whatsapp-worker/src/__tests__/OnboardingHandler.test.ts

@@ -0,0 +1,105 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { OnboardingHandler } from '../handlers/OnboardingHandler';
+import { prisma } from '../services/prisma';
+import { MessageContext } from '../handlers/types';
+
+vi.mock('../services/prisma', () => ({
+    prisma: {
+        user: {
+            findUnique: vi.fn(),
+            create: vi.fn(),
+            update: vi.fn(),
+        },
+        enrollment: {
+            findFirst: vi.fn(),
+            deleteMany: vi.fn(),
+        },
+        userProgress: {
+            deleteMany: vi.fn(),
+        },
+        response: {
+            deleteMany: vi.fn(),
+        },
+        message: {
+            deleteMany: vi.fn(),
+        },
+        userBadge: {
+            deleteMany: vi.fn(),
+        },
+        teamMember: {
+            deleteMany: vi.fn(),
+        },
+        businessProfile: {
+            deleteMany: vi.fn(),
+        }
+    }
+}));
+
+vi.mock('../timeTravelContext', () => ({
+    clearTimeTravelContext: vi.fn(),
+}));
+
+describe('OnboardingHandler', () => {
+    let handler: OnboardingHandler;
+    let mockQueue: any;
+
+    beforeEach(() => {
+        handler = new OnboardingHandler();
+        mockQueue = {
+            add: vi.fn(),
+        };
+        vi.clearAllMocks();
+    });
+
+    it('should handle INSCRIPTION for a new user', async () => {
+        const ctx: MessageContext = {
+            phone: '221770000000',
+            text: 'INSCRIPTION',
+            normalizedText: 'INSCRIPTION',
+            traceId: 'test-trace',
+            organizationId: 'test-org',
+            whatsappQueue: mockQueue,
+            redis: {} as any,
+        };
+
+        // Mock: User doesn't exist
+        (prisma.user.findUnique as any).mockResolvedValue(null);
+        // Mock: Create user
+        (prisma.user.create as any).mockResolvedValue({ id: 'user-1', phone: '221770000000', language: 'FR' });
+
+        const handled = await handler.handle(ctx);
+
+        expect(handled).toBe(true);
+        expect(prisma.user.create).toHaveBeenCalled();
+        expect(mockQueue.add).toHaveBeenCalledWith('send-interactive-buttons', expect.objectContaining({
+            userId: 'user-1',
+            bodyText: expect.stringContaining('choisissez votre langue')
+        }));
+    });
+
+    it('should handle language selection', async () => {
+        const ctx: MessageContext = {
+            phone: '221770000000',
+            text: 'LANG_WO',
+            normalizedText: 'LANG_WO',
+            traceId: 'test-trace',
+            organizationId: 'test-org',
+            whatsappQueue: mockQueue,
+            redis: {} as any,
+            user: { id: 'user-1', phone: '221770000000', language: 'FR' } as any,
+        };
+
+        (prisma.user.update as any).mockResolvedValue({ id: 'user-1', language: 'WOLOF' });
+
+        const handled = await handler.handle(ctx);
+
+        expect(handled).toBe(true);
+        expect(prisma.user.update).toHaveBeenCalledWith(expect.objectContaining({
+            data: { language: 'WOLOF' }
+        }));
+        expect(mockQueue.add).toHaveBeenCalledWith('send-interactive-list', expect.objectContaining({
+            userId: 'user-1',
+            bodyText: expect.stringContaining('Ci ban mbir ngay yëngu')
+        }));
+    });
+});

apps/whatsapp-worker/src/__tests__/normalizeWolof.test.ts

@@ -0,0 +1,26 @@
+import { describe, it, expect } from 'vitest';
+import { normalizeWolof, shortenForWhatsApp } from '../normalizeWolof';
+
+describe('Wolof Normalization', () => {
+    it('should normalize common Wolof variations', () => {
+        const input = "Xalme est cool, woy !";
+        const { normalizedText } = normalizeWolof(input);
+        expect(normalizedText).toContain('Xamlé');
+    });
+
+    it('should fix "waaw" variations', () => {
+        expect(normalizeWolof('waaww').normalizedText).toBe('Waaw');
+        expect(normalizeWolof('waaaaw').normalizedText).toBe('Waaw');
+    });
+
+    it('should handle "déet" (no)', () => {
+        expect(normalizeWolof('deet').normalizedText).toBe('Déet');
+    });
+
+    it('should shorten long text for WhatsApp', () => {
+        const longText = "Ceci est une phrase très longue. ".repeat(20); // ~600 chars
+        const chunks = shortenForWhatsApp(longText);
+        expect(chunks.length).toBeGreaterThan(1);
+        expect(chunks[0].length).toBeLessThanOrEqual(280);
+    });
+});

apps/whatsapp-worker/src/config.ts

@@ -1,104 +1,32 @@
-import { logger } from './logger';
+import { z } from 'zod';
 import dotenv from 'dotenv';
-dotenv.config();
-
-/**
- * Strictly requires a base URL to start with https:// 
- * and removes any trailing slashes.
- */
-export function requireHttpUrl(url: string | undefined, keyName: string): string {
-    if (!url) {
-        throw new Error(`[CONFIG] Missing environment variable: ${keyName}`);
-    }
-
-    let normalized = url.trim();
-
-    // Auto-prefix with https:// if it doesn't start with http
-    if (!normalized.startsWith('http')) {
-        normalized = `https://${normalized}`;
-        logger.warn(`[CONFIG] Warning: Auto-prefixed ${keyName} with https://`);
-    }
-
-    // Strictly forbid http:// in production, except for local or internal private networking
-    const isLocal = normalized.includes('localhost') || normalized.includes('127.0.0.1');
-    const isInternal = normalized.includes('.internal');
-
-    if (normalized.startsWith('http://') && !isLocal && !isInternal) {
-        throw new Error(`[CONFIG] ❌ CRITICAL: ${keyName} MUST use https:// (got ${normalized})`);
-    }
-
-    // Remove trailing slashes
-    while (normalized.endsWith('/')) {
-        normalized = normalized.slice(0, -1);
-    }
-
-    return normalized;
+import path from 'path';
+
+dotenv.config({ path: path.join(__dirname, '../../../../.env') });
+
+const envSchema = z.object({
+    DATABASE_URL: z.string().url(),
+    REDIS_URL: z.string().url(),
+    ADMIN_API_KEY: z.string(),
+    API_URL: z.string().url(),
+    WHATSAPP_ACCESS_TOKEN: z.string().optional(),
+    WHATSAPP_PHONE_NUMBER_ID: z.string().optional(),
+    OPENAI_API_KEY: z.string().optional(),
+    GOOGLE_AI_API_KEY: z.string().optional(),
+    WORKER_CONCURRENCY: z.string().default('5').transform(Number),
+    NODE_ENV: z.enum(['development', 'production', 'test']).default('development')
+});
+
+const result = envSchema.safeParse(process.env);
+
+if (!result.success) {
+    console.error('❌ Invalid worker environment variables:', JSON.stringify(result.error.format(), null, 2));
+    process.exit(1);
 }
 
-/**
- * Gets the AI API URL for internal webhook processing and endpoints.
- */
-export function getApiUrl(): string {
-    return requireHttpUrl(process.env.AI_API_BASE_URL, 'AI_API_BASE_URL');
-}
-
-/**
- * Checks if a specific feature is enabled via environment variables.
- * Usage: FEATURE_BUSINESS_PROFILE=true
- */
-export function isFeatureEnabled(featureName: string): boolean {
-    const val = process.env[featureName];
-    return val === 'true' || val === '1';
-}
+export const config = result.data;
 
-/**
- * Gets the Admin API key used for internal protected routes.
- */
-export function getAdminApiKey(): string {
-    const key = process.env.ADMIN_API_KEY;
-    if (!key) {
-        throw new Error(`[CONFIG] Missing environment variable: ADMIN_API_KEY`);
-    }
-    return key;
-}
-
-/**
- * Validates critical environment variables at startup.
- * Throws an explicit error if any are missing.
- */
-export function validateEnvironment() {
-    logger.info('[CONFIG] Validating environment variables...');
-
-    const requiredVars = [
-        'AI_API_BASE_URL',
-        'OPENAI_API_KEY',
-        'ADMIN_API_KEY',
-        'WHATSAPP_ACCESS_TOKEN',
-        'WHATSAPP_PHONE_NUMBER_ID',
-        'REDIS_URL' // or REDIS_HOST
-    ];
-
-    const missing = [];
-
-    for (const req of requiredVars) {
-        if (req === 'REDIS_URL') {
-            if (!process.env.REDIS_URL && !process.env.REDIS_HOST) {
-                missing.push('REDIS_URL or REDIS_HOST');
-            }
-            continue;
-        }
-
-        if (!process.env[req]) {
-            missing.push(req);
-        }
-    }
-
-    if (missing.length > 0) {
-        throw new Error(`[CONFIG] ❌ CRITICAL: Missing required environment variables: ${missing.join(', ')}`);
-    }
-
-    // Validate and print effective API URL
-    const effectiveApiUrl = getApiUrl();
-    logger.info(`[CONFIG] ✅ AI_API_BASE_URL effective: ${effectiveApiUrl}`);
-    logger.info(`[CONFIG] ✅ Environment validation passed.`);
-}
+export function getApiUrl() { return config.API_URL; }
+export function getAdminApiKey() { return config.ADMIN_API_KEY; }
+export function validateEnvironment() { return true; } // Kept for compatibility
+export function isFeatureEnabled(feature: string) { return true; } // Placeholder

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

@@ -0,0 +1,76 @@
+import { Job, Queue } from 'bullmq';
+import Redis from 'ioredis';
+import { JobHandler, JobData } from './types';
+import { prisma } from '../services/prisma';
+import { logger } from '../logger';
+import { sendTextMessage } from '../whatsapp-cloud';
+
+interface TenantConfig {
+    accessToken: string;
+    phoneNumberId: string;
+}
+
+export class AdminHandler implements JobHandler {
+    private async getTenantConfig(organizationId: string, connection: Redis): Promise<TenantConfig | undefined> {
+        const cacheKey = `org:config:${organizationId}`;
+        try {
+            const cached = await connection.get(cacheKey);
+            if (cached) return JSON.parse(cached);
+        } catch (err) {}
+
+        const org = await prisma.organization.findUnique({
+            where: { id: organizationId },
+            include: { phoneNumbers: true }
+        });
+        
+        if (!org || !org.systemUserToken || !org.phoneNumbers?.[0]?.id) return undefined;
+
+        const config = {
+            accessToken: org.systemUserToken,
+            phoneNumberId: org.phoneNumbers[0].id
+        };
+        await connection.set(cacheKey, JSON.stringify(config), 'EX', 3600);
+        return config;
+    }
+
+    async handle(job: Job<JobData>, connection: Redis): Promise<void> {
+        const { userId, trackId, overrideAudioUrl, adminId, organizationId } = job.data;
+        if (!userId || !overrideAudioUrl) return;
+
+        const user = await prisma.user.findUnique({ where: { id: userId } });
+        const tenantConfig = await this.getTenantConfig(organizationId || '', connection);
+
+        if (user?.phone) {
+            const { sendAudioMessage } = await import('../whatsapp-cloud');
+            await sendAudioMessage(user.phone, overrideAudioUrl, tenantConfig);
+
+            await sendTextMessage(user.phone,
+                user.language === 'WOLOF'
+                    ? "Baax na ! Yónnee *SUITE* ngir dem ci kanam."
+                    : "Bravo ! Envoyez *SUITE* pour passer à la leçon suivante.",
+                tenantConfig
+            );
+
+            await prisma.response.create({
+                data: {
+                    userId: userId,
+                    enrollmentId: (await prisma.enrollment.findFirst({ where: { userId, trackId, status: 'ACTIVE' } }))?.id || '',
+                    dayNumber: (await prisma.enrollment.findFirst({ where: { userId, trackId, status: 'ACTIVE' } }))?.currentDay || 0,
+                    content: `[AUDIO_OVERRIDE] ${overrideAudioUrl}`,
+                    aiSource: `ADMIN_OVERRIDE:${adminId || 'unknown'}`,
+                    organizationId: organizationId || user.organizationId
+                }
+            });
+
+            const enrollment = await prisma.enrollment.findFirst({
+                where: { userId, trackId, status: 'ACTIVE' }
+            });
+
+            if (enrollment) {
+                const nextDay = Math.floor(enrollment.currentDay) + 1;
+                const q = new Queue('whatsapp-queue', { connection: connection as any });
+                await q.add('send-content', { userId, trackId, dayNumber: nextDay, organizationId }, { delay: 2000 });
+            }
+        }
+    }
+}

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

@@ -0,0 +1,132 @@
+import { Job, Queue } from 'bullmq';
+import Redis from 'ioredis';
+import { JobHandler, JobData } from './types';
+import { prisma } from '../services/prisma';
+import { logger } from '../logger';
+import { sendLessonDay } from '../pedagogy';
+import { sendTextMessage } from '../whatsapp-cloud';
+
+interface TenantConfig {
+    accessToken: string;
+    phoneNumberId: string;
+}
+
+export class ContentHandler implements JobHandler {
+    private async getTenantConfig(organizationId: string, connection: Redis): Promise<TenantConfig | undefined> {
+        const cacheKey = `org:config:${organizationId}`;
+        try {
+            const cached = await connection.get(cacheKey);
+            if (cached) return JSON.parse(cached);
+        } catch (err) {}
+
+        const org = await prisma.organization.findUnique({
+            where: { id: organizationId },
+            include: { phoneNumbers: true }
+        });
+        
+        if (!org || !org.systemUserToken || !org.phoneNumbers?.[0]?.id) return undefined;
+
+        const config = {
+            accessToken: org.systemUserToken,
+            phoneNumberId: org.phoneNumbers[0].id
+        };
+        await connection.set(cacheKey, JSON.stringify(config), 'EX', 3600);
+        return config;
+    }
+
+    async handle(job: Job<JobData>, connection: Redis): Promise<void> {
+        const { userId, trackId, dayNumber, organizationId } = job.data;
+        if (!userId || !trackId || !dayNumber || !organizationId) {
+            logger.error(`[CONTENT_HANDLER] Missing data: userId=${userId}, trackId=${trackId}, dayNumber=${dayNumber}`);
+            return;
+        }
+
+        const user = await prisma.user.findUnique({ where: { id: userId } });
+        const trackDay = await prisma.trackDay.findFirst({
+            where: { trackId, dayNumber }
+        });
+
+        if (trackDay) {
+            await sendLessonDay(userId, trackId, dayNumber, organizationId, {
+                skipProgressUpdate: job.data.skipProgressUpdate === true
+            });
+
+            if (!job.data.skipProgressUpdate) {
+                await prisma.enrollment.updateMany({
+                    where: { userId, trackId },
+                    data: {
+                        currentDay: dayNumber,
+                        lastActivityAt: new Date()
+                    }
+                });
+            } else {
+                await prisma.enrollment.updateMany({
+                    where: { userId, trackId },
+                    data: { lastActivityAt: new Date() }
+                });
+                logger.info(`[CONTENT_HANDLER] Replay Day ${dayNumber} sent read-only.`);
+            }
+        } else {
+            logger.info(`[CONTENT_HANDLER] No more content for Track ${trackId} Day ${dayNumber}. Completing enrollment.`);
+            await prisma.enrollment.updateMany({
+                where: { userId, trackId },
+                data: { status: 'COMPLETED', lastActivityAt: new Date() }
+            });
+
+            // Graduation Logic
+            if (trackId.match(/^T(\d)-(FR|WO)$/)) {
+                const trackMatch = trackId.match(/^T(\d)-(FR|WO)$/);
+                if (trackMatch) {
+                    const currentLevel = parseInt(trackMatch[1]);
+                    const lang = trackMatch[2];
+                    const nextLevel = currentLevel + 1;
+                    const nextTrackId = `T${nextLevel}-${lang}`;
+
+                    const nextTrack = await prisma.track.findUnique({ where: { id: nextTrackId } });
+                    if (nextTrack) {
+                        const existingNext = await prisma.enrollment.findFirst({
+                            where: { userId, trackId: nextTrackId }
+                        });
+
+                        if (!existingNext) {
+                            const isWolof = lang === 'WO';
+                            const congratsMsg = isWolof
+                                ? `🎉 Baraka Allahu fik ! Mat nga Niveau ${currentLevel}. Maangi lay tàmbaleel Niveau ${nextLevel} : *${nextTrack.title}*...`
+                                : `🎉 Félicitations ! Vous avez validé le Niveau ${currentLevel}. Je vous inscris immédiatement au Niveau ${nextLevel} : *${nextTrack.title}*...`;
+
+                            if (user?.phone) {
+                                const tenantConfig = await this.getTenantConfig(user.organizationId, connection);
+                                await sendTextMessage(user.phone, congratsMsg, tenantConfig);
+
+                                if (!nextTrack.isPremium) {
+                                    await prisma.enrollment.create({
+                                        data: { 
+                                            userId: userId, 
+                                            trackId: nextTrackId, 
+                                            status: 'ACTIVE', 
+                                            currentDay: 1,
+                                            organizationId: user.organizationId
+                                        }
+                                    });
+                                    const q = new Queue('whatsapp-queue', { connection: connection as any });
+                                    await q.add('send-content', { 
+                                        userId, 
+                                        trackId: nextTrackId, 
+                                        dayNumber: 1,
+                                        organizationId: user.organizationId
+                                    }, { delay: 10000 });
+                                } else {
+                                    const payMsg = isWolof
+                                        ? `💳 Niveau ${nextLevel} bi dafa laaj pass. Yónnee ma "PAYER" ngir tàmbaleeti.`
+                                        : `💳 Le Niveau ${nextLevel} est un module Premium. Envoyez "PAYER" pour le débloquer et continuer votre ascension !`;
+                                    const tenantConfig = await this.getTenantConfig(user.organizationId, connection);
+                                    await sendTextMessage(user.phone, payMsg, tenantConfig);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,89 @@
+import { Job, Queue } from 'bullmq';
+import Redis from 'ioredis';
+import { JobHandler, JobData } from './types';
+import { prisma } from '../services/prisma';
+import { logger } from '../logger';
+import { sendTextMessage } from '../whatsapp-cloud';
+import { getApiUrl, getAdminApiKey } from '../config';
+import fetch from 'node-fetch';
+
+interface TenantConfig {
+    accessToken: string;
+    phoneNumberId: string;
+}
+
+export class EnrollHandler implements JobHandler {
+    private async getTenantConfig(organizationId: string, connection: Redis): Promise<TenantConfig | undefined> {
+        const cacheKey = `org:config:${organizationId}`;
+        try {
+            const cached = await connection.get(cacheKey);
+            if (cached) return JSON.parse(cached);
+        } catch (err) {}
+
+        const org = await prisma.organization.findUnique({
+            where: { id: organizationId },
+            include: { phoneNumbers: true }
+        });
+        
+        if (!org || !org.systemUserToken || !org.phoneNumbers?.[0]?.id) return undefined;
+
+        const config = {
+            accessToken: org.systemUserToken,
+            phoneNumberId: org.phoneNumbers[0].id
+        };
+        await connection.set(cacheKey, JSON.stringify(config), 'EX', 3600);
+        return config;
+    }
+
+    async handle(job: Job<JobData>, connection: Redis): Promise<void> {
+        const { userId, trackId, organizationId } = job.data;
+        const track = await prisma.track.findUnique({ where: { id: trackId } });
+        if (!track) return;
+
+        if (track.isPremium) {
+            try {
+                const AI_API_BASE_URL = getApiUrl();
+                const apiKey = getAdminApiKey();
+                const checkoutRes = await fetch(`${AI_API_BASE_URL.replace(/\/$/, "")}/v1/payments/checkout`, {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'Authorization': `Bearer ${apiKey}`,
+                        'x-organization-id': organizationId as string
+                    },
+                    body: JSON.stringify({ userId, trackId })
+                });
+
+                const checkoutData = await checkoutRes.json() as any;
+                if (checkoutRes.ok && checkoutData.url) {
+                    const user = await prisma.user.findUnique({ where: { id: userId } });
+                    if (user?.phone) {
+                        const tenantConfig = await this.getTenantConfig(organizationId as string, connection);
+                        await sendTextMessage(user.phone, `💳 Cette formation est Premium. Complétez votre paiement ici :\n${checkoutData.url}`, tenantConfig);
+                    }
+                }
+            } catch (err) {}
+        } else {
+            const existing = await prisma.enrollment.findFirst({ where: { userId, trackId } });
+            if (!existing) {
+                await prisma.enrollment.create({
+                    data: { 
+                        userId: userId || '', 
+                        trackId: trackId || '', 
+                        status: 'ACTIVE', 
+                        currentDay: 1, 
+                        organizationId: organizationId || 'default-org-id' 
+                    } as any
+                });
+                const user = await prisma.user.findUnique({ where: { id: userId } });
+                if (user?.phone) {
+                    const tenantConfig = await this.getTenantConfig(organizationId as string, connection);
+                    await sendTextMessage(user.phone, `🎉 Bienvenue dans *${track.title}* ! La génération de votre cours personnalisé (Jour 1) a commencé...`, tenantConfig);
+
+                    const q = new Queue('whatsapp-queue', { connection: connection as any });
+                    await q.add('send-content', { userId, trackId, dayNumber: 1, organizationId });
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,25 @@
+import { Job } from 'bullmq';
+import { JobHandler, JobData } from './types';
+import { logger } from '../logger';
+import { WhatsAppLogic } from '../services/whatsapp-logic';
+
+export class InboundHandler implements JobHandler {
+    async handle(job: Job<JobData>): Promise<void> {
+        const { phone, text, audioUrl, imageUrl, organizationId } = job.data;
+        
+        if (!phone || text === undefined) {
+            logger.error(`[INBOUND_HANDLER] Missing data: phone=${phone}, text=${text}`);
+            return;
+        }
+
+        logger.info(`[INBOUND_HANDLER] Processing inbound for ${phone} (Org: ${organizationId})`);
+        
+        await WhatsAppLogic.handleIncomingMessage(
+            phone, 
+            text, 
+            audioUrl, 
+            imageUrl, 
+            organizationId
+        );
+    }
+}

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

@@ -0,0 +1,145 @@
+import { Job } from 'bullmq';
+import Redis from 'ioredis';
+import { JobHandler, JobData } from './types';
+import { prisma } from '../services/prisma';
+import { logger } from '../logger';
+import { downloadMedia, sendTextMessage } from '../whatsapp-cloud';
+import { getApiUrl, getAdminApiKey } from '../config';
+import { normalizeWolof } from '../normalizeWolof';
+import { WhatsAppLogic } from '../services/whatsapp-logic';
+import fetch from 'node-fetch';
+
+interface TenantConfig {
+    accessToken: string;
+    phoneNumberId: string;
+}
+
+export class MediaHandler implements JobHandler {
+    private async getTenantConfig(organizationId: string, connection: Redis): Promise<TenantConfig | undefined> {
+        const cacheKey = `org:config:${organizationId}`;
+        try {
+            const cached = await connection.get(cacheKey);
+            if (cached) return JSON.parse(cached);
+        } catch (err) {}
+
+        const org = await prisma.organization.findUnique({
+            where: { id: organizationId },
+            include: { phoneNumbers: true }
+        });
+        
+        if (!org || !org.systemUserToken || !org.phoneNumbers?.[0]?.id) return undefined;
+
+        const config = {
+            accessToken: org.systemUserToken,
+            phoneNumberId: org.phoneNumbers[0].id
+        };
+        await connection.set(cacheKey, JSON.stringify(config), 'EX', 3600);
+        return config;
+    }
+
+    async handle(job: Job<JobData>, connection: Redis): Promise<void> {
+        const { mediaId, mimeType, phone, organizationId } = job.data;
+        if (!mediaId || !phone) {
+            logger.error(`[MEDIA_HANDLER] Missing data: mediaId=${mediaId}, phone=${phone}`);
+            return;
+        }
+
+        const tenantConfig = await this.getTenantConfig(organizationId || '', connection);
+        const traceId = `[STT-FLOW-${phone.slice(-4)}]`;
+        const accessToken = process.env.WHATSAPP_ACCESS_TOKEN || tenantConfig?.accessToken;
+
+        if (!accessToken) {
+            logger.error(`[MEDIA_HANDLER] Missing WhatsApp Access Token for media ${mediaId}`);
+            return;
+        }
+
+        try {
+            const { buffer } = await downloadMedia(mediaId, accessToken);
+            const AI_API_BASE_URL = getApiUrl();
+            const apiKey = getAdminApiKey();
+
+            let audioUrl = '';
+            // Store on R2
+            try {
+                const storeRes = await fetch(`${AI_API_BASE_URL.replace(/\/$/, "")}/v1/ai/store-audio`, {
+                    method: 'POST',
+                    headers: { 
+                        'Content-Type': 'application/json', 
+                        'Authorization': `Bearer ${apiKey}`,
+                        'x-organization-id': organizationId as string
+                    },
+                    body: JSON.stringify({ audioBase64: buffer.toString('base64'), mimeType, phone })
+                });
+                if (storeRes.ok) {
+                    const storeData = await storeRes.json() as any;
+                    audioUrl = storeData.url;
+                }
+            } catch (err) {}
+
+            const user = await prisma.user.findFirst({ where: { phone } });
+            if (user) {
+                await prisma.message.create({
+                    data: {
+                        userId: user.id,
+                        direction: 'INBOUND',
+                        channel: 'WHATSAPP',
+                        mediaUrl: audioUrl || null,
+                        payload: job.data as any,
+                        organizationId: organizationId || user.organizationId
+                    }
+                });
+            }
+
+            if (mimeType?.startsWith('audio/')) {
+                const transcribeRes = await fetch(`${AI_API_BASE_URL.replace(/\/$/, "")}/v1/ai/transcribe`, {
+                    method: 'POST',
+                    headers: { 
+                        'Content-Type': 'application/json', 
+                        'Authorization': `Bearer ${apiKey}`,
+                        'x-organization-id': organizationId as string
+                    },
+                    body: JSON.stringify({
+                        audioBase64: buffer.toString('base64'),
+                        filename: `msg.${mimeType?.includes('mp4') ? 'mp4' : 'ogg'}`,
+                        language: user?.language 
+                    })
+                });
+
+                if (transcribeRes.ok) {
+                    const data = await transcribeRes.json() as any;
+                    let transcribedText = data.text || '';
+                    const confidence = data.confidence || 0;
+
+                    if (user?.language === 'WOLOF') {
+                        const normResult = normalizeWolof(transcribedText);
+                        transcribedText = normResult.normalizedText;
+
+                        if (confidence <= 40 || transcribedText.split(/\s+/).length < 4) {
+                            // Pending review logic
+                            const activeEnrollment = await prisma.enrollment.findFirst({
+                                where: { userId: user.id, status: 'ACTIVE' }
+                            });
+                            if (activeEnrollment) {
+                                await prisma.userProgress.upsert({
+                                    where: { userId_trackId: { userId: user.id, trackId: activeEnrollment.trackId } },
+                                    update: { exerciseStatus: 'PENDING_REVIEW' as any, adminTranscription: transcribedText, confidenceScore: confidence },
+                                    create: { userId: user.id, trackId: activeEnrollment.trackId, exerciseStatus: 'PENDING_REVIEW' as any, adminTranscription: transcribedText, confidenceScore: confidence }
+                                });
+                                await sendTextMessage(phone, "🎙️ Nyangi jaxas sa kàddu. Xamle dina la tontu ci kanam !", tenantConfig);
+                                return;
+                            }
+                        }
+                    }
+
+                    if (transcribedText) {
+                        await WhatsAppLogic.handleIncomingMessage(phone, transcribedText, audioUrl, undefined, organizationId);
+                    }
+                }
+            } else if (mimeType?.startsWith('image/')) {
+                await WhatsAppLogic.handleIncomingMessage(phone, job.data.caption || 'Image reçue', undefined, audioUrl, organizationId);
+            }
+        } catch (err) {
+            logger.error(`[MEDIA_HANDLER] download-media failed:`, err);
+        }
+    }
+}

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

@@ -0,0 +1,80 @@
+import { Job } from 'bullmq';
+import Redis from 'ioredis';
+import { JobHandler, JobData } from './types';
+import { prisma } from '../services/prisma';
+import { logger } from '../logger';
+import { sendTextMessage, sendImageMessage, sendInteractiveButtonMessage, sendInteractiveListMessage } from '../whatsapp-cloud';
+
+interface TenantConfig {
+    accessToken: string;
+    phoneNumberId: string;
+}
+
+export class MessageHandler implements JobHandler {
+    private async getTenantConfig(organizationId: string, connection: Redis): Promise<TenantConfig | undefined> {
+        const cacheKey = `org:config:${organizationId}`;
+        try {
+            const cached = await connection.get(cacheKey);
+            if (cached) return JSON.parse(cached);
+        } catch (err) {}
+
+        const org = await prisma.organization.findUnique({
+            where: { id: organizationId },
+            include: { phoneNumbers: true }
+        });
+        
+        if (!org || !org.systemUserToken || !org.phoneNumbers?.[0]?.id) return undefined;
+
+        const config = {
+            accessToken: org.systemUserToken,
+            phoneNumberId: org.phoneNumbers[0].id
+        };
+        await connection.set(cacheKey, JSON.stringify(config), 'EX', 3600);
+        return config;
+    }
+
+    async handle(job: Job<JobData>, connection: Redis): Promise<void> {
+        const { organizationId } = job.data;
+        const tenantConfig = await this.getTenantConfig(organizationId || 'default-org-id', connection);
+
+        switch (job.name) {
+            case 'send-message': {
+                const { userId, text } = job.data;
+                if (!userId || !text) return;
+                const user = await prisma.user.findUnique({ where: { id: userId } });
+                if (user?.phone) {
+                    await sendTextMessage(user.phone, text, tenantConfig);
+                }
+                break;
+            }
+            case 'send-message-direct': {
+                const { phone, text } = job.data;
+                if (!phone || !text) return;
+                await sendTextMessage(phone, text, tenantConfig);
+                break;
+            }
+            case 'send-image': {
+                const { to, imageUrl, caption } = job.data;
+                if (!to || !imageUrl) return;
+                await sendImageMessage(to, imageUrl, caption || '', tenantConfig);
+                break;
+            }
+            case 'send-interactive-buttons': {
+                const { userId, bodyText, buttons } = job.data;
+                const user = await prisma.user.findUnique({ where: { id: userId } });
+                if (user?.phone) {
+                    await sendInteractiveButtonMessage(user.phone, bodyText || '', buttons || [], undefined, tenantConfig);
+                }
+                break;
+            }
+            case 'send-interactive-list': {
+                const { userId, headerText, bodyText, buttonLabel, sections } = job.data;
+                const user = await prisma.user.findUnique({ where: { id: userId } });
+                if (user?.phone) {
+                    await sendInteractiveListMessage(user.phone, headerText || '', bodyText || '', buttonLabel || '', sections || [], undefined, tenantConfig);
+                }
+                break;
+            }
+        }
+    }
+}

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

@@ -0,0 +1,57 @@
+import { Job } from 'bullmq';
+import Redis from 'ioredis';
+import { JobHandler, JobData } from './types';
+import { prisma } from '../services/prisma';
+import { logger } from '../logger';
+import { sendTextMessage } from '../whatsapp-cloud';
+
+interface TenantConfig {
+    accessToken: string;
+    phoneNumberId: string;
+}
+
+export class NudgeHandler implements JobHandler {
+    private async getTenantConfig(organizationId: string, connection: Redis): Promise<TenantConfig | undefined> {
+        const cacheKey = `org:config:${organizationId}`;
+        try {
+            const cached = await connection.get(cacheKey);
+            if (cached) return JSON.parse(cached);
+        } catch (err) {}
+
+        const org = await prisma.organization.findUnique({
+            where: { id: organizationId },
+            include: { phoneNumbers: true }
+        });
+        
+        if (!org || !org.systemUserToken || !org.phoneNumbers?.[0]?.id) return undefined;
+
+        const config = {
+            accessToken: org.systemUserToken,
+            phoneNumberId: org.phoneNumbers[0].id
+        };
+        await connection.set(cacheKey, JSON.stringify(config), 'EX', 3600);
+        return config;
+    }
+
+    async handle(job: Job<JobData>, connection: Redis): Promise<void> {
+        const { userId, type, organizationId } = job.data;
+        const user = await prisma.user.findUnique({ where: { id: userId } });
+        const tenantConfig = await this.getTenantConfig(organizationId || '', connection);
+        if (!user?.phone) return;
+
+        const isWolof = user.language === 'WOLOF';
+        const messages = {
+            ENCOURAGEMENT: isWolof
+                ? "Assalamuyalaykum ! Fatte wuñu sa mbir. Tontu bu gatt ngir wéy ? 💪"
+                : "Coucou ! On n'a pas oublié ton projet. Une petite réponse pour continuer ? 💪",
+            RESURRECTION: isWolof
+                ? "Sa liggeey mu ngi lay xaar ! Am succès dafa laaj lëkkalë. Ñu tàmbaleeti ? 🚀"
+                : "Ton business t'attend ! Le succès vient de la régularité. On s'y remet ? 🚀"
+        };
+
+        const nudgeType = (type || 'ENCOURAGEMENT') as keyof typeof messages;
+        const text = messages[nudgeType] || messages.ENCOURAGEMENT;
+        await sendTextMessage(user.phone, text, tenantConfig);
+        logger.info(`[NUDGE_HANDLER] Nudge ${nudgeType} sent to ${user.phone}`);
+    }
+}

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

@@ -21,6 +21,12 @@ export interface MessageHandler {
     handle(ctx: MessageContext): Promise<boolean>; // Returns true if it completely handled the message
 }
 
+import { Job } from 'bullmq';
+
+export interface JobHandler {
+    handle(job: Job<JobData>, connection: Redis): Promise<void>;
+}
+
 export interface MultilangContent {
     lessonText?: string;
     exercisePrompt?: string;

apps/whatsapp-worker/src/index.ts

@@ -2,22 +2,25 @@ import { logger } from './logger';
 import dns from 'node:dns';
 dns.setDefaultResultOrder('ipv4first');
 
-import { Worker, Job, Queue } from 'bullmq';
+import { Worker, Job } from 'bullmq';
 import dotenv from 'dotenv';
 import Redis from 'ioredis';
-import { sendTextMessage, sendDocumentMessage, downloadMedia, sendInteractiveButtonMessage, sendInteractiveListMessage, sendImageMessage } from './whatsapp-cloud';
-import { sendLessonDay } from './pedagogy';
-import { updateBehavioralScore } from './scoring';
-import { normalizeWolof } from './normalizeWolof';
-import { getApiUrl, getAdminApiKey, validateEnvironment, isFeatureEnabled } from './config';
-import { WhatsAppLogic } from './services/whatsapp-logic';
+import { validateEnvironment } from './config';
 import { startWorkerCleanupCron } from './services/cleanup';
-import { prisma } from './services/prisma';
-import { JobData, FeedbackData, ExerciseCriteria } from './handlers/types';
+import { JobData, JobHandler } from './handlers/types';
 import { reportError } from './services/errors';
+import { runWithTenant } from '@repo/database';
 
-dotenv.config();
+// Handlers
+import { MessageHandler } from './handlers/MessageHandler';
+import { MediaHandler } from './handlers/MediaHandler';
+import { ContentHandler } from './handlers/ContentHandler';
+import { AdminHandler } from './handlers/AdminHandler';
+import { NudgeHandler } from './handlers/NudgeHandler';
+import { EnrollHandler } from './handlers/EnrollHandler';
+import { InboundHandler } from './handlers/InboundHandler';
 
+dotenv.config();
 validateEnvironment();
 startWorkerCleanupCron();
 
@@ -32,1132 +35,51 @@ const connection = process.env.REDIS_URL
         maxRetriesPerRequest: null
     });
 
-interface TenantConfig {
-    accessToken: string;
-    phoneNumberId: string;
-}
-
-async function getTenantConfig(organizationId?: string): Promise<TenantConfig | undefined> {
-    if (!organizationId) return undefined;
-
-    const cacheKey = `org:config:${organizationId}`;
-    try {
-        const cached = await connection.get(cacheKey);
-        if (cached) {
-            return JSON.parse(cached) as TenantConfig;
-        }
-    } catch (err) {
-        logger.warn(`[CACHE] Failed to get tenant config from Redis: ${err}`);
-    }
-
-    const org = await prisma.organization.findUnique({
-        where: { id: organizationId },
-        include: { phoneNumbers: true }
-    });
-    
-    if (!org || !org.systemUserToken || !org.phoneNumbers?.[0]?.id) return undefined;
-
-    const config: TenantConfig = {
-        accessToken: org.systemUserToken,
-        phoneNumberId: org.phoneNumbers[0].id
-    };
-
-    try {
-        await connection.set(cacheKey, JSON.stringify(config), 'EX', 3600); // 1 hour TTL
-    } catch (err) {
-        logger.warn(`[CACHE] Failed to set tenant config in Redis: ${err}`);
-    }
-
-    return config;
-}
+const handlers: Record<string, JobHandler> = {
+    'send-message': new MessageHandler(),
+    'send-message-direct': new MessageHandler(),
+    'send-image': new MessageHandler(),
+    'send-interactive-buttons': new MessageHandler(),
+    'send-interactive-list': new MessageHandler(),
+    'download-media': new MediaHandler(),
+    'send-content': new ContentHandler(),
+    'send-admin-audio-override': new AdminHandler(),
+    'send-nudge': new NudgeHandler(),
+    'enroll-user': new EnrollHandler(),
+    'handle-inbound': new InboundHandler()
+};
 
 const worker = new Worker('whatsapp-queue', async (job: Job<JobData>) => {
-    logger.info('Processing job:', job.name, job.id);
-
-    try {
-        if (job.name === 'send-message') {
-            const { userId, text, organizationId } = job.data;
-            if (!userId || !text) {
-                logger.error(`[WORKER] Missing data for send-message: userId=${userId}, text=${text?.substring(0,20)}`);
-                return;
-            }
-            const user = await prisma.user.findUnique({ where: { id: userId } });
-            const tenantConfig = await getTenantConfig(organizationId);
-            if (user?.phone) {
-                await sendTextMessage(user.phone, text, tenantConfig);
-            } else {
-                logger.warn(`[WORKER] User ${userId} not found or missing phone — skipping send.`);
-            }
-        }
-        else if (job.name === 'send-message-direct') {
-            const { phone, text, organizationId } = job.data;
-            if (!phone || !text) {
-                logger.error(`[WORKER] Missing data for send-message-direct: phone=${phone}, text=${text?.substring(0,20)}`);
-                return;
-            }
-            const tenantConfig = await getTenantConfig(organizationId);
-            await sendTextMessage(phone, text, tenantConfig);
-        }
-        else if (job.name === 'handle-inbound') {
-            const { phone, text, audioUrl, imageUrl, messageId, organizationId } = job.data;
-            if (!phone) {
-                logger.error(`[WORKER] Missing phone for handle-inbound`);
-                return;
-            }
-            
-            // 🚨 Idempotence Lock for Inbound Messages
-            if (messageId) {
-                const lockKey = `lock:inbound:${messageId}`;
-                const isLocked = await connection.set(lockKey, "1", "EX", 300, "NX");
-                if (!isLocked) {
-                    logger.info(`[WORKER] 🔒 Lock inbound activé : message ${messageId} déjà traité.`);
-                    return;
-                }
-            }
-
-            await WhatsAppLogic.handleIncomingMessage(phone, text || '', audioUrl, imageUrl, organizationId);
-        }
-        else if (job.name === 'generate-feedback') {
-            const { userId, text, trackId, exercisePrompt, lessonText, exerciseCriteria, totalDays, language, userActivity, userRegion, previousResponses, isDeepDive, iterationCount, imageUrl, isButtonChoice, isTimeTravelMode, realCurrentDay, organizationId } = job.data;
-            const currentDay = Number(job.data.currentDay || job.data.dayNumber || 0);
-            const enrollmentId = job.data.enrollmentId;
-
-            if (!userId || !trackId) return;
-
-            const user = await prisma.user.findUnique({
-                where: { id: userId },
-                include: { 
-                    businessProfile: true, 
-                    organization: {
-                        include: { phoneNumbers: true }
-                    }
-                }
-            });
-            if (!user?.phone) {
-                logger.error(`[WORKER] User ${userId} not found or missing phone for feedback generation`);
-                return;
-            }
-
-            // ─── 🚀 Idempotence Lock (Progression Bug Fix) ─────────
-            const Redis = (await import('ioredis')).default;
-            const redis = process.env.REDIS_URL
-                ? new Redis(process.env.REDIS_URL, { maxRetriesPerRequest: null })
-                : new Redis({ host: process.env.REDIS_HOST || 'localhost', port: parseInt(process.env.REDIS_PORT || '6379'), maxRetriesPerRequest: null });
-            
-            const textHash = text ? text.substring(0, 10).replace(/[^a-z0-9]/gi, '') : '';
-            const lockKey = `lock:feedback:${userId}:${currentDay}:${textHash}`;
-            
-            const isLocked = await redis.set(lockKey, "1", "EX", 300, "NX");
-            if (!isLocked) {
-                logger.info(`[WORKER] 🔒 Lock activé : ignorer ce job de feedback en double (User ${userId}, Day ${currentDay})`);
-                return;
-            }
-
-            let feedbackMsg = '';
-            let feedbackData: any = null;
-            let trackDay: any = null;
-            let AI_API_BASE_URL = '';
-            let apiKey = '';
-
-            const tenantConfig: TenantConfig = {
-                accessToken: user.organization.systemUserToken || '',
-                phoneNumberId: user.organization.phoneNumbers?.[0]?.id || ''
-            };
-
-            if (!tenantConfig.accessToken || !tenantConfig.phoneNumberId) {
-                logger.error(`[WORKER] Missing WhatsApp credentials for Organization ${user.organizationId}`);
-                return;
-            }
-
-            try {
-                trackDay = await prisma.trackDay.findFirst({
-                    where: { trackId, dayNumber: currentDay }
-                });
-
-                logger.info(`[WORKER] Generating expert feedback for User ${userId}`);
-
-                AI_API_BASE_URL = getApiUrl();
-                apiKey = getAdminApiKey();
-
-                logger.info(`[PIPELINE] Handing over text to Coach Engine... (User: ${userId}, Day: ${currentDay})`);
-                
-                const feedbackRes = await fetch(`${AI_API_BASE_URL.replace(/\/$/, "")}/v1/ai/generate-feedback`, {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${apiKey}` },
-                    body: JSON.stringify({
-                        answers: text,
-                        lessonText,
-                        exercisePrompt,
-                        userLanguage: language,
-                        businessProfile: user.businessProfile,
-                        exerciseCriteria,
-                        userActivity,
-                        userRegion,
-                        dayNumber: currentDay,
-                        previousResponses,
-                        isDeepDive: isDeepDive || false,
-                        iterationCount: iterationCount || 0,
-                        imageUrl: imageUrl,
-                        isButtonChoice: isButtonChoice || false,
-                        tenantPrompt: (user.organization as any)?.customPrompt,
-                        tenantBranding: (user.organization as any)?.brandingData
-                    })
-                });
-
-                if (feedbackRes.ok) {
-                    feedbackData = await feedbackRes.json() as FeedbackData;
-
-                    if (feedbackData.text) {
-                        feedbackMsg = feedbackData.text;
-                    } else if (feedbackData.validation && feedbackData.enrichedVersion && feedbackData.actionableAdvice) {
-                        feedbackMsg = `🌟 ${feedbackData.validation}\n\n🚀 ${feedbackData.enrichedVersion}\n\n💡 Conseil de Terrain :\n${feedbackData.actionableAdvice}`;
-                        const callToAction = language === 'WOLOF'
-                            ? "\n\nSoo 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*."
-                            : "\n\nSi tu veux affiner ce point avec une donnée de ton propre terrain, tape 1️⃣ *APPROFONDIR*, sinon tape 2️⃣ *SUITE*.";
-                        if (!isDeepDive || (isDeepDive && (iterationCount || 0) < 3 && !feedbackData.isForcedClosure)) {
-                            feedbackMsg += callToAction;
-                        }
-                    } else {
-                        feedbackMsg = '✅ Analyse terminée.';
-                    }
-
-                } else if (feedbackRes.status === 429) {
-                    logger.warn(`[WORKER] 429 Error during generate-feedback`);
-                    const fallbackMsg = language === 'WOLOF'
-                        ? "Jërëjëf ci sa tontu ! (Analyse IA temporairement indisponible)"
-                        : "Merci pour ta réponse ! (Analyse IA de la réponse temporairement indisponible suite à une surcharge, mais ta progression est sauvegardée).";
-                    await sendTextMessage(user.phone, fallbackMsg, tenantConfig);
-                    return;
-                } else {
-                    const errText = await feedbackRes.text();
-                    throw new Error(`generate-feedback failed HTTP ${feedbackRes.status}: ${errText}`);
-                }
-            } catch (err: unknown) {
-                logger.error(`[WORKER] generate-feedback failed:`, (err instanceof Error ? err.message : String(err)));
-                // 🚨 RACE CONDITION: Delete lock on error to allow immediate retry by BullMQ
-                await redis.del(lockKey);
-                throw err;
-            }
-
-            if (feedbackMsg) {
-                // 🌟 Adaptive Pedagogy: Dynamic Remediation & Diagnostic Logic v1.1 🌟
-                // 🚨 RACE CONDITION FIX: Update UserProgress strictly BEFORE sending the message over WhatsApp.
-                let nextDay = currentDay + 1;
-                const currentProgress = await prisma.userProgress.findUnique({
-                    where: { userId_trackId: { userId, trackId } },
-                    include: { userBadges: true }
-                });
-                const currentBadges = (currentProgress?.userBadges || []).map(b => b.name);
-                let updatedBadges = [...currentBadges];
-
-                const criteria = (exerciseCriteria as unknown) as ExerciseCriteria | undefined;
-
-                if (feedbackData?.isQualified === false) {
-                    // Check for Adaptive Diagnostic Branching
-                    const diagnosticTrigger = criteria?.diagnostic?.trigger;
-                    const adaptiveModuleId = criteria?.diagnostic?.moduleId;
-
-                    if (diagnosticTrigger && feedbackData?.missingElements?.includes(diagnosticTrigger) && adaptiveModuleId) {
-                        logger.info(`[WORKER] Adaptive Diagnostic triggered for User ${userId}: Re-routing to module ${adaptiveModuleId}`);
-                        // 🚀 Redirect to specific module
-                        nextDay = 1; // Modules start at day 1
-                        await prisma.enrollment.updateMany({
-                            where: { userId, status: 'ACTIVE' },
-                            data: { trackId: adaptiveModuleId, currentDay: 1 }
-                        });
-                    }
-
-                    const remediationDay = criteria?.remediation?.dayNumber;
-                    if (remediationDay && remediationDay !== currentDay) {
-                        logger.info(`[WORKER] Dynamic remediation triggered for User ${userId}: Day ${currentDay} -> ${remediationDay}`);
-                        nextDay = remediationDay;
-                    } else {
-                        logger.info(`[WORKER] Exercise not qualified but no remediation day defined. Staying on Day ${currentDay}.`);
-                        nextDay = currentDay;
-                    }
-
-                    // 🚨 Hardening: If explicitly not qualified, we put the user in PENDING_REMEDIATION
-                    // 🕰️ TIME-TRAVEL GUARD: Don't downgrade global status during a replay
-                    if (!isTimeTravelMode) {
-                        await prisma.userProgress.update({
-                            where: { userId_trackId: { userId, trackId } },
-                            data: {
-                                exerciseStatus: 'PENDING_REMEDIATION', // Stay in remediation until final success
-                                score: { increment: 0 }
-                            }
-                        });
-                    }
-
-                    // 🚨 Store Strategy Data in BusinessProfile (Guarded by Day 10+)
-                    const hasStrategyData = feedbackData?.searchResults || feedbackData?.competitorList || feedbackData?.financialProjections || feedbackData?.fundingAsk || feedbackData?.teamMembers;
-                    if (hasStrategyData && currentDay >= 10) {
-                        const updatePayload: any = { lastUpdatedFromDay: currentDay };
-                        if (feedbackData?.searchResults) updatePayload.marketData = feedbackData.searchResults;
-                        if (feedbackData?.competitorList) updatePayload.competitorList = feedbackData.competitorList;
-                        if (feedbackData?.financialProjections) updatePayload.financialProjections = feedbackData.financialProjections;
-                        if (feedbackData?.fundingAsk) updatePayload.fundingAsk = feedbackData.fundingAsk;
-                        if (feedbackData?.teamMembers && Array.isArray(feedbackData.teamMembers)) {
-                            const existingProfile = await prisma.businessProfile.findUnique({ where: { userId } });
-                            const existingTeam = Array.isArray(existingProfile?.teamMembers) ? (existingProfile?.teamMembers as any[]) : [];
-                            updatePayload.teamMembers = [...existingTeam, ...feedbackData.teamMembers];
-                        }
-
-                        try {
-                            await prisma.businessProfile.upsert({
-                                where: { userId },
-                                update: updatePayload,
-                                create: { userId, ...updatePayload, organizationId }
-                            });
-                        } catch (bpErr: unknown) {
-                            logger.error('[WORKER] BusinessProfile upsert failed (non-fatal, REMEDIATION path):', (bpErr as Error).message);
-                        }
-                    }
-                } else {
-                    // Success! Award Badges & Mark Completed (or keep Pending for Deep Dive)
-                    const trackDayBadges = (trackDay as any)?.badges as string[] || [];
-                    for (const b of trackDayBadges) {
-                        if (!updatedBadges.includes(b)) updatedBadges.push(b);
-                    }
-
-                    let newStatus = (isDeepDive && feedbackData?.isForcedClosure !== true) ? 'PENDING_DEEPDIVE' : 'COMPLETED';
-
-                    // 🚨 Card/Button Bypass Logic (Lead Fullstack Developer Requirement)
-                    // Ensure that a button click never completes the lesson, even if the AI validates it.
-                    if (isButtonChoice) {
-                        logger.info(`[WORKER] 🛡️ Button choice detected for User ${userId}. Overriding COMPLETED with PENDING.`);
-                        newStatus = 'PENDING';
-                    }
-
-                    // 🕰️ TIME-TRAVEL GUARD: Skip COMPLETED update when replaying a historical lesson.
-                    // BusinessProfile (One-Pager) IS updated below — only the global exerciseStatus is preserved.
-                    if (!isTimeTravelMode) {
-                        const newBadges = updatedBadges.filter(b => !currentBadges.includes(b));
-                        
-                        await prisma.userProgress.update({
-                            where: { userId_trackId: { userId, trackId } },
-                            data: {
-                                exerciseStatus: newStatus as any,
-                                score: { increment: newStatus === 'COMPLETED' ? 1 : 0 },
-                                badges: updatedBadges,
-                                userBadges: {
-                                    create: newBadges.map(name => ({ name }))
-                                },
-                                behavioralScoring: updateBehavioralScore(currentProgress ? currentProgress.behavioralScoring as any : null, criteria?.scoring?.impact_success as any),
-                                aiSource: feedbackData?.aiSource || 'OPENAI'
-                            }
-                        });
-                    }
-
-                    // 🚨 Store Strategy Data in BusinessProfile (Guarded by Day 10+)
-                    const hasStrategyData = feedbackData?.searchResults || feedbackData?.competitorList || feedbackData?.financialProjections || feedbackData?.fundingAsk || feedbackData?.teamMembers;
-                    if (hasStrategyData && currentDay >= 10) {
-                        const updatePayload: any = { lastUpdatedFromDay: currentDay };
-                        if (feedbackData?.searchResults) updatePayload.marketData = feedbackData.searchResults;
-                        if (feedbackData?.competitorList) updatePayload.competitorList = feedbackData.competitorList;
-                        if (feedbackData?.financialProjections) updatePayload.financialProjections = feedbackData.financialProjections;
-                        if (feedbackData?.fundingAsk) updatePayload.fundingAsk = feedbackData.fundingAsk;
-                        if (feedbackData?.teamMembers && Array.isArray(feedbackData.teamMembers)) {
-                            const newMembers = feedbackData.teamMembers;
-                            
-                            const profile = await prisma.businessProfile.findUnique({ where: { userId } });
-                            if (profile) {
-                                await prisma.teamMember.deleteMany({ where: { businessProfileId: profile.id } });
-                                updatePayload.teamMembersList = {
-                                    create: newMembers.map((m: any) => ({
-                                        name: m.name || m.fullName || 'Unknown',
-                                        role: m.role || m.position,
-                                        bio: m.bio || m.description
-                                    }))
-                                };
-                            }
-                            updatePayload.teamMembers = newMembers; 
-                        }
-
-                        try {
-                            await prisma.businessProfile.upsert({
-                                where: { userId },
-                                update: updatePayload,
-                                create: { userId, ...updatePayload, organizationId }
-                            });
-                        } catch (bpErr: unknown) {
-                            logger.error('[WORKER] BusinessProfile upsert failed (non-fatal, SUCCESS path):', (bpErr as Error).message);
-                        }
-                    }
-
-                    // If we were in a remediation day (fractional) -> move to next integer day
-                    if (!isTimeTravelMode && currentDay % 1 !== 0) {
-                        nextDay = Math.floor(currentDay) + 1;
-                        logger.info(`[WORKER] Remediation successful for User ${userId}. Moving to Day ${nextDay}.`);
-                    }
-
-                } // end success else block
-
-                // THEN store the response
-                await prisma.response.create({
-                    data: {
-                        enrollmentId: enrollmentId || '',
-                        userId: user.id,
-                        dayNumber: currentDay,
-                        content: feedbackMsg,
-                        aiSource: feedbackData?.aiSource || 'OPENAI',
-                        organizationId: organizationId || user.organizationId
-                    }
-                });
-
-                // THEN send the WhatsApp message
-                await sendTextMessage(user.phone, feedbackMsg, tenantConfig);
-
-                if (isFeatureEnabled('FEATURE_BUSINESS_PROFILE') && currentDay) {
-                    try {
-                        const extractRes = await fetch(`${AI_API_BASE_URL.replace(/\/$/, "")}/v1/ai/extract-profile`, {
-                            method: 'POST',
-                            headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${apiKey}` },
-                            body: JSON.stringify({
-                                userInput: text,
-                                dayNumber: currentDay,
-                                userLanguage: language
-                            })
-                        });
-
-                        if (extractRes.ok) {
-                            const { data } = await extractRes.json() as any;
-                            // Clean up undefined/null values
-                                const profileData = Object.fromEntries(Object.entries(data).filter(([_, v]) => v != null && v !== ''));
-
-                                // 🚨 Sector Locking (Lead AI Engineer Requirement)
-                                const lockedSectors = ["Organisation d'événements / PWA"];
-                                if (lockedSectors.includes(user.activity || "")) {
-                                    if (profileData.activityLabel || profileData.activityType) {
-                                        logger.info(`[WORKER] Sector Locked for User ${userId}. Blocking activity update.`);
-                                        delete profileData.activityLabel;
-                                        delete profileData.activityType;
-                                    }
-                                }
-
-                                if (Object.keys(profileData).length > 0 || feedbackData?.searchResults) {
-                                    logger.info(`[WORKER] Updating BusinessProfile for User ${userId}:`, profileData);
-                                    const updatePayload: any = {
-                                        ...profileData,
-                                        lastUpdatedFromDay: currentDay
-                                    };
-
-                                if (feedbackData?.searchResults) {
-                                    updatePayload.marketData = feedbackData.searchResults;
-                                    logger.info(`[WORKER] Market Data (Enrichment) added to profile.`);
-                                }
-
-                                await prisma.businessProfile.upsert({
-                                    where: { userId },
-                                    update: updatePayload,
-                                    create: { userId, ...updatePayload, organizationId }
-                                });
-
-                                // 🌟 Visuals WOW: Generate Pitch Card for Day 1 🌟
-                                const finalLabel = (profileData as any).activityLabel || user.activity || "Projet Entrepreneurial";
-                                if (isFeatureEnabled('FEATURE_SHARE_CARD') && currentDay === 1 && finalLabel) {
-                                    try {
-                                        const { generatePitchCard } = await import('./visuals');
-                                        const { uploadFile } = await import('./storage');
-                                        const cardBuffer = await generatePitchCard(finalLabel);
-                                        const cardUrl = await uploadFile(cardBuffer, 'pitch-card.png', 'image/png');
-
-                                        const caption = language === 'WOLOF'
-                                            ? "Sa kàrdu business mu neex ! ✨"
-                                            : "Ta carte business personnalisée ! ✨";
-                                        await sendImageMessage(user.phone, cardUrl, caption);
-                                    } catch (vErr: unknown) {
-                                        logger.error('[WORKER] Pitch Card generation failed:', (vErr as any)?.message);
-                                    }
-                                }
-                            }
-                        }
-                    } catch (err: unknown) {
-                        logger.error('[WORKER] BusinessProfile extraction failed:', (err instanceof Error ? err.message : String(err)));
-                    }
-                }
-
-
-
-                // 🚨 Hardening: We DO NOT update `currentDay` here for normal or remediation flows.
-                // The `send-content` job will update `enrollment.currentDay` right before sending the lesson!
-                // This prevents the 'double incrementation' bug (+2 days) when the user types SUITE.
-
-                // 🌟 Adaptive Pedagogy: Streak Management 🌟
-                const lastActivity = user.lastActivityAt ? new Date(user.lastActivityAt) : null;
-                const today = new Date();
-                const diffTime = lastActivity ? Math.abs(today.getTime() - lastActivity.getTime()) : Infinity;
-                const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
-
-                let newStreak = (user as any).currentStreak || 0;
-                if (diffDays <= 1) {
-                    newStreak += 1; // Continuous streak
-                } else if (diffDays > 1) {
-                    newStreak = 1; // Streak broken
-                }
-
-                await prisma.user.update({
-                    where: { id: userId },
-                    data: {
-                        lastActivityAt: new Date(),
-                        currentStreak: newStreak,
-                        longestStreak: Math.max((user as any).longestStreak || 0, newStreak)
-                    } as any
-                });
-
-                if (currentDay >= (totalDays || 12) && feedbackData?.isQualified !== false) {
-                    const tenantConfig = await getTenantConfig(organizationId);
-                    await sendTextMessage(user.phone, language === 'WOLOF'
-                        ? "🎉 Baraka Allahu fik ! Jeex nga module bi. Dokumaan yi dinañu leen yónnee ci kanam !"
-                        : "🎉 Félicitations ! Vous avez terminé ce module. Vos documents intelligents arrivent bientôt !",
-                        tenantConfig
-                    );
-
-                    const q = new Queue('whatsapp-queue', { connection: connection as any });
-                    await q.add('send-content', { userId, trackId, dayNumber: currentDay + 1, organizationId });
-                } else if (feedbackData?.isQualified === false) {
-                    const tenantConfig = await getTenantConfig(organizationId);
-                    await sendTextMessage(user.phone, language === 'WOLOF'
-                        ? "🚨 Am na lo xamni leerul bu baax. Xoolal missal yi ma la yónnee te tàmbaleet ko ndànk."
-                        : "🚨 Certains points sont encore à renforcer pour valider. Regarde mes conseils et réessaie.",
-                        tenantConfig
-                    );
-
-                    // Si on a un jour de remédiation (ex 1.5), on l'envoie automatiquement
-                    if (nextDay !== currentDay && nextDay % 1 !== 0) {
-                        const q = new Queue('whatsapp-queue', { connection: connection as any });
-                        await q.add('send-content', { userId, trackId, dayNumber: nextDay, organizationId }, { delay: 2000 });
-                    }
-                } else {
-                    // 🕰️ TIME-TRAVEL MODE: Custom CTA — SUITE would be blocked, so give clear guidance
-                    const tenantConfig = await getTenantConfig(organizationId);
-                    if (isTimeTravelMode) {
-                        await sendTextMessage(user.phone, language === 'WOLOF'
-                            ? `✅ Tànkâr ! Sa tôntu Jour ${currentDay} def na nu ci kos. Dànga dem ci Jour ${realCurrentDay || currentDay} — tôntu ci sén exercice ngir dem ci kanam.`
-                            : `✅ Enregistré ! Ta réponse du Jour ${currentDay} a été sauvegardée. Tu es toujours au Jour ${realCurrentDay || currentDay} — réponds à son exercice pour continuer 📅`,
-                            tenantConfig
-                        );
-                    } else {
-                        await sendTextMessage(user.phone, language === 'WOLOF'
-                            ? "Baax na ! Yónnee *SUITE* ngir dem ci kanam."
-                            : "Bravo ! Envoyez *SUITE* pour passer à la leçon suivante.",
-                            tenantConfig
-                        );
-                    }
-                }
-            }
-        }
-        else if (job.name === 'send-nudge') {
-            const { userId, type, organizationId } = job.data;
-            const user = await prisma.user.findUnique({ where: { id: userId } });
-            const tenantConfig = await getTenantConfig(organizationId);
-            if (!user?.phone) return;
-
-            const isWolof = user.language === 'WOLOF';
+    const organizationId = job.data.organizationId || 'default-org-id';
 
-            const messages = {
-                ENCOURAGEMENT: isWolof
-                    ? "Assalamuyalaykum ! Fatte wuñu sa mbir. Tontu bu gatt ngir wéy ? 💪"
-                    : "Coucou ! On n'a pas oublié ton projet. Une petite réponse pour continuer ? 💪",
-                RESURRECTION: isWolof
-                    ? "Sa liggeey mu ngi lay xaar ! Am succès dafa laaj lëkkalë. Ñu tàmbaleeti ? 🚀"
-                    : "Ton business t'attend ! Le succès vient de la régularité. On s'y remet ? 🚀"
-            };
+    return runWithTenant(organizationId, async () => {
+        logger.info(`[WORKER] Processing job: ${job.name} (${job.id}) for Org: ${organizationId}`);
 
-            const nudgeType = (type || 'ENCOURAGEMENT') as keyof typeof messages;
-            const text = messages[nudgeType] || messages.ENCOURAGEMENT;
-            await sendTextMessage(user.phone, text, tenantConfig);
-            logger.info(`[WORKER] Nudge ${nudgeType} sent to ${user.phone}`);
-        }
-        else if (job.name === 'send-interactive-buttons') {
-            const { userId, bodyText, buttons, organizationId } = job.data;
-            const user = await prisma.user.findUnique({ where: { id: userId } });
-            const tenantConfig = await getTenantConfig(organizationId || 'default-org-id');
-            if (user?.phone) {
-                await sendInteractiveButtonMessage(user.phone, bodyText || '', buttons || [], undefined, tenantConfig);
-            }
-        }
-        else if (job.name === 'send-interactive-list') {
-            const { userId, headerText, bodyText, buttonLabel, sections, organizationId } = job.data;
-            const user = await prisma.user.findUnique({ where: { id: userId } });
-            const tenantConfig = await getTenantConfig(organizationId || 'default-org-id');
-            if (user?.phone) {
-                await sendInteractiveListMessage(user.phone, headerText || '', bodyText || '', buttonLabel || '', sections || [], undefined, tenantConfig);
-            }
-        }
-        else if (job.name === 'enroll-user') {
-            const { userId, trackId, organizationId } = job.data;
-
-            const track = await prisma.track.findUnique({ where: { id: trackId } });
-            if (!track) {
-                logger.error(`[WORKER] Enrollment failed: Track ${trackId} not found.`);
-                return;
-            }
-
-            if (track.isPremium) {
-                logger.info(`[WORKER] User ${userId} requested Premium Track ${trackId}. Generating Payment Link...`);
-                try {
-                    const AI_API_BASE_URL = getApiUrl();
-                    const apiKey = getAdminApiKey();
-                    const checkoutRes = await fetch(`${AI_API_BASE_URL.replace(/\/$/, "")}/v1/payments/checkout`, {
-                        method: 'POST',
-                        headers: {
-                            'Content-Type': 'application/json',
-                            'Authorization': `Bearer ${apiKey}`
-                        },
-                        body: JSON.stringify({ userId, trackId })
-                    });
-
-                    const checkoutData = await checkoutRes.json() as any;
-                    if (checkoutRes.ok && checkoutData.url) {
-                        const user = await prisma.user.findUnique({ where: { id: userId } });
-                        if (user?.phone) {
-                            const tenantConfig = await getTenantConfig(organizationId);
-                            await sendTextMessage(
-                                user.phone,
-                                `💳 Cette formation est Premium. Complétez votre paiement ici :\n${checkoutData.url}`,
-                                tenantConfig
-                            );
-                        }
-                    } else {
-                        logger.error('[WORKER] Failed to get checkout URL', checkoutData);
-                    }
-                } catch (err) {
-                    logger.error('[WORKER] Error calling checkout endpoint', err);
-                }
+        try {
+            const handler = handlers[job.name];
+            if (handler) {
+                await handler.handle(job, connection);
             } else {
-                logger.info(`[WORKER] Enrolling User ${userId} in Free Track ${trackId}...`);
-                const existing = await prisma.enrollment.findFirst({ where: { userId, trackId } });
-                if (!existing) {
-                    await prisma.enrollment.create({
-                        data: { 
-                            userId: userId || '', 
-                            trackId: trackId || '', 
-                            status: 'ACTIVE', 
-                            currentDay: 1, 
-                            organizationId: organizationId || 'default-org-id' 
-                        } as any
-                    });
-                    const user = await prisma.user.findUnique({ where: { id: userId } });
-                    if (user?.phone) {
-                        const tenantConfig = await getTenantConfig(organizationId);
-                        await sendTextMessage(
-                            user.phone,
-                            `🎉 Bienvenue dans *${track.title}* ! La génération de votre cours personnalisé (Jour 1) a commencé. Cela prendra environ 30 secondes...`,
-                            tenantConfig
-                        );
-
-                        // Immediately trigger Day 1 content generation
-                        const whatsappQueue = new Queue('whatsapp-queue', { connection: connection as any });
-                        await whatsappQueue.add('send-content', {
-                            userId,
-                            trackId,
-                            dayNumber: 1,
-                            organizationId
-                        });
-                    }
-                }
-            }
-        }
-        else if (job.name === 'download-media') {
-            const { mediaId, mimeType, phone, organizationId } = job.data;
-            if (!mediaId || !phone) {
-                logger.error(`[WORKER] Missing data for download-media: mediaId=${mediaId}, phone=${phone}`);
-                return;
-            }
-            const tenantConfig = await getTenantConfig(organizationId);
-            const traceId = `[STT-FLOW-${phone.slice(-4)}]`;
-            
-            // Prioritize the live environment variable if available
-            const accessToken = process.env.WHATSAPP_ACCESS_TOKEN || tenantConfig?.accessToken;
-
-            if (!accessToken) {
-                logger.error(`[WORKER] Missing WhatsApp Access Token for media ${mediaId} (Org: ${organizationId})`);
-                return;
-            }
-
-            let transcribedText = '';
-            let audioUrl = '';
-            try {
-                const { buffer } = await downloadMedia(mediaId, accessToken);
-                logger.info(`${traceId} Downloaded file size=${buffer.length} contentType=${mimeType}`);
-
-                const AI_API_BASE_URL = getApiUrl();
-                const apiKey = getAdminApiKey();
-
-                // ─── Hardening: Store audio on R2 via the API ─────────
-                try {
-                    const storeRes = await fetch(`${AI_API_BASE_URL.replace(/\/$/, "")}/v1/ai/store-audio`, {
-                        method: 'POST',
-                        headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${apiKey}` },
-                        body: JSON.stringify({ audioBase64: buffer.toString('base64'), mimeType, phone })
-                    });
-                    if (storeRes.ok) {
-                        const storeData = await storeRes.json() as any;
-                        if (storeData.url) {
-                            audioUrl = storeData.url;
-                            logger.info(`[R2] Inbound audio uploaded: ${audioUrl}`);
-                        }
-                    }
-                } catch (err: unknown) {
-                    logger.error('[WORKER] store-audio failed (inbound audio will not have a permanent link):', (err instanceof Error ? err.message : String(err)));
-                }
-
-                // ─── Hardening: Record Inbound Message in DB ──────────
-                const user = await prisma.user.findFirst({ where: { phone } });
-                if (user) {
-                    try {
-                        await prisma.message.create({
-                            data: {
-                                userId: user.id,
-                                direction: 'INBOUND',
-                                channel: 'WHATSAPP',
-                                mediaUrl: audioUrl || null,
-                                payload: job.data as any,
-                                organizationId: organizationId || user.organizationId
-                            }
-                        });
-                        logger.info(`[DB] Recorded inbound audio message for ${phone}`);
-                    } catch (dbErr: unknown) {
-                        logger.error('[DB] Failed to record inbound message:', (dbErr as Error).message);
-                    }
-                }
-
-                // ─── Routing: Transcribe if Audio, Forward if Image ─────────
-                if (mimeType?.startsWith('audio/')) {
-                    logger.info(`${traceId} Transcribe start calling ${AI_API_BASE_URL.replace(/\/$/, "")}/v1/ai/transcribe`);
-                const fileExtension = mimeType?.includes('mp4') ? 'mp4' : 'ogg';
-                const filename = `msg.${fileExtension}`;
-                const transcribeRes = await fetch(`${AI_API_BASE_URL.replace(/\/$/, "")}/v1/ai/transcribe`, {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${apiKey}` },
-                    body: JSON.stringify({
-                        audioBase64: buffer.toString('base64'),
-                        filename,
-                        language: user?.language 
-                    })
-                });
-
-                if (transcribeRes.ok) {
-                    const data = await transcribeRes.json() as any;
-                    const isSuspect = data.isSuspect || false;
-                    const confidence = data.confidence || 0;
-                    transcribedText = data.text || '';
-
-                    const user = await prisma.user.findFirst({ where: { phone } });
-
-                    // 🌍 Normalisation Wolof STT v2.0 🌍
-                    if (user?.language === 'WOLOF') {
-                        const originalText = transcribedText;
-                        const normResult = normalizeWolof(transcribedText);
-                        transcribedText = normResult.normalizedText;
-
-                        // Output correction feedback
-                        logger.info(`[STT] Normalized: "${originalText}" -> "${transcribedText}"`);
-
-                        // Soft Feedback UI
-                        await sendTextMessage(phone, `Ma dégg na: "${transcribedText}" ✅\n(Confiance STT: ${confidence}%)`, tenantConfig);
-                        if (normResult.changes.length > 0) {
-                            const limitedChanges = normResult.changes.slice(0, 2).join(", ");
-                            await sendTextMessage(phone, `Nataal bu gën: ${limitedChanges}`, tenantConfig);
-                        }
-
-                        // 🚨 Wolof Auto-Validation Logic (Target: > 40%) 🚨
-                        const isTooShort = transcribedText.split(/\s+/).length < 4;
-                        if (confidence <= 40 || isTooShort) {
-                            logger.info(`[STT] Whisper Confidence (${confidence}%) <= 40 or isTooShort (${isTooShort}). Intercepting WOLOF audio for User ${user.id}. Shifting to PENDING_REVIEW.`);
-
-                            // First, make sure there is an active enrollment to find the trackId
-                            const activeEnrollment = await prisma.enrollment.findFirst({
-                                where: { userId: user.id, status: 'ACTIVE' },
-                                include: { track: true }
-                            });
-
-                            if (activeEnrollment) {
-                                // 🚨 Brique 4 (Routage Deep Dive) : On ne bloque pas les audios itératifs
-                                const currentProgress = await prisma.userProgress.findUnique({
-                                    where: { userId_trackId: { userId: user.id, trackId: activeEnrollment.trackId } }
-                                });
-
-                                if (currentProgress?.exerciseStatus !== 'PENDING_DEEPDIVE') {
-                                    await prisma.userProgress.upsert({
-                                        where: { userId_trackId: { userId: user.id, trackId: activeEnrollment.trackId } },
-                                        update: { exerciseStatus: 'PENDING_REVIEW' as any, adminTranscription: transcribedText, confidenceScore: confidence },
-                                        create: { userId: user.id, trackId: activeEnrollment.trackId, exerciseStatus: 'PENDING_REVIEW' as any, adminTranscription: transcribedText, confidenceScore: confidence }
-                                    });
-                                    const tenantConfig = await getTenantConfig(organizationId);
-                                    await sendTextMessage(phone, "🎙️ Nyangi jaxas sa kàddu. Xamle dina la tontu ci kanam ! (En cours d'analyse par l'équipe)", tenantConfig);
-
-                                    // Still save the audio URL to the message for the admin to read!
-                                    await prisma.message.updateMany({
-                                        where: { userId: user.id, direction: 'INBOUND', mediaUrl: audioUrl },
-                                        data: { content: transcribedText }
-                                    }).catch(() => { });
-
-                                    return; // Stop here, WAIT FOR ADMIN OVERRIDE
-                                }
-                            } else {
-                                // Edge case: not enrolled but sent audio...
-                                const tenantConfig = await getTenantConfig(organizationId);
-                                await sendTextMessage(phone, "Dama jaxaso ci li nga wax... Mën nga ko waxaat ndànk ?", tenantConfig);
-                                return;
-                            }
-                        }
-
-                        logger.info(`[STT] transcribe result="${transcribedText.substring(0, 80)}" (suspect=${isSuspect}, confidence=${confidence}%)`);
-
-                        // 🌟 STT Hardening: Handle suspect transcription 🌟
-                        if (isSuspect && user) {
-                            const fallbackMsg = user.language === 'WOLOF'
-                                ? "Dama jaxaso ci li nga wax... Mën nga ko waxaat ndànk ? (10-15s)"
-                                : "Je n'ai pas bien compris ton vocal. Pourrais-tu le renvoyer en parlant bien distinctement ? (10-15s)";
-                            await sendTextMessage(phone, fallbackMsg);
-                            return; // Stop here, don't trigger AI generator
-                        }
-
-                        // Send an immediate confirmation to the user that the audio was understood
-                        if (user && transcribedText) {
-                            const confirmationText = `J'ai compris :\n"${transcribedText}"`;
-                            await sendTextMessage(phone, confirmationText);
-
-                            // Update the message record with transcribed text if found
-                            await prisma.message.updateMany({
-                                where: { userId: user.id, direction: 'INBOUND', mediaUrl: audioUrl },
-                                data: { content: transcribedText }
-                            }).catch(() => { });
-                        }
-                    } // end WOLOF block
-
-                    // 🇫🇷 FR users: send confirmation (WOLOF users already got theirs above)
-                    if (user?.language !== 'WOLOF' && user && transcribedText) {
-                        logger.info(`[STT] transcribe result="${transcribedText.substring(0, 80)}" (suspect=${isSuspect}, confidence=${confidence}%)`);
-
-                        if (isSuspect) {
-                            await sendTextMessage(phone, "Je n'ai pas bien compris ton vocal. Pourrais-tu le renvoyer en parlant bien distinctement ? (10-15s)", tenantConfig);
-                            return;
-                        }
-
-                        await sendTextMessage(phone, `🎙️ J'ai compris : "${transcribedText}"`, tenantConfig);
-                        await prisma.message.updateMany({
-                            where: { userId: user!.id, direction: 'INBOUND', mediaUrl: audioUrl },
-                            data: { content: transcribedText }
-                        }).catch(() => { });
-                    }
-
-                    // Process the transcribed text as a normal incoming message via API
-                    // ─── Routing: Process transcribed text ─────────
-                    if (transcribedText) {
-                        const traceId = `[STT-FLOW-${phone.slice(-4)}]`;
-                        logger.info(`${traceId} Processing transcribed text via WhatsAppLogic...`);
-                        await WhatsAppLogic.handleIncomingMessage(phone, transcribedText, audioUrl, undefined, organizationId);
-                        logger.info(`${traceId} Inbound audio processing complete.`);
-                    }
-                } else if (transcribeRes.status === 429) {
-                    // OpenAI quota exceeded — send fallback and do NOT requeue
-                    logger.warn(`[WORKER] 429 Error during transcription`);
-                    const user = await prisma.user.findFirst({ where: { phone } });
-                    if (user) {
-                        await sendTextMessage(phone, user.language === 'WOLOF'
-                            ? "⚠️ Mënuma dégg sa kàddu léegi (réseau bi dafa fees). Yónnee sa tontu ci bind (texte)."
-                            : "⚠️ Le service audio est temporairement saturé. Envoie ta réponse en texte.",
-                            tenantConfig
-                        );
-                    }
-                    return; // Stop processing
-                } else {
-                    const errText = await transcribeRes.text().catch(() => `HTTP ${transcribeRes.status}`);
-                    logger.error(`[WORKER] /v1/ai/transcribe failed with HTTP ${transcribeRes.status}: ${errText}`);
-                    throw new Error(`Transcription failed HTTP ${transcribeRes.status}`); // throw so BullMQ retries
-                }
-            } else if (mimeType?.startsWith('image/')) {
-                // 📸 IMAGE-FLOW: Build imageUrl from the R2 store result (same pattern as audioUrl for audio)
-                let imageUrl = '';
-                try {
-                    const storeImgRes = await fetch(`${AI_API_BASE_URL.replace(/\/$/, '')}/v1/ai/store-audio`, {
-                        method: 'POST',
-                        headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${apiKey}` },
-                        body: JSON.stringify({ audioBase64: buffer.toString('base64'), mimeType, phone })
-                    });
-                    if (storeImgRes.ok) {
-                        const storeImgData = await storeImgRes.json() as any;
-                        if (storeImgData.url) {
-                            imageUrl = storeImgData.url;
-                            logger.info(`[IMAGE-FLOW] ✅ Image uploaded to R2: ${imageUrl}`);
-                        }
-                    }
-                } catch (imgStoreErr: unknown) {
-                    logger.error('[IMAGE-FLOW] R2 store failed (image will be analyzed without permanent URL):', (imgStoreErr as Error).message);
-                }
-
-                logger.info(`[IMAGE-FLOW] 📸 Image detected for ${phone}. Routing to WhatsAppLogic (imageUrl: ${imageUrl || audioUrl || 'none'})...`);
-                // Fallback: si imageUrl (upload #2) échoue, utiliser audioUrl (upload #1, même buffer, déjà réussi)
-                const finalImageUrl = imageUrl || audioUrl || undefined;
-                await WhatsAppLogic.handleIncomingMessage(phone, job.data.caption || 'Image reçue', undefined, finalImageUrl, organizationId);
-                logger.info(`[IMAGE-FLOW] ✅ Inbound image processing complete.`);
-            }
-        } catch (err: unknown) {
-            logger.error(`[WORKER] download-media failed:`, err);
-        }
-    }
-        else if (job.name === 'send-image') {
-            const { to, imageUrl, caption, organizationId } = job.data;
-            if (!to || !imageUrl) return;
-            const tenantConfig = await getTenantConfig(organizationId || 'default-org-id');
-            try {
-                const { sendImageMessage } = await import('./whatsapp-cloud');
-                await sendImageMessage(to, imageUrl, caption || '', tenantConfig);
-                logger.info(`[WhatsApp] ✅ Image message sent to ${to}`);
-            } catch (err: unknown) {
-                logger.error(`[WORKER] send-image failed:`, (err instanceof Error ? err.message : String(err)));
-            }
-        }
-        else if (job.name === 'send-content') {
-            const { userId, trackId, dayNumber, organizationId } = job.data;
-            if (!userId || !trackId || !dayNumber || !organizationId) {
-                logger.error(`[WORKER] Missing data for send-content: userId=${userId}, trackId=${trackId}, dayNumber=${dayNumber}`);
-                return;
-            }
-
-            const user = await prisma.user.findUnique({ where: { id: userId } });
-            const trackDay = await prisma.trackDay.findFirst({
-                where: { trackId, dayNumber }
+                logger.warn(`[WORKER] No handler found for job name: ${job.name}`);
+            }
+        } catch (err) {
+            reportError(err, {
+                jobId: job.id,
+                jobName: job.name,
+                organizationId,
+                userId: job.data.userId || 'unknown'
             });
-
-            if (trackDay) {
-                await sendLessonDay(userId, trackId, dayNumber, organizationId, {
-                    skipProgressUpdate: job.data.skipProgressUpdate === true
-                });
-
-                // 🕰️ TIME-TRAVEL GUARD: Only update currentDay if this is NOT a historical replay
-                if (!job.data.skipProgressUpdate) {
-                    await prisma.enrollment.updateMany({
-                        where: { userId, trackId },
-                        data: {
-                            currentDay: dayNumber,
-                            lastActivityAt: new Date()
-                        }
-                    });
-                } else {
-                    // Read-only replay: only touch lastActivityAt to keep heartbeat alive
-                    await prisma.enrollment.updateMany({
-                        where: { userId, trackId },
-                        data: { lastActivityAt: new Date() }
-                    });
-                    logger.info(`[SEND-CONTENT] 🕰️ Replay Day ${dayNumber} sent read-only. currentDay unchanged.`);
-                }
-            } else {
-                logger.info(`[WORKER] No more content for Track ${trackId} Day ${dayNumber}. Marking enrollment as completed.`);
-                await prisma.enrollment.updateMany({
-                    where: { userId, trackId },
-                    data: {
-                        status: 'COMPLETED',
-                        lastActivityAt: new Date()
-                    }
-                });
-
-                // 🎓 Graduation Flow: Successive Track Unlocking (v1.0) 🎓
-                if (trackId.match(/^T(\d)-(FR|WO)$/)) {
-                    const trackMatch = trackId.match(/^T(\d)-(FR|WO)$/);
-                    if (trackMatch) {
-                        const currentLevel = parseInt(trackMatch[1]);
-                        const lang = trackMatch[2];
-                        const nextLevel = currentLevel + 1;
-                        const nextTrackId = `T${nextLevel}-${lang}`;
-
-                        const nextTrack = await prisma.track.findUnique({ where: { id: nextTrackId } });
-                        if (nextTrack) {
-                            const existingNextEnrollment = await prisma.enrollment.findFirst({
-                                where: { userId, trackId: nextTrackId }
-                            });
-
-                            if (!existingNextEnrollment) {
-                                logger.info(`[WORKER] Auto-graduating User ${userId}: ${trackId} -> ${nextTrackId}`);
-                                const isWolof = lang === 'WO';
-
-                                const congratsMsg = isWolof
-                                    ? `🎉 Baraka Allahu fik ! Mat nga Niveau ${currentLevel}. Maangi lay tàmbaleel Niveau ${nextLevel} : *${nextTrack.title}*...`
-                                    : `🎉 Félicitations ! Vous avez validé le Niveau ${currentLevel}. Je vous inscris immédiatement au Niveau ${nextLevel} : *${nextTrack.title}*...`;
-
-                                if (user?.phone) {
-                                    const tenantConfig = await getTenantConfig(user.organizationId);
-                                    await sendTextMessage(user.phone, congratsMsg, tenantConfig);
-
-                                    if (!nextTrack.isPremium) {
-                                        await prisma.enrollment.create({
-                                            data: { 
-                                                userId: userId, 
-                                                trackId: nextTrackId, 
-                                                status: 'ACTIVE', 
-                                                currentDay: 1,
-                                                organizationId: user.organizationId
-                                            }
-                                        });
-                                        // Trigger Day 1 for next track with 10s delay
-                                        const q = new Queue('whatsapp-queue', { connection: connection as any });
-                                        await q.add('send-content', { 
-                                            userId, 
-                                            trackId: nextTrackId, 
-                                            dayNumber: 1,
-                                            organizationId: user.organizationId
-                                        }, { delay: 10000 });
-                                    } else {
-                                        const payMsg = isWolof
-                                            ? `💳 Niveau ${nextLevel} bi dafa laaj pass. Yónnee ma "PAYER" ngir tàmbaleeti.`
-                                            : `💳 Le Niveau ${nextLevel} est un module Premium. Envoyez "PAYER" pour le débloquer et continuer votre ascension !`;
-                                        const tenantConfig = await getTenantConfig(user.organizationId);
-                                        await sendTextMessage(user.phone, payMsg, tenantConfig);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                // 🌟 Trigger AI Document Generation 🌟
-                logger.info(`[WORKER] Triggering AI Document Generation for User ${userId}...`);
-                try {
-                    const userWithProfile = await prisma.user.findUnique({
-                        where: { id: userId },
-                        include: { businessProfile: true }
-                    }) as any;
-
-                    const isWolof = userWithProfile?.language === 'WOLOF';
-                    const userLangPrefix = isWolof ? "MBIR : " : "ACTIVITÉ : ";
-
-                    // Localize context to avoid English bias in LLM
-                    const userContext = `${userLangPrefix} ${userWithProfile?.businessProfile?.activityLabel || userWithProfile?.activity || 'Inconnue'}. Cet entrepreneur a terminé son parcours de formation XAMLÉ. Génère les documents basés sur son activité et les concepts appris.`;
-
-                    const AI_API_BASE_URL = getApiUrl();
-                    const apiKey = getAdminApiKey();
-                    const authHeaders = {
-                        'Content-Type': 'application/json',
-                        'Authorization': `Bearer ${apiKey}`
-                    };
-
-                    logger.info(`[WORKER] Calling ${AI_API_BASE_URL.replace(/\/$/, "")}/v1/ai/onepager (${userWithProfile?.language || 'FR'})...`);
-                    const opRes = await fetch(`${AI_API_BASE_URL.replace(/\/$/, "")}/v1/ai/onepager`, {
-                        method: 'POST',
-                        headers: authHeaders,
-                        body: JSON.stringify({
-                            userContext,
-                            language: userWithProfile?.language || 'FR',
-                            businessProfile: userWithProfile?.businessProfile
-                        })
-                    });
-                    const pdfData = await opRes.json() as any;
-
-                    logger.info(`[WORKER] Calling ${AI_API_BASE_URL.replace(/\/$/, "")}/v1/ai/deck (${userWithProfile?.language || 'FR'})...`);
-                    const deckRes = await fetch(`${AI_API_BASE_URL.replace(/\/$/, "")}/v1/ai/deck`, {
-                        method: 'POST',
-                        headers: authHeaders,
-                        body: JSON.stringify({
-                            userContext,
-                            language: userWithProfile?.language || 'FR',
-                            businessProfile: userWithProfile?.businessProfile
-                        })
-                    });
-                    const pptxData = await deckRes.json() as any;
-
-                    logger.info(`[AI DOCS READY] 📄 PDF: ${pdfData.url}`);
-                    logger.info(`[AI DOCS READY] 📊 PPTX: ${pptxData.url}`);
-
-                    // Send documents to user via WhatsApp
-                    if (user?.phone) {
-                        const tenantConfig = await getTenantConfig(userWithProfile?.organizationId);
-                        if (pdfData.url) {
-                            await sendDocumentMessage(
-                                user.phone,
-                                pdfData.url,
-                                isWolof ? 'one-pager-xamle.pdf' : 'mon-business-plan.pdf',
-                                isWolof ? '📄 Sa One-Pager mu ngi nii !' : '📄 Votre One-Pager est prêt !',
-                                tenantConfig
-                            );
-                        }
-                        if (pptxData.url) {
-                            await sendDocumentMessage(
-                                user.phone,
-                                pptxData.url,
-                                isWolof ? 'pitch-deck-xamle.pptx' : 'mon-pitch-deck.pptx',
-                                isWolof ? '📊 Sa Pitch Deck mu ngi nii !' : '📊 Votre Pitch Deck est prêt !',
-                                tenantConfig
-                            );
-                        }
-
-                        // 🚨 Track AI source for documents via Response table
-                        await prisma.response.create({
-                            data: {
-                                userId: userId,
-                                enrollmentId: userWithProfile?.enrollments?.[0]?.id || '',
-                                dayNumber: (dayNumber || 1) + 1, // Indicate graduation/end of track
-                                content: `AI Documents Generated. PDF: ${(pdfData as any)?.aiSource || '?'}, PPTX: ${(pptxData as any)?.aiSource || '?'}`,
-                                aiSource: 'SYSTEM',
-                                organizationId: organizationId || 'default-org-id'
-                            }
-                        }).catch(() => { });
-                    }
-                } catch (aiError) {
-                    logger.error('[WORKER] Failed to generate AI documents:', aiError);
-                }
-            }
-        }
-        else if (job.name === 'send-admin-audio-override') {
-            const { userId, trackId, overrideAudioUrl, adminId, organizationId } = job.data;
-            if (!userId || !overrideAudioUrl) return;
-            const user = await prisma.user.findUnique({ where: { id: userId } });
-            const tenantConfig = await getTenantConfig(organizationId);
-
-            if (user?.phone) {
-                // 1. Send the Admin's Voice Message
-                const { sendAudioMessage } = await import('./whatsapp-cloud');
-                await sendAudioMessage(user.phone, overrideAudioUrl, tenantConfig);
-
-                // 2. Send transition prompt
-                await sendTextMessage(user.phone,
-                    user.language === 'WOLOF'
-                        ? "Baax na ! Yónnee *SUITE* ngir dem ci kanam."
-                        : "Bravo ! Envoyez *SUITE* pour passer à la leçon suivante.",
-                    tenantConfig
-                );
-
-                logger.info(`[WORKER] Admin ${adminId} Audio Overdrive sent to User ${userId}.`);
-
-                // 3. Record the override as a response
-                await prisma.response.create({
-                    data: {
-                        userId: userId,
-                        enrollmentId: (await prisma.enrollment.findFirst({ where: { userId, trackId, status: 'ACTIVE' } }))?.id || '',
-                        dayNumber: (await prisma.enrollment.findFirst({ where: { userId, trackId, status: 'ACTIVE' } }))?.currentDay || 0,
-                        content: `[AUDIO_OVERRIDE] ${overrideAudioUrl}`,
-                        aiSource: `ADMIN_OVERRIDE:${adminId || 'unknown'}`,
-                        organizationId: organizationId || user.organizationId
-                    }
-                });
-
-                // 3. Increment the logic via Queue so that user doesn't fall behind.
-                const enrollment = await prisma.enrollment.findFirst({
-                    where: { userId, trackId, status: 'ACTIVE' }
-                });
-
-                if (enrollment) {
-                    const nextDay = Math.floor(enrollment.currentDay) + 1;
-                    const q = new Queue('whatsapp-queue', { connection: connection as any });
-                    await q.add('send-content', { userId, trackId, dayNumber: nextDay }, { delay: 2000 });
-                }
-            }
+            throw err;
         }
-    } catch (err) {
-        reportError(err, {
-            jobId: job.id,
-            jobName: job.name,
-            organizationId: job.data.organizationId || 'unknown',
-            userId: job.data.userId || 'unknown'
-        });
-        throw err;
-    }
-}, { connection: connection as any });
+    });
+}, { 
+    connection: connection as any,
+    concurrency: parseInt(process.env.WORKER_CONCURRENCY || '5')
+});
 
-logger.info('WhatsApp Worker started...');
+logger.info('🚀 WhatsApp Worker started (Modular Mode)...');
 
-// 🚀 Start the daily cron scheduler
+// Start the daily cron scheduler
 import { startDailyScheduler } from './scheduler';
 startDailyScheduler();
 
@@ -1166,5 +88,5 @@ worker.on('completed', job => {
 });
 
 worker.on('failed', (job, err) => {
-    logger.error(`[WORKER] Job ${job?.id} has failed with ${(err instanceof Error ? err.message : String(err))}`);
+    logger.error(`[WORKER] Job ${job?.id} failed: ${err.message}`);
 });

apps/whatsapp-worker/src/logger.ts

@@ -1,4 +1,5 @@
 import pino from 'pino';
+import { getOrganizationId } from '@repo/database';
 
 const pinoLogger = pino({
   level: process.env.LOG_LEVEL || 'info',
@@ -12,38 +13,47 @@ const pinoLogger = pino({
   } : undefined
 });
 
+function getEnrichedObject(obj: any = {}) {
+    const organizationId = getOrganizationId();
+    if (organizationId) {
+        return { ...obj, organizationId };
+    }
+    return obj;
+}
+
 export const logger = {
     info: (first: any, ...rest: any[]) => {
+        const orgId = getOrganizationId();
         if (typeof first === 'string') {
-            pinoLogger.info(first, ...rest);
+            pinoLogger.info(orgId ? { organizationId: orgId } : {}, first, ...rest);
         } else {
-            pinoLogger.info(first, rest[0] || '', ...rest.slice(1));
+            pinoLogger.info(getEnrichedObject(first), rest[0] || '', ...rest.slice(1));
         }
     },
     error: (first: any, ...rest: any[]) => {
+        const orgId = getOrganizationId();
         if (first instanceof Error) {
-            pinoLogger.error(first, rest[0] || first.message, ...rest.slice(1));
+            pinoLogger.error(getEnrichedObject({ err: first }), rest[0] || first.message, ...rest.slice(1));
         } else if (typeof first === 'string') {
-            pinoLogger.error(first, ...rest);
+            pinoLogger.error(orgId ? { organizationId: orgId } : {}, first, ...rest);
         } else {
-            pinoLogger.error(first, rest[0] || '', ...rest.slice(1));
+            pinoLogger.error(getEnrichedObject(first), rest[0] || '', ...rest.slice(1));
         }
     },
     warn: (first: any, ...rest: any[]) => {
+        const orgId = getOrganizationId();
         if (typeof first === 'string') {
-            pinoLogger.warn(first, ...rest);
+            pinoLogger.warn(orgId ? { organizationId: orgId } : {}, first, ...rest);
         } else {
-            pinoLogger.warn(first, rest[0] || '', ...rest.slice(1));
+            pinoLogger.warn(getEnrichedObject(first), rest[0] || '', ...rest.slice(1));
         }
     },
     debug: (first: any, ...rest: any[]) => {
+        const orgId = getOrganizationId();
         if (typeof first === 'string') {
-            pinoLogger.debug(first, ...rest);
+            pinoLogger.debug(orgId ? { organizationId: orgId } : {}, first, ...rest);
         } else {
-            pinoLogger.debug(first, rest[0] || '', ...rest.slice(1));
+            pinoLogger.debug(getEnrichedObject(first), rest[0] || '', ...rest.slice(1));
         }
     },
 };
-
-
-

apps/whatsapp-worker/src/normalizeWolof.ts

@@ -60,6 +60,12 @@ const NORMALIZATION_RULES: Record<string, string> = {
     "borom": "boroom",
     "xaalisou": "xaalis",
     "xaliss": "xaalis",
+    "xamle": "Xamlé",
+    "xalme": "Xamlé",
+    "waaw": "waaw",
+    "waaww": "waaw",
+    "deet": "déet",
+    "deet-deet": "déet",
 };
 
 const CAPITALIZED_PLACES = ["Yoff", "Dakar", "Pikine", "Guédiawaye"];
@@ -115,6 +121,9 @@ export function normalizeWolof(rawText: string): NormalizationResult {
     // jaay (vendre), jënd (acheter), fey (payer), denc (épargner), lim (compter)
     // These are already in NORMALIZATION_RULES.
 
+    // Handle repeated vowels (e.g., waaaaw -> waaw)
+    normalizedText = normalizedText.replace(/(a|e|i|o|u)\1{2,}/gi, "$1$1");
+
     return { normalizedText, changes: Array.from(new Set(changes)) };
 }
 

apps/whatsapp-worker/src/pedagogy.ts

@@ -1,37 +1,30 @@
-import { logger } from './logger';
 import { prisma } from './services/prisma';
-import { sendTextMessage, sendAudioMessage, sendInteractiveButtonMessage, sendInteractiveListMessage, sendImageMessage, sendVideoMessage } from './whatsapp-cloud';
-
-import { requireHttpUrl, getAdminApiKey, isFeatureEnabled } from './config';
+import { sendTextMessage, sendAudioMessage, sendInteractiveButtonMessage, sendImageMessage, sendVideoMessage } from './whatsapp-cloud';
+import { isFeatureEnabled } from './config';
 import { shortenForWhatsApp } from './normalizeWolof';
-import { ButtonsJson, MultilangContent } from './handlers/types';
+import { ButtonsJson } from './handlers/types';
 import { castJson } from '@repo/shared-types';
-
-
+import { AIPedagogyService } from './services/ai-pedagogy';
 
 const BADGE_EMOJIS: Record<string, string> = {
-    "CLARTÉ": "🏅",
-    "CONFIANCE": "🌟",
-    "CLIENT": "👥",
-    "OFFRE": "📦",
-    "PITCH": "🎙️"
+    "CLARTÉ": "🏅", "CONFIANCE": "🌟", "CLIENT": "👥", "OFFRE": "📦", "PITCH": "🎙️"
 };
 
-interface TtsResponse {
-    url: string;
-}
-
-interface PersonalizeResponse {
-    text: string;
-}
-
 function generateProgressBar(current: number, total: number): string {
     const size = 10;
     const progress = Math.min(Math.max(Math.round((current / total) * size), 0), size);
-    const empty = size - progress;
-    const bar = '█'.repeat(progress) + '░'.repeat(empty);
-    const percentage = Math.round((current / total) * 100);
-    return `[${bar}] ${percentage}%`;
+    const bar = '█'.repeat(progress) + '░'.repeat(size - progress);
+    return `[${bar}] ${Math.round((current / total) * 100)}%`;
+}
+
+function generateLessonHeader(isWolof: boolean, trackTitle: string, dayNumber: number, totalDays: number, badgeName?: string): string {
+    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`;
 }
 
 export async function sendLessonDay(
@@ -41,8 +34,6 @@ export async function sendLessonDay(
     organizationId: string,
     options?: { skipProgressUpdate?: boolean }
 ) {
-    logger.info(`[PEDAGOGY] Preparing Lesson Day ${dayNumber} for User ${userId}`);
-
     const user = await prisma.user.findUnique({
         where: { id: userId },
         include: {
@@ -51,390 +42,105 @@ export async function sendLessonDay(
             organization: { include: { phoneNumbers: true } }
         }
     });
-    if (!user || !user.phone) {
-        logger.error(`[PEDAGOGY] User ${userId} not found or has no phone number.`);
-        return;
-    }
 
+    if (!user || !user.phone) return;
     const isWolof = user.language === 'WOLOF';
     const activeEnrollment = user.enrollments[0];
-
     const tenantConfig = {
         accessToken: user.organization?.systemUserToken || '',
         phoneNumberId: user.organization?.phoneNumbers?.[0]?.id || ''
     };
-    const trackTitle = activeEnrollment?.track?.title || (isWolof ? 'XAMLÉ' : 'XAMLÉ (FR)');
 
-    // 🚨 COHÉRENCE CHECK: Prevent jumps > 1 point
-    const currentDay = activeEnrollment?.currentDay || 1;
-    if (dayNumber - currentDay > 1) {
-        logger.error(`[CRITICAL] Cohérence Error: User ${userId} attempting to jump from ${currentDay} to ${dayNumber} sans remédiation.`);
-        await sendTextMessage(user.phone, isWolof
-            ? "❌ Am na luy doxul ci sa njàng mi. Lëj-lëj la, dinañu ko lijjanti."
-            : "❌ Une erreur de synchronisation a été détectée sur ton parcours (Saut > 1). L'équipe technique a été notifiée.",
-            tenantConfig
-        );
-        return;
-    }
-
-    const trackDay = await prisma.trackDay.findFirst({
-        where: { trackId, dayNumber }
-    });
-
-    if (!trackDay) {
-        logger.error(`[PEDAGOGY] TrackDay not found for Track ${trackId} Day ${dayNumber}`);
-        return;
-    }
+    const trackDay = await prisma.trackDay.findFirst({ where: { trackId, dayNumber } });
+    if (!trackDay) return;
 
     let lessonText = trackDay.lessonText || '';
     let exercisePrompt = trackDay.exercisePrompt || '';
 
-    // 🌍 Parallel Multi-Lang Support v1.0 🌍
+    // Multi-lang content
     const buttonsJson = castJson<ButtonsJson>(trackDay.buttonsJson);
-    if (buttonsJson && buttonsJson.content) {
+    if (buttonsJson?.content && (buttonsJson.content as any)[user.language]) {
         const langContent = (buttonsJson.content as any)[user.language];
-        if (langContent) {
-            lessonText = langContent.lessonText || lessonText;
-            exercisePrompt = langContent.exercisePrompt || exercisePrompt;
-        }
+        lessonText = langContent.lessonText || lessonText;
+        exercisePrompt = langContent.exercisePrompt || exercisePrompt;
     }
 
-    // 🌟 Personalize Lesson Content 🌟
+    // AI Personalization
     if (user.activity && lessonText) {
-        try {
-            logger.info(`[PEDAGOGY] Personalizing lesson for User ${userId}'s activity: ${user.activity}`);
-
-            // Fetch previous responses to inform the lesson examples
-            const previousResponsesData = await prisma.response.findMany({
-                where: { userId: user.id, enrollmentId: activeEnrollment.id, organizationId },
-                orderBy: { dayNumber: 'asc' },
-                take: 5
-            });
-            const previousResponses = previousResponsesData.map(r => ({ day: r.dayNumber, response: r.content }));
-
-            const AI_API_BASE_URL = requireHttpUrl(process.env.AI_API_BASE_URL, 'AI_API_BASE_URL');
-            const apiKey = getAdminApiKey();
-            const personalizeRes = await fetch(`${AI_API_BASE_URL.replace(/\/$/, "")}/v1/ai/personalize-lesson`, {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                    'Authorization': `Bearer ${apiKey}`
-                },
-                body: JSON.stringify({
-                    lessonText,
-                    userActivity: user.activity,
-                    userLanguage: user.language,
-                    businessProfile: user.businessProfile,
-                    previousResponses,
-                    tenantPrompt: (user.organization as any)?.customPrompt,
-                    tenantBranding: (user.organization as any)?.brandingData
-                })
-            });
-
-            if (personalizeRes.ok) {
-                const personalizeData = await personalizeRes.json() as PersonalizeResponse;
-                if (personalizeData.text) {
-                    lessonText = personalizeData.text;
-                }
-            }
-        } catch (err) {
-            logger.error({ err }, '[PEDAGOGY] Failed to personalize lesson');
-        }
+        const previousResponses = await prisma.response.findMany({
+            where: { userId: user.id, enrollmentId: activeEnrollment.id, organizationId },
+            orderBy: { dayNumber: 'asc' },
+            take: 5
+        }).then(res => res.map(r => ({ day: r.dayNumber, response: r.content })));
+
+        lessonText = await AIPedagogyService.personalizeLesson({
+            lessonText,
+            userActivity: user.activity,
+            userLanguage: user.language,
+            businessProfile: user.businessProfile,
+            previousResponses,
+            tenantPrompt: (user.organization as any)?.customPrompt,
+            tenantBranding: (user.organization as any)?.brandingData,
+            organizationId
+        });
     }
 
-    // 🌟 Formatting: Add Header & Progress & Badges 🌟
+    // Formatting
     const totalDays = activeEnrollment?.track?.duration || 12;
-
-    const userProgress = await prisma.userProgress.findUnique({
-        where: { userId_trackId: { userId, trackId } }
-    });
-    
-    const progressBar = isFeatureEnabled('FEATURE_PROGRESS_BAR') ? `\n${generateProgressBar(dayNumber, totalDays)}` : '';
-
-    let badgeText = '';
+    const userProgress = await prisma.userProgress.findUnique({ where: { userId_trackId: { userId, trackId } } });
     const badges = (userProgress?.badges as string[]) || [];
-    let isVisible = false;
-
-    if (badges.length > 0) {
-        let lastBadge = badges[badges.length - 1];
-
-        // 🚨 REMEDIATION BADGE GUARD: Hide 'REPRISE' on normal integer days
-        if (lastBadge === 'REPRISE' && dayNumber % 1 === 0) {
-            const nonRepriseBadges = badges.filter(b => b !== 'REPRISE');
-            if (nonRepriseBadges.length > 0) {
-                lastBadge = nonRepriseBadges[nonRepriseBadges.length - 1];
-                badgeText = `\nBadge : ${lastBadge} ${BADGE_EMOJIS[lastBadge] || '🏅'}`;
-                isVisible = true;
-            }
-        } else {
-            badgeText = `\nBadge : ${lastBadge} ${BADGE_EMOJIS[lastBadge] || '🏅'}`;
-            isVisible = true;
-        }
-    }
+    const lastBadge = badges.length > 0 ? (badges[badges.length - 1] === 'REPRISE' && dayNumber % 1 === 0 ? badges[badges.length - 2] : badges[badges.length - 1]) : undefined;
 
-    logger.info(`[Badge Guard] Day: ${dayNumber} - Badge Visible: ${isVisible}`);
-
-    const dayDisplay = dayNumber === 1.5 ? '1bis' : Math.floor(dayNumber).toString();
-
-    const header = isWolof
-        ? `*${trackTitle}*\n*Bés ${dayDisplay}* 🗓️${progressBar}${badgeText}\n\n`
-        : `*${trackTitle}*\n*Jour ${dayDisplay}* 🗓️${progressBar}${badgeText}\n\n`;
-
-    lessonText = header + lessonText;
-
-    // 🌟 Visuals WoW: Send day video if available (Production Ready v2) 🌟
-    let imageAlreadySent = false;
+    lessonText = generateLessonHeader(isWolof, activeEnrollment?.track?.title || 'XAMLÉ', dayNumber, totalDays, lastBadge) + lessonText;
 
+    // Visuals Dispatch
     if (trackDay.videoUrl) {
-        const vUrl = trackDay.videoUrl;
-        const vCaption = trackDay.videoCaption || (isWolof ? "Xoolal vidéo bi !" : "Regarde cette vidéo !");
-
-        logger.info(`[VIDEO] Sending video day=${dayNumber} track=${trackId} url=${vUrl}`);
-
-        try {
-            await sendVideoMessage(user.phone, vUrl, vCaption, tenantConfig);
-            logger.info(`[VIDEO_OK] WhatsApp accepted video for ${user.phone}`);
-        } catch (vErr: unknown) {
-            logger.warn(`[VIDEO_FALLBACK] reason=${(vErr instanceof Error ? vErr.message : String(vErr))}. Sending image fallback for ${user.phone}`);
-
-            // Fallback: Image + Link + "Clique pour regarder"
-            const fallbackText = isWolof
-                ? `⚠️ Vidéo bi mënul neex léegi. Klikal fii ngir seeti ko :\n${vUrl}\n(Xoolal nataal bi ci suuf)`
-                : `⚠️ La vidéo ne peut pas être affichée directement. Clique ici pour la voir :\n${vUrl}\n(Regarde l'image ci-dessous)`;
-
-            await sendTextMessage(user.phone, fallbackText, tenantConfig);
-
-            if (trackDay.imageUrl) {
-                await sendImageMessage(user.phone, trackDay.imageUrl, undefined, tenantConfig);
-                imageAlreadySent = true;
-            } else {
-                // Secondary fallback image if no specific day image exists
-                await sendImageMessage(user.phone, 'https://r2.xamle.sn/branding/bes1_welcome.png', undefined, tenantConfig);
-            }
-        }
-    }
-
-    // 🌟 Visuals WoW: Send day image as an infographic to keep (even if video was sent) 🌟
-    if (trackDay.imageUrl && !imageAlreadySent) {
-        logger.info(`[PEDAGOGY] Sending daily image infographic: ${trackDay.imageUrl}`);
-        await sendImageMessage(user.phone, trackDay.imageUrl, undefined, tenantConfig);
-    } else if (!imageAlreadySent) {
-        // FALLBACK: Inject missing image using the user sector
-        const sectorStr = user.activity ? user.activity.toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/g, "").replace(/[^a-z0-9]/g, "_") : "general";
-        const fallbackImageUrl = `https://r2.xamle.sn/branding/${sectorStr}_generic.png`;
-        logger.info(`[PEDAGOGY] Missing imageUrl on Day ${dayNumber}! Using fallback: ${fallbackImageUrl}`);
-        try {
-            await sendImageMessage(user.phone, fallbackImageUrl, undefined, tenantConfig);
-        } catch (e: unknown) {
-            logger.warn(`[PEDAGOGY] Fallback image also failed: ${(e instanceof Error ? e.message : String(e))}`);
-        }
-    }
-
-    // 🌟 1. Send Lesson (audio or text) 🌟
-    let finalAudioUrl = trackDay.audioUrl;
-
-    if (!finalAudioUrl && lessonText) {
         try {
-            logger.info(`[PEDAGOGY] Generating TTS Audio for User ${userId}...`);
-            const AI_API_BASE_URL = requireHttpUrl(process.env.AI_API_BASE_URL, 'AI_API_BASE_URL');
-            const apiKey = getAdminApiKey();
-            const ttsRes = await fetch(`${AI_API_BASE_URL.replace(/\/$/, "")}/v1/ai/tts`, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${apiKey}` },
-                body: JSON.stringify({ text: lessonText })
-            });
-
-            if (ttsRes.ok) {
-                const ttsData = await ttsRes.json() as TtsResponse;
-                finalAudioUrl = ttsData.url;
-            }
+            await sendVideoMessage(user.phone, trackDay.videoUrl, trackDay.videoCaption || (isWolof ? "Xoolal vidéo bi !" : "Regarde cette vidéo !"), tenantConfig);
         } catch (err) {
-            logger.error({ err }, '[PEDAGOGY] Failed to generate TTS');
+            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}`;
+            await sendTextMessage(user.phone, fallbackMsg, tenantConfig);
+            if (trackDay.imageUrl) await sendImageMessage(user.phone, trackDay.imageUrl, undefined, tenantConfig);
         }
+    } else if (trackDay.imageUrl) {
+        await sendImageMessage(user.phone, trackDay.imageUrl, undefined, tenantConfig);
     }
 
+    // Audio & Text Send
+    let finalAudioUrl = trackDay.audioUrl || await AIPedagogyService.generateLessonAudio(lessonText, organizationId);
     if (finalAudioUrl) {
-        try {
-            logger.info(`[TTS] audioUrl=${finalAudioUrl} sending to WhatsApp...`);
-            await sendAudioMessage(user.phone, finalAudioUrl, tenantConfig);
-            logger.info(`[WhatsApp] ✅ Audio message sent to ${user.phone}`);
-
-            // ─── Hardening: Record Outbound Audio in DB ──────────
-            try {
-                await prisma.message.create({
-                    data: {
-                        userId: user.id,
-                        direction: 'OUTBOUND',
-                        channel: 'WHATSAPP',
-                        content: lessonText || null,
-                        mediaUrl: finalAudioUrl,
-                        organizationId
-                    }
-                });
-            } catch (dbErr: unknown) {
-                logger.error({ err: dbErr }, '[DB] Failed to record outbound audio');
-            }
-
-            // Send the text as a separate short message 
-            // ─── Format & Send 🌍 Bilingue v1.0 🌍 ─────────────
-            let textFR = '';
-            const bJson = castJson<ButtonsJson>(trackDay.buttonsJson);
-            if (!isWolof && bJson?.content?.FR) {
-                const frContent = bJson.content.FR;
-                if (frContent && !Array.isArray(frContent)) {
-                    textFR = (frContent as MultilangContent).lessonText || '';
-                }
-            }
-
-            if (dayNumber === 1 || dayNumber === 1.0) {
-                // Heuristic: Send a branding or sector image on Day 1
-                await sendImageMessage(user.phone, 'https://r2.xamle.sn/branding/bes1_welcome.png', `Bés 1 - Dalal jàmm!`, tenantConfig);
-                logger.info(`[WhatsApp] ✅ Day 1 intro image sent to ${user.phone}`);
-            }
-
-            const lessonMsg = textFR ? `${lessonText}\n(FR) ${textFR}` : lessonText;
-            const formattedMessages = shortenForWhatsApp(lessonMsg);
-            for (const msg of formattedMessages) {
-                await sendTextMessage(user.phone, msg, tenantConfig);
-            }
-        } catch (err) {
-            logger.error({ err }, `[PEDAGOGY] Failed to send native audio, falling back to text`);
-            // Fallback: Send at least the text if audio fails entirely
-            if (lessonText) {
-                const alertMsg = isWolof ? "⚠️ Kàddu gi mënul a yónnee. Làng gi a ngi nii ci mbind:" : "⚠️ Impossible de charger l'audio de la leçon. Voici le contenu au format texte :";
-                await sendTextMessage(user.phone, alertMsg, tenantConfig);
-                let textFR = '';
-                const bJson = castJson<ButtonsJson>(trackDay.buttonsJson);
-                if (!isWolof && bJson?.content?.FR) {
-                    const frContent = bJson.content.FR;
-                    if (frContent && !Array.isArray(frContent)) {
-                        textFR = (frContent as MultilangContent).lessonText || '';
-                    }
-                }
-                const lessonMsg = textFR ? `${lessonText}\n(FR) ${textFR}` : lessonText;
-                const formattedMessages = shortenForWhatsApp(lessonMsg);
-                for (const msg of formattedMessages) {
-                    await sendTextMessage(user.phone, msg, tenantConfig);
-                }
-            }
-        }
-    } else if (lessonText) {
-        // Fallback: Alert discreetly if no audio URL could be produced
-        const alertMsg = isWolof ? "⚠️ Kàddu gi mënul a yónnee. Làng gi a ngi nii ci mbind:" : "⚠️ Impossible de charger l'audio de la leçon. Voici le contenu au format texte :";
-        await sendTextMessage(user.phone, alertMsg, tenantConfig);
-
-        let textFR = '';
-        const bJson = castJson<ButtonsJson>(trackDay.buttonsJson);
-        if (!isWolof && bJson?.content?.FR) {
-            const frContent = bJson.content.FR;
-            if (frContent && !Array.isArray(frContent)) {
-                textFR = (frContent as MultilangContent).lessonText || '';
-            }
-        }
-
-        const lessonMsg = textFR ? `${lessonText}\n(FR) ${textFR}` : lessonText;
-        const formattedMessages = shortenForWhatsApp(lessonMsg);
-        for (const msg of formattedMessages) {
-            await sendTextMessage(user.phone, msg, tenantConfig);
-        }
+        await sendAudioMessage(user.phone, finalAudioUrl, tenantConfig);
+        await prisma.message.create({
+            data: { userId: user.id, direction: 'OUTBOUND', channel: 'WHATSAPP', content: lessonText, mediaUrl: finalAudioUrl, organizationId }
+        }).catch(() => {});
     }
 
-    // 🌟 2. Send Interactive Exercise 🌟
+    const messages = shortenForWhatsApp(lessonText);
+    for (const msg of messages) await sendTextMessage(user.phone, msg, tenantConfig);
+
+    // Exercise
     if (exercisePrompt) {
         if (trackDay.exerciseType === 'BUTTON' && trackDay.buttonsJson) {
-            const buttons = trackDay.buttonsJson as Array<{ id: string; title: string }>;
-            await sendInteractiveButtonMessage(user.phone, exercisePrompt, buttons, undefined, tenantConfig);
+            await sendInteractiveButtonMessage(user.phone, exercisePrompt, trackDay.buttonsJson as any, undefined, tenantConfig);
         } else {
             await sendTextMessage(user.phone, exercisePrompt, tenantConfig);
         }
     }
 
-    // 🌟 3. Send Action LIST menu ────────────────────────────────────────────────
-    // Shown after every lesson so the user knows their options
-    const isHistorical = options?.skipProgressUpdate === true || dayNumber < currentDay;
-
+    // Action Menu
+    const isHistorical = options?.skipProgressUpdate === true || dayNumber < (activeEnrollment?.currentDay || 1);
     if (dayNumber === 1 && !isHistorical) {
-        // Direct invitation to respond for Day 1 to reduce friction
-        await sendTextMessage(
-            user.phone,
-            isWolof
-                ? "🎙️ Lëjj bi: Tontul kàddu gi ci dëbb (vocal) walla mbind (texte)."
-                : "🎙️ À toi de jouer ! Réponds à l'exercice ci-dessus par message vocal ou texte.",
-            tenantConfig
-        );
+        await sendTextMessage(user.phone, isWolof ? "🎙️ Tontul kàddu gi ci vocal walla mbind." : "🎙️ Réponds par message vocal ou texte.", tenantConfig);
     } else {
-        const sections = [];
-        
-        if (isHistorical) {
-            // MODE REPLAY: Just show the Refaire button
-            sections.push({
-                title: isWolof ? "Revoir" : "Revue",
-                rows: [{
-                    id: `DAY${dayNumber}_REPLAY`,
-                    title: isWolof ? `🎧 Refaire Bés ${dayNumber}` : `🎧 Refaire Leçon ${dayNumber}`,
-                    description: isWolof ? "Waxtu bi ci kaw" : "Réécouter la leçon"
-                }]
-            });
-        } else {
-            // MODE NOUVEAU: Let user answer or see history
-            sections.push({
-                title: isWolof ? "Jëfandikoo" : "Actions",
-                rows: [
-                    {
-                        id: `DAY${dayNumber}_EXERCISE`,
-                        title: isWolof ? "📝 Tontul exercice" : "📝 Répondre",
-                        description: isWolof ? "Dëbb (vocal) walla mbind" : "Message vocal ou texte"
-                    },
-                    {
-                        id: `MENU_HISTORIQUE`,
-                        title: isWolof ? "📚 Li nekk ci ginnaaw" : "📚 Revoir anciennes leçons",
-                        description: isWolof ? "Seeti lu passé" : "Historique des leçons"
-                    }
-                ]
-            });
-        }
-
-        await sendInteractiveListMessage(
-            user.phone,
-            isWolof ? `Jour ${dayNumber}` : `Leçon ${dayNumber}`,
-            isWolof
-                ? "Seetee ci suuf ban jëf ngay def :"
-                : "Que veux-tu faire maintenant ?",
-            isWolof ? "Tànnal" : "Choisir",
-            sections,
-            undefined,
-            tenantConfig
-        );
+        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" }
+        ];
+        await sendInteractiveListMessage(user.phone, isWolof ? "Sa Mbir" : "Actions", isWolof ? "Tànnal :" : "Choisis :", isWolof ? "Tànn" : "Menu", [{ title: "Menu", rows: rows as any }], undefined, tenantConfig);
     }
+}
 
-
-    // 🌟 4 & 5. Update User Progress and Enrollment.currentDay 🌟
-    // ⚠️ Skipped when skipProgressUpdate=true (REPLAY of a historical lesson)
-    if (!options?.skipProgressUpdate) {
-        await prisma.userProgress.upsert({
-            where: { userId_trackId: { userId, trackId } },
-            update: {
-                exerciseStatus: 'PENDING',
-                lastInteraction: new Date()
-            },
-            create: {
-                userId,
-                trackId,
-                exerciseStatus: 'PENDING',
-                organizationId
-            }
-        });
-
-        await prisma.enrollment.updateMany({
-            where: { userId, trackId, status: 'ACTIVE' },
-            data: {
-                currentDay: dayNumber,
-                lastActivityAt: new Date()
-            }
-        });
-
-        logger.info(`[PEDAGOGY] Lesson Day ${dayNumber} sent. UserProgress set to PENDING.`);
-    } else {
-        logger.info(`[PEDAGOGY] Lesson Day ${dayNumber} replayed (read-only). currentDay unchanged.`);
-    }
+async function sendInteractiveListMessage(phone: string, header: string, body: string, label: string, sections: any[], metadata: any, config: any) {
+    const { sendInteractiveListMessage: sendList } = await import('./whatsapp-cloud');
+    return sendList(phone, header, body, label, sections, metadata, config);
 }

apps/whatsapp-worker/src/scratch/check_orgs.ts

@@ -0,0 +1,17 @@
+import { prisma } from '../services/prisma';
+import * as dotenv from 'dotenv';
+import path from 'path';
+
+// Load .env from root
+dotenv.config({ path: path.join(__dirname, '../../../../.env') });
+
+async function main() {
+  const orgs = await prisma.organization.findMany();
+  console.log('Organizations:', JSON.stringify(orgs, null, 2));
+}
+
+main()
+  .catch(console.error)
+  .finally(async () => {
+    await prisma.$disconnect();
+  });

apps/whatsapp-worker/src/services/ai-pedagogy.ts

@@ -0,0 +1,74 @@
+import { logger } from '../logger';
+import { getApiUrl, getAdminApiKey } from '../config';
+import fetch from 'node-fetch';
+
+export interface PersonalizeParams {
+    lessonText: string;
+    userActivity: string;
+    userLanguage: string;
+    businessProfile?: any;
+    previousResponses: Array<{ day: number; response: string | null }>;
+    tenantPrompt?: string;
+    tenantBranding?: any;
+    organizationId: string;
+}
+
+export class AIPedagogyService {
+    static async personalizeLesson(params: PersonalizeParams): Promise<string> {
+        try {
+            const AI_API_BASE_URL = getApiUrl();
+            const apiKey = getAdminApiKey();
+            
+            const res = await fetch(`${AI_API_BASE_URL.replace(/\/$/, "")}/v1/ai/personalize-lesson`, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Authorization': `Bearer ${apiKey}`,
+                    'x-organization-id': params.organizationId
+                },
+                body: JSON.stringify({
+                    lessonText: params.lessonText,
+                    userActivity: params.userActivity,
+                    userLanguage: params.userLanguage,
+                    businessProfile: params.businessProfile,
+                    previousResponses: params.previousResponses,
+                    tenantPrompt: params.tenantPrompt,
+                    tenantBranding: params.tenantBranding
+                })
+            });
+
+            if (res.ok) {
+                const data = await res.json() as { text: string };
+                return data.text || params.lessonText;
+            }
+        } catch (err) {
+            logger.error(`[AI_PEDAGOGY] Personalization failed: ${err}`);
+        }
+        return params.lessonText;
+    }
+
+    static async generateLessonAudio(text: string, organizationId: string): Promise<string | undefined> {
+        try {
+            const AI_API_BASE_URL = getApiUrl();
+            const apiKey = getAdminApiKey();
+            
+            const res = await fetch(`${AI_API_BASE_URL.replace(/\/$/, "")}/v1/ai/tts`, {
+                method: 'POST',
+                headers: { 
+                    'Content-Type': 'application/json', 
+                    'Authorization': `Bearer ${apiKey}`,
+                    'x-organization-id': organizationId
+                },
+                body: JSON.stringify({ text })
+            });
+
+            if (res.ok) {
+                const data = await res.json() as { url: string };
+                return data.url;
+            }
+        } catch (err) {
+            logger.error(`[AI_PEDAGOGY] TTS failed: ${err}`);
+        }
+        return undefined;
+    }
+}

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

@@ -1,3 +1,4 @@
-import { PrismaClient } from '@repo/database';
+import { PrismaClient, withTenantIsolation } from '@repo/database';
 
-export const prisma = new PrismaClient();
+const basePrisma = new PrismaClient();
+export const prisma = withTenantIsolation(basePrisma);

packages/database/index.ts

@@ -1 +1,3 @@
 export * from '@prisma/client';
+export * from './src/extension';
+export * from './src/context';

packages/database/prisma/schema.prisma

@@ -13,6 +13,7 @@ model Organization {
   wabaId          String?               @unique
   systemUserToken String?
   customPrompt    String?               @db.Text
+  personalityConfig Json?               // Dynamic personality variables
   brandingData    Json?
   createdAt       DateTime              @default(now())
   updatedAt       DateTime              @updatedAt
@@ -24,6 +25,10 @@ model Organization {
   payments        Payment[]
   responses       Response[]
   progress        UserProgress[]
+  trackDays       TrackDay[]
+  businessProfiles BusinessProfile[]
+  teamMembers     TeamMember[]
+  userBadges      UserBadge[]
 }
 
 model WhatsAppPhoneNumber {
@@ -56,6 +61,8 @@ model User {
   payments        Payment[]
   responses       Response[]
   progress        UserProgress[]
+
+  @@index([organizationId])
 }
 
 model BusinessProfile {
@@ -74,11 +81,15 @@ model BusinessProfile {
   financialProjections Json?
   fundingAsk           String?
   lastUpdatedFromDay   Int          @default(0)
+  organizationId       String       @default("default-org-id")
   createdAt            DateTime     @default(now())
   updatedAt            DateTime     @updatedAt
   teamMembers          Json?        @map("teamMembers")
   teamMembersList      TeamMember[]
   user                 User         @relation(fields: [userId], references: [id])
+  organization         Organization @relation(fields: [organizationId], references: [id])
+
+  @@index([organizationId])
 }
 
 model TeamMember {
@@ -87,7 +98,11 @@ model TeamMember {
   name              String?
   role              String?
   bio               String?
+  organizationId    String          @default("default-org-id")
   businessProfile   BusinessProfile @relation(fields: [businessProfileId], references: [id], onDelete: Cascade)
+  organization      Organization    @relation(fields: [organizationId], references: [id])
+
+  @@index([organizationId])
 }
 
 model Track {
@@ -107,6 +122,8 @@ model Track {
   payments       Payment[]
   days           TrackDay[]
   progress       UserProgress[]
+
+  @@index([organizationId])
 }
 
 model TrackDay {
@@ -126,9 +143,13 @@ model TrackDay {
   exerciseCriteria  Json?
   badges            Json?
   unlockCondition   String?
+  organizationId    String       @default("default-org-id")
   createdAt         DateTime     @default(now())
   updatedAt         DateTime     @updatedAt
   track             Track        @relation(fields: [trackId], references: [id])
+  organization      Organization @relation(fields: [organizationId], references: [id])
+
+  @@index([organizationId])
 }
 
 model UserProgress {
@@ -155,6 +176,7 @@ model UserProgress {
   user               User           @relation(fields: [userId], references: [id])
 
   @@unique([userId, trackId])
+  @@index([organizationId])
 }
 
 model Enrollment {
@@ -171,6 +193,8 @@ model Enrollment {
   track          Track            @relation(fields: [trackId], references: [id])
   user           User             @relation(fields: [userId], references: [id])
   responses      Response[]
+
+  @@index([organizationId])
 }
 
 model Response {
@@ -186,6 +210,8 @@ model Response {
   enrollment     Enrollment   @relation(fields: [enrollmentId], references: [id], onDelete: Cascade)
   organization   Organization @relation(fields: [organizationId], references: [id])
   user           User         @relation(fields: [userId], references: [id])
+
+  @@index([organizationId])
 }
 
 model Message {
@@ -202,6 +228,7 @@ model Message {
   user           User         @relation(fields: [userId], references: [id])
 
   @@index([userId, createdAt])
+  @@index([organizationId])
 }
 
 model Payment {
@@ -218,6 +245,8 @@ model Payment {
   organization    Organization  @relation(fields: [organizationId], references: [id])
   track           Track         @relation(fields: [trackId], references: [id])
   user            User          @relation(fields: [userId], references: [id])
+
+  @@index([organizationId])
 }
 
 model TrainingData {
@@ -292,5 +321,9 @@ model UserBadge {
   userProgressId String
   name           String
   earnedAt       DateTime     @default(now())
+  organizationId String       @default("default-org-id")
   userProgress   UserProgress @relation(fields: [userProgressId], references: [id], onDelete: Cascade)
+  organization   Organization @relation(fields: [organizationId], references: [id])
+
+  @@index([organizationId])
 }

packages/database/src/context.ts

@@ -0,0 +1,11 @@
+import { AsyncLocalStorage } from 'async_hooks';
+
+export const tenantContext = new AsyncLocalStorage<{ organizationId: string }>();
+
+export const runWithTenant = <T>(organizationId: string, fn: () => T): T => {
+  return tenantContext.run({ organizationId }, fn);
+};
+
+export const getOrganizationId = (): string | undefined => {
+  return tenantContext.getStore()?.organizationId;
+};

packages/database/src/extension.ts

@@ -0,0 +1,58 @@
+import { PrismaClient } from '@prisma/client';
+import { getOrganizationId } from './context';
+
+export const createTenantExtension = (explicitOrganizationId?: string) => {
+  return {
+    query: {
+      $allModels: {
+        async $allOperations({ operation, args, query }: any) {
+          const organizationId = explicitOrganizationId || getOrganizationId();
+
+          if (!organizationId) {
+            return query(args);
+          }
+
+          // List of operations where we want to enforce organizationId
+          const filteredOperations = [
+            'findMany',
+            'findFirst',
+            'count',
+            'updateMany',
+            'deleteMany',
+            'aggregate',
+            'groupBy'
+          ];
+
+          if (filteredOperations.includes(operation)) {
+            args.where = { ...args.where, organizationId };
+          }
+
+          // Special handling for create: automatically inject organizationId
+          if (operation === 'create') {
+            args.data = { ...args.data, organizationId };
+          }
+
+          // For update/delete/findUnique
+          if (['update', 'delete', 'findUnique'].includes(operation)) {
+             args.where = { ...args.where, organizationId };
+          }
+
+          return query(args);
+        },
+      },
+    },
+  };
+};
+
+/**
+ * Extends a PrismaClient with a helper to get a tenant-bound client
+ */
+export function withTenantIsolation(prisma: PrismaClient) {
+  return prisma.$extends({
+    client: {
+      $forOrganization(organizationId: string) {
+        return prisma.$extends(createTenantExtension(organizationId));
+      }
+    }
+  }).$extends(createTenantExtension()); // Also apply the automatic context-based extension
+}

packages/prompts/src/index.ts

@@ -1,12 +1,30 @@
 import fs from 'fs';
 import path from 'path';
 
+export interface PersonalityConfig {
+    botName: string;
+    coreMission: string;
+    toneDescription: string;
+    constraints?: string[];
+}
+
+export const DEFAULT_PERSONALITY: PersonalityConfig = {
+    botName: 'XAMLÉ COACH',
+    coreMission: "expert business pour entrepreneurs d'Afrique de l'Ouest",
+    toneDescription: "direct, dynamique et encourageant. Style WhatsApp (gras *texte*, emojis).",
+    constraints: ["JAMAIS ANGLAIS", "Ne jamais citer 'Manga Deaf'"]
+};
+
 export class PromptLoader {
     private static templatesDir = path.join(__dirname, 'templates');
 
     static getTemplate(name: string): string {
         const filePath = path.join(this.templatesDir, `${name}.md`);
         try {
+            if (!fs.existsSync(filePath)) {
+                console.warn(`[PROMPT_LOADER] Template "${name}" not found at ${filePath}`);
+                return '';
+            }
             return fs.readFileSync(filePath, 'utf-8');
         } catch (err) {
             console.error(`[PROMPT_LOADER] Error loading template "${name}":`, err);
@@ -14,10 +32,35 @@ export class PromptLoader {
         }
     }
 
-    static compile(templateName: string, variables: Record<string, string | number | boolean>): string {
+    /**
+     * Compiles a template with variables and organization personality
+     */
+    static compile(
+        templateName: string, 
+        variables: Record<string, string | number | boolean>,
+        personality: Partial<PersonalityConfig> = {}
+    ): string {
         let template = this.getTemplate(templateName);
+        if (!template) return '';
+
+        // Merge personality with defaults
+        const config: PersonalityConfig = {
+            botName: personality.botName || DEFAULT_PERSONALITY.botName,
+            coreMission: personality.coreMission || DEFAULT_PERSONALITY.coreMission,
+            toneDescription: personality.toneDescription || DEFAULT_PERSONALITY.toneDescription,
+            constraints: [...(DEFAULT_PERSONALITY.constraints || []), ...(personality.constraints || [])]
+        };
+
+        // Inject personality variables
+        const allVariables = {
+            ...variables,
+            botName: config.botName,
+            coreMission: config.coreMission,
+            toneDescription: config.toneDescription,
+            constraints: config.constraints?.join('. ') || ''
+        };
         
-        for (const [key, value] of Object.entries(variables)) {
+        for (const [key, value] of Object.entries(allVariables)) {
             const placeholder = new RegExp(`{{${key}}}`, 'g');
             template = template.replace(placeholder, String(value));
         }

packages/prompts/src/templates/personalized-lesson.md

@@ -1,4 +1,4 @@
-Tu es XAMLÉ COACH, expert business pour entrepreneurs d'Afrique de l'Ouest.
+Tu es {{botName}}, {{coreMission}}.
 Réécris la leçon ci-dessous pour qu'elle parle DIRECTEMENT au business de cet entrepreneur.
 
 {{businessContext}}
@@ -16,9 +16,9 @@ STT Cleanup : Applique les règles de normalisation Wolof (ex: 'damae' -> 'damay
 Utilisation du Glossaire Officiel : Utilise exclusivement les termes validés (ex: Ñàkk pour perte, Xaalis pour argent, Denc pour épargne).
 
 CONTRAINTES DE FORMAT :
-- STYLE : WhatsApp (gras *texte*, emojis). Sois direct, dynamique et encourageant.
+- STYLE : {{toneDescription}}.
 - LANGUE : {{languageLabel}}.
-- JAMAIS ANGLAIS. Ne jamais citer "Manga Deaf".
+- {{constraints}}
 
 LEÇON À ADAPTER :
 {{lessonText}}

pnpm-lock.yaml

@@ -243,6 +243,9 @@ importers:
       node-cron:
         specifier: ^4.2.1
         version: 4.2.1
+      node-fetch:
+        specifier: ^2.6.7
+        version: 2.7.0
       sharp:
         specifier: ^0.34.5
         version: 0.34.5
@@ -256,12 +259,18 @@ importers:
       '@types/node-cron':
         specifier: ^3.0.11
         version: 3.0.11
+      '@types/node-fetch':
+        specifier: ^2.6.2
+        version: 2.6.13
       tsx:
         specifier: ^3.0.0
         version: 3.14.0
       typescript:
         specifier: ^5.0.0
         version: 5.9.3
+      vitest:
+        specifier: ^1.0.0
+        version: 1.6.1(@types/node@20.19.33)
 
   packages/database:
     dependencies:
@@ -1163,6 +1172,10 @@ packages:
   '@ioredis/commands@1.5.0':
     resolution: {integrity: sha512-eUgLqrMf8nJkZxT24JvVRrQya1vZkQh8BBeYNwGDqa5I0VUi8ACx7uFvAaLxintokpTenkK6DASvo/bvNbBGow==}
 
+  '@jest/schemas@29.6.3':
+    resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
   '@jridgewell/gen-mapping@0.3.13':
     resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==}
 
@@ -1392,6 +1405,9 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@sinclair/typebox@0.27.10':
+    resolution: {integrity: sha512-MTBk/3jGLNB2tVxv6uLlFh1iu64iYOQ2PbdOSK3NW8JZsmlaOh2q6sdtKowBhfw8QFLmYNzTW4/oK4uATIi6ZA==}
+
   '@smithy/abort-controller@4.2.8':
     resolution: {integrity: sha512-peuVfkYHAmS5ybKxWcfraK7WBBP0J+rkfUcbHJJKQ4ir3UAUNQI+Y4Vt/PqSzGqgloJ5O1dk7+WzNL8wcCSXbw==}
     engines: {node: '>=18.0.0'}
@@ -1681,6 +1697,9 @@ packages:
     peerDependencies:
       vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
 
+  '@vitest/expect@1.6.1':
+    resolution: {integrity: sha512-jXL+9+ZNIJKruofqXuuTClf44eSpcHlgj3CiuNihUF3Ioujtmc0zIa3UJOW5RjDK1YLBJZnWBlPuqhYycLioog==}
+
   '@vitest/expect@4.0.18':
     resolution: {integrity: sha512-8sCWUyckXXYvx4opfzVY03EOiYVxyNrHS5QxX3DAIi5dpJAAkyJezHCP77VMX4HKA2LDT/Jpfo8i2r5BE3GnQQ==}
 
@@ -1698,12 +1717,21 @@ packages:
   '@vitest/pretty-format@4.0.18':
     resolution: {integrity: sha512-P24GK3GulZWC5tz87ux0m8OADrQIUVDPIjjj65vBXYG17ZeU3qD7r+MNZ1RNv4l8CGU2vtTRqixrOi9fYk/yKw==}
 
+  '@vitest/runner@1.6.1':
+    resolution: {integrity: sha512-3nSnYXkVkf3mXFfE7vVyPmi3Sazhb/2cfZGGs0JRzFsPFvAMBEcrweV1V1GsrstdXeKCTXlJbvnQwGWgEIHmOA==}
+
   '@vitest/runner@4.0.18':
     resolution: {integrity: sha512-rpk9y12PGa22Jg6g5M3UVVnTS7+zycIGk9ZNGN+m6tZHKQb7jrP7/77WfZy13Y/EUDd52NDsLRQhYKtv7XfPQw==}
 
+  '@vitest/snapshot@1.6.1':
+    resolution: {integrity: sha512-WvidQuWAzU2p95u8GAKlRMqMyN1yOJkGHnx3M1PL9Raf7AQ1kwLKg04ADlCa3+OXUZE7BceOhVZiuWAbzCKcUQ==}
+
   '@vitest/snapshot@4.0.18':
     resolution: {integrity: sha512-PCiV0rcl7jKQjbgYqjtakly6T1uwv/5BQ9SwBLekVg/EaYeQFPiXcgrC2Y7vDMA8dM1SUEAEV82kgSQIlXNMvA==}
 
+  '@vitest/spy@1.6.1':
+    resolution: {integrity: sha512-MGcMmpGkZebsMZhbQKkAf9CX5zGvjkBTqf8Zx3ApYWXr3wG+QvEu2eXWfnIIWYSJExIp4V9FCKDEeygzkYrXMw==}
+
   '@vitest/spy@4.0.18':
     resolution: {integrity: sha512-cbQt3PTSD7P2OARdVW3qWER5EGq7PHlvE+QfzSC0lbwO+xnt7+XH06ZzFjFRgzUX//JmpxrCu92VdwvEPlWSNw==}
 
@@ -1712,6 +1740,9 @@ packages:
     peerDependencies:
       vitest: 4.0.18
 
+  '@vitest/utils@1.6.1':
+    resolution: {integrity: sha512-jOrrUvXM4Av9ZWiG1EajNto0u96kWAhJ1LmPmJhXXQx/32MecEKd10pOLYgS2BQx1TgkGhloPU1ArDW2vvaY6g==}
+
   '@vitest/utils@4.0.18':
     resolution: {integrity: sha512-msMRKLMVLWygpK3u2Hybgi4MNjcYJvwTb0Ru09+fOyCXIgT5raYP041DRRdiJiI3k/2U6SEbAETB3YtBrUkCFA==}
 
@@ -1722,6 +1753,15 @@ packages:
   abstract-logging@2.0.1:
     resolution: {integrity: sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA==}
 
+  acorn-walk@8.3.5:
+    resolution: {integrity: sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==}
+    engines: {node: '>=0.4.0'}
+
+  acorn@8.16.0:
+    resolution: {integrity: sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
   agent-base@7.1.4:
     resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==}
     engines: {node: '>= 14'}
@@ -1757,6 +1797,10 @@ packages:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
     engines: {node: '>=8'}
 
+  ansi-styles@5.2.0:
+    resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
+    engines: {node: '>=10'}
+
   any-promise@1.3.0:
     resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==}
 
@@ -1770,6 +1814,9 @@ packages:
   argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
+  assertion-error@1.1.0:
+    resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==}
+
   assertion-error@2.0.1:
     resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==}
     engines: {node: '>=12'}
@@ -1893,6 +1940,10 @@ packages:
   bullmq@5.69.3:
     resolution: {integrity: sha512-P9uLsR7fDvejH/1m6uur6j7U9mqY6nNt+XvhlhStOUe7jdwbZoP/c2oWNtE+8ljOlubw4pRUKymtRqkyvloc4A==}
 
+  cac@6.7.14:
+    resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
+    engines: {node: '>=8'}
+
   call-bind-apply-helpers@1.0.2:
     resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
     engines: {node: '>= 0.4'}
@@ -1908,10 +1959,17 @@ packages:
   caniuse-lite@1.0.30001770:
     resolution: {integrity: sha512-x/2CLQ1jHENRbHg5PSId2sXq1CIO1CISvwWAj027ltMVG2UNgW+w9oH2+HzgEIRFembL8bUlXtfbBHR1fCg2xw==}
 
+  chai@4.5.0:
+    resolution: {integrity: sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==}
+    engines: {node: '>=4'}
+
   chai@6.2.2:
     resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==}
     engines: {node: '>=18'}
 
+  check-error@1.0.3:
+    resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==}
+
   chokidar@3.6.0:
     resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
     engines: {node: '>= 8.10.0'}
@@ -1947,6 +2005,9 @@ packages:
     resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
     engines: {node: '>= 6'}
 
+  confbox@0.1.8:
+    resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==}
+
   convert-source-map@2.0.0:
     resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
 
@@ -1970,6 +2031,10 @@ packages:
     resolution: {integrity: sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==}
     engines: {node: '>=12.0.0'}
 
+  cross-spawn@7.0.6:
+    resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
+    engines: {node: '>= 8'}
+
   cssesc@3.0.0:
     resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
     engines: {node: '>=4'}
@@ -1994,6 +2059,10 @@ packages:
       supports-color:
         optional: true
 
+  deep-eql@4.1.4:
+    resolution: {integrity: sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==}
+    engines: {node: '>=6'}
+
   degenerator@5.0.1:
     resolution: {integrity: sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==}
     engines: {node: '>= 14'}
@@ -2016,6 +2085,10 @@ packages:
   didyoumean@1.2.2:
     resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
 
+  diff-sequences@29.6.3:
+    resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
   diff@8.0.3:
     resolution: {integrity: sha512-qejHi7bcSD4hQAZE0tNAawRK1ZtafHDmMTMkrrIGgSLl7hTnQHmKCeB45xAcbfTqK2zowkM3j3bHt/4b/ARbYQ==}
     engines: {node: '>=0.3.1'}
@@ -2113,6 +2186,10 @@ packages:
   events-universal@1.0.1:
     resolution: {integrity: sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==}
 
+  execa@8.0.1:
+    resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}
+    engines: {node: '>=16.17'}
+
   expect-type@1.3.0:
     resolution: {integrity: sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==}
     engines: {node: '>=12.0.0'}
@@ -2251,6 +2328,9 @@ packages:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
     engines: {node: 6.* || 8.* || >= 10.*}
 
+  get-func-name@2.0.2:
+    resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==}
+
   get-intrinsic@1.3.0:
     resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
     engines: {node: '>= 0.4'}
@@ -2263,6 +2343,10 @@ packages:
     resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
     engines: {node: '>=8'}
 
+  get-stream@8.0.1:
+    resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}
+    engines: {node: '>=16'}
+
   get-tsconfig@4.13.6:
     resolution: {integrity: sha512-shZT/QMiSHc/YBLxxOkMtgSid5HFoauqCE3/exfsEcwg1WkeqjG+V40yBbBrsD+jW2HDXcs28xOfcbm2jI8Ddw==}
 
@@ -2313,6 +2397,10 @@ packages:
   https@1.0.0:
     resolution: {integrity: sha512-4EC57ddXrkaF0x83Oj8sM6SLQHAWXw90Skqu2M4AEWENZ3F02dFJE/GARA8igO79tcgYqGrD7ae4f5L3um2lgg==}
 
+  human-signals@5.0.0:
+    resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
+    engines: {node: '>=16.17.0'}
+
   humanize-ms@1.2.1:
     resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
 
@@ -2384,9 +2472,16 @@ packages:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
 
+  is-stream@3.0.0:
+    resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
   isarray@1.0.0:
     resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
 
+  isexe@2.0.0:
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
+
   jiti@1.21.7:
     resolution: {integrity: sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==}
     hasBin: true
@@ -2398,6 +2493,9 @@ packages:
   js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
+  js-tokens@9.0.1:
+    resolution: {integrity: sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==}
+
   js-yaml@4.1.1:
     resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
     hasBin: true
@@ -2437,6 +2535,10 @@ packages:
   lines-and-columns@1.2.4:
     resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
 
+  local-pkg@0.5.1:
+    resolution: {integrity: sha512-9rrA30MRRP3gBD3HTGnC6cDFpaE1kVDWxWgqWJUN0RvDNAo+Nz/9GxB+nHOH0ifbVFy0hSA1V6vFDvnx54lTEQ==}
+    engines: {node: '>=14'}
+
   lodash.defaults@4.2.0:
     resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
 
@@ -2450,6 +2552,9 @@ packages:
     resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
     hasBin: true
 
+  loupe@2.3.7:
+    resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==}
+
   lru-cache@5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
 
@@ -2473,6 +2578,9 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
+  merge-stream@2.0.0:
+    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
+
   merge2@1.4.1:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
     engines: {node: '>= 8'}
@@ -2489,6 +2597,10 @@ packages:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
 
+  mimic-fn@4.0.0:
+    resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
+    engines: {node: '>=12'}
+
   minimatch@5.1.6:
     resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==}
     engines: {node: '>=10'}
@@ -2499,6 +2611,9 @@ packages:
   mitt@3.0.1:
     resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==}
 
+  mlly@1.8.2:
+    resolution: {integrity: sha512-d+ObxMQFmbt10sretNDytwt85VrbkhhUA/JBGm1MPaWJ65Cl4wOgLaB1NYvJSZ0Ef03MMEU/0xpPMXUIQ29UfA==}
+
   mnemonist@0.39.6:
     resolution: {integrity: sha512-A/0v5Z59y63US00cRSLiloEIw3t5G+MiKz4BhX21FI+YBJXBOGW0ohFxTxO08dsOYlzxo87T7vGfZKYp2bcAWA==}
 
@@ -2563,6 +2678,10 @@ packages:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
     engines: {node: '>=0.10.0'}
 
+  npm-run-path@5.3.0:
+    resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
   object-assign@4.1.1:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
     engines: {node: '>=0.10.0'}
@@ -2584,6 +2703,10 @@ packages:
   once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
 
+  onetime@6.0.0:
+    resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
+    engines: {node: '>=12'}
+
   openai@4.104.0:
     resolution: {integrity: sha512-p99EFNsA/yX6UhVO93f5kJsDRLAg+CTA2RBqdHK4RtK8u5IJw32Hyb2dTGKbnnFmnuoBv5r7Z2CURI9sGZpSuA==}
     hasBin: true
@@ -2596,6 +2719,10 @@ packages:
       zod:
         optional: true
 
+  p-limit@5.0.0:
+    resolution: {integrity: sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==}
+    engines: {node: '>=18'}
+
   pac-proxy-agent@7.2.0:
     resolution: {integrity: sha512-TEB8ESquiLMc0lV8vcd5Ql/JAKAoyzHFXaStwjkzpOpC5Yv+pIzLfHvjTSdf3vpa2bMiUQrg9i6276yn8666aA==}
     engines: {node: '>= 14'}
@@ -2615,15 +2742,29 @@ packages:
     resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
     engines: {node: '>=8'}
 
+  path-key@3.1.1:
+    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
+    engines: {node: '>=8'}
+
+  path-key@4.0.0:
+    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
+    engines: {node: '>=12'}
+
   path-parse@1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
   path@0.12.7:
     resolution: {integrity: sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==}
 
+  pathe@1.1.2:
+    resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
+
   pathe@2.0.3:
     resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
 
+  pathval@1.1.1:
+    resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==}
+
   pend@1.2.0:
     resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
 
@@ -2667,6 +2808,9 @@ packages:
     resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==}
     engines: {node: '>= 6'}
 
+  pkg-types@1.3.1:
+    resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==}
+
   postcss-import@15.1.0:
     resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
     engines: {node: '>=14.0.0'}
@@ -2722,6 +2866,10 @@ packages:
     engines: {node: '>=14'}
     hasBin: true
 
+  pretty-format@29.7.0:
+    resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
   prisma@5.22.0:
     resolution: {integrity: sha512-vtpjW3XuYCSnMsNVBjLMNkTj6OZbudcPPTPYHqX0CJfpcdWciI1dM8uHETwmDxxiqEwCIE6WvXucWUetJgfu/A==}
     engines: {node: '>=16.13'}
@@ -2782,6 +2930,9 @@ packages:
     peerDependencies:
       react: ^18.3.1
 
+  react-is@18.3.1:
+    resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==}
+
   react-refresh@0.17.0:
     resolution: {integrity: sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==}
     engines: {node: '>=0.10.0'}
@@ -2902,9 +3053,21 @@ packages:
     resolution: {integrity: sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
 
+  shebang-command@2.0.0:
+    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
+    engines: {node: '>=8'}
+
+  shebang-regex@3.0.0:
+    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
+    engines: {node: '>=8'}
+
   siginfo@2.0.0:
     resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
 
+  signal-exit@4.1.0:
+    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
+    engines: {node: '>=14'}
+
   sirv@3.0.2:
     resolution: {integrity: sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==}
     engines: {node: '>=18'}
@@ -2962,10 +3125,17 @@ packages:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
     engines: {node: '>=8'}
 
+  strip-final-newline@3.0.0:
+    resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
+    engines: {node: '>=12'}
+
   strip-json-comments@5.0.3:
     resolution: {integrity: sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==}
     engines: {node: '>=14.16'}
 
+  strip-literal@2.1.1:
+    resolution: {integrity: sha512-631UJ6O00eNGfMiWG78ck80dfBab8X6IVFB51jZK5Icd7XAs60Z5y7QdSd/wGIklnWvRbUNloVzhOKKmutxQ6Q==}
+
   stripe@20.3.1:
     resolution: {integrity: sha512-k990yOT5G5rhX3XluRPw5Y8RLdJDW4dzQ29wWT66piHrbnM2KyamJ1dKgPsw4HzGHRWjDiSSdcI2WdxQUPV3aQ==}
     engines: {node: '>=16'}
@@ -3032,10 +3202,18 @@ packages:
     resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==}
     engines: {node: '>=12.0.0'}
 
+  tinypool@0.8.4:
+    resolution: {integrity: sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==}
+    engines: {node: '>=14.0.0'}
+
   tinyrainbow@3.0.3:
     resolution: {integrity: sha512-PSkbLUoxOFRzJYjjxHJt9xro7D+iilgMX/C9lawzVuYiIdcihh9DXmVibBe8lmcFrRi/VzlPjBxbN7rH24q8/Q==}
     engines: {node: '>=14.0.0'}
 
+  tinyspy@2.2.1:
+    resolution: {integrity: sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==}
+    engines: {node: '>=14.0.0'}
+
   to-regex-range@5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
@@ -3095,11 +3273,18 @@ packages:
     resolution: {integrity: sha512-1q7+9UJABuBAHrcC4Sxp5lOqYS5mvxRrwa33wpIyM18hlOCpRD/fTJNxZ0vhbMcJmz15o9kkVm743mPn7p6jpQ==}
     hasBin: true
 
+  type-detect@4.1.0:
+    resolution: {integrity: sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==}
+    engines: {node: '>=4'}
+
   typescript@5.9.3:
     resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
     engines: {node: '>=14.17'}
     hasBin: true
 
+  ufo@1.6.3:
+    resolution: {integrity: sha512-yDJTmhydvl5lJzBmy/hyOAA0d+aqCBuwl818haVdYCRrWV84o7YyeVm4QlVHStqNrrJSTb6jKuFAVqAFsr+K3Q==}
+
   unbzip2-stream@1.4.3:
     resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==}
 
@@ -3132,6 +3317,11 @@ packages:
     resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
     hasBin: true
 
+  vite-node@1.6.1:
+    resolution: {integrity: sha512-YAXkfvGtuTzwWbDSACdJSg4A4DZiAqckWe90Zapc/sEX3XvHcw1NdurM/6od8J207tSDqNbSsgdCacBgvJKFuA==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    hasBin: true
+
   vite@5.4.21:
     resolution: {integrity: sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==}
     engines: {node: ^18.0.0 || >=20.0.0}
@@ -3203,6 +3393,31 @@ packages:
       yaml:
         optional: true
 
+  vitest@1.6.1:
+    resolution: {integrity: sha512-Ljb1cnSJSivGN0LqXd/zmDbWEM0RNNg2t1QW/XUhYl/qPqyu7CsqeWtqQXHVaJsecLPuDoak2oJcZN2QoRIOag==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    hasBin: true
+    peerDependencies:
+      '@edge-runtime/vm': '*'
+      '@types/node': ^18.0.0 || >=20.0.0
+      '@vitest/browser': 1.6.1
+      '@vitest/ui': 1.6.1
+      happy-dom: '*'
+      jsdom: '*'
+    peerDependenciesMeta:
+      '@edge-runtime/vm':
+        optional: true
+      '@types/node':
+        optional: true
+      '@vitest/browser':
+        optional: true
+      '@vitest/ui':
+        optional: true
+      happy-dom:
+        optional: true
+      jsdom:
+        optional: true
+
   vitest@4.0.18:
     resolution: {integrity: sha512-hOQuK7h0FGKgBAas7v0mSAsnvrIgAvWmRFjmzpJ7SwFHH3g1k2u37JtYwOwmEKhK6ZO3v9ggDBBm0La1LCK4uQ==}
     engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
@@ -3247,6 +3462,11 @@ packages:
   whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
 
+  which@2.0.2:
+    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
+    engines: {node: '>= 8'}
+    hasBin: true
+
   why-is-node-running@2.3.0:
     resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==}
     engines: {node: '>=8'}
@@ -3289,6 +3509,10 @@ packages:
   yauzl@2.10.0:
     resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
 
+  yocto-queue@1.2.2:
+    resolution: {integrity: sha512-4LCcse/U2MHZ63HAJVE+v71o7yOdIe4cZ70Wpf8D/IyjDKYQLV5GD46B+hSTjJsvV5PztjvHoU580EftxjDZFQ==}
+    engines: {node: '>=12.20'}
+
   zod@3.23.8:
     resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==}
 
@@ -4252,6 +4476,10 @@ snapshots:
 
   '@ioredis/commands@1.5.0': {}
 
+  '@jest/schemas@29.6.3':
+    dependencies:
+      '@sinclair/typebox': 0.27.10
+
   '@jridgewell/gen-mapping@0.3.13':
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.5
@@ -4427,6 +4655,8 @@ snapshots:
   '@rollup/rollup-win32-x64-msvc@4.57.1':
     optional: true
 
+  '@sinclair/typebox@0.27.10': {}
+
   '@smithy/abort-controller@4.2.8':
     dependencies:
       '@smithy/types': 4.12.0
@@ -4857,6 +5087,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@vitest/expect@1.6.1':
+    dependencies:
+      '@vitest/spy': 1.6.1
+      '@vitest/utils': 1.6.1
+      chai: 4.5.0
+
   '@vitest/expect@4.0.18':
     dependencies:
       '@standard-schema/spec': 1.1.0
@@ -4878,17 +5114,33 @@ snapshots:
     dependencies:
       tinyrainbow: 3.0.3
 
+  '@vitest/runner@1.6.1':
+    dependencies:
+      '@vitest/utils': 1.6.1
+      p-limit: 5.0.0
+      pathe: 1.1.2
+
   '@vitest/runner@4.0.18':
     dependencies:
       '@vitest/utils': 4.0.18
       pathe: 2.0.3
 
+  '@vitest/snapshot@1.6.1':
+    dependencies:
+      magic-string: 0.30.21
+      pathe: 1.1.2
+      pretty-format: 29.7.0
+
   '@vitest/snapshot@4.0.18':
     dependencies:
       '@vitest/pretty-format': 4.0.18
       magic-string: 0.30.21
       pathe: 2.0.3
 
+  '@vitest/spy@1.6.1':
+    dependencies:
+      tinyspy: 2.2.1
+
   '@vitest/spy@4.0.18': {}
 
   '@vitest/ui@4.0.18(vitest@4.0.18)':
@@ -4902,6 +5154,13 @@ snapshots:
       tinyrainbow: 3.0.3
       vitest: 4.0.18(@types/node@20.19.33)(@vitest/ui@4.0.18)(jiti@1.21.7)(tsx@3.14.0)
 
+  '@vitest/utils@1.6.1':
+    dependencies:
+      diff-sequences: 29.6.3
+      estree-walker: 3.0.3
+      loupe: 2.3.7
+      pretty-format: 29.7.0
+
   '@vitest/utils@4.0.18':
     dependencies:
       '@vitest/pretty-format': 4.0.18
@@ -4913,6 +5172,12 @@ snapshots:
 
   abstract-logging@2.0.1: {}
 
+  acorn-walk@8.3.5:
+    dependencies:
+      acorn: 8.16.0
+
+  acorn@8.16.0: {}
+
   agent-base@7.1.4: {}
 
   agentkeepalive@4.6.0:
@@ -4940,6 +5205,8 @@ snapshots:
     dependencies:
       color-convert: 2.0.1
 
+  ansi-styles@5.2.0: {}
+
   any-promise@1.3.0: {}
 
   anymatch@3.1.3:
@@ -4951,6 +5218,8 @@ snapshots:
 
   argparse@2.0.1: {}
 
+  assertion-error@1.1.0: {}
+
   assertion-error@2.0.1: {}
 
   ast-types@0.13.4:
@@ -5086,6 +5355,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  cac@6.7.14: {}
+
   call-bind-apply-helpers@1.0.2:
     dependencies:
       es-errors: 1.3.0
@@ -5097,8 +5368,22 @@ snapshots:
 
   caniuse-lite@1.0.30001770: {}
 
+  chai@4.5.0:
+    dependencies:
+      assertion-error: 1.1.0
+      check-error: 1.0.3
+      deep-eql: 4.1.4
+      get-func-name: 2.0.2
+      loupe: 2.3.7
+      pathval: 1.1.1
+      type-detect: 4.1.0
+
   chai@6.2.2: {}
 
+  check-error@1.0.3:
+    dependencies:
+      get-func-name: 2.0.2
+
   chokidar@3.6.0:
     dependencies:
       anymatch: 3.1.3
@@ -5140,6 +5425,8 @@ snapshots:
 
   commander@4.1.1: {}
 
+  confbox@0.1.8: {}
+
   convert-source-map@2.0.0: {}
 
   cookie@0.7.2: {}
@@ -5159,6 +5446,12 @@ snapshots:
     dependencies:
       luxon: 3.7.2
 
+  cross-spawn@7.0.6:
+    dependencies:
+      path-key: 3.1.1
+      shebang-command: 2.0.0
+      which: 2.0.2
+
   cssesc@3.0.0: {}
 
   csstype@3.2.3: {}
@@ -5171,6 +5464,10 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
+  deep-eql@4.1.4:
+    dependencies:
+      type-detect: 4.1.0
+
   degenerator@5.0.1:
     dependencies:
       ast-types: 0.13.4
@@ -5187,6 +5484,8 @@ snapshots:
 
   didyoumean@1.2.2: {}
 
+  diff-sequences@29.6.3: {}
+
   diff@8.0.3: {}
 
   dlv@1.1.3: {}
@@ -5338,6 +5637,18 @@ snapshots:
     transitivePeerDependencies:
       - bare-abort-controller
 
+  execa@8.0.1:
+    dependencies:
+      cross-spawn: 7.0.6
+      get-stream: 8.0.1
+      human-signals: 5.0.0
+      is-stream: 3.0.0
+      merge-stream: 2.0.0
+      npm-run-path: 5.3.0
+      onetime: 6.0.0
+      signal-exit: 4.1.0
+      strip-final-newline: 3.0.0
+
   expect-type@1.3.0: {}
 
   extract-zip@2.0.1:
@@ -5479,6 +5790,8 @@ snapshots:
 
   get-caller-file@2.0.5: {}
 
+  get-func-name@2.0.2: {}
+
   get-intrinsic@1.3.0:
     dependencies:
       call-bind-apply-helpers: 1.0.2
@@ -5501,6 +5814,8 @@ snapshots:
     dependencies:
       pump: 3.0.3
 
+  get-stream@8.0.1: {}
+
   get-tsconfig@4.13.6:
     dependencies:
       resolve-pkg-maps: 1.0.0
@@ -5559,6 +5874,8 @@ snapshots:
 
   https@1.0.0: {}
 
+  human-signals@5.0.0: {}
+
   humanize-ms@1.2.1:
     dependencies:
       ms: 2.1.3
@@ -5637,14 +5954,20 @@ snapshots:
 
   is-number@7.0.0: {}
 
+  is-stream@3.0.0: {}
+
   isarray@1.0.0: {}
 
+  isexe@2.0.0: {}
+
   jiti@1.21.7: {}
 
   joycon@3.1.1: {}
 
   js-tokens@4.0.0: {}
 
+  js-tokens@9.0.1: {}
+
   js-yaml@4.1.1:
     dependencies:
       argparse: 2.0.1
@@ -5682,6 +6005,11 @@ snapshots:
 
   lines-and-columns@1.2.4: {}
 
+  local-pkg@0.5.1:
+    dependencies:
+      mlly: 1.8.2
+      pkg-types: 1.3.1
+
   lodash.defaults@4.2.0: {}
 
   lodash.isarguments@3.1.0: {}
@@ -5692,6 +6020,10 @@ snapshots:
     dependencies:
       js-tokens: 4.0.0
 
+  loupe@2.3.7:
+    dependencies:
+      get-func-name: 2.0.2
+
   lru-cache@5.1.1:
     dependencies:
       yallist: 3.1.1
@@ -5710,6 +6042,8 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
+  merge-stream@2.0.0: {}
+
   merge2@1.4.1: {}
 
   micromatch@4.0.8:
@@ -5723,6 +6057,8 @@ snapshots:
     dependencies:
       mime-db: 1.52.0
 
+  mimic-fn@4.0.0: {}
+
   minimatch@5.1.6:
     dependencies:
       brace-expansion: 2.0.2
@@ -5731,6 +6067,13 @@ snapshots:
 
   mitt@3.0.1: {}
 
+  mlly@1.8.2:
+    dependencies:
+      acorn: 8.16.0
+      pathe: 2.0.3
+      pkg-types: 1.3.1
+      ufo: 1.6.3
+
   mnemonist@0.39.6:
     dependencies:
       obliterator: 2.0.5
@@ -5788,6 +6131,10 @@ snapshots:
 
   normalize-path@3.0.0: {}
 
+  npm-run-path@5.3.0:
+    dependencies:
+      path-key: 4.0.0
+
   object-assign@4.1.1: {}
 
   object-hash@3.0.0: {}
@@ -5802,6 +6149,10 @@ snapshots:
     dependencies:
       wrappy: 1.0.2
 
+  onetime@6.0.0:
+    dependencies:
+      mimic-fn: 4.0.0
+
   openai@4.104.0(ws@8.19.0)(zod@3.25.76):
     dependencies:
       '@types/node': 18.19.130
@@ -5817,6 +6168,10 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
+  p-limit@5.0.0:
+    dependencies:
+      yocto-queue: 1.2.2
+
   pac-proxy-agent@7.2.0:
     dependencies:
       '@tootallnate/quickjs-emscripten': 0.23.0
@@ -5848,6 +6203,10 @@ snapshots:
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
 
+  path-key@3.1.1: {}
+
+  path-key@4.0.0: {}
+
   path-parse@1.0.7: {}
 
   path@0.12.7:
@@ -5855,8 +6214,12 @@ snapshots:
       process: 0.11.10
       util: 0.10.4
 
+  pathe@1.1.2: {}
+
   pathe@2.0.3: {}
 
+  pathval@1.1.1: {}
+
   pend@1.2.0: {}
 
   picocolors@1.1.1: {}
@@ -5923,6 +6286,12 @@ snapshots:
 
   pirates@4.0.7: {}
 
+  pkg-types@1.3.1:
+    dependencies:
+      confbox: 0.1.8
+      mlly: 1.8.2
+      pathe: 2.0.3
+
   postcss-import@15.1.0(postcss@8.5.6):
     dependencies:
       postcss: 8.5.6
@@ -5969,6 +6338,12 @@ snapshots:
 
   prettier@3.8.1: {}
 
+  pretty-format@29.7.0:
+    dependencies:
+      '@jest/schemas': 29.6.3
+      ansi-styles: 5.2.0
+      react-is: 18.3.1
+
   prisma@5.22.0:
     dependencies:
       '@prisma/engines': 5.22.0
@@ -6054,6 +6429,8 @@ snapshots:
       react: 18.3.1
       scheduler: 0.23.2
 
+  react-is@18.3.1: {}
+
   react-refresh@0.17.0: {}
 
   react-router-dom@6.30.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
@@ -6208,8 +6585,16 @@ snapshots:
       '@img/sharp-win32-ia32': 0.34.5
       '@img/sharp-win32-x64': 0.34.5
 
+  shebang-command@2.0.0:
+    dependencies:
+      shebang-regex: 3.0.0
+
+  shebang-regex@3.0.0: {}
+
   siginfo@2.0.0: {}
 
+  signal-exit@4.1.0: {}
+
   sirv@3.0.2:
     dependencies:
       '@polka/url': 1.0.0-next.29
@@ -6275,8 +6660,14 @@ snapshots:
     dependencies:
       ansi-regex: 5.0.1
 
+  strip-final-newline@3.0.0: {}
+
   strip-json-comments@5.0.3: {}
 
+  strip-literal@2.1.1:
+    dependencies:
+      js-tokens: 9.0.1
+
   stripe@20.3.1(@types/node@20.19.33):
     optionalDependencies:
       '@types/node': 20.19.33
@@ -6385,8 +6776,12 @@ snapshots:
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
 
+  tinypool@0.8.4: {}
+
   tinyrainbow@3.0.3: {}
 
+  tinyspy@2.2.1: {}
+
   to-regex-range@5.0.1:
     dependencies:
       is-number: 7.0.0
@@ -6436,8 +6831,12 @@ snapshots:
       turbo-windows-64: 1.13.4
       turbo-windows-arm64: 1.13.4
 
+  type-detect@4.1.0: {}
+
   typescript@5.9.3: {}
 
+  ufo@1.6.3: {}
+
   unbzip2-stream@1.4.3:
     dependencies:
       buffer: 5.7.1
@@ -6465,6 +6864,33 @@ snapshots:
 
   uuid@9.0.1: {}
 
+  vite-node@1.6.1(@types/node@20.19.33):
+    dependencies:
+      cac: 6.7.14
+      debug: 4.4.3
+      pathe: 1.1.2
+      picocolors: 1.1.1
+      vite: 5.4.21(@types/node@20.19.33)
+    transitivePeerDependencies:
+      - '@types/node'
+      - less
+      - lightningcss
+      - sass
+      - sass-embedded
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+
+  vite@5.4.21(@types/node@20.19.33):
+    dependencies:
+      esbuild: 0.21.5
+      postcss: 8.5.6
+      rollup: 4.57.1
+    optionalDependencies:
+      '@types/node': 20.19.33
+      fsevents: 2.3.3
+
   vite@5.4.21(@types/node@22.19.11):
     dependencies:
       esbuild: 0.21.5
@@ -6488,6 +6914,40 @@ snapshots:
       jiti: 1.21.7
       tsx: 3.14.0
 
+  vitest@1.6.1(@types/node@20.19.33):
+    dependencies:
+      '@vitest/expect': 1.6.1
+      '@vitest/runner': 1.6.1
+      '@vitest/snapshot': 1.6.1
+      '@vitest/spy': 1.6.1
+      '@vitest/utils': 1.6.1
+      acorn-walk: 8.3.5
+      chai: 4.5.0
+      debug: 4.4.3
+      execa: 8.0.1
+      local-pkg: 0.5.1
+      magic-string: 0.30.21
+      pathe: 1.1.2
+      picocolors: 1.1.1
+      std-env: 3.10.0
+      strip-literal: 2.1.1
+      tinybench: 2.9.0
+      tinypool: 0.8.4
+      vite: 5.4.21(@types/node@20.19.33)
+      vite-node: 1.6.1(@types/node@20.19.33)
+      why-is-node-running: 2.3.0
+    optionalDependencies:
+      '@types/node': 20.19.33
+    transitivePeerDependencies:
+      - less
+      - lightningcss
+      - sass
+      - sass-embedded
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+
   vitest@4.0.18(@types/node@20.19.33)(@vitest/ui@4.0.18)(jiti@1.21.7)(tsx@3.14.0):
     dependencies:
       '@vitest/expect': 4.0.18
@@ -6535,6 +6995,10 @@ snapshots:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
 
+  which@2.0.2:
+    dependencies:
+      isexe: 2.0.0
+
   why-is-node-running@2.3.0:
     dependencies:
       siginfo: 2.0.0
@@ -6571,6 +7035,8 @@ snapshots:
       buffer-crc32: 0.2.13
       fd-slicer: 1.1.0
 
+  yocto-queue@1.2.2: {}
+
   zod@3.23.8: {}
 
   zod@3.25.76: {}