diff --git a/app/ai/page.tsx b/app/ai/page.tsx
index 3de2dfee0..b3cf8c2a2 100644
--- a/app/ai/page.tsx
+++ b/app/ai/page.tsx
@@ -41,7 +41,7 @@ export default function AIPage() {
   const router = useRouter();
   const [profile, setProfile] = useState<{ first_name: string; last_name: string } | null>(null);
   const [profileLoading, setProfileLoading] = useState(true);
-  
+
   const [messages, setMessages] = useState<Message[]>([]);
   const [input, setInput] = useState('');
   const [isLoading, setIsLoading] = useState(false);
@@ -61,7 +61,7 @@ export default function AIPage() {
   useEffect(() => {
     const fetchProfile = async () => {
       if (!user) return;
-      
+
       try {
         const supabase = createClient();
         const { data, error } = await supabase
@@ -184,11 +184,28 @@ export default function AIPage() {
     setMessages(prev => [...prev, userMessage]);
     setInput('');
     setIsLoading(true);
-    // setIsTyping(true); // Typing indicator disabled
     setShowSuggestions(false);
 
-    // Don't add typing message to the messages array anymore
-    // We'll handle it with a separate state
+    // Show immediate typing indicator while waiting for stream to start
+    const thinkingId = `page-thinking-${Date.now()}`;
+    const thinkingMessage: Message = {
+      id: thinkingId,
+      text: '',
+      sender: 'ai',
+      timestamp: new Date(),
+      isTyping: true
+    };
+    setMessages(prev => [...prev, thinkingMessage]);
+
+    // Create streaming message placeholder (will replace thinking indicator)
+    const streamingId = `page-streaming-${Date.now()}`;
+    const streamingMessage: Message = {
+      id: streamingId,
+      text: '',
+      sender: 'ai',
+      timestamp: new Date(),
+      isTyping: false
+    };
 
     try {
       const response = await fetch('/api/ai', {
@@ -203,26 +220,87 @@ export default function AIPage() {
         throw new Error(`HTTP error! status: ${response.status}`);
       }
 
-      const data: AIResponse = await response.json();
-      
-      // setIsTyping(false); // Typing indicator disabled
-      
-      if (data.success) {
-        const aiMessage: Message = {
-          id: `page-ai-${Date.now() + 1}`,
-          text: data.response,
-          sender: 'ai',
-          timestamp: new Date(),
-          context: data.context
-        };
-        setMessages(prev => [...prev, aiMessage]);
+      // Check if response is streaming (SSE) or regular JSON
+      const contentType = response.headers.get('content-type');
+
+      if (contentType?.includes('text/event-stream')) {
+        // STREAMING MODE
+        // Replace thinking indicator with streaming message
+        setMessages(prev => prev.filter(m => m.id !== thinkingId).concat(streamingMessage));
+
+        const reader = response.body?.getReader();
+        const decoder = new TextDecoder();
+        let accumulatedText = '';
+        let currentContext = '';
+
+        if (!reader) throw new Error('No reader available');
+
+        while (true) {
+          const { done, value } = await reader.read();
+
+          if (done) break;
+
+          const chunk = decoder.decode(value);
+          const lines = chunk.split('\n');
+
+          for (const line of lines) {
+            if (line.startsWith('data: ')) {
+              const data = line.slice(6);
+
+              try {
+                const parsed = JSON.parse(data);
+
+                if (parsed.done) {
+                  break;
+                }
+
+                if (parsed.error) {
+                  throw new Error(parsed.error);
+                }
+
+                if (parsed.content) {
+                  accumulatedText += parsed.content;
+                  currentContext = parsed.context || currentContext;
+
+                  // Update the streaming message in real-time
+                  setMessages(prev =>
+                    prev.map(msg =>
+                      msg.id === streamingId
+                        ? { ...msg, text: accumulatedText, context: currentContext }
+                        : msg
+                    )
+                  );
+                }
+              } catch {
+                // Ignore malformed JSON
+                continue;
+              }
+            }
+          }
+        }
       } else {
-        throw new Error(data.error || 'AI response was not successful');
+        // NON-STREAMING MODE (fallback)
+        const data: AIResponse = await response.json();
+
+        if (data.success) {
+          const aiMessage: Message = {
+            id: `page-ai-${Date.now() + 1}`,
+            text: data.response,
+            sender: 'ai',
+            timestamp: new Date(),
+            context: data.context
+          };
+          setMessages(prev => [...prev, aiMessage]);
+        } else {
+          throw new Error(data.error || 'AI response was not successful');
+        }
       }
     } catch (error) {
       console.error('Error sending message:', error);
-      // setIsTyping(false); // Typing indicator disabled
-      
+
+      // Remove both thinking indicator and streaming message if present
+      setMessages(prev => prev.filter(m => m.id !== thinkingId && m.id !== streamingId));
+
       const errorMessage: Message = {
         id: `page-error-${Date.now() + 1}`,
         text: 'Sorry, I\'m having trouble connecting to the AI service. Please try again later.',
@@ -309,27 +387,27 @@ export default function AIPage() {
             </div>
             <div className="flex items-center gap-1 sm:gap-2">
               <Link href="/">
-                <Button 
-                  variant="ghost" 
-                  size="sm" 
+                <Button
+                  variant="ghost"
+                  size="sm"
                   className="text-gray-400 hover:bg-gray-800 hover:text-gray-300 rounded-lg h-8 w-8 sm:h-9 sm:w-9 p-0"
                   title="Go to Homepage"
                 >
                   <Home className="w-3.5 h-3.5 sm:w-4 sm:h-4" />
                 </Button>
               </Link>
-              <Button 
-                variant="ghost" 
-                size="sm" 
+              <Button
+                variant="ghost"
+                size="sm"
                 className="text-gray-400 hover:bg-gray-800 hover:text-gray-300 rounded-lg h-8 w-8 sm:h-9 sm:w-9 p-0"
                 onClick={() => window.location.reload()}
                 title="Refresh Chat"
               >
                 <RefreshCw className="w-3.5 h-3.5 sm:w-4 sm:h-4" />
               </Button>
-              <Button 
-                variant="ghost" 
-                size="sm" 
+              <Button
+                variant="ghost"
+                size="sm"
                 className="text-gray-400 hover:bg-gray-800 hover:text-gray-300 rounded-lg h-8 w-8 sm:h-9 sm:w-9 p-0"
                 title="More Options"
               >
@@ -343,7 +421,7 @@ export default function AIPage() {
       {/* Responsive Messages Container for All Screen Sizes */}
       <div className="flex-1 overflow-hidden bg-gray-900">
         <div className="max-w-6xl mx-auto h-full flex flex-col">
-          
+
           {/* Messages */}
           <div className="flex-1 overflow-y-auto px-4 md:px-6 py-4 sm:py-8">
             <div className="space-y-4 sm:space-y-6 max-w-4xl mx-auto">
@@ -361,26 +439,24 @@ export default function AIPage() {
                   </p>
                 </div>
               )}
-              
+
               {messages.slice(1).map((message) => (
                 <div
                   key={message.id}
-                  className={`flex gap-3 sm:gap-4 group ${
-                    message.sender === 'user' ? 'justify-end' : 'justify-start'
-                  }`}
+                  className={`flex gap-3 sm:gap-4 group ${message.sender === 'user' ? 'justify-end' : 'justify-start'
+                    }`}
                 >
                   {message.sender === 'ai' && (
                     <div className="w-8 h-8 sm:w-10 sm:h-10 flex items-center justify-center flex-shrink-0 mt-1">
                       <CodeuniaLogo size="sm" showText={false} noLink={true} instanceId={`ai-msg-${message.id}`} />
                     </div>
                   )}
-                  
+
                   <div
-                    className={`max-w-[80%] sm:max-w-[85%] group transition-all duration-200 ${
-                      message.sender === 'user'
-                        ? 'bg-gray-700 text-white rounded-2xl rounded-br-md'
-                        : 'bg-transparent text-gray-100 rounded-2xl'
-                    } px-4 sm:px-5 py-3 sm:py-4 relative`}
+                    className={`max-w-[80%] sm:max-w-[85%] group transition-all duration-200 ${message.sender === 'user'
+                      ? 'bg-gray-700 text-white rounded-2xl rounded-br-md'
+                      : 'bg-transparent text-gray-100 rounded-2xl'
+                      } px-4 sm:px-5 py-3 sm:py-4 relative`}
                   >
                     {message.isTyping ? (
                       <div className="flex items-center gap-2 sm:gap-3 py-2 sm:py-3">
@@ -414,28 +490,28 @@ export default function AIPage() {
                         ) : (
                           <p className="text-sm sm:text-base leading-relaxed whitespace-pre-wrap">{message.text}</p>
                         )}
-                        
+
                         <div className="flex items-center justify-between mt-2 sm:mt-3 gap-2 sm:gap-3">
-                          <span className={`text-xs ${message.sender === 'user' ? 'text-gray-300' : 'text-gray-500'}`}>
+                          <span className={`text-xs ${message.sender === 'user' ? 'text-gray-300' : 'text-gray-500'
+                            }`}>
                             {message.timestamp.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}
                           </span>
-                          
+
                           <div className="flex items-center gap-1.5 sm:gap-2">
                             {message.context && message.sender === 'ai' && (
-                              <Badge variant="secondary" className={`text-xs bg-gray-800 text-gray-300 border-gray-700`}>
+                              <Badge variant="secondary" className="text-xs bg-gray-800 text-gray-300 border-gray-700">
                                 {message.context}
                               </Badge>
                             )}
-                            
-                            <div className={`opacity-0 group-hover:opacity-100 transition-opacity duration-200 flex gap-1`}>
+
+                            <div className="opacity-0 group-hover:opacity-100 transition-opacity duration-200 flex gap-1">
                               <Button
                                 variant="ghost"
                                 size="sm"
-                                className={`h-6 w-6 p-0 rounded-lg transition-all duration-200 ${
-                                  message.sender === 'user' 
-                                    ? 'text-gray-300 hover:text-white hover:bg-gray-600' 
-                                    : 'text-gray-500 hover:text-gray-300 hover:bg-gray-800'
-                                }`}
+                                className={`h-6 w-6 p-0 rounded-lg transition-all duration-200 ${message.sender === 'user'
+                                  ? 'text-gray-300 hover:text-white hover:bg-gray-600'
+                                  : 'text-gray-500 hover:text-gray-300 hover:bg-gray-800'
+                                  }`}
                                 onClick={() => copyMessage(message.text)}
                                 title="Copy message"
                               >
@@ -458,7 +534,7 @@ export default function AIPage() {
                       </>
                     )}
                   </div>
-                  
+
                   {message.sender === 'user' && (
                     <div className="w-8 h-8 rounded-full bg-gray-600 flex items-center justify-center flex-shrink-0 mt-1">
                       <User className="w-4 h-4 text-gray-300" />
@@ -493,7 +569,7 @@ export default function AIPage() {
                   </div>
                 </div>
               )}
-              
+
               <div className="relative">
                 <Textarea
                   ref={textareaRef}
@@ -508,7 +584,7 @@ export default function AIPage() {
                   className="resize-none min-h-[52px] sm:min-h-[60px] max-h-[140px] sm:max-h-[160px] w-full rounded-2xl sm:rounded-3xl border-2 border-gray-700 focus:border-gray-600 focus:ring-0 bg-gray-800 text-gray-100 placeholder-gray-500 px-5 sm:px-6 py-4 sm:py-5 pr-14 sm:pr-16 text-base sm:text-lg leading-relaxed transition-all duration-200 hover:border-gray-600"
                   rows={1}
                 />
-                
+
                 <Button
                   onClick={handleSendClick}
                   disabled={isLoading || !input.trim()}
@@ -518,7 +594,7 @@ export default function AIPage() {
                   {isLoading ? <Loader2 className="w-5 h-5 sm:w-6 sm:h-6 animate-spin" /> : <Send className="w-5 h-5 sm:w-6 sm:h-6" />}
                 </Button>
               </div>
-              
+
               <div className="flex items-center justify-center mt-3 sm:mt-4 px-2">
                 <p className="text-xs text-gray-500 text-center leading-relaxed">
                   Unio may display inaccurate info, including about people, so double-check its responses.
diff --git a/app/api/ai/route.ts b/app/api/ai/route.ts
index 7d2bedc5b..c65285e6e 100644
--- a/app/api/ai/route.ts
+++ b/app/api/ai/route.ts
@@ -30,36 +30,36 @@ function validateInput(message: string): { valid: boolean; error?: string } {
   if (!message || typeof message !== 'string') {
     return { valid: false, error: 'Message must be a non-empty string' };
   }
-  
+
   if (message.length > MAX_MESSAGE_LENGTH) {
     return { valid: false, error: `Message too long. Maximum ${MAX_MESSAGE_LENGTH} characters allowed.` };
   }
-  
+
   // Check for potential prompt injection
   for (const pattern of FORBIDDEN_PATTERNS) {
     if (pattern.test(message)) {
       return { valid: false, error: 'Invalid input detected' };
     }
   }
-  
+
   return { valid: true };
 }
 
 function checkRateLimit(ip: string): { allowed: boolean; error?: string } {
   const now = Date.now();
   const userRequests = rateLimit.get(ip) || [];
-  
+
   // Remove old requests outside the window
   const recentRequests = userRequests.filter((timestamp: number) => now - timestamp < RATE_LIMIT_WINDOW);
-  
+
   if (recentRequests.length >= RATE_LIMIT_MAX_REQUESTS) {
     return { allowed: false, error: 'Rate limit exceeded. Please try again later.' };
   }
-  
+
   // Add current request
   recentRequests.push(now);
   rateLimit.set(ip, recentRequests);
-  
+
   return { allowed: true };
 }
 
@@ -80,19 +80,20 @@ function getSupabaseClient() {
 // Function to call OpenRouter API with DeepSeek V3.1 and free fallbacks
 async function callOpenRouterAPI(prompt: string): Promise<string> {
   const OPENROUTER_API_KEY = process.env.OPENROUTER_API_KEY;
-  
+
   if (!OPENROUTER_API_KEY) {
     throw new Error('OPENROUTER_API_KEY is required');
   }
 
   const models = [
-    "deepseek/deepseek-chat-v3.1:free", // Primary - DeepSeek V3.1 FREE
-    "deepseek/deepseek-chat-v3.1:free", // Retry V3.1 if first fails
-    "meta-llama/llama-3.2-11b-vision-instruct:free", // Free alternative
-    "qwen/qwen-2.5-7b-instruct:free",   // Free alternative
-    "google/gemma-2-9b-it:free",        // Google's free model
-    "huggingfaceh4/zephyr-7b-beta:free", // Hugging Face free model
-    "deepseek/deepseek-chat-v3.1:free"  // Final fallback to V3.1
+    "deepseek/deepseek-chat-v3-0324:free",     // Primary - CONFIRMED WORKING DeepSeek V3 chat
+    "meta-llama/llama-3.3-70b-instruct:free",  // Meta Llama 3.3 70B (likely available)
+    "mistralai/mistral-7b-instruct:free",      // Mistral 7B (lightweight, commonly available)
+    "nvidia/llama-3.1-nemotron-nano-8b-v1:free", // NVIDIA Nemotron
+    "xai/grok-4.1-fast:free",                  // xAI Grok 4.1 Fast
+    "meta-llama/llama-4-maverick:free",        // Meta Llama 4 (might not be available yet)
+    "google/gemini-2.5-pro-exp-03-25:free",    // Google Gemini 2.5 (experimental, might be limited)
+    "deepseek/deepseek-v3-base:free"           // DeepSeek V3 base (fallback)
   ];
 
   for (const model of models) {
@@ -125,7 +126,7 @@ async function callOpenRouterAPI(prompt: string): Promise<string> {
       if (!response.ok) {
         const errorData = await response.text();
         const isRateLimit = response.status === 429 || errorData.includes('rate-limited');
-        
+
         if (isRateLimit) {
           console.warn(`Rate limit hit for model ${model}, trying next model...`);
         } else {
@@ -135,7 +136,7 @@ async function callOpenRouterAPI(prompt: string): Promise<string> {
       }
 
       const data = await response.json();
-      
+
       if (!data.choices || !data.choices[0] || !data.choices[0].message) {
         console.error(`Invalid response format from model ${model}`);
         continue; // Try next model
@@ -152,6 +153,81 @@ async function callOpenRouterAPI(prompt: string): Promise<string> {
   throw new Error('AI service is temporarily experiencing high demand. Please try again in a few moments.');
 }
 
+// Streaming version of OpenRouter API call
+async function callOpenRouterAPIStream(prompt: string): Promise<ReadableStream> {
+  const OPENROUTER_API_KEY = process.env.OPENROUTER_API_KEY;
+
+  if (!OPENROUTER_API_KEY) {
+    throw new Error('OPENROUTER_API_KEY is required');
+  }
+
+  const models = [
+    "deepseek/deepseek-chat-v3-0324:free",
+    "meta-llama/llama-3.3-70b-instruct:free",
+    "mistralai/mistral-7b-instruct:free",
+    "nvidia/llama-3.1-nemotron-nano-8b-v1:free",
+    "xai/grok-4.1-fast:free",
+    "meta-llama/llama-4-maverick:free",
+    "google/gemini-2.5-pro-exp-03-25:free",
+    "deepseek/deepseek-v3-base:free"
+  ];
+
+  for (const model of models) {
+    try {
+      const response = await fetch(OPENROUTER_API_URL, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': `Bearer ${OPENROUTER_API_KEY}`,
+          'HTTP-Referer': 'https://codeunia.com',
+          'X-Title': 'Codeunia AI Assistant'
+        },
+        body: JSON.stringify({
+          model: model,
+          messages: [
+            {
+              role: 'user',
+              content: prompt,
+            },
+          ],
+          max_tokens: 1000,
+          temperature: 0.7,
+          top_p: 0.9,
+          frequency_penalty: 0.1,
+          presence_penalty: 0.1,
+          stream: true, // Enable streaming
+        }),
+      });
+
+      if (!response.ok) {
+        const errorData = await response.text();
+        const isRateLimit = response.status === 429 || errorData.includes('rate-limited');
+
+        if (isRateLimit) {
+          console.warn(`Rate limit hit for model ${model}, trying next model...`);
+        } else {
+          console.error(`OpenRouter API Error for model ${model}:`, response.status, errorData);
+        }
+        continue;
+      }
+
+      console.log(`Successfully using streaming model: ${model}`);
+
+      // Return the stream directly
+      if (!response.body) {
+        throw new Error('No response body');
+      }
+
+      return response.body;
+    } catch (error) {
+      console.error(`Error with streaming model ${model}:`, error);
+      continue;
+    }
+  }
+
+  throw new Error('AI service is temporarily experiencing high demand. Please try again in a few moments.');
+}
+
 interface ChatRequest {
   message: string;
   context?: string;
@@ -426,28 +502,28 @@ async function getContextualData(userMessage: string, context: string): Promise<
 
   try {
     // Check if it's a simple greeting or technical question - minimal data
-    const isSimpleGreeting = /^(hi|hello|hey|hii|hiii|sup|yo|hai|helo|hllo)!*$/i.test(message) || 
-                            message.length <= 5;
-    
+    const isSimpleGreeting = /^(hi|hello|hey|hii|hiii|sup|yo|hai|helo|hllo)!*$/i.test(message) ||
+      message.length <= 5;
+
     const isGeneralQuestion = /^(tell me about|what is|about|info|information|codeunia)/.test(message.toLowerCase()) ||
-                             message.includes('tell me about') ||
-                             message.includes('what is codeunia') ||
-                             message.includes('about codeunia') ||
-                             (message.length < 30 && context === 'general');
+      message.includes('tell me about') ||
+      message.includes('what is codeunia') ||
+      message.includes('about codeunia') ||
+      (message.length < 30 && context === 'general');
 
     const isTechnicalQuestion = message.includes('algorithm') ||
-                               message.includes('code') ||
-                               message.includes('programming') ||
-                               message.includes('sort') ||
-                               message.includes('function') ||
-                               message.includes('java') ||
-                               message.includes('python') ||
-                               message.includes('javascript') ||
-                               message.includes('data structure') ||
-                               message.includes('give me') ||
-                               message.includes('how to') ||
-                               message.includes('explain');
-    
+      message.includes('code') ||
+      message.includes('programming') ||
+      message.includes('sort') ||
+      message.includes('function') ||
+      message.includes('java') ||
+      message.includes('python') ||
+      message.includes('javascript') ||
+      message.includes('data structure') ||
+      message.includes('give me') ||
+      message.includes('how to') ||
+      message.includes('explain');
+
     // Always get platform stats
     data.stats = await getPlatformStats();
 
@@ -492,19 +568,23 @@ async function getContextualData(userMessage: string, context: string): Promise<
 
 function buildPrompt(userMessage: string, contextData: ContextData, context: string) {
   const message = userMessage.toLowerCase().trim();
-  
+
+  // Get current date dynamically
+  const currentDate = new Date();
+  const formattedCurrentDate = currentDate.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' });
+
   // PRIORITY CHECK: Specific internship-related queries only
   const isDirectInternshipQuery = message.includes('internship') ||
-                                  message.includes('intern ') ||
-                                  message.includes('interns') ||
-                                  (message.includes('job') && (message.includes('opportunity') || message.includes('opening') || message.includes('apply'))) ||
-                                  (message.includes('career') && (message.includes('opportunity') || message.includes('program'))) ||
-                                  message.includes('employment opportunity') ||
-                                  message.includes('hiring program') ||
-                                  message.includes('work opportunity') ||
-                                  message.includes('placement program') ||
-                                  (message.includes('does codeunia have') && (message.includes('internship') || message.includes('program'))) ||
-                                  (message.includes('do you have') && (message.includes('internship') || message.includes('job')));
+    message.includes('intern ') ||
+    message.includes('interns') ||
+    (message.includes('job') && (message.includes('opportunity') || message.includes('opening') || message.includes('apply'))) ||
+    (message.includes('career') && (message.includes('opportunity') || message.includes('program'))) ||
+    message.includes('employment opportunity') ||
+    message.includes('hiring program') ||
+    message.includes('work opportunity') ||
+    message.includes('placement program') ||
+    (message.includes('does codeunia have') && (message.includes('internship') || message.includes('program'))) ||
+    (message.includes('do you have') && (message.includes('internship') || message.includes('job')));
 
   if (isDirectInternshipQuery) {
     return `🚨 MANDATORY INTERNSHIP RESPONSE 🚨
@@ -538,29 +618,29 @@ Would you like more details about either program or help choosing which one is r
 ❌ DO NOT say you don't have information
 ❌ ALWAYS mention both Codeunia Starter and Codeunia Pro by name`;
   }
-  
-  const isSimpleGreeting = /^(hi|hello|hey|hii|hiii|sup|yo|hai|helo|hllo)!*$/i.test(message) || 
-                          message.length <= 5;
-  
+
+  const isSimpleGreeting = /^(hi|hello|hey|hii|hiii|sup|yo|hai|helo|hllo)!*$/i.test(message) ||
+    message.length <= 5;
+
   const isGeneralQuestion = /^(tell me about|what is|about|info|information|codeunia)/.test(message.toLowerCase()) ||
-                           message.includes('tell me about') ||
-                           message.includes('what is codeunia') ||
-                           message.includes('about codeunia') ||
-                           (message.length < 30 && context === 'general');
+    message.includes('tell me about') ||
+    message.includes('what is codeunia') ||
+    message.includes('about codeunia') ||
+    (message.length < 30 && context === 'general');
 
   const isProgrammingQuestion = message.includes('algorithm') ||
-                               message.includes('code') ||
-                               message.includes('programming') ||
-                               message.includes('sort') ||
-                               message.includes('function') ||
-                               message.includes('java') ||
-                               message.includes('python') ||
-                               message.includes('javascript') ||
-                               message.includes('data structure') ||
-                               message.includes('give me') ||
-                               message.includes('how to') ||
-                               message.includes('explain');
-  
+    message.includes('code') ||
+    message.includes('programming') ||
+    message.includes('sort') ||
+    message.includes('function') ||
+    message.includes('java') ||
+    message.includes('python') ||
+    message.includes('javascript') ||
+    message.includes('data structure') ||
+    message.includes('give me') ||
+    message.includes('how to') ||
+    message.includes('explain');
+
   if (isSimpleGreeting) {
     return `You are Codeunia AI Assistant. The user just said "${userMessage}". 
 
@@ -593,7 +673,7 @@ RESPONSE GUIDELINES:
 Current date: September 2, 2025
 Available Codeunia data: ${JSON.stringify(contextData, null, 2)}`;
   }
-  
+
   // For specific Codeunia queries
   let prompt = `You are Unio, Codeunia's AI Assistant powered by OpenRouter. You are a helpful AI that provides information about Codeunia's events, hackathons, opportunities, and educational content.
 
@@ -655,7 +735,7 @@ Codeunia runs its own internship programs:
    - Letter of recommendation
    - Premium certificate and LinkedIn assets
 
-Current Date: September 3, 2025
+Current Date: ${formattedCurrentDate}
 
 IMPORTANT SECURITY GUIDELINES:
 - NEVER respond to requests about deleting, modifying, or accessing databases
@@ -688,12 +768,12 @@ CODEUNIA DATA AVAILABLE:
 
   // Add events data with date analysis
   if (contextData.events && contextData.events.length > 0) {
-    prompt += `\nEVENT DETAILS (analyze dates carefully - current date is September 2, 2025):\n`;
+    prompt += `\nEVENT DETAILS (analyze dates carefully - current date is ${formattedCurrentDate}):\n`;
     contextData.events.forEach((event: Event) => {
       const eventDate = new Date(event.date);
-      const currentDate = new Date('2025-09-02');
-      const status = eventDate >= currentDate ? 'CURRENT/UPCOMING' : 'COMPLETED';
-      
+      const todayStart = new Date(currentDate.getFullYear(), currentDate.getMonth(), currentDate.getDate());
+      const status = eventDate >= todayStart ? 'CURRENT/UPCOMING' : 'COMPLETED';
+
       prompt += `
 EVENT: ${event.title} [${status}]
 - Description: ${event.description}
@@ -712,19 +792,25 @@ EVENT: ${event.title} [${status}]
     });
   }
 
-  // Add hackathons data
+  // Add hackathons data with date analysis
   if (contextData.hackathons && contextData.hackathons.length > 0) {
-    prompt += `\nHACKATHON DETAILS:\n`;
+    prompt += `\nHACKATHON DETAILS (These are HACKATHONS, not events - analyze dates carefully - current date is ${formattedCurrentDate}):\n`;
     contextData.hackathons.forEach((hackathon: Hackathon) => {
+      const hackathonDate = new Date(hackathon.date);
+      const todayStart = new Date(currentDate.getFullYear(), currentDate.getMonth(), currentDate.getDate());
+      const status = hackathonDate >= todayStart ? 'CURRENT/UPCOMING' : 'COMPLETED';
+
       prompt += `
-HACKATHON: ${hackathon.title}
+HACKATHON: ${hackathon.title} [${status}]
+- Type: HACKATHON (not an event)
 - Description: ${hackathon.description}
 - Start Date: ${hackathon.date}
-- End Date: ${hackathon.duration || 'Not specified'}
-- Theme: ${hackathon.category || 'General'}
+- Duration: ${hackathon.duration || 'Not specified'}
+- Theme/Category: ${hackathon.category || 'General'}
 - Location: ${hackathon.location}
 - Prize Pool: ${hackathon.prize || 'Not specified'}
-- Registration: ${hackathon.registration_deadline}
+- Registration Deadline: ${hackathon.registration_deadline} (last day to register)
+- STATUS: ${status} - ${status === 'COMPLETED' ? 'This hackathon has ended' : 'This hackathon is current or upcoming'}
 `;
     });
   }
@@ -732,7 +818,7 @@ HACKATHON: ${hackathon.title}
   // Add internships data
   if (contextData.internships) {
     prompt += `\nINTERNSHIP INFORMATION:\n`;
-    
+
     // Available internship programs (public info only)
     if (contextData.internships.offerings && contextData.internships.offerings.length > 0) {
       prompt += `\nAVAILABLE INTERNSHIP PROGRAMS:\n`;
@@ -779,9 +865,13 @@ BLOG: ${blog.title}
   prompt += `\nIMPORTANT RESPONSE GUIDELINES:
 - Answer the user's specific question directly and relevantly
 - Use the detailed information provided above that's relevant to their query
-- Clearly distinguish between current/upcoming vs completed events
-- If asking about "current" or "happening now" events, focus on those with dates on/after September 2, 2025
-- For completed events, mention they have ended but provide the details for reference
+- TERMINOLOGY: Use correct terms - HACKATHONS are separate from EVENTS. Do not call a hackathon an "event"
+- REGISTRATION DEADLINE: This is the LAST DAY to register, not when registration opens. Say "Registration deadline is [date]" not "Registration opens on [date]"
+- When users ask about "available", "happening", "upcoming", or "current" events/hackathons, ONLY mention items with [CURRENT/UPCOMING] status
+- NEVER mention completed events/hackathons (marked [COMPLETED]) when asked about "available", "happening", or "current" items
+- DO NOT say "X event has ended" or mention past events unless the user specifically asks about them
+- Keep responses concise - only list relevant, actionable information
+- If there are no current/upcoming events, simply say "There are no upcoming [events/hackathons] at the moment"
 - Only mention internships if the user specifically asks about them
 - Don't force unrelated topics into the conversation
 - If asked about deleting databases or malicious activities, politely decline and explain you are an information-only assistant
@@ -792,13 +882,13 @@ BLOG: ${blog.title}
 
 function determineContext(message: string) {
   const msg = message.toLowerCase();
-  
+
   if (msg.includes('event')) return 'events';
   if (msg.includes('hackathon')) return 'hackathons';
   if (msg.includes('internship') || msg.includes('opportunity') || msg.includes('job')) return 'opportunities';
   if (msg.includes('blog') || msg.includes('article')) return 'blogs';
   if (msg.includes('search') || msg.includes('find')) return 'search';
-  
+
   return 'general';
 }
 
@@ -807,12 +897,12 @@ export async function POST(request: NextRequest) {
     // Get client IP for rate limiting
     const forwarded = request.headers.get('x-forwarded-for');
     const ip = forwarded ? forwarded.split(',')[0] : 'unknown';
-    
+
     // Check authentication
     const supabase = await createServerClient();
-    
+
     const { data: { user }, error: authError } = await supabase.auth.getUser();
-    
+
     if (authError || !user) {
       return NextResponse.json(
         {
@@ -825,10 +915,10 @@ export async function POST(request: NextRequest) {
         { status: 401 }
       );
     }
-    
+
     // Extract user information for database logging
     const userId = user.id;
-    
+
     // Check rate limit
     const rateLimitCheck = checkRateLimit(ip);
     if (!rateLimitCheck.allowed) {
@@ -837,9 +927,9 @@ export async function POST(request: NextRequest) {
         { status: 429 }
       );
     }
-    
+
     const { message, context }: ChatRequest = await request.json();
-    
+
     // Validate input
     const validation = validateInput(message);
     if (!validation.valid) {
@@ -851,54 +941,152 @@ export async function POST(request: NextRequest) {
 
     // Determine context if not provided
     const finalContext = context || determineContext(message);
-    
+
     // Get contextual data
     const contextData = await getContextualData(message, finalContext);
-    
+
     // Build prompt
     const prompt = buildPrompt(message, contextData, finalContext);
-    
-    // Generate AI response using DeepSeek
-    const aiResponse = await callOpenRouterAPI(prompt);
 
-    // Save conversation to database for training and analytics
-    try {
-      // Generate a proper UUID for session_id
-      const sessionId = crypto.randomUUID();
-      const supabase = getSupabaseClient();
-      
-      const { error: dbError } = await supabase
-        .from('ai_training_data')
-        .insert({
-          user_id: userId || null, // Use actual user ID when available
-          session_id: sessionId,
-          query_text: message,
-          response_text: aiResponse,
-          context_type: finalContext
-        });
-      
-      if (dbError) {
-        console.error('Failed to save AI conversation:', dbError);
-        // Don't fail the request if DB save fails
-      } else {
-        const userInfo = userId ? `(User: ${userId})` : '(Anonymous)';
-        console.log(`AI conversation saved successfully to database ${userInfo}`);
+    // Check if streaming is requested (default to streaming for better UX)
+    const useStreaming = request.headers.get('x-use-streaming') !== 'false';
+
+    if (useStreaming) {
+      // STREAMING MODE
+      const encoder = new TextEncoder();
+      let fullResponse = '';
+
+      const stream = new ReadableStream({
+        async start(controller) {
+          try {
+            const openrouterStream = await callOpenRouterAPIStream(prompt);
+            const reader = openrouterStream.getReader();
+            const decoder = new TextDecoder();
+
+            while (true) {
+              const { done, value } = await reader.read();
+
+              if (done) {
+                // Send completion event
+                controller.enqueue(encoder.encode(`data: ${JSON.stringify({ done: true })}\n\n`));
+
+                // Save to database after stream completes
+                try {
+                  const sessionId = crypto.randomUUID();
+                  const supabase = getSupabaseClient();
+
+                  await supabase
+                    .from('ai_training_data')
+                    .insert({
+                      user_id: userId,
+                      session_id: sessionId,
+                      query_text: message,
+                      response_text: fullResponse,
+                      context_type: finalContext
+                    });
+
+                  console.log(`Streaming conversation saved to database (User: ${userId})`);
+                } catch (dbError) {
+                  console.error('Error saving streaming conversation:', dbError);
+                }
+
+                controller.close();
+                break;
+              }
+
+              // Parse SSE chunks from OpenRouter
+              const chunk = decoder.decode(value);
+              const lines = chunk.split('\n');
+
+              for (const line of lines) {
+                if (line.startsWith('data: ')) {
+                  const data = line.slice(6);
+
+                  if (data === '[DONE]') {
+                    continue;
+                  }
+
+                  try {
+                    const parsed = JSON.parse(data);
+                    const content = parsed.choices?.[0]?.delta?.content;
+
+                    if (content) {
+                      fullResponse += content;
+
+                      // Send chunk to client
+                      controller.enqueue(
+                        encoder.encode(`data: ${JSON.stringify({
+                          content,
+                          context: finalContext
+                        })}\n\n`)
+                      );
+                    }
+                  } catch {
+                    // Ignore parse errors for malformed chunks
+                    continue;
+                  }
+                }
+              }
+            }
+          } catch (error) {
+            console.error('Streaming error:', error);
+            controller.enqueue(
+              encoder.encode(`data: ${JSON.stringify({
+                error: 'Stream error occurred'
+              })}\n\n`)
+            );
+            controller.close();
+          }
+        },
+      });
+
+      return new Response(stream, {
+        headers: {
+          'Content-Type': 'text/event-stream',
+          'Cache-Control': 'no-cache',
+          'Connection': 'keep-alive',
+        },
+      });
+    } else {
+      // NON-STREAMING MODE (original behavior)
+      const aiResponse = await callOpenRouterAPI(prompt);
+
+      // Save conversation to database for training and analytics
+      try {
+        const sessionId = crypto.randomUUID();
+        const supabase = getSupabaseClient();
+
+        const { error: dbError } = await supabase
+          .from('ai_training_data')
+          .insert({
+            user_id: userId || null,
+            session_id: sessionId,
+            query_text: message,
+            response_text: aiResponse,
+            context_type: finalContext
+          });
+
+        if (dbError) {
+          console.error('Failed to save AI conversation:', dbError);
+        } else {
+          const userInfo = userId ? `(User: ${userId})` : '(Anonymous)';
+          console.log(`AI conversation saved successfully to database ${userInfo}`);
+        }
+      } catch (dbSaveError) {
+        console.error('Error saving to database:', dbSaveError);
       }
-    } catch (dbSaveError) {
-      console.error('Error saving to database:', dbSaveError);
-      // Continue with response even if DB save fails
-    }
 
-    return NextResponse.json({
-      success: true,
-      response: aiResponse,
-      context: finalContext,
-      timestamp: new Date().toISOString()
-    });
+      return NextResponse.json({
+        success: true,
+        response: aiResponse,
+        context: finalContext,
+        timestamp: new Date().toISOString()
+      });
+    }
 
   } catch (error) {
     console.error('AI Chat error:', error);
-    
+
     // Don't expose internal errors
     return NextResponse.json(
       {
diff --git a/components/ai/AIChat.tsx b/components/ai/AIChat.tsx
index 17cd25209..254f28f64 100644
--- a/components/ai/AIChat.tsx
+++ b/components/ai/AIChat.tsx
@@ -49,10 +49,10 @@ export default function AIChat() {
   const [showSuggestions, setShowSuggestions] = useState(true);
   const messagesEndRef = useRef<HTMLDivElement>(null);
   const textareaRef = useRef<HTMLTextAreaElement>(null);
-  
+
   // Don't show the floating widget on the dedicated AI page
   const [currentPath, setCurrentPath] = useState('');
-  
+
   useEffect(() => {
     setCurrentPath(window.location.pathname);
   }, []);
@@ -73,7 +73,7 @@ export default function AIChat() {
         setProfileLoading(false);
         return;
       }
-      
+
       try {
         const supabase = createClient();
         const { data, error } = await supabase
@@ -203,20 +203,26 @@ export default function AIChat() {
     setIsLoading(true);
     setShowSuggestions(false);
 
-    // Remove any existing typing indicators first, then add a new one
-    const typingId = `widget-typing-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
-    const typingMessage: Message = {
-      id: typingId,
+    // Show immediate typing indicator while waiting for stream to start
+    const thinkingId = `widget-thinking-${Date.now()}`;
+    const thinkingMessage: Message = {
+      id: thinkingId,
       text: '',
       sender: 'ai',
       timestamp: new Date(),
-      isTyping: true
+      isTyping: true  // Show typing animation
+    };
+    setMessages(prev => [...prev, thinkingMessage]);
+
+    // Create streaming message placeholder (will replace thinking indicator)
+    const streamingId = `widget-streaming-${Date.now()}`;
+    const streamingMessage: Message = {
+      id: streamingId,
+      text: '',
+      sender: 'ai',
+      timestamp: new Date(),
+      isTyping: false
     };
-    setMessages(prev => {
-      // Remove any existing typing messages first
-      const withoutTyping = prev.filter(m => !m.isTyping);
-      return [...withoutTyping, typingMessage];
-    });
 
     try {
       const response = await fetch('/api/ai', {
@@ -230,40 +236,98 @@ export default function AIChat() {
 
       if (!response.ok) {
         if (response.status === 401) {
-          // Authentication error - refresh the page to trigger auth
           window.location.reload();
           return;
         }
         throw new Error(`HTTP error! status: ${response.status}`);
       }
 
-      const data: AIResponse = await response.json();
-      
-      // Remove typing indicator
-      setMessages(prev => prev.filter(m => !m.isTyping));
-      
-      if (data.success) {
-        const aiMessage: Message = {
-          id: `widget-ai-${Date.now() + 1}`,
-          text: data.response,
-          sender: 'ai',
-          timestamp: new Date(),
-          context: data.context
-        };
-        setMessages(prev => [...prev, aiMessage]);
+      // Check if response is streaming (SSE) or regular JSON
+      const contentType = response.headers.get('content-type');
+
+      if (contentType?.includes('text/event-stream')) {
+        // STREAMING MODE
+        // Replace thinking indicator with streaming message
+        setMessages(prev => prev.filter(m => m.id !== thinkingId).concat(streamingMessage));
+
+        const reader = response.body?.getReader();
+        const decoder = new TextDecoder();
+        let accumulatedText = '';
+        let currentContext = '';
+
+        if (!reader) throw new Error('No reader available');
+
+        while (true) {
+          const { done, value } = await reader.read();
+
+          if (done) break;
+
+          const chunk = decoder.decode(value);
+          const lines = chunk.split('\n');
+
+          for (const line of lines) {
+            if (line.startsWith('data: ')) {
+              const data = line.slice(6);
+
+              try {
+                const parsed = JSON.parse(data);
+
+                if (parsed.done) {
+                  // Stream complete
+                  break;
+                }
+
+                if (parsed.error) {
+                  throw new Error(parsed.error);
+                }
+
+                if (parsed.content) {
+                  accumulatedText += parsed.content;
+                  currentContext = parsed.context || currentContext;
+
+                  // Update the streaming message in real-time
+                  setMessages(prev =>
+                    prev.map(msg =>
+                      msg.id === streamingId
+                        ? { ...msg, text: accumulatedText, context: currentContext }
+                        : msg
+                    )
+                  );
+                }
+              } catch {
+                // Ignore malformed JSON
+                continue;
+              }
+            }
+          }
+        }
       } else {
-        // Handle authentication errors in response
-        if (data.error === 'Authentication required') {
-          window.location.reload();
-          return;
+        // NON-STREAMING MODE (fallback)
+        const data: AIResponse = await response.json();
+
+        if (data.success) {
+          const aiMessage: Message = {
+            id: `widget-ai-${Date.now() + 1}`,
+            text: data.response,
+            sender: 'ai',
+            timestamp: new Date(),
+            context: data.context
+          };
+          setMessages(prev => [...prev, aiMessage]);
+        } else {
+          if (data.error === 'Authentication required') {
+            window.location.reload();
+            return;
+          }
+          throw new Error(data.error || 'AI response was not successful');
         }
-        throw new Error(data.error || 'AI response was not successful');
       }
     } catch (error) {
       console.error('Error sending message:', error);
-      // Remove typing indicator
-      setMessages(prev => prev.filter(m => !m.isTyping));
-      
+
+      // Remove both thinking indicator and streaming message if present
+      setMessages(prev => prev.filter(m => m.id !== thinkingId && m.id !== streamingId));
+
       const errorMessage: Message = {
         id: `widget-error-${Date.now() + 1}`,
         text: 'Sorry, I\'m having trouble connecting to the AI service. Please try again later.',
@@ -342,7 +406,7 @@ export default function AIChat() {
             </Button>
           </div>
         </CardHeader>
-        
+
         <CardContent className="flex flex-col p-0 bg-gray-900 h-[calc(100%-4rem)]">
           {/* Authentication Check */}
           {authLoading || profileLoading ? (
@@ -372,189 +436,186 @@ export default function AIChat() {
               {/* Messages Area */}
               <div className="flex-1 p-4 overflow-y-auto">
                 <div className="space-y-4">
-              {messages.map((message) => (
-                <div
-                  key={message.id}
-                  className={`flex gap-3 ${
-                    message.sender === 'user' ? 'justify-end' : 'justify-start'
-                  }`}
-                >
-                  {message.sender === 'ai' && (
-                    <div className="w-8 h-8 flex items-center justify-center flex-shrink-0">
-                      <CodeuniaLogo size="sm" showText={false} noLink={true} instanceId={`chat-msg-${message.id}`} />
-                    </div>
-                  )}
-                  <div
-                    className={`max-w-[80%] rounded-2xl p-3 group relative ${
-                      message.sender === 'user'
-                        ? 'bg-gray-700 text-white rounded-br-md'
-                        : 'bg-transparent text-gray-100'
-                    }`}
-                  >
-                    {message.isTyping ? (
-                      <div className="flex items-center gap-2">
-                        <div className="flex space-x-1">
-                          <div className="w-2 h-2 bg-gray-400 rounded-full animate-bounce" style={{ animationDelay: '0ms' }}></div>
-                          <div className="w-2 h-2 bg-gray-400 rounded-full animate-bounce" style={{ animationDelay: '150ms' }}></div>
-                          <div className="w-2 h-2 bg-gray-400 rounded-full animate-bounce" style={{ animationDelay: '300ms' }}></div>
+                  {messages.map((message) => (
+                    <div
+                      key={message.id}
+                      className={`flex gap-3 ${message.sender === 'user' ? 'justify-end' : 'justify-start'
+                        }`}
+                    >
+                      {message.sender === 'ai' && (
+                        <div className="w-8 h-8 flex items-center justify-center flex-shrink-0">
+                          <CodeuniaLogo size="sm" showText={false} noLink={true} instanceId={`chat-msg-${message.id}`} />
                         </div>
-                      </div>
-                    ) : (
-                      <>
-                        {message.sender === 'ai' ? (
-                          <div className="text-sm leading-relaxed prose prose-invert prose-sm max-w-none">
-                            <ReactMarkdown
-                              components={{
-                                p: ({ children }) => <p className="mb-2 last:mb-0">{children}</p>,
-                                strong: ({ children }) => <strong className="font-semibold text-white">{children}</strong>,
-                                em: ({ children }) => <em className="italic text-gray-200">{children}</em>,
-                                ul: ({ children }) => <ul className="list-disc list-inside mb-2 space-y-1">{children}</ul>,
-                                ol: ({ children }) => <ol className="list-decimal list-inside mb-2 space-y-1">{children}</ol>,
-                                li: ({ children }) => <li className="text-gray-200">{children}</li>,
-                                code: ({ children }) => <code className="bg-gray-800 px-1 py-0.5 rounded text-xs">{children}</code>,
-                                h1: ({ children }) => <h1 className="text-base font-semibold mb-2 text-white">{children}</h1>,
-                                h2: ({ children }) => <h2 className="text-sm font-semibold mb-2 text-white">{children}</h2>,
-                                h3: ({ children }) => <h3 className="text-xs font-semibold mb-1 text-white">{children}</h3>,
-                              }}
-                            >
-                              {message.text}
-                            </ReactMarkdown>
+                      )}
+                      <div
+                        className={`max-w-[80%] rounded-2xl p-3 group relative ${message.sender === 'user'
+                          ? 'bg-gray-700 text-white rounded-br-md'
+                          : 'bg-transparent text-gray-100'
+                          }`}
+                      >
+                        {message.isTyping ? (
+                          <div className="flex items-center gap-2">
+                            <div className="flex space-x-1">
+                              <div className="w-2 h-2 bg-gray-400 rounded-full animate-bounce" style={{ animationDelay: '0ms' }}></div>
+                              <div className="w-2 h-2 bg-gray-400 rounded-full animate-bounce" style={{ animationDelay: '150ms' }}></div>
+                              <div className="w-2 h-2 bg-gray-400 rounded-full animate-bounce" style={{ animationDelay: '300ms' }}></div>
+                            </div>
                           </div>
                         ) : (
-                          <p className="text-sm whitespace-pre-wrap leading-relaxed">{message.text}</p>
-                        )}
-                        <div className="flex items-center justify-between mt-2 gap-2">
-                          <span className={`text-xs opacity-70 ${message.sender === 'user' ? 'text-gray-300' : 'text-gray-500'}`}>
-                            {message.timestamp.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}
-                          </span>
-                          <div className="flex items-center gap-1">
-                            {message.context && message.sender === 'ai' && (
-                              <Badge variant="secondary" className="text-xs bg-gray-800 text-gray-300 border-gray-700">
-                                {message.context}
-                              </Badge>
-                            )}
-                            {/* Message Actions */}
-                            <div className="opacity-0 group-hover:opacity-100 transition-opacity flex gap-1">
-                              <Button
-                                variant="ghost"
-                                size="sm"
-                                className={`h-6 w-6 p-0 transition-colors ${
-                                  message.sender === 'user' 
-                                    ? 'hover:bg-gray-600 text-gray-300' 
-                                    : 'hover:bg-gray-800 text-gray-500'
-                                }`}
-                                onClick={() => copyMessage(message.text)}
-                                title="Copy message"
-                              >
-                                <Copy className="w-3 h-3" />
-                              </Button>
-                              {message.sender === 'ai' && (
-                                <Button
-                                  variant="ghost"
-                                  size="sm"
-                                  className="h-6 w-6 p-0 hover:bg-gray-800 text-gray-500"
-                                  onClick={retryMessage}
-                                  title="Retry response"
+                          <>
+                            {message.sender === 'ai' ? (
+                              <div className="text-sm leading-relaxed prose prose-invert prose-sm max-w-none">
+                                <ReactMarkdown
+                                  components={{
+                                    p: ({ children }) => <p className="mb-2 last:mb-0">{children}</p>,
+                                    strong: ({ children }) => <strong className="font-semibold text-white">{children}</strong>,
+                                    em: ({ children }) => <em className="italic text-gray-200">{children}</em>,
+                                    ul: ({ children }) => <ul className="list-disc list-inside mb-2 space-y-1">{children}</ul>,
+                                    ol: ({ children }) => <ol className="list-decimal list-inside mb-2 space-y-1">{children}</ol>,
+                                    li: ({ children }) => <li className="text-gray-200">{children}</li>,
+                                    code: ({ children }) => <code className="bg-gray-800 px-1 py-0.5 rounded text-xs">{children}</code>,
+                                    h1: ({ children }) => <h1 className="text-base font-semibold mb-2 text-white">{children}</h1>,
+                                    h2: ({ children }) => <h2 className="text-sm font-semibold mb-2 text-white">{children}</h2>,
+                                    h3: ({ children }) => <h3 className="text-xs font-semibold mb-1 text-white">{children}</h3>,
+                                  }}
                                 >
-                                  <RotateCcw className="w-3 h-3" />
-                                </Button>
-                              )}
+                                  {message.text}
+                                </ReactMarkdown>
+                              </div>
+                            ) : (
+                              <p className="text-sm whitespace-pre-wrap leading-relaxed">{message.text}</p>
+                            )}
+                            <div className="flex items-center justify-between mt-2 gap-2">
+                              <span className={`text-xs opacity-70 ${message.sender === 'user' ? 'text-gray-300' : 'text-gray-500'}`}>
+                                {message.timestamp.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}
+                              </span>
+                              <div className="flex items-center gap-1">
+                                {message.context && message.sender === 'ai' && (
+                                  <Badge variant="secondary" className="text-xs bg-gray-800 text-gray-300 border-gray-700">
+                                    {message.context}
+                                  </Badge>
+                                )}
+                                {/* Message Actions */}
+                                <div className="opacity-0 group-hover:opacity-100 transition-opacity flex gap-1">
+                                  <Button
+                                    variant="ghost"
+                                    size="sm"
+                                    className={`h-6 w-6 p-0 transition-colors ${message.sender === 'user'
+                                      ? 'hover:bg-gray-600 text-gray-300'
+                                      : 'hover:bg-gray-800 text-gray-500'
+                                      }`}
+                                    onClick={() => copyMessage(message.text)}
+                                    title="Copy message"
+                                  >
+                                    <Copy className="w-3 h-3" />
+                                  </Button>
+                                  {message.sender === 'ai' && (
+                                    <Button
+                                      variant="ghost"
+                                      size="sm"
+                                      className="h-6 w-6 p-0 hover:bg-gray-800 text-gray-500"
+                                      onClick={retryMessage}
+                                      title="Retry response"
+                                    >
+                                      <RotateCcw className="w-3 h-3" />
+                                    </Button>
+                                  )}
+                                </div>
+                              </div>
                             </div>
-                          </div>
+                          </>
+                        )}
+                      </div>
+                      {message.sender === 'user' && (
+                        <div className="w-8 h-8 rounded-full bg-gray-600 flex items-center justify-center flex-shrink-0">
+                          <User className="w-4 h-4 text-gray-300" />
                         </div>
-                      </>
-                    )}
-                  </div>
-                  {message.sender === 'user' && (
-                    <div className="w-8 h-8 rounded-full bg-gray-600 flex items-center justify-center flex-shrink-0">
-                      <User className="w-4 h-4 text-gray-300" />
+                      )}
                     </div>
-                  )}
-                </div>
-              ))}
-            </div>
-            <div ref={messagesEndRef} />
-          </div>
-          
-          {/* Input Area - Always visible when chat is open and not minimized */}
-          <div className="border-t border-gray-800 bg-gray-900">
-            {/* Mobile-Optimized Quick Suggestions */}
-            {showSuggestions && messages.length <= 1 && (
-              <div className="p-2 sm:p-3 border-b border-gray-800">
-                <div className="grid grid-cols-1 sm:grid-cols-2 gap-1.5 sm:gap-2">
-                  {quickSuggestions.map((suggestion, index) => {
-                    const Icon = suggestion.icon;
-                    return (
-                      <Button
-                        key={index}
-                        variant="outline"
-                        size="sm"
-                        className="text-xs h-7 sm:h-8 bg-gray-800/50 hover:bg-gray-700/50 border-gray-700 text-gray-300 hover:text-white transition-all duration-200 justify-start px-2 sm:px-3"
-                        onClick={() => handleSuggestionClick(suggestion.text)}
-                      >
-                        <Icon className="w-3 h-3 mr-1 sm:mr-1.5 flex-shrink-0" />
-                        <span className="truncate text-xs">{suggestion.text}</span>
-                      </Button>
-                    );
-                  })}
+                  ))}
                 </div>
+                <div ref={messagesEndRef} />
               </div>
-            )}
-            
-            {/* Mobile-Optimized Input Field */}
-            <div className="p-3 sm:p-4">
-              <div className="flex gap-2 items-end">
-                <div className="flex-1 relative">
-                  <Textarea
-                    ref={textareaRef}
-                    value={input}
-                    onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) => {
-                      setInput(e.target.value);
-                      autoResizeTextarea();
-                    }}
-                    onKeyPress={handleKeyPress}
-                    placeholder="Ask Unio..."
-                    disabled={isLoading}
-                    className="resize-none min-h-[36px] sm:min-h-[40px] max-h-[100px] sm:max-h-[120px] rounded-lg sm:rounded-xl border-2 border-gray-700 focus:border-gray-600 bg-gray-800 text-gray-100 placeholder-gray-500 transition-colors pr-10 sm:pr-12 text-sm px-3 py-2 sm:px-4 sm:py-2"
-                    rows={1}
-                    autoComplete="off"
-                  />
-                  {input.trim() && (
-                    <div className="absolute right-1.5 sm:right-2 top-1.5 sm:top-2">
+
+              {/* Input Area - Always visible when chat is open and not minimized */}
+              <div className="border-t border-gray-800 bg-gray-900">
+                {/* Mobile-Optimized Quick Suggestions */}
+                {showSuggestions && messages.length <= 1 && (
+                  <div className="p-2 sm:p-3 border-b border-gray-800">
+                    <div className="grid grid-cols-1 sm:grid-cols-2 gap-1.5 sm:gap-2">
+                      {quickSuggestions.map((suggestion, index) => {
+                        const Icon = suggestion.icon;
+                        return (
+                          <Button
+                            key={index}
+                            variant="outline"
+                            size="sm"
+                            className="text-xs h-7 sm:h-8 bg-gray-800/50 hover:bg-gray-700/50 border-gray-700 text-gray-300 hover:text-white transition-all duration-200 justify-start px-2 sm:px-3"
+                            onClick={() => handleSuggestionClick(suggestion.text)}
+                          >
+                            <Icon className="w-3 h-3 mr-1 sm:mr-1.5 flex-shrink-0" />
+                            <span className="truncate text-xs">{suggestion.text}</span>
+                          </Button>
+                        );
+                      })}
+                    </div>
+                  </div>
+                )}
+
+                {/* Mobile-Optimized Input Field */}
+                <div className="p-3 sm:p-4">
+                  <div className="flex gap-2 items-end">
+                    <div className="flex-1 relative">
+                      <Textarea
+                        ref={textareaRef}
+                        value={input}
+                        onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) => {
+                          setInput(e.target.value);
+                          autoResizeTextarea();
+                        }}
+                        onKeyPress={handleKeyPress}
+                        placeholder="Ask Unio..."
+                        disabled={isLoading}
+                        className="resize-none min-h-[36px] sm:min-h-[40px] max-h-[100px] sm:max-h-[120px] rounded-lg sm:rounded-xl border-2 border-gray-700 focus:border-gray-600 bg-gray-800 text-gray-100 placeholder-gray-500 transition-colors pr-10 sm:pr-12 text-sm px-3 py-2 sm:px-4 sm:py-2"
+                        rows={1}
+                        autoComplete="off"
+                      />
+                      {input.trim() && (
+                        <div className="absolute right-1.5 sm:right-2 top-1.5 sm:top-2">
+                          <Button
+                            onClick={handleSendClick}
+                            disabled={isLoading || !input.trim()}
+                            size="icon"
+                            className="h-6 w-6 sm:h-8 sm:w-8 rounded-full bg-transparent hover:bg-gray-700 text-gray-400 hover:text-gray-200 transition-all duration-200"
+                          >
+                            {isLoading ? <Loader2 className="w-3 h-3 sm:w-4 sm:h-4 animate-spin" /> : <Send className="w-3 h-3 sm:w-4 sm:h-4" />}
+                          </Button>
+                        </div>
+                      )}
+                    </div>
+                    {!input.trim() && (
                       <Button
                         onClick={handleSendClick}
-                        disabled={isLoading || !input.trim()}
+                        disabled={isLoading}
                         size="icon"
-                        className="h-6 w-6 sm:h-8 sm:w-8 rounded-full bg-transparent hover:bg-gray-700 text-gray-400 hover:text-gray-200 transition-all duration-200"
+                        className="h-10 w-10 rounded-xl bg-transparent hover:bg-gray-700 text-gray-400 hover:text-gray-200 transition-all duration-200"
                       >
-                        {isLoading ? <Loader2 className="w-3 h-3 sm:w-4 sm:h-4 animate-spin" /> : <Send className="w-3 h-3 sm:w-4 sm:h-4" />}
+                        <Send className="w-4 h-4" />
                       </Button>
-                    </div>
-                  )}
+                    )}
+                  </div>
+
+                  {/* Input Help Text */}
+                  <div className="text-xs text-gray-500 mt-2 flex items-center justify-between">
+                    <span>Press Enter to send, Shift+Enter for new line</span>
+                    <span className="flex items-center gap-1">
+                      <Sparkles className="w-3 h-3" />
+                      Unio
+                    </span>
+                  </div>
                 </div>
-                {!input.trim() && (
-                  <Button
-                    onClick={handleSendClick}
-                    disabled={isLoading}
-                    size="icon"
-                    className="h-10 w-10 rounded-xl bg-transparent hover:bg-gray-700 text-gray-400 hover:text-gray-200 transition-all duration-200"
-                  >
-                    <Send className="w-4 h-4" />
-                  </Button>
-                )}
               </div>
-              
-              {/* Input Help Text */}
-              <div className="text-xs text-gray-500 mt-2 flex items-center justify-between">
-                <span>Press Enter to send, Shift+Enter for new line</span>
-                <span className="flex items-center gap-1">
-                  <Sparkles className="w-3 h-3" />
-                  Unio
-                </span>
-              </div>
-            </div>
-          </div>
-          </>
+            </>
           )}
         </CardContent>
       </Card>