Update app.py

app.py

@@ -825,7 +825,7 @@ with demo: # Ahora el bloque 'with' utiliza el objeto demo ya creado
                         voiceStatus.textContent = 'No se detectó voz. Intenta hablar más claro o más fuerte. 🎤';
                         voiceStatus.style.color = '#fbbf24'; // Amber
                     } else if (event.error === 'aborted') {
-                        voiceStatus.textContent = 'Reconocimiento de voz cancelado. �';
+                        voiceStatus.textContent = 'Reconocimiento de voz cancelado. 👍';
                         voiceStatus.style.color = '#4b5563';
                     }
                 };
@@ -1103,7 +1103,7 @@ with demo: # Ahora el bloque 'with' utiliza el objeto demo ya creado
     with nudges_section: # Nudges visible por defecto
         gr.Markdown("<h2 style='color: #10b981;'>¡Che, acá estoy para cebarte un susurro!</h2><p>Contame un poco de tu día y te tiro la posta. Para empezar, podés decir: <b>'Quiero un susurro'</b>.</p>")
         chat_history = gr.State([]) # Para mantener el historial del chat
-        chatbot = gr.Chatbot(label="Conversación con MateAI", height=300, type='messages') # Added type='messages'
+        chatbot = gr.Chatbot(label="Conversación con MateAI", height=300, bubble_full_width=False)
         msg_input = gr.Textbox(label="Contale a MateAI...", placeholder="Ej: 'Estoy en casa, laburando y medio cansado.' o 'Quiero un susurro de bienestar.'")
         
         # Botón para enviar el mensaje de texto (además de la entrada de voz)
@@ -1179,7 +1179,7 @@ with demo: # Ahora el bloque 'with' utiliza el objeto demo ya creado
                     """
                     <div class="browser-frame">
                         <div class="browser-header">
-                            <span style="color: #666;">&#9679; &#9679; &#9679;</span>
+                            <span style="color: #666;">● ● ●</span>
                             <div class="browser-address-bar" id="simulated_browser_address">https://www.google.com.ar</div>
                         </div>
                         <div class="browser-content" id="simulated_browser_content">
@@ -1201,29 +1201,6 @@ with demo: # Ahora el bloque 'with' utiliza el objeto demo ya creado
                     </p>
                     """
                 )
-        
-        # Funciones simuladas para el asistente visual
-        def simulate_browser_action(action_description, new_url=None, new_content=None):
-            if new_url:
-                js_code = f"""
-                document.getElementById('simulated_browser_address').innerText = '{new_url}';
-                document.getElementById('simulated_browser_content').innerHTML = '<p>Cargando: {new_url}...</p>';
-                """
-                if "google.com" in new_url:
-                    js_code += """
-                    document.getElementById('simulated_browser_content').innerHTML = '<p>¡Estás en Google! ¿Qué querés buscar?</p><img src="https://placehold.co/200x100/ffffff/000000?text=Google" alt="Google Logo">';
-                    """
-                elif "wikipedia.org" in new_url:
-                    js_code += """
-                    document.getElementById('simulated_browser_content').innerHTML = '<p>¡Estás en Wikipedia! Buscando información...</p><img src="https://placehold.co/200x100/ffffff/000000?text=Wikipedia" alt="Wikipedia Logo">';
-                    """
-                else:
-                    js_code += f"""
-                    document.getElementById('simulated_browser_content').innerHTML = '<p>Contenido simulado de: {new_url}</p>';
-                    """
-                return action_description, new_url, gr.HTML.update(value=js_code)
-            
-            return action_description, gr.skip(), gr.skip() # No cambia URL ni contenido si no se especifica
 
     # --- Funciones de Interacción para Gradio ---
 
@@ -1300,7 +1277,7 @@ with demo: # Ahora el bloque 'with' utiliza el objeto demo ya creado
             tareas_str = "\n".join([f"- {t['task']} (Agregada el: {datetime.strptime(t['added_at'], '%Y-%m-%d %H:%M:%S.%f').strftime('%d/%m')})" for t in user.tasks])
 
             # Retorna todos los outputs en el orden correcto para los componentes de Gradio
-            return (user, user.user_id, msg, user.name, str(current_points), current_insignia, next_insignia_goal,
+            return (user, user.id, msg, user.name, str(current_points), current_insignia, next_insignia_goal,
                     historial, user.preferences.get('tipo_susurro'), user.preferences.get('frecuencia'),
                     user.preferences.get('modo_che_tranqui'), tareas_str)
         # If user loading failed, return default values and the error message
@@ -1333,244 +1310,187 @@ with demo: # Ahora el bloque 'with' utiliza el objeto demo ya creado
         challenge_text = await nudge_generator.get_mateai_challenge(user_obj.user_id)
         return challenge_text, challenge_text # Return the text for vocalization
 
+    # --- Refactored Task Functions to use the central nudge_generator methods ---
     async def _add_task_gradio(user_obj, task_name):
         user_id = user_obj.user_id if user_obj else None
-        if not user_id: 
-            return "Error: Por favor, crea o carga un usuario primero.", "" 
-        user = await self.user_manager.get_user(user_id)
-        if not user:
-            return "Error: Usuario no logueado. Por favor, crea o carga un usuario.", ""
-        
-        new_task = {"task": task_name, "added_at": datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f'), "last_nudged": None}
-        user.tasks.append(new_task)
-        await self.user_manager.update_user_data(user)
-        tareas_str = "\n".join([f"- {t['task']} (Agregada el: {datetime.strptime(t['added_at'], '%Y-%m-%d %H:%M:%S.%f').strftime('%d/%m')})" for t in user.tasks])
-        return f"¡Tarea '{task_name}' agregada a tu lista, {user.name}!", tareas_str
+        msg, tareas_str = await nudge_generator.add_task(user_id, task_name)
+        return msg, tareas_str
 
     async def _complete_task_gradio(user_obj, task_name):
         user_id = user_obj.user_id if user_obj else None
-        if not user_id: 
-            return "Error: Por favor, crea o carga un usuario primero.", "" 
-        user = await self.user_manager.get_user(user_id)
-        if not user:
-            return "Error: Usuario no logueado. Por favor, crea o carga un usuario.", ""
-        
-        initial_task_count = len(user.tasks)
-        user.tasks = [task for task in user.tasks if task['task'].lower() != task_name.lower()]
-        
-        if len(user.tasks) < initial_task_count:
-            await self.user_manager.update_user_data(user)
-            tareas_str = "\n".join([f"- {t['task']} (Agregada el: {datetime.strptime(t['added_at'], '%Y-%m-%d %H:%M:%S.%f').strftime('%d/%m')})" for t in user.tasks])
-            return f"¡Tarea '{task_name}' marcada como completada, {user.name}! ¡Bien ahí!", tareas_str
-        tareas_str = "\n".join([f"- {t['task']} (Agregada el: {datetime.strptime(t['added_at'], '%Y-%m-%d %H:%M:%S.%f').strftime('%d/%m')})" for t in user.tasks])
-        return f"No encontré la tarea '{task_name}' en tu lista, {user.name}.", tareas_str
+        msg, tareas_str = await nudge_generator.complete_task(user_id, task_name)
+        return msg, tareas_str
 
     def _download_diary_gradio(diary_text):
-        return gr.File(value=diary_text.encode('utf-8'), filename="diario_mateai.txt", type="bytes")
-
-    # --- Funciones para el chat conversacional ---
+        if not diary_text:
+            return None # Avoid error on empty download
+        # Create a temporary file to be returned by Gradio
+        with open("diario_mateai.txt", "w", encoding="utf-8") as f:
+            f.write(diary_text)
+        return "diario_mateai.txt"
+
+    # --- THE NEW UNIFIED CONVERSATIONAL ENGINE ---
     async def _process_conversational_input(user_message, chat_history, current_user_state, conversation_context_state):
+        if not user_message.strip():
+            return chat_history, "", conversation_context_state, "", gr.skip(), gr.skip(), gr.skip(), gr.skip(), gr.skip()
+
         user_message_lower = user_message.lower()
-        response = ""
         user_obj = current_user_state
 
         # Append user message to chat history immediately
-        chat_history.append({"role": "user", "content": user_message})
+        chat_history.append((user_message, None))
 
         # Check if user is logged in
         if not user_obj:
             mateai_response = "¡Che, para arrancar, necesito que crees o cargues tu perfil en la sección 'Inicio & Perfil'! Después volvé acá y seguimos charlando."
-            chat_history.append({"role": "MateAI", "content": mateai_response})
-            return chat_history, "", conversation_context_state, mateai_response, gr.skip(), gr.skip(), gr.skip()
+            chat_history[-1] = (user_message, mateai_response)
+            return chat_history, "", conversation_context_state, mateai_response, gr.skip(), gr.skip(), gr.skip(), gr.skip(), gr.skip()
 
-        # Command handling for other sections (simulates voice controlling the menu)
-        if "oráculo" in user_message_lower or "revelación" in user_message_lower:
-            revelation_text = await nudge_generator.get_daily_oracle_revelation(user_obj.user_id)
-            chat_history.append({"role": "MateAI", "content": revelation_text})
-            return chat_history, "", conversation_context_state, revelation_text, gr.skip(), gr.skip(), gr.skip()
+        # --- Intent Router ---
+        response = ""
+        voice_response = ""
+        action_output = gr.skip()
+        browser_url = gr.skip()
+        browser_content = gr.skip()
+        task_list_update = gr.skip()
+        oracle_update = gr.skip()
         
-        if "desafío" in user_message_lower or "reto" in user_message_lower:
-            challenge_text = await nudge_generator.get_mateai_challenge(user_obj.user_id)
-            chat_history.append({"role": "MateAI", "content": challenge_text})
-            return chat_history, "", conversation_context_state, challenge_text, gr.skip(), gr.skip(), gr.skip()
+        # --- Intent: Oracle/Challenge ---
+        if "oráculo" in user_message_lower or "revelación" in user_message_lower:
+            response = await nudge_generator.get_daily_oracle_revelation(user_obj.user_id)
+            voice_response = response
+            oracle_update = response
 
-        if "agregar tarea" in user_message_lower or "nueva tarea" in user_message_lower:
-            task_name = user_message_lower.replace("agregar tarea", "").replace("nueva tarea", "").strip()
+        elif "desafío" in user_message_lower or "reto" in user_message_lower:
+            response = await nudge_generator.get_mateai_challenge(user_obj.user_id)
+            voice_response = response
+        
+        # --- Intent: Task Management ---
+        elif "agregar tarea" in user_message_lower or "nueva tarea" in user_message_lower:
+            task_name = user_message.replace("agregar tarea", "").replace("nueva tarea", "", 1).strip()
             if task_name:
-                msg, _ = await nudge_generator.add_task(user_obj.user_id, task_name)
-                chat_history.append({"role": "MateAI", "content": msg})
-                return chat_history, "", conversation_context_state, msg, gr.skip(), gr.skip(), gr.skip()
+                response, task_list_update = await nudge_generator.add_task(user_obj.user_id, task_name)
+                voice_response = response
             else:
                 response = "¡Dale, che! ¿Qué tarea querés que agregue? Decime, por ejemplo: 'agregar tarea comprar yerba'."
-                chat_history.append({"role": "MateAI", "content": response})
-                return chat_history, "", conversation_context_state, response, gr.skip(), gr.skip(), gr.skip()
+                voice_response = response
 
-        if "completar tarea" in user_message_lower or "tarea lista" in user_message_lower:
-            task_name = user_message_lower.replace("completar tarea", "").replace("tarea lista", "").strip()
+        elif "completar tarea" in user_message_lower or "tarea lista" in user_message_lower:
+            task_name = user_message.replace("completar tarea", "").replace("tarea lista", "", 1).strip()
             if task_name:
-                msg, _ = await nudge_generator.complete_task(user_obj.user_id, task_name)
-                chat_history.append({"role": "MateAI", "content": msg})
-                return chat_history, "", conversation_context_state, msg, gr.skip(), gr.skip(), gr.skip()
+                response, task_list_update = await nudge_generator.complete_task(user_obj.user_id, task_name)
+                voice_response = response
             else:
                 response = "¡Decime qué tarea completaste, así la saco de la lista! Por ejemplo: 'completar tarea ir al súper'."
-                chat_history.append({"role": "MateAI", "content": response})
-                return chat_history, "", conversation_context_state, response, gr.skip(), gr.skip(), gr.skip()
-        
-        # --- Conversational Browser Agent (Simulated) ---
-        if "abrir" in user_message_lower or "ir a" in user_message_lower or "navegar" in user_message_lower:
-            if "google" in user_message_lower:
-                action_desc = "¡Dale, abriendo Google en el navegador simulado!"
-                new_url = "https://www.google.com.ar"
-                chat_history.append({"role": "MateAI", "content": action_desc})
-                action_output, browser_url, browser_content = simulate_browser_action(action_desc, new_url)
-                return chat_history, "", conversation_context_state, action_output, browser_url, browser_content
-            elif "wikipedia" in user_message_lower:
-                action_desc = "¡Perfecto! Abriendo Wikipedia en el navegador simulado."
-                new_url = "https://es.wikipedia.org"
-                chat_history.append({"role": "MateAI", "content": action_desc})
-                action_output, browser_url, browser_content = simulate_browser_action(action_desc, new_url)
-                return chat_history, "", conversation_context_state, action_output, browser_url, browser_content
-            elif "pagina de inicio" in user_message_lower or "inicio" in user_message_lower:
-                action_desc = "Volviendo a la página de inicio del navegador simulado."
-                new_url = "https://www.google.com.ar" # Or your default URL
-                chat_history.append({"role": "MateAI", "content": action_desc})
-                action_output, browser_url, browser_content = simulate_browser_action(action_desc, new_url)
-                return chat_history, "", conversation_context_state, action_output, browser_url, browser_content
-            else:
-                response = "¡Che, a qué página querés ir? Decime, por ejemplo: 'abrir Google' o 'ir a Wikipedia'."
-                chat_history.append({"role": "MateAI", "content": response})
-                return chat_history, "", conversation_context_state, response, gr.skip(), gr.skip(), gr.skip()
-        
-        if "buscar" in user_message_lower and "en google" in user_message_lower:
-            query = user_message_lower.replace("buscar", "").replace("en google", "").strip()
-            if query:
-                action_desc = f"¡Buscando '{query}' en Google!"
-                new_url = f"https://www.google.com.ar/search?q={query.replace(' ', '+')}"
-                chat_history.append({"role": "MateAI", "content": action_desc})
-                action_output, browser_url, browser_content = simulate_browser_action(action_desc, new_url)
-                return chat_history, "", conversation_context_state, action_output, browser_url, browser_content
-            else:
-                response = "¡Decime qué querés buscar, che! Por ejemplo: 'buscar el clima en Google'."
-                chat_history.append({"role": "MateAI", "content": response})
-                return chat_history, "", conversation_context_state, response, gr.skip(), gr.skip(), gr.skip()
-        
-        if "cerrar esta pagina" in user_message_lower or "cerrar pagina" in user_message_lower:
-            action_desc = "¡Listo, cerrando la página actual en el navegador simulado!"
-            new_url = "about:blank" # Simulate a blank or closed page
-            chat_history.append({"role": "MateAI", "content": action_desc})
-            action_output, browser_url, browser_content = simulate_browser_action(action_desc, new_url)
-            return chat_history, "", conversation_context_state, action_output, browser_url, browser_content
-
-        # Logic to request a contextual nudge
-        current_step = conversation_context_state["step"]
-        location = conversation_context_state["location"]
-        activity = conversation_context_state["activity"]
-        sentiment = conversation_context_state["sentiment"]
-        pending_nudge_request = conversation_context_state["pending_nudge_request"]
-
-        if "susurro" in user_message_lower or "decime algo" in user_message_lower or "onda" in user_message_lower or "che" in user_message_lower or pending_nudge_request:
-            pending_nudge_request = True
-            conversation_context_state["pending_nudge_request"] = True
-            if not location:
-                response = "¡Dale! Para cebarte un susurro a medida, contame, ¿dónde estás ahora? ¿En casa, en la oficina, en la calle? (Ej: 'Estoy en casa')"
-                conversation_context_state["step"] = "ask_location"
-            elif not activity:
-                response = f"Ah, estás en {location}. ¿Y en qué andás ahora? ¿Laburando, haciendo ejercicio, relajado, cocinando, viendo un partido? (Ej: 'Estoy laburando')"
-                conversation_context_state["step"] = "ask_activity"
-            elif not sentiment:
-                response = f"Entendido, en {location} y {activity}. ¿Y cómo te sentís? ¿Bien, cansado, bajoneado, motivado? (Ej: 'Me siento bien')"
-                conversation_context_state["step"] = "ask_sentiment"
-            else:
-                # We have everything, generate the nudge
-                nudge_text, current_points, current_insignia, next_insignia_goal, historial = await nudge_generator.generate_nudge(user_obj.user_id, location, activity, sentiment)
-                response = nudge_text
-                chat_history.append({"role": "MateAI", "content": response})
-                # Reset context after generating the nudge
-                conversation_context_state = {"step": "initial", "pending_nudge_request": False, "location": None, "activity": None, "sentiment": None}
-                return chat_history, "", conversation_context_state, response, gr.skip(), gr.skip(), gr.skip()
-
-        elif current_step == "ask_location":
-            if any(k in user_message_lower for k in ["casa", "hogar"]):
-                location = "Casa"
-            elif any(k in user_message_lower for k in ["oficina", "laburo", "estudio", "trabajando"]):
-                location = "Oficina/Estudio"
-            elif any(k in user_message_lower for k in ["calle", "aire libre", "plaza", "parque", "caminando"]):
-                location = "Aire Libre/Calle"
-            else:
-                response = "No te entendí bien, che. ¿Estás en casa, en la oficina o en la calle? (Ej: 'Estoy en casa')"
-                chat_history.append({"role": "MateAI", "content": response})
-                return chat_history, "", conversation_context_state, response, gr.skip(), gr.skip(), gr.skip()
+                voice_response = response
+
+        # --- Intent: Simulated Browser Agent ---
+        elif any(keyword in user_message_lower for keyword in ["abrir", "ir a", "navegar a", "buscar", "cerrar"]):
+            if any(keyword in user_message_lower for keyword in ["abrir", "ir a", "navegar a"]):
+                if "google" in user_message_lower:
+                    response = "¡Dale, abriendo Google en el navegador simulado!"
+                    new_url = "https://www.google.com.ar"
+                    js_code = f"""
+                    document.getElementById('simulated_browser_address').innerText = '{new_url}';
+                    document.getElementById('simulated_browser_content').innerHTML = '<p>¡Estás en Google! ¿Qué querés buscar?</p><img src="https://www.gstatic.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png" alt="Google Logo" style="height: 92px;">';
+                    """
+                    action_output, browser_url, browser_content = response, new_url, gr.HTML(js_code)
+                elif "wikipedia" in user_message_lower:
+                    response = "¡Perfecto! Abriendo Wikipedia en el navegador simulado."
+                    new_url = "https://es.wikipedia.org"
+                    js_code = f"""
+                    document.getElementById('simulated_browser_address').innerText = '{new_url}';
+                    document.getElementById('simulated_browser_content').innerHTML = '<p>¡Estás en Wikipedia! ¿Qué querés buscar?</p><img src="https://upload.wikimedia.org/wikipedia/commons/8/80/Wikipedia-logo-v2.svg" alt="Wikipedia Logo" style="height: 100px;">';
+                    """
+                    action_output, browser_url, browser_content = response, new_url, gr.HTML(js_code)
+                else:
+                    response = "¡Che, a qué página querés ir? Decime un sitio conocido como 'Google' o 'Wikipedia'."
             
-            conversation_context_state["location"] = location
-            if not activity:
-                response = f"Ah, estás en {location}. ¿Y en qué andás ahora? ¿Laburando, haciendo ejercicio, relajado, cocinando, viendo un partido? (Ej: 'Estoy laburando')"
-                conversation_context_state["step"] = "ask_activity"
-            elif not sentiment:
-                response = f"Entendido, en {location} y {activity}. ¿Y cómo te sentís? ¿Bien, cansado, bajoneado, motivado? (Ej: 'Me siento bien')"
-                conversation_context_state["step"] = "ask_sentiment"
-            else: # Should not happen if flow is sequential, but as fallback
-                nudge_text, current_points, current_insignia, next_insignia_goal, historial = await nudge_generator.generate_nudge(user_obj.user_id, location, activity, sentiment)
-                response = nudge_text
-                chat_history.append({"role": "MateAI", "content": response})
-                conversation_context_state = {"step": "initial", "pending_nudge_request": False, "location": None, "activity": None, "sentiment": None}
-                return chat_history, "", conversation_context_state, response, gr.skip(), gr.skip(), gr.skip()
-
-        elif current_step == "ask_activity":
-            if any(k in user_message_lower for k in ["relajado", "tranqui", "descansando"]):
-                activity = "Relajado"
-            elif any(k in user_message_lower for k in ["laburando", "trabajando", "estudiando"]):
-                activity = "Trabajando"
-            elif any(k in user_message_lower for k in ["ejercicio", "entrenando", "corriendo", "caminando"]):
-                activity = "Ejercicio"
-            elif any(k in user_message_lower for k in ["leyendo", "libro"]):
-                activity = "Leyendo"
-            elif any(k in user_message_lower for k in ["cocinando", "comida"]):
-                activity = "Cocinando"
-            elif any(k in user_message_lower for k in ["partido", "fútbol", "viendo tele"]):
-                activity = "Viendo un partido"
-            else:
-                response = "No te pesqué esa, che. ¿Estás laburando, haciendo ejercicio, relajado, cocinando, o viendo un partido? (Ej: 'Estoy relajado')"
-                chat_history.append({"role": "MateAI", "content": response})
-                return chat_history, "", conversation_context_state, response, gr.skip(), gr.skip(), gr.skip()
+            elif "buscar" in user_message_lower:
+                query = user_message_lower.split("buscar", 1)[1].strip()
+                if query:
+                    response = f"¡Buscando '{query}' en el navegador simulado!"
+                    new_url = f"https://www.google.com.ar/search?q={query.replace(' ', '+')}"
+                    js_code = f"""
+                    document.getElementById('simulated_browser_address').innerText = '{new_url}';
+                    document.getElementById('simulated_browser_content').innerHTML = '<h3>Resultados de búsqueda para: {query}</h3><p><i>(Simulación de resultados)</i></p><ul><li>{query} - Wikipedia</li><li>Noticias sobre {query}</li><li>Imágenes de {query}</li></ul>';
+                    """
+                    action_output, browser_url, browser_content = response, new_url, gr.HTML(js_code)
+                else:
+                    response = "¡Decime qué querés buscar, che! Por ejemplo: 'buscar el clima en Google'."
+
+            elif "cerrar" in user_message_lower:
+                response = "¡Listo, cerrando la página actual en el navegador simulado!"
+                new_url = "about:blank"
+                js_code = """
+                document.getElementById('simulated_browser_address').innerText = 'Ninguna página abierta';
+                document.getElementById('simulated_browser_content').innerHTML = '<p>Navegador listo para tu próxima instrucción.</p>';
+                """
+                action_output, browser_url, browser_content = response, new_url, gr.HTML(js_code)
             
-            conversation_context_state["activity"] = activity
-            if not sentiment:
-                response = f"Entendido, en {location} y {activity}. ¿Y cómo te sentís? ¿Bien, cansado, bajoneado, motivado? (Ej: 'Me siento bien')"
-                conversation_context_state["step"] = "ask_sentiment"
-            else: # Should not happen if flow is sequential, but as fallback
-                nudge_text, current_points, current_insignia, next_insignia_goal, historial = await nudge_generator.generate_nudge(user_obj.user_id, location, activity, sentiment)
-                response = nudge_text
-                chat_history.append({"role": "MateAI", "content": response})
-                conversation_context_state = {"step": "initial", "pending_nudge_request": False, "location": None, "activity": None, "sentiment": None}
-                return chat_history, "", conversation_context_state, response, gr.skip(), gr.skip(), gr.skip()
-
-        elif current_step == "ask_sentiment":
-            if any(k in user_message_lower for k in ["bien", "joya", "diez puntos", "contento"]):
-                sentiment = "Bien"
-            elif any(k in user_message_lower for k in ["cansado", "agotado", "fundido"]):
-                sentiment = "Cansado"
-            elif any(k in user_message_lower for k in ["bajoneado", "triste", "mal", "depre"]):
-                sentiment = "Bajoneado"
-            elif any(k in user_message_lower for k in ["motivado", "con pilas", "enchufado"]):
-                sentiment = "Motivado"
-            else:
-                response = "No te capto el sentimiento, che. ¿Estás bien, cansado, bajoneado o motivado? (Ej: 'Estoy cansado')"
-                chat_history.append({"role": "MateAI", "content": response})
-                return chat_history, "", conversation_context_state, response, gr.skip(), gr.skip(), gr.skip()
+            voice_response = response
+
+        # --- Intent: Nudge Request (Multi-step) ---
+        else:
+            current_step = conversation_context_state["step"]
+            location = conversation_context_state["location"]
+            activity = conversation_context_state["activity"]
+            sentiment = conversation_context_state["sentiment"]
             
-            conversation_context_state["sentiment"] = sentiment
-            # Now that we have everything, generate the nudge
-            nudge_text, current_points, current_insignia, next_insignia_goal, historial = await nudge_generator.generate_nudge(user_obj.user_id, location, activity, sentiment)
-            response = nudge_text
-            chat_history.append({"role": "MateAI", "content": response})
-            # Reset context after generating the nudge
-            conversation_context_state = {"step": "initial", "pending_nudge_request": False, "location": None, "activity": None, "sentiment": None}
-            return chat_history, "", conversation_context_state, response, gr.skip(), gr.skip(), gr.skip()
+            if "susurro" in user_message_lower or "decime algo" in user_message_lower or conversation_context_state["pending_nudge_request"]:
+                conversation_context_state["pending_nudge_request"] = True
+                
+                if current_step == "initial":
+                    response = "¡Dale! Para cebarte un susurro a medida, contame, ¿dónde estás ahora? ¿En casa, en la oficina, en la calle?"
+                    conversation_context_state["step"] = "ask_location"
+                
+                elif current_step == "ask_location":
+                    if any(k in user_message_lower for k in ["casa", "hogar"]): location = "Casa"
+                    elif any(k in user_message_lower for k in ["oficina", "laburo", "estudio"]): location = "Oficina/Estudio"
+                    elif any(k in user_message_lower for k in ["calle", "aire libre", "plaza"]): location = "Aire Libre/Calle"
+                    else:
+                        response = "No te entendí bien, che. ¿Estás en casa, en la oficina o en la calle?"
+                    if location:
+                        conversation_context_state["location"] = location
+                        response = f"Ah, estás en {location}. ¿Y en qué andás ahora? ¿Laburando, haciendo ejercicio, relajado, cocinando...?"
+                        conversation_context_state["step"] = "ask_activity"
+
+                elif current_step == "ask_activity":
+                    if any(k in user_message_lower for k in ["relajado", "tranqui"]): activity = "Relajado"
+                    elif any(k in user_message_lower for k in ["laburando", "trabajando"]): activity = "Trabajando"
+                    elif any(k in user_message_lower for k in ["ejercicio", "entrenando"]): activity = "Ejercicio"
+                    elif any(k in user_message_lower for k in ["cocinando", "comida"]): activity = "Cocinando"
+                    elif any(k in user_message_lower for k in ["partido", "fútbol", "tele"]): activity = "Viendo un partido"
+                    else:
+                        response = "No te pesqué esa, che. ¿Estás laburando, haciendo ejercicio, relajado, cocinando...?"
+                    if activity:
+                        conversation_context_state["activity"] = activity
+                        response = f"Entendido, en {location} y {activity}. ¿Y cómo te sentís? ¿Bien, cansado, bajoneado, motivado?"
+                        conversation_context_state["step"] = "ask_sentiment"
+
+                elif current_step == "ask_sentiment":
+                    if any(k in user_message_lower for k in ["bien", "joya"]): sentiment = "Bien"
+                    elif any(k in user_message_lower for k in ["cansado", "agotado"]): sentiment = "Cansado"
+                    elif any(k in user_message_lower for k in ["bajoneado", "triste"]): sentiment = "Bajoneado"
+                    elif any(k in user_message_lower for k in ["motivado", "con pilas"]): sentiment = "Motivado"
+                    else:
+                        response = "No te capto el sentimiento, che. ¿Estás bien, cansado, bajoneado o motivado?"
+                    if sentiment:
+                        conversation_context_state["sentiment"] = sentiment
+                        # We have everything, generate the nudge
+                        response, _, _, _, _ = await nudge_generator.generate_nudge(user_obj.user_id, location, activity, sentiment)
+                        # Reset context
+                        conversation_context_state = {"step": "initial", "pending_nudge_request": False, "location": None, "activity": None, "sentiment": None}
+
+            else:
+                response = "¡No te entendí bien, che! Soy MateAI. Podés pedirme un 'susurro', un 'desafío', el 'oráculo', o manejar tus tareas y el navegador."
+
+            voice_response = response
+
+        # Update chat history with MateAI's response
+        chat_history[-1] = (user_message, response)
         
-        else: # Default response if no specific command or context step
-            response = "¡No te entendí bien, che! Soy MateAI, tu compañero. Si querés un susurro, decime <b>'quiero un susurro'</b> y te voy a preguntar unas cositas. Si no, decime qué andás necesitando."
-            chat_history.append({"role": "MateAI", "content": response})
-            return chat_history, "", conversation_context_state, response, gr.skip(), gr.skip(), gr.skip()
+        return chat_history, "", conversation_context_state, voice_response, action_output, browser_url, browser_content, task_list_update, oracle_update
 
     # --- Conexión de Eventos ---
     btn_crear_usuario.click(
@@ -1620,26 +1540,37 @@ with demo: # Ahora el bloque 'with' utiliza el objeto demo ya creado
         inputs=[diario_reflexion],
         outputs=gr.File(label="Descargar tu Diario")
     )
+    
+    # Define outputs for the unified conversational engine
+    CONVERSATIONAL_OUTPUTS = [
+        chatbot, 
+        msg_input, 
+        conversation_context_state, 
+        voice_output_text, 
+        simulated_action_output, 
+        simulated_browser_url, 
+        simulated_browser_content, 
+        tareas_pendientes_output,
+        oraculo_output
+    ]
 
     # --- Manejo de la entrada de voz y texto conversacional ---
-    # El input de texto (msg_input) y el botón de enviar (btn_send_msg)
-    # ahora se conectan a la función _process_conversational_input
     msg_input.submit(
         fn=_process_conversational_input,
         inputs=[msg_input, chat_history, current_user_state, conversation_context_state],
-        outputs=[chatbot, msg_input, conversation_context_state, voice_output_text, simulated_action_output, simulated_browser_url, simulated_browser_content]
+        outputs=CONVERSATIONAL_OUTPUTS
     )
     btn_send_msg.click(
         fn=_process_conversational_input,
         inputs=[msg_input, chat_history, current_user_state, conversation_context_state],
-        outputs=[chatbot, msg_input, conversation_context_state, voice_output_text, simulated_action_output, simulated_browser_url, simulated_browser_content]
+        outputs=CONVERSATIONAL_OUTPUTS
     )
 
-    # El botón oculto para la entrada de voz también se conecta a la función conversacional
+    # The hidden voice input button also connects to the unified engine
     hidden_voice_submit_button.click(
         fn=_process_conversational_input,
         inputs=[voice_input_textbox, chat_history, current_user_state, conversation_context_state],
-        outputs=[chatbot, voice_input_textbox, conversation_context_state, voice_output_text, simulated_action_output, simulated_browser_url, simulated_browser_content]
+        outputs=[chatbot, voice_input_textbox, conversation_context_state, voice_output_text, simulated_action_output, simulated_browser_url, simulated_browser_content, tareas_pendientes_output, oraculo_output]
     )
     
     # When the backend generates text for voice, it sends it to voice_output_text,
@@ -1652,4 +1583,4 @@ with demo: # Ahora el bloque 'with' utiliza el objeto demo ya creado
     )
 
 # Lanza la interfaz de Gradio
-demo.launch()
+demo.launch(debug=True)