diff --git a/src/components/ChatInterface.tsx b/src/components/ChatInterface.tsx
index 4a33a2e2..9f2d578d 100644
--- a/src/components/ChatInterface.tsx
+++ b/src/components/ChatInterface.tsx
@@ -37,6 +37,7 @@ import { streamAIResponse, generateChatTitleFromMessages, generateAIResponse } f
 import { executeCode, startSandbox } from '@/lib/sandbox.ts';
 import { useAuth } from '@/hooks/useAuth';
 import { useAuth as useClerkAuth } from '@clerk/clerk-react';
+import { useUsageTracking } from '@/hooks/useUsageTracking';
 import { E2BCodeExecution } from './E2BCodeExecution';
 import AnimatedResultShowcase, { type ShowcaseExecutionResult } from './AnimatedResultShowcase';
 import { braveSearchService, type BraveSearchResult, type WebsiteAnalysis } from '@/lib/search-service';
@@ -129,6 +130,7 @@ interface CodeBlock {
 const ChatInterface: React.FC = () => {
   const { user, isLoading: authLoading } = useAuth();
   const { getToken } = useClerkAuth();
+  const { getSubscription } = useUsageTracking();
   const [input, setInput] = useState('');
   const [isTyping, setIsTyping] = useState(false);
   const [selectedChatId, setSelectedChatId] = useState<string | null>(null);
@@ -384,7 +386,12 @@ const ChatInterface: React.FC = () => {
           // Create user message
           await createMessage(messageData);
 
-          await refetchCustomer();
+          // Refresh user subscription data after usage
+          try {
+            await getSubscription();
+          } catch (error) {
+            console.debug('Failed to refresh subscription data:', error);
+          }
 
           // Auto-run user code blocks via E2B (JS/TS only per project preference)
           const userBlocks = extractCodeBlocks(userContent);
@@ -487,7 +494,12 @@ const ChatInterface: React.FC = () => {
           // Create assistant message
           await createMessage(assistantMessageData);
 
-          await refetchCustomer();
+          // Refresh user subscription data after usage  
+          try {
+            await getSubscription();
+          } catch (error) {
+            console.debug('Failed to refresh subscription data:', error);
+          }
 
           // Try AI title refinement after first exchange
           try {
diff --git a/src/components/EnhancedChatInterface.tsx b/src/components/EnhancedChatInterface.tsx
new file mode 100644
index 00000000..7c5b7290
--- /dev/null
+++ b/src/components/EnhancedChatInterface.tsx
@@ -0,0 +1,1126 @@
+import React, { useState, useRef, useEffect } from 'react';
+import { Button } from '@/components/ui/button';
+import { Textarea } from '@/components/ui/textarea';
+import { Card, CardContent } from '@/components/ui/card';
+import { ScrollArea } from '@/components/ui/scroll-area';
+import { Separator } from '@/components/ui/separator';
+import { Badge } from '@/components/ui/badge';
+import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
+import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from '@/components/ui/dialog';
+import { Input } from '@/components/ui/input';
+import { SafeText } from '@/components/ui/SafeText';
+import { 
+  Send, 
+  User, 
+  Bot, 
+  Play, 
+  Copy, 
+  Check, 
+  Plus,
+  MessageSquare,
+  Trash2,
+  Edit3,
+  Sparkles,
+  Clock,
+  Zap,
+  Loader2,
+  Search,
+  Globe,
+  ExternalLink,
+  Link,
+  Code,
+  Palette,
+  Layers,
+  ArrowUp,
+  Mic,
+  Paperclip,
+  Settings
+} from 'lucide-react';
+import { motion, AnimatePresence } from 'framer-motion';
+import { useQuery, useMutation } from 'convex/react';
+import { api } from '../../convex/_generated/api';
+import type { Id } from '../../convex/_generated/dataModel';
+import { streamAIResponse, generateChatTitleFromMessages, generateAIResponse } from '@/lib/ai';
+import { executeCode, startSandbox } from '@/lib/sandbox';
+import { useAuth } from '@/hooks/useAuth';
+import { useAuth as useClerkAuth } from '@clerk/clerk-react';
+import { useUsageTracking } from '@/hooks/useUsageTracking';
+import AnimatedResultShowcase from './AnimatedResultShowcase';
+import { braveSearchService, type BraveSearchResult, type WebsiteAnalysis } from '@/lib/search-service';
+import { crawlSite } from '@/lib/firecrawl';
+import { toast } from 'sonner';
+import * as Sentry from '@sentry/react';
+import WebContainerFailsafe from './WebContainerFailsafe';
+import { DECISION_PROMPT_NEXT } from '@/lib/decisionPrompt';
+
+const { logger } = Sentry;
+
+// Security constants for input validation
+const MAX_MESSAGE_LENGTH = 10000;
+const MAX_TITLE_LENGTH = 100;
+const MIN_TITLE_LENGTH = 1;
+
+// XSS protection: sanitize text input
+const sanitizeText = (text: string): string => {
+  return text
+    .replace(/[<>'"&]/g, (char) => {
+      const chars: { [key: string]: string } = {
+        '<': '&lt;',
+        '>': '&gt;',
+        "'": '&#x27;',
+        '"': '&quot;',
+        '&': '&amp;'
+      };
+      return chars[char] || char;
+    })
+    .trim();
+};
+
+// Validate input length and content
+const validateInput = (text: string, maxLength: number): { isValid: boolean; error?: string } => {
+  if (!text || text.trim().length === 0) {
+    return { isValid: false, error: 'Input cannot be empty' };
+  }
+  if (text.length > maxLength) {
+    return { isValid: false, error: `Input too long. Maximum ${maxLength} characters allowed` };
+  }
+  // Check for potentially malicious patterns
+  const suspiciousPatterns = [
+    /<script/i,
+    /javascript:/i,
+    /vbscript:/i,
+    /onload=/i,
+    /onerror=/i,
+    /onclick=/i
+  ];
+  
+  for (const pattern of suspiciousPatterns) {
+    if (pattern.test(text)) {
+      return { isValid: false, error: 'Invalid content detected' };
+    }
+  }
+  
+  return { isValid: true };
+};
+
+interface ConvexMessage {
+  _id: string;
+  content: string;
+  role: 'user' | 'assistant' | 'system';
+  createdAt: number;
+  metadata?: {
+    model?: string;
+    tokens?: number;
+    cost?: number;
+  };
+}
+
+interface ConvexChat {
+  _id: string;
+  title: string;
+  createdAt: number;
+  updatedAt: number;
+}
+
+interface CodeBlock {
+  id: string;
+  language: 'python' | 'javascript';
+  code: string;
+  executed: boolean;
+  result?: string;
+}
+
+const EnhancedChatInterface: React.FC = () => {
+  const { user, isLoading: authLoading } = useAuth();
+  const { getToken } = useClerkAuth();
+  const { getSubscription } = useUsageTracking();
+  const [input, setInput] = useState('');
+  const [isTyping, setIsTyping] = useState(false);
+  const [selectedChatId, setSelectedChatId] = useState<string | null>(null);
+  const [isNewChatOpen, setIsNewChatOpen] = useState(false);
+  const [copiedMessage, setCopiedMessage] = useState<string | null>(null);
+  const [sessionStarted, setSessionStarted] = useState(false);
+  const [sidebarExpanded, setSidebarExpanded] = useState<boolean>(false);
+
+  // Enhanced UI state
+  const [isSearchOpen, setIsSearchOpen] = useState(false);
+  const [searchResults, setSearchResults] = useState<BraveSearchResult[]>([]);
+  const [isAnalyzingWebsite, setIsAnalyzingWebsite] = useState(false);
+  const [websiteAnalysis, setWebsiteAnalysis] = useState<WebsiteAnalysis | null>(null);
+  const [isWebsiteDialogOpen, setIsWebsiteDialogOpen] = useState(false);
+  const [websiteUrl, setWebsiteUrl] = useState('');
+  
+  // Enhanced animations
+  const [messageAnimations, setMessageAnimations] = useState<{ [key: string]: boolean }>({});
+
+  const textareaRef = useRef<HTMLTextAreaElement>(null);
+  const messagesEndRef = useRef<HTMLDivElement>(null);
+  const inputContainerRef = useRef<HTMLDivElement>(null);
+
+  // Convex queries and mutations
+  const chats = useQuery(api.chats.getChats);
+  const messages = selectedChatId 
+    ? useQuery(api.messages.getMessages, { chatId: selectedChatId as Id<'chats'> })
+    : null;
+  
+  const createChatMutation = useMutation(api.chats.createChat);
+  const addMessageMutation = useMutation(api.messages.addMessage);
+  const updateMessageMutation = useMutation(api.messages.updateMessage);
+  const deleteChatMutation = useMutation(api.chats.deleteChat);
+  const updateChatTitleMutation = useMutation(api.chats.updateChatTitle);
+
+  // Auto-scroll to bottom when messages change
+  useEffect(() => {
+    messagesEndRef.current?.scrollIntoView({ behavior: 'smooth' });
+  }, [messages]);
+
+  // Initialize sandbox on component mount for better performance
+  useEffect(() => {
+    const warmUpSandbox = async () => {
+      try {
+        await startSandbox();
+        logger.info('Sandbox warmed up successfully');
+      } catch (error) {
+        logger.warn('Sandbox warm-up failed:', error);
+      }
+    };
+    
+    warmUpSandbox();
+  }, []);
+
+  // Enhanced auto-resize for textarea
+  useEffect(() => {
+    if (textareaRef.current) {
+      textareaRef.current.style.height = 'auto';
+      const scrollHeight = Math.min(textareaRef.current.scrollHeight, 200);
+      textareaRef.current.style.height = `${scrollHeight}px`;
+    }
+  }, [input]);
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+    
+    const validation = validateInput(input, MAX_MESSAGE_LENGTH);
+    if (!validation.isValid) {
+      toast.error(validation.error);
+      return;
+    }
+    
+    const sanitizedInput = sanitizeText(input);
+    if (!sanitizedInput.trim()) return;
+
+    if (!sessionStarted) {
+      setSessionStarted(true);
+    }
+
+    try {
+      let currentChatId = selectedChatId;
+      
+      if (!currentChatId) {
+        const newChat = await createChatMutation({
+          title: 'New Chat',
+        });
+        currentChatId = newChat;
+        setSelectedChatId(currentChatId);
+      }
+
+      // Add user message
+      await addMessageMutation({
+        chatId: currentChatId as Id<'chats'>,
+        content: sanitizedInput,
+        role: 'user',
+        metadata: {}
+      });
+
+      setInput('');
+      setIsTyping(true);
+
+      // Generate AI response with enhanced error handling
+      try {
+        const stream = await streamAIResponse(sanitizedInput);
+        let assistantResponse = '';
+
+        // Add assistant message placeholder
+        const assistantMessageId = await addMessageMutation({
+          chatId: currentChatId as Id<'chats'>,
+          content: '',
+          role: 'assistant',
+          metadata: {}
+        });
+
+        // Process stream with real-time updates
+        for await (const delta of stream.textStream) {
+          assistantResponse += delta;
+          // Update message in real-time
+          try {
+            await updateMessageMutation({
+              messageId: assistantMessageId,
+              content: assistantResponse
+            });
+          } catch (error) {
+            // Continue streaming even if update fails
+            console.warn('Failed to update message during streaming:', error);
+          }
+        }
+        
+        // Auto-generate title if this is the first exchange
+        if (messages?.length === 0) {
+          try {
+            const title = await generateChatTitleFromMessages([
+              { role: 'user', content: sanitizedInput },
+              { role: 'assistant', content: assistantResponse }
+            ]);
+            await updateChatTitleMutation({
+              chatId: currentChatId as Id<'chats'>,
+              title: title.slice(0, MAX_TITLE_LENGTH)
+            });
+          } catch (titleError) {
+            logger.warn('Title generation failed:', titleError);
+          }
+        }
+
+        // Refresh subscription data
+        try {
+          await getSubscription();
+        } catch (error) {
+          logger.warn('Failed to refresh subscription data:', error);
+        }
+
+      } catch (aiError) {
+        logger.error('AI response failed:', aiError);
+        toast.error('Failed to generate AI response. Please try again.');
+        
+        await addMessageMutation({
+          chatId: currentChatId as Id<'chats'>,
+          content: 'I apologize, but I encountered an error while processing your request. Please try again.',
+          role: 'assistant',
+          metadata: { error: true }
+        });
+      }
+
+    } catch (error) {
+      logger.error('Chat submission failed:', error);
+      toast.error('Failed to send message. Please try again.');
+    } finally {
+      setIsTyping(false);
+    }
+  };
+
+  const copyToClipboard = async (text: string, messageId: string) => {
+    try {
+      await navigator.clipboard.writeText(text);
+      setCopiedMessage(messageId);
+      toast.success('Message copied to clipboard');
+      
+      setTimeout(() => {
+        setCopiedMessage(null);
+      }, 2000);
+    } catch (error) {
+      logger.error('Clipboard copy failed:', error);
+      toast.error('Failed to copy message');
+    }
+  };
+
+  const deleteChat = async (chatId: string) => {
+    try {
+      await deleteChatMutation({ chatId: chatId as Id<'chats'> });
+      if (selectedChatId === chatId) {
+        setSelectedChatId(null);
+        setSessionStarted(false);
+      }
+      toast.success('Chat deleted successfully');
+    } catch (error) {
+      logger.error('Chat deletion failed:', error);
+      toast.error('Failed to delete chat');
+    }
+  };
+
+  const startNewChat = () => {
+    setSelectedChatId(null);
+    setSessionStarted(false);
+    setInput('');
+    setIsNewChatOpen(false);
+    toast.success('Started new chat');
+  };
+
+  const selectChat = (chatId: string) => {
+    setSelectedChatId(chatId);
+    setSessionStarted(true);
+    setSidebarExpanded(false);
+  };
+
+  // Enhanced web search with improved UX
+  const searchWeb = async (query: string) => {
+    if (!query.trim()) return;
+    
+    try {
+      setIsSearchOpen(true);
+      const results = await braveSearchService.search(query);
+      setSearchResults(results);
+      toast.success(`Found ${results.length} results for "${query}"`);
+    } catch (error) {
+      logger.error('Web search failed:', error);
+      toast.error('Search failed. Please try again.');
+    }
+  };
+
+  // Enhanced website analysis
+  const analyzeWebsite = async (url: string) => {
+    if (!url.trim()) {
+      toast.error('Please enter a valid URL');
+      return;
+    }
+
+    try {
+      setIsAnalyzingWebsite(true);
+      const analysis = await crawlSite(url);
+      setWebsiteAnalysis(analysis);
+      
+      if (analysis) {
+        const analysisSummary = 
+          `**Website Analysis for ${url}:**\n\n` +
+          `**Title:** ${analysis.title || 'Not detected'}\n\n` +
+          `**Description:** ${analysis.description || 'Not detected'}\n\n` +
+          `**Technologies:** ${analysis.technologies?.join(', ') || 'Not detected'}\n\n` +
+          `**Color Scheme:** ${analysis.colorScheme?.slice(0, 5).join(', ') || 'Not detected'}\n\n` +
+          `**Content Preview:** ${analysis.content?.substring(0, 500) || 'No content extracted'}...\n\n`;
+        
+        setInput(prev => prev + (prev ? '\n\n' : '') + `Please help me clone this website:\n\n${analysisSummary}\n\nI want to recreate: `);
+        toast.success('Website analyzed successfully!');
+      }
+      
+    } catch (error) {
+      logger.error('Website analysis error:', error);
+      toast.error(error instanceof Error ? error.message : 'Website analysis failed');
+    } finally {
+      setIsAnalyzingWebsite(false);
+      setIsWebsiteDialogOpen(false);
+    }
+  };
+
+  const addSearchResultToInput = (result: BraveSearchResult) => {
+    const resultText = `Reference: ${result.title} - ${result.description} (${result.url})`;
+    setInput(prev => prev + (prev ? '\n\n' : '') + resultText + '\n\n');
+    toast.success('Search result added to message');
+  };
+
+  const formatTimestamp = (timestamp: number) => {
+    return new Date(timestamp).toLocaleTimeString([], { 
+      hour: '2-digit', 
+      minute: '2-digit' 
+    });
+  };
+
+  const isSameDay = (a: number, b: number) => {
+    const da = new Date(a);
+    const db = new Date(b);
+    return (
+      da.getFullYear() === db.getFullYear() &&
+      da.getMonth() === db.getMonth() &&
+      da.getDate() === db.getDate()
+    );
+  };
+
+  const formatDateHeader = (timestamp: number) => {
+    return new Date(timestamp).toLocaleDateString(undefined, {
+      year: 'numeric',
+      month: 'short',
+      day: 'numeric',
+    });
+  };
+
+  if (authLoading) {
+    return (
+      <div className="flex items-center justify-center h-full bg-[var(--color-chat-bg)]">
+        <motion.div 
+          className="flex items-center space-x-3"
+          initial={{ opacity: 0, scale: 0.9 }}
+          animate={{ opacity: 1, scale: 1 }}
+          transition={{ duration: 0.3 }}
+        >
+          <div className="animate-spin rounded-full h-8 w-8 border-2 border-primary border-t-transparent"></div>
+          <span className="text-muted-foreground text-lg">Loading ZapDev...</span>
+        </motion.div>
+      </div>
+    );
+  }
+
+  if (!user) {
+    return (
+      <div className="flex items-center justify-center h-full bg-[var(--color-chat-bg)]">
+        <motion.div 
+          className="text-center"
+          initial={{ opacity: 0, y: 20 }}
+          animate={{ opacity: 1, y: 0 }}
+          transition={{ duration: 0.5 }}
+        >
+          <motion.div
+            className="w-20 h-20 mx-auto mb-6 p-4 rounded-full glass"
+            whileHover={{ scale: 1.05 }}
+            whileTap={{ scale: 0.95 }}
+          >
+            <Bot className="w-full h-full text-primary" />
+          </motion.div>
+          <h3 className="text-2xl font-semibold mb-3 text-gradient-static">Please Sign In</h3>
+          <p className="text-muted-foreground text-lg">You need to be signed in to use ZapDev AI</p>
+        </motion.div>
+      </div>
+    );
+  }
+
+  const hasMessages = messages && messages.length > 0;
+  const showSplitLayout = sessionStarted || hasMessages;
+
+  return (
+    <div className="flex h-full bg-[var(--color-chat-bg)] text-foreground">
+      {/* Enhanced Welcome Hero */}
+      <AnimatePresence mode="wait">
+        {!showSplitLayout && (
+          <motion.div 
+            key="hero"
+            className="flex-1 flex flex-col relative overflow-hidden"
+            initial={{ opacity: 0 }}
+            animate={{ opacity: 1 }}
+            exit={{ opacity: 0 }}
+            transition={{ duration: 0.5 }}
+          >
+            {/* Enhanced animated background */}
+            <motion.div
+              animate={{
+                background: [
+                  "radial-gradient(circle at 20% 30%, hsl(262 83% 58% / 0.15) 0%, transparent 50%)",
+                  "radial-gradient(circle at 80% 70%, hsl(224 82% 60% / 0.15) 0%, transparent 50%)",
+                  "radial-gradient(circle at 40% 90%, hsl(280 90% 65% / 0.1) 0%, transparent 50%)",
+                  "radial-gradient(circle at 20% 30%, hsl(262 83% 58% / 0.15) 0%, transparent 50%)",
+                ],
+              }}
+              transition={{ 
+                duration: 12, 
+                repeat: Infinity, 
+                ease: "easeInOut",
+                times: [0, 0.33, 0.66, 1]
+              }}
+              className="absolute inset-0 pointer-events-none"
+            />
+
+            {/* Floating particles effect */}
+            <div className="absolute inset-0 pointer-events-none overflow-hidden">
+              {[...Array(20)].map((_, i) => (
+                <motion.div
+                  key={i}
+                  className="absolute w-2 h-2 bg-primary/20 rounded-full"
+                  initial={{ 
+                    x: Math.random() * window.innerWidth,
+                    y: Math.random() * window.innerHeight,
+                    opacity: 0
+                  }}
+                  animate={{
+                    y: [null, -100],
+                    opacity: [0, 0.6, 0],
+                  }}
+                  transition={{
+                    duration: 8 + Math.random() * 4,
+                    repeat: Infinity,
+                    delay: Math.random() * 5,
+                    ease: "linear"
+                  }}
+                />
+              ))}
+            </div>
+
+            {/* Enhanced main content */}
+            <div className="flex-1 flex items-center justify-center px-6">
+              <motion.div
+                initial={{ opacity: 0, y: 30 }}
+                animate={{ opacity: 1, y: 0 }}
+                transition={{ duration: 0.8, ease: "easeOut" }}
+                className="text-center max-w-4xl w-full"
+              >
+                {/* Enhanced logo section */}
+                <motion.div
+                  initial={{ scale: 0.8, rotate: -10 }}
+                  animate={{ scale: 1, rotate: 0 }}
+                  transition={{ 
+                    duration: 1.2, 
+                    ease: "easeOut",
+                    type: "spring",
+                    stiffness: 100
+                  }}
+                  className="relative mb-8"
+                >
+                  <div className="relative">
+                    <motion.div
+                      animate={{ rotate: 360 }}
+                      transition={{ duration: 20, repeat: Infinity, ease: "linear" }}
+                      className="absolute -inset-4 rounded-full bg-gradient-to-r from-primary/20 to-purple-600/20 blur-xl"
+                    />
+                    <motion.div
+                      whileHover={{ scale: 1.1, rotate: 5 }}
+                      whileTap={{ scale: 0.9 }}
+                      className="relative w-24 h-24 mx-auto mb-2 glass-elevated rounded-2xl flex items-center justify-center cursor-pointer"
+                    >
+                      <Zap className="w-12 h-12 text-gradient animate-pulse-glow" />
+                    </motion.div>
+                  </div>
+                </motion.div>
+
+                {/* Enhanced title */}
+                <motion.h1 
+                  className="text-6xl md:text-7xl lg:text-8xl font-bold mb-6 text-gradient animate-gradient tracking-tight"
+                  initial={{ opacity: 0, y: 20 }}
+                  animate={{ opacity: 1, y: 0 }}
+                  transition={{ duration: 0.8, delay: 0.3 }}
+                >
+                  ZapDev AI
+                </motion.h1>
+
+                <motion.p 
+                  className="text-xl md:text-2xl text-muted-foreground mb-12 max-w-2xl mx-auto text-pretty leading-relaxed"
+                  initial={{ opacity: 0, y: 20 }}
+                  animate={{ opacity: 1, y: 0 }}
+                  transition={{ duration: 0.8, delay: 0.5 }}
+                >
+                  Build, code, and create with the most advanced AI development assistant. 
+                  From concept to deployment in minutes.
+                </motion.p>
+
+                {/* Enhanced feature highlights */}
+                <motion.div 
+                  className="grid grid-cols-1 md:grid-cols-3 gap-6 mb-12 max-w-4xl mx-auto"
+                  initial={{ opacity: 0, y: 30 }}
+                  animate={{ opacity: 1, y: 0 }}
+                  transition={{ duration: 0.8, delay: 0.7 }}
+                >
+                  {[
+                    { icon: Code, title: "Live Code Execution", desc: "Run and test code instantly with E2B sandbox" },
+                    { icon: Palette, title: "Smart UI Generation", desc: "Create beautiful interfaces with AI guidance" },
+                    { icon: Layers, title: "Full-Stack Development", desc: "Build complete applications end-to-end" }
+                  ].map((feature, index) => (
+                    <motion.div
+                      key={index}
+                      className="glass-elevated p-6 rounded-xl glass-hover"
+                      initial={{ opacity: 0, y: 20 }}
+                      animate={{ opacity: 1, y: 0 }}
+                      transition={{ duration: 0.5, delay: 0.8 + index * 0.1 }}
+                      whileHover={{ scale: 1.02, y: -2 }}
+                    >
+                      <feature.icon className="w-8 h-8 text-primary mb-3 mx-auto" />
+                      <h3 className="font-semibold text-lg mb-2">{feature.title}</h3>
+                      <p className="text-muted-foreground text-sm text-pretty">{feature.desc}</p>
+                    </motion.div>
+                  ))}
+                </motion.div>
+
+                {/* Enhanced input section */}
+                <motion.div
+                  initial={{ opacity: 0, scale: 0.95 }}
+                  animate={{ opacity: 1, scale: 1 }}
+                  transition={{ duration: 0.8, delay: 1 }}
+                  className="max-w-3xl mx-auto"
+                >
+                  <form onSubmit={handleSubmit} className="space-y-6">
+                    {/* Enhanced input container */}
+                    <div className="relative">
+                      <div className="absolute -inset-0.5 bg-gradient-to-r from-primary/50 to-purple-600/50 rounded-2xl blur opacity-20"></div>
+                      <div className="relative glass-elevated rounded-2xl p-2">
+                        <Textarea
+                          ref={textareaRef}
+                          value={input}
+                          onChange={(e) => setInput(e.target.value)}
+                          placeholder="What would you like to build today? Describe your app, website, or coding challenge..."
+                          className="min-h-[120px] max-h-[300px] resize-none border-none bg-transparent text-lg placeholder:text-muted-foreground/70 focus:ring-0 focus-visible:ring-0 focus-visible:outline-none transition-smooth"
+                          onKeyDown={(e) => {
+                            if (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) {
+                              handleSubmit(e);
+                            }
+                          }}
+                        />
+                        
+                        {/* Enhanced action buttons */}
+                        <div className="flex items-center justify-between pt-3 border-t border-white/10">
+                          <div className="flex items-center space-x-2">
+                            {/* Quick action buttons */}
+                            <Dialog open={isSearchOpen} onOpenChange={setIsSearchOpen}>
+                              <DialogTrigger asChild>
+                                <Button 
+                                  variant="ghost" 
+                                  size="sm" 
+                                  className="glass-hover rounded-lg"
+                                  type="button"
+                                >
+                                  <Search className="w-4 h-4 mr-2" />
+                                  Search Web
+                                </Button>
+                              </DialogTrigger>
+                              <DialogContent className="glass-elevated border-white/20">
+                                <DialogHeader>
+                                  <DialogTitle className="text-gradient-static">Web Search</DialogTitle>
+                                </DialogHeader>
+                                {/* Search content here */}
+                              </DialogContent>
+                            </Dialog>
+
+                            <Dialog open={isWebsiteDialogOpen} onOpenChange={setIsWebsiteDialogOpen}>
+                              <DialogTrigger asChild>
+                                <Button 
+                                  variant="ghost" 
+                                  size="sm" 
+                                  className="glass-hover rounded-lg"
+                                  type="button"
+                                >
+                                  <Globe className="w-4 h-4 mr-2" />
+                                  Clone Website
+                                </Button>
+                              </DialogTrigger>
+                              <DialogContent className="glass-elevated border-white/20">
+                                <DialogHeader>
+                                  <DialogTitle className="text-gradient-static">Analyze Website</DialogTitle>
+                                </DialogHeader>
+                                <div className="space-y-4">
+                                  <Input
+                                    value={websiteUrl}
+                                    onChange={(e) => setWebsiteUrl(e.target.value)}
+                                    placeholder="Enter website URL to analyze..."
+                                    className="glass"
+                                  />
+                                  <Button
+                                    onClick={() => analyzeWebsite(websiteUrl)}
+                                    disabled={isAnalyzingWebsite}
+                                    className="button-gradient w-full"
+                                  >
+                                    {isAnalyzingWebsite ? (
+                                      <>
+                                        <Loader2 className="w-4 h-4 mr-2 animate-spin" />
+                                        Analyzing...
+                                      </>
+                                    ) : (
+                                      'Analyze Website'
+                                    )}
+                                  </Button>
+                                </div>
+                              </DialogContent>
+                            </Dialog>
+                          </div>
+
+                          {/* Enhanced send button */}
+                          <Button
+                            type="submit"
+                            disabled={!input.trim() || isTyping}
+                            className="button-gradient px-8 py-3 text-base font-semibold transition-smooth"
+                          >
+                            {isTyping ? (
+                              <>
+                                <Loader2 className="w-4 h-4 mr-2 animate-spin" />
+                                Creating...
+                              </>
+                            ) : (
+                              <>
+                                <ArrowUp className="w-4 h-4 mr-2" />
+                                Start Building
+                              </>
+                            )}
+                          </Button>
+                        </div>
+                      </div>
+                    </div>
+
+                    {/* Enhanced keyboard shortcut hint */}
+                    <motion.p 
+                      className="text-muted-foreground text-sm text-center"
+                      initial={{ opacity: 0 }}
+                      animate={{ opacity: 1 }}
+                      transition={{ delay: 1.5 }}
+                    >
+                      Press <kbd className="glass px-2 py-1 rounded text-xs font-mono">Ctrl</kbd> + <kbd className="glass px-2 py-1 rounded text-xs font-mono">Enter</kbd> to send
+                    </motion.p>
+                  </form>
+                </motion.div>
+              </motion.div>
+            </div>
+          </motion.div>
+        )}
+      </AnimatePresence>
+
+      {/* Enhanced Split Layout */}
+      <AnimatePresence>
+        {showSplitLayout && (
+          <motion.div 
+            key="split"
+            className="flex-1 flex"
+            initial={{ opacity: 0, x: 20 }}
+            animate={{ opacity: 1, x: 0 }}
+            exit={{ opacity: 0, x: -20 }}
+            transition={{ duration: 0.5 }}
+          >
+            {/* Enhanced Left Sidebar */}
+            <motion.div
+              onMouseEnter={() => setSidebarExpanded(true)}
+              onMouseLeave={() => setSidebarExpanded(false)}
+              className={`${
+                sidebarExpanded ? 'w-80' : 'w-12'
+              } glass border-r border-white/10 flex flex-col transition-smooth relative overflow-hidden`}
+              animate={{ width: sidebarExpanded ? 320 : 48 }}
+              transition={{ duration: 0.3, ease: "easeOut" }}
+            >
+              {/* Sidebar header */}
+              <div className="p-4 border-b border-white/10">
+                <motion.div 
+                  className="flex items-center gap-3"
+                  animate={{ opacity: sidebarExpanded ? 1 : 0 }}
+                  transition={{ delay: sidebarExpanded ? 0.1 : 0 }}
+                >
+                  <div className="w-8 h-8 glass-elevated rounded-lg flex items-center justify-center">
+                    <Zap className="w-4 h-4 text-primary" />
+                  </div>
+                  {sidebarExpanded && (
+                    <div>
+                      <h3 className="font-semibold text-gradient-static">ZapDev</h3>
+                      <p className="text-xs text-muted-foreground">AI Development Assistant</p>
+                    </div>
+                  )}
+                </motion.div>
+              </div>
+
+              {/* New chat button */}
+              <div className="p-3">
+                <Button
+                  onClick={startNewChat}
+                  className="w-full glass-hover justify-start"
+                  variant="ghost"
+                >
+                  <Plus className="w-4 h-4" />
+                  {sidebarExpanded && <span className="ml-2">New Chat</span>}
+                </Button>
+              </div>
+
+              {/* Chat list */}
+              <ScrollArea className="flex-1 custom-scrollbar">
+                <div className="p-3 space-y-2">
+                  {chats?.map((chat) => (
+                    <motion.button
+                      key={chat._id}
+                      onClick={() => selectChat(chat._id)}
+                      className={`w-full text-left p-3 rounded-lg glass-hover transition-smooth group relative ${
+                        selectedChatId === chat._id 
+                          ? 'chat-bubble-user' 
+                          : 'glass'
+                      }`}
+                      whileHover={{ scale: 1.02, x: 2 }}
+                      whileTap={{ scale: 0.98 }}
+                    >
+                      <div className="flex items-center gap-3">
+                        <MessageSquare className="w-4 h-4 text-primary flex-shrink-0" />
+                        {sidebarExpanded && (
+                          <div className="min-w-0 flex-1">
+                            <p className="font-medium truncate text-sm">
+                              {chat.title}
+                            </p>
+                            <p className="text-xs text-muted-foreground">
+                              {formatTimestamp(chat.updatedAt)}
+                            </p>
+                          </div>
+                        )}
+                      </div>
+                      
+                      {sidebarExpanded && (
+                        <Button
+                          onClick={(e) => {
+                            e.stopPropagation();
+                            deleteChat(chat._id);
+                          }}
+                          variant="ghost"
+                          size="sm"
+                          className="absolute right-2 top-2 opacity-0 group-hover:opacity-100 transition-opacity h-6 w-6 p-0"
+                        >
+                          <Trash2 className="w-3 h-3" />
+                        </Button>
+                      )}
+                    </motion.button>
+                  ))}
+                </div>
+              </ScrollArea>
+
+              {/* Sidebar footer */}
+              {sidebarExpanded && (
+                <motion.div 
+                  className="p-4 border-t border-white/10"
+                  initial={{ opacity: 0, y: 20 }}
+                  animate={{ opacity: 1, y: 0 }}
+                  transition={{ delay: 0.2 }}
+                >
+                  <div className="flex items-center gap-3">
+                    <Avatar className="h-8 w-8">
+                      <AvatarImage src={user?.imageUrl} />
+                      <AvatarFallback>
+                        <User className="w-4 h-4" />
+                      </AvatarFallback>
+                    </Avatar>
+                    <div className="min-w-0 flex-1">
+                      <p className="text-sm font-medium truncate">
+                        {user?.firstName} {user?.lastName}
+                      </p>
+                      <p className="text-xs text-muted-foreground truncate">
+                        {user?.primaryEmailAddress?.emailAddress}
+                      </p>
+                    </div>
+                  </div>
+                </motion.div>
+              )}
+            </motion.div>
+
+            {/* Enhanced Main Chat Area */}
+            <div className="flex-1 flex flex-col min-h-0 bg-[var(--color-chat-bg)]">
+              {/* Chat messages */}
+              <ScrollArea className="flex-1 custom-scrollbar">
+                <div className="p-6 space-y-6 max-w-4xl mx-auto w-full">
+                  {messages?.map((message, index) => {
+                    const isUser = message.role === 'user';
+                    const prevMessage = messages[index - 1];
+                    const showDateHeader = !prevMessage || !isSameDay(message.createdAt, prevMessage.createdAt);
+                    const isFirstInGroup = !prevMessage || prevMessage.role !== message.role;
+                    const nextMessage = messages[index + 1];
+                    const isLastInGroup = !nextMessage || nextMessage.role !== message.role;
+
+                    return (
+                      <motion.div
+                        key={message._id}
+                        initial={{ opacity: 0, y: 20, scale: 0.95 }}
+                        animate={{ opacity: 1, y: 0, scale: 1 }}
+                        transition={{ 
+                          duration: 0.3,
+                          delay: index * 0.05,
+                          ease: "easeOut"
+                        }}
+                        className="space-y-4"
+                      >
+                        {showDateHeader && (
+                          <div className="text-center">
+                            <div className="glass px-4 py-2 rounded-full inline-block">
+                              <span className="text-sm text-muted-foreground font-medium">
+                                {formatDateHeader(message.createdAt)}
+                              </span>
+                            </div>
+                          </div>
+                        )}
+
+                        <div className={`group flex gap-4 ${isUser ? 'flex-row-reverse' : 'flex-row'}`}>
+                          {/* Enhanced Avatar */}
+                          {isFirstInGroup && (
+                            <motion.div
+                              initial={{ scale: 0 }}
+                              animate={{ scale: 1 }}
+                              transition={{ delay: 0.1 }}
+                              className="flex-shrink-0"
+                            >
+                              <Avatar className="h-10 w-10">
+                                {isUser ? (
+                                  <AvatarImage src={user?.imageUrl} />
+                                ) : (
+                                  <div className="glass-elevated h-full w-full flex items-center justify-center">
+                                    <Bot className="w-5 h-5 text-primary" />
+                                  </div>
+                                )}
+                                <AvatarFallback>
+                                  {isUser ? <User className="w-5 h-5" /> : <Bot className="w-5 h-5 text-primary" />}
+                                </AvatarFallback>
+                              </Avatar>
+                            </motion.div>
+                          )}
+
+                          {/* Enhanced Message Bubble */}
+                          <div className={`flex-1 max-w-3xl ${!isFirstInGroup ? (isUser ? 'mr-14' : 'ml-14') : ''}`}>
+                            <Card className={`
+                              transition-smooth group-hover:scale-[1.01]
+                              ${isUser 
+                                ? 'chat-bubble-user ml-auto' 
+                                : 'chat-bubble-assistant'
+                              }
+                              ${isFirstInGroup ? '' : (isUser ? 'rounded-tr-lg' : 'rounded-tl-lg')}
+                              ${isLastInGroup ? '' : (isUser ? 'rounded-br-lg' : 'rounded-bl-lg')}
+                            `}>
+                              <CardContent className="p-4 relative">
+                                {/* Message content */}
+                                <div className="space-y-3">
+                                  <SafeText 
+                                    className={`text-sm leading-relaxed ${
+                                      isUser ? 'text-foreground' : 'text-foreground/90'
+                                    }`}
+                                  >
+                                    {message.content}
+                                  </SafeText>
+                                  
+                                  {/* Message metadata */}
+                                  {message.metadata?.model && (
+                                    <div className="flex items-center gap-2 text-xs text-muted-foreground">
+                                      <Badge variant="outline" className="glass text-xs">
+                                        {message.metadata.model}
+                                      </Badge>
+                                      {message.metadata.tokens && (
+                                        <span>{message.metadata.tokens} tokens</span>
+                                      )}
+                                      {message.metadata.cost && (
+                                        <span>${message.metadata.cost.toFixed(4)}</span>
+                                      )}
+                                    </div>
+                                  )}
+                                </div>
+
+                                {/* Enhanced message actions */}
+                                <div className={`absolute top-2 ${isUser ? 'left-2' : 'right-2'} opacity-0 group-hover:opacity-100 transition-opacity flex items-center gap-1`}>
+                                  <Button
+                                    variant="ghost"
+                                    size="sm"
+                                    onClick={() => copyToClipboard(message.content, message._id)}
+                                    className="h-6 w-6 p-0 glass-hover"
+                                  >
+                                    {copiedMessage === message._id ? (
+                                      <Check className="w-3 h-3 text-green-400" />
+                                    ) : (
+                                      <Copy className="w-3 h-3" />
+                                    )}
+                                  </Button>
+                                </div>
+
+                                {/* Timestamp */}
+                                <div className={`text-xs text-muted-foreground mt-2 ${
+                                  isUser ? 'text-right' : 'text-left'
+                                }`}>
+                                  {formatTimestamp(message.createdAt)}
+                                </div>
+                              </CardContent>
+                            </Card>
+                          </div>
+                        </div>
+                      </motion.div>
+                    );
+                  })}
+
+                  {/* Enhanced typing indicator */}
+                  <AnimatePresence>
+                    {isTyping && (
+                      <motion.div
+                        initial={{ opacity: 0, y: 20 }}
+                        animate={{ opacity: 1, y: 0 }}
+                        exit={{ opacity: 0, y: -20 }}
+                        className="flex gap-4"
+                      >
+                        <Avatar className="h-10 w-10">
+                          <div className="glass-elevated h-full w-full flex items-center justify-center">
+                            <motion.div
+                              animate={{ rotate: 360 }}
+                              transition={{ duration: 2, repeat: Infinity, ease: "linear" }}
+                            >
+                              <Bot className="w-5 h-5 text-primary" />
+                            </motion.div>
+                          </div>
+                        </Avatar>
+                        
+                        <Card className="chat-bubble-assistant max-w-xs">
+                          <CardContent className="p-4">
+                            <div className="flex items-center space-x-2">
+                              <span className="text-sm text-muted-foreground">AI is thinking</span>
+                              <div className="flex space-x-1">
+                                {[0, 1, 2].map((i) => (
+                                  <motion.div
+                                    key={i}
+                                    className="w-2 h-2 bg-primary rounded-full"
+                                    animate={{ 
+                                      scale: [1, 1.2, 1], 
+                                      opacity: [0.4, 1, 0.4] 
+                                    }}
+                                    transition={{ 
+                                      duration: 1.5, 
+                                      repeat: Infinity, 
+                                      delay: i * 0.2 
+                                    }}
+                                  />
+                                ))}
+                              </div>
+                            </div>
+                          </CardContent>
+                        </Card>
+                      </motion.div>
+                    )}
+                  </AnimatePresence>
+
+                  <div ref={messagesEndRef} />
+                </div>
+              </ScrollArea>
+
+              {/* Enhanced Input Area */}
+              <div className="border-t border-white/10 bg-[var(--color-chat-surface)]/50 backdrop-blur-xl">
+                <div className="max-w-4xl mx-auto p-4">
+                  <form onSubmit={handleSubmit}>
+                    <div className="relative">
+                      {/* Input container with enhanced styling */}
+                      <div className="glass-elevated rounded-2xl p-3 focus-within:ring-2 focus-within:ring-primary/50 transition-smooth">
+                        <Textarea
+                          ref={textareaRef}
+                          value={input}
+                          onChange={(e) => setInput(e.target.value)}
+                          placeholder="Ask me anything about coding, building apps, or development..."
+                          className="min-h-[50px] max-h-[200px] resize-none border-none bg-transparent placeholder:text-muted-foreground/60 focus:ring-0 focus-visible:ring-0 focus-visible:outline-none transition-smooth text-base"
+                          onKeyDown={(e) => {
+                            if (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) {
+                              handleSubmit(e);
+                            }
+                          }}
+                        />
+                        
+                        {/* Enhanced input actions */}
+                        <div className="flex items-center justify-between pt-2 border-t border-white/10 mt-2">
+                          <div className="flex items-center gap-2">
+                            {/* Quick action buttons with enhanced styling */}
+                            <Button
+                              variant="ghost"
+                              size="sm"
+                              className="glass-hover h-8 px-3 text-xs"
+                              type="button"
+                              onClick={() => setIsSearchOpen(true)}
+                            >
+                              <Search className="w-3 h-3 mr-1" />
+                              Search
+                            </Button>
+                            <Button
+                              variant="ghost"
+                              size="sm"
+                              className="glass-hover h-8 px-3 text-xs"
+                              type="button"
+                              onClick={() => setIsWebsiteDialogOpen(true)}
+                            >
+                              <Globe className="w-3 h-3 mr-1" />
+                              Clone
+                            </Button>
+                          </div>
+
+                          <div className="flex items-center gap-2">
+                            <span className="text-xs text-muted-foreground">
+                              {input.length}/{MAX_MESSAGE_LENGTH}
+                            </span>
+                            <Button
+                              type="submit"
+                              disabled={!input.trim() || isTyping}
+                              className="button-gradient h-8 px-4 text-sm font-medium"
+                            >
+                              {isTyping ? (
+                                <Loader2 className="w-3 h-3 animate-spin" />
+                              ) : (
+                                <Send className="w-3 h-3" />
+                              )}
+                            </Button>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </form>
+                </div>
+              </div>
+            </div>
+          </motion.div>
+        )}
+      </AnimatePresence>
+    </div>
+  );
+};
+
+export default EnhancedChatInterface;
\ No newline at end of file
diff --git a/src/components/ErrorBoundary.tsx b/src/components/ErrorBoundary.tsx
new file mode 100644
index 00000000..27de96b3
--- /dev/null
+++ b/src/components/ErrorBoundary.tsx
@@ -0,0 +1,374 @@
+import React, { Component, ErrorInfo, ReactNode } from 'react';
+import { motion, AnimatePresence } from 'framer-motion';
+import { AlertTriangle, RefreshCw, Home, Bug, Copy, Check } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
+import { Badge } from '@/components/ui/badge';
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible';
+import * as Sentry from '@sentry/react';
+import { toast } from 'sonner';
+
+interface Props {
+  children: ReactNode;
+  fallback?: ReactNode;
+  onError?: (error: Error, errorInfo: ErrorInfo) => void;
+  showDetails?: boolean;
+  level?: 'page' | 'component' | 'critical';
+}
+
+interface State {
+  hasError: boolean;
+  error: Error | null;
+  errorInfo: ErrorInfo | null;
+  errorId: string | null;
+  isDetailsOpen: boolean;
+  copied: boolean;
+}
+
+class ErrorBoundary extends Component<Props, State> {
+  private retryCount = 0;
+  private maxRetries = 3;
+
+  constructor(props: Props) {
+    super(props);
+    this.state = {
+      hasError: false,
+      error: null,
+      errorInfo: null,
+      errorId: null,
+      isDetailsOpen: false,
+      copied: false,
+    };
+  }
+
+  static getDerivedStateFromError(error: Error): Partial<State> {
+    return {
+      hasError: true,
+      error,
+    };
+  }
+
+  componentDidCatch(error: Error, errorInfo: ErrorInfo) {
+    const errorId = Math.random().toString(36).substring(2, 15);
+    
+    this.setState({
+      errorInfo,
+      errorId,
+    });
+
+    // Log to Sentry with additional context
+    Sentry.withScope((scope) => {
+      scope.setTag('errorBoundary', true);
+      scope.setTag('level', this.props.level || 'component');
+      scope.setLevel('error');
+      scope.setContext('errorInfo', {
+        componentStack: errorInfo.componentStack,
+        errorBoundary: this.constructor.name,
+        retryCount: this.retryCount,
+      });
+      Sentry.captureException(error);
+    });
+
+    // Call custom error handler
+    this.props.onError?.(error, errorInfo);
+
+    // Log to console in development
+    if (process.env.NODE_ENV === 'development') {
+      console.error('ErrorBoundary caught an error:', error, errorInfo);
+    }
+  }
+
+  handleRetry = () => {
+    if (this.retryCount < this.maxRetries) {
+      this.retryCount++;
+      this.setState({
+        hasError: false,
+        error: null,
+        errorInfo: null,
+        errorId: null,
+        isDetailsOpen: false,
+      });
+      toast.success(`Retrying... (${this.retryCount}/${this.maxRetries})`);
+    } else {
+      toast.error('Maximum retry attempts reached');
+    }
+  };
+
+  handleReload = () => {
+    window.location.reload();
+  };
+
+  handleGoHome = () => {
+    window.location.href = '/';
+  };
+
+  copyErrorDetails = async () => {
+    const errorDetails = {
+      errorId: this.state.errorId,
+      message: this.state.error?.message,
+      stack: this.state.error?.stack,
+      componentStack: this.state.errorInfo?.componentStack,
+      timestamp: new Date().toISOString(),
+      userAgent: navigator.userAgent,
+      url: window.location.href,
+    };
+
+    try {
+      await navigator.clipboard.writeText(JSON.stringify(errorDetails, null, 2));
+      this.setState({ copied: true });
+      toast.success('Error details copied to clipboard');
+      setTimeout(() => this.setState({ copied: false }), 2000);
+    } catch (error) {
+      toast.error('Failed to copy error details');
+    }
+  };
+
+  render() {
+    if (this.state.hasError) {
+      const { level = 'component', showDetails = true } = this.props;
+      const isPageLevel = level === 'page';
+      const isCritical = level === 'critical';
+
+      const errorContent = (
+        <motion.div
+          initial={{ opacity: 0, scale: 0.95 }}
+          animate={{ opacity: 1, scale: 1 }}
+          exit={{ opacity: 0, scale: 0.95 }}
+          transition={{ duration: 0.3 }}
+          className={`flex items-center justify-center ${
+            isPageLevel ? 'min-h-screen p-6 bg-[var(--color-chat-bg)]' : 'p-4'
+          }`}
+        >
+          <Card className={`glass-elevated max-w-2xl w-full ${
+            isCritical ? 'border-destructive/50' : 'border-white/20'
+          }`}>
+            <CardHeader className="text-center">
+              <motion.div
+                initial={{ scale: 0 }}
+                animate={{ scale: 1 }}
+                transition={{ delay: 0.2, type: "spring", stiffness: 200 }}
+                className="mx-auto mb-4"
+              >
+                <div className={`w-16 h-16 rounded-full flex items-center justify-center ${
+                  isCritical 
+                    ? 'bg-destructive/20 text-destructive' 
+                    : 'bg-orange-500/20 text-orange-500'
+                }`}>
+                  <AlertTriangle className="w-8 h-8" />
+                </div>
+              </motion.div>
+
+              <CardTitle className="text-2xl font-bold mb-2">
+                {isCritical ? 'Critical Error' : 'Something went wrong'}
+              </CardTitle>
+              
+              <div className="space-y-2">
+                <p className="text-muted-foreground">
+                  {isCritical 
+                    ? 'A critical error occurred that requires immediate attention.'
+                    : 'We encountered an unexpected error. This has been logged and our team has been notified.'
+                  }
+                </p>
+                
+                {this.state.errorId && (
+                  <div className="flex items-center justify-center gap-2">
+                    <Badge variant="outline" className="font-mono text-xs">
+                      Error ID: {this.state.errorId}
+                    </Badge>
+                  </div>
+                )}
+              </div>
+            </CardHeader>
+
+            <CardContent className="space-y-6">
+              {/* Error message */}
+              {this.state.error?.message && (
+                <motion.div
+                  initial={{ opacity: 0, y: 10 }}
+                  animate={{ opacity: 1, y: 0 }}
+                  transition={{ delay: 0.3 }}
+                  className="p-4 glass rounded-lg"
+                >
+                  <h4 className="font-semibold text-sm mb-2 text-destructive">Error Message:</h4>
+                  <p className="text-sm font-mono text-muted-foreground">
+                    {this.state.error.message}
+                  </p>
+                </motion.div>
+              )}
+
+              {/* Action buttons */}
+              <motion.div
+                initial={{ opacity: 0, y: 10 }}
+                animate={{ opacity: 1, y: 0 }}
+                transition={{ delay: 0.4 }}
+                className="flex flex-col sm:flex-row gap-3"
+              >
+                {!isCritical && this.retryCount < this.maxRetries && (
+                  <Button
+                    onClick={this.handleRetry}
+                    className="button-gradient flex-1"
+                    leftIcon={<RefreshCw className="w-4 h-4" />}
+                  >
+                    Try Again ({this.maxRetries - this.retryCount} left)
+                  </Button>
+                )}
+
+                {isPageLevel && (
+                  <Button
+                    onClick={this.handleGoHome}
+                    variant="glass"
+                    className="flex-1"
+                    leftIcon={<Home className="w-4 h-4" />}
+                  >
+                    Go Home
+                  </Button>
+                )}
+
+                {!isPageLevel && (
+                  <Button
+                    onClick={this.handleReload}
+                    variant="outline"
+                    className="flex-1"
+                    leftIcon={<RefreshCw className="w-4 h-4" />}
+                  >
+                    Reload Page
+                  </Button>
+                )}
+              </motion.div>
+
+              {/* Error details (collapsible) */}
+              {showDetails && (this.state.error?.stack || this.state.errorInfo) && (
+                <motion.div
+                  initial={{ opacity: 0, y: 10 }}
+                  animate={{ opacity: 1, y: 0 }}
+                  transition={{ delay: 0.5 }}
+                >
+                  <Collapsible 
+                    open={this.state.isDetailsOpen} 
+                    onOpenChange={(isOpen) => this.setState({ isDetailsOpen: isOpen })}
+                  >
+                    <CollapsibleTrigger asChild>
+                      <Button
+                        variant="ghost"
+                        size="sm"
+                        className="w-full justify-center text-muted-foreground hover:text-foreground"
+                      >
+                        <Bug className="w-4 h-4 mr-2" />
+                        {this.state.isDetailsOpen ? 'Hide' : 'Show'} Technical Details
+                      </Button>
+                    </CollapsibleTrigger>
+                    
+                    <CollapsibleContent className="mt-4">
+                      <div className="space-y-3">
+                        <div className="flex justify-between items-center">
+                          <h4 className="font-semibold text-sm">Technical Details</h4>
+                          <Button
+                            onClick={this.copyErrorDetails}
+                            variant="ghost"
+                            size="sm"
+                            className="text-xs"
+                          >
+                            {this.state.copied ? (
+                              <>
+                                <Check className="w-3 h-3 mr-1" />
+                                Copied
+                              </>
+                            ) : (
+                              <>
+                                <Copy className="w-3 h-3 mr-1" />
+                                Copy Details
+                              </>
+                            )}
+                          </Button>
+                        </div>
+
+                        {this.state.error?.stack && (
+                          <div className="p-3 bg-black/20 rounded border border-white/10">
+                            <h5 className="font-semibold text-xs mb-2 text-destructive">Stack Trace:</h5>
+                            <pre className="text-xs text-muted-foreground overflow-x-auto whitespace-pre-wrap">
+                              {this.state.error.stack}
+                            </pre>
+                          </div>
+                        )}
+
+                        {this.state.errorInfo?.componentStack && (
+                          <div className="p-3 bg-black/20 rounded border border-white/10">
+                            <h5 className="font-semibold text-xs mb-2 text-orange-400">Component Stack:</h5>
+                            <pre className="text-xs text-muted-foreground overflow-x-auto whitespace-pre-wrap">
+                              {this.state.errorInfo.componentStack}
+                            </pre>
+                          </div>
+                        )}
+                      </div>
+                    </CollapsibleContent>
+                  </Collapsible>
+                </motion.div>
+              )}
+
+              {/* Development only information */}
+              {process.env.NODE_ENV === 'development' && (
+                <motion.div
+                  initial={{ opacity: 0, y: 10 }}
+                  animate={{ opacity: 1, y: 0 }}
+                  transition={{ delay: 0.6 }}
+                  className="p-3 bg-yellow-500/10 border border-yellow-500/20 rounded-lg"
+                >
+                  <p className="text-xs text-yellow-400 font-medium">
+                    🚧 Development Mode: Check console for additional error details
+                  </p>
+                </motion.div>
+              )}
+            </CardContent>
+          </Card>
+        </motion.div>
+      );
+
+      // If a fallback is provided, use it instead
+      if (this.props.fallback) {
+        return (
+          <AnimatePresence mode="wait">
+            {this.props.fallback}
+          </AnimatePresence>
+        );
+      }
+
+      return (
+        <AnimatePresence mode="wait">
+          {errorContent}
+        </AnimatePresence>
+      );
+    }
+
+    return this.props.children;
+  }
+}
+
+// Higher-order component for easy wrapping
+export const withErrorBoundary = <P extends object>(
+  Component: React.ComponentType<P>,
+  errorBoundaryProps?: Omit<Props, 'children'>
+) => {
+  const WrappedComponent = (props: P) => (
+    <ErrorBoundary {...errorBoundaryProps}>
+      <Component {...props} />
+    </ErrorBoundary>
+  );
+
+  WrappedComponent.displayName = `withErrorBoundary(${Component.displayName || Component.name})`;
+  return WrappedComponent;
+};
+
+// Specialized error boundaries for different contexts
+export const PageErrorBoundary: React.FC<Omit<Props, 'level'>> = (props) => (
+  <ErrorBoundary {...props} level="page" />
+);
+
+export const ComponentErrorBoundary: React.FC<Omit<Props, 'level'>> = (props) => (
+  <ErrorBoundary {...props} level="component" />
+);
+
+export const CriticalErrorBoundary: React.FC<Omit<Props, 'level'>> = (props) => (
+  <ErrorBoundary {...props} level="critical" />
+);
+
+export default ErrorBoundary;
\ No newline at end of file
diff --git a/src/components/LoadingStates.tsx b/src/components/LoadingStates.tsx
new file mode 100644
index 00000000..b73d1a0e
--- /dev/null
+++ b/src/components/LoadingStates.tsx
@@ -0,0 +1,598 @@
+import React from 'react';
+import { motion, AnimatePresence } from 'framer-motion';
+import { Loader2, Zap, Bot, Code, Sparkles, Brain, Cpu, Network, Shield } from 'lucide-react';
+import { cn } from '@/lib/utils';
+
+interface LoadingSpinnerProps {
+  size?: 'xs' | 'sm' | 'md' | 'lg' | 'xl';
+  variant?: 'default' | 'dots' | 'pulse' | 'bounce' | 'gradient' | 'glow';
+  className?: string;
+}
+
+interface LoadingStateProps {
+  loading: boolean;
+  children: React.ReactNode;
+  fallback?: React.ReactNode;
+  delay?: number;
+  className?: string;
+}
+
+interface SkeletonProps {
+  className?: string;
+  variant?: 'default' | 'avatar' | 'text' | 'button' | 'card';
+  lines?: number;
+  animate?: boolean;
+}
+
+interface ProgressiveLoadingProps {
+  steps: Array<{
+    id: string;
+    label: string;
+    icon?: React.ReactNode;
+    duration?: number;
+  }>;
+  currentStep?: string;
+  className?: string;
+}
+
+// Loading Spinner Component
+export const LoadingSpinner: React.FC<LoadingSpinnerProps> = ({
+  size = 'md',
+  variant = 'default',
+  className
+}) => {
+  const sizeClasses = {
+    xs: 'w-3 h-3',
+    sm: 'w-4 h-4',
+    md: 'w-6 h-6',
+    lg: 'w-8 h-8',
+    xl: 'w-12 h-12'
+  };
+
+  if (variant === 'dots') {
+    return (
+      <div className={cn('flex items-center space-x-1', className)}>
+        {[0, 1, 2].map((i) => (
+          <motion.div
+            key={i}
+            className={cn(
+              'bg-primary rounded-full',
+              size === 'xs' ? 'w-1 h-1' :
+              size === 'sm' ? 'w-1.5 h-1.5' :
+              size === 'md' ? 'w-2 h-2' :
+              size === 'lg' ? 'w-3 h-3' : 'w-4 h-4'
+            )}
+            animate={{
+              scale: [1, 1.2, 1],
+              opacity: [0.4, 1, 0.4],
+            }}
+            transition={{
+              duration: 1.5,
+              repeat: Infinity,
+              delay: i * 0.2,
+              ease: 'easeInOut'
+            }}
+          />
+        ))}
+      </div>
+    );
+  }
+
+  if (variant === 'pulse') {
+    return (
+      <motion.div
+        className={cn(
+          'bg-primary rounded-full opacity-75',
+          sizeClasses[size],
+          className
+        )}
+        animate={{
+          scale: [1, 1.1, 1],
+          opacity: [0.7, 1, 0.7],
+        }}
+        transition={{
+          duration: 2,
+          repeat: Infinity,
+          ease: 'easeInOut'
+        }}
+      />
+    );
+  }
+
+  if (variant === 'bounce') {
+    return (
+      <div className={cn('flex items-end space-x-1', className)}>
+        {[0, 1, 2, 3].map((i) => (
+          <motion.div
+            key={i}
+            className="w-1 bg-primary rounded-full"
+            style={{ height: size === 'xs' ? 8 : size === 'sm' ? 12 : size === 'md' ? 16 : size === 'lg' ? 20 : 24 }}
+            animate={{
+              scaleY: [1, 2, 1],
+            }}
+            transition={{
+              duration: 1,
+              repeat: Infinity,
+              delay: i * 0.1,
+              ease: 'easeInOut'
+            }}
+          />
+        ))}
+      </div>
+    );
+  }
+
+  if (variant === 'gradient') {
+    return (
+      <motion.div
+        className={cn(
+          'relative rounded-full bg-gradient-to-r from-primary to-purple-600',
+          sizeClasses[size],
+          className
+        )}
+        animate={{ rotate: 360 }}
+        transition={{ duration: 1, repeat: Infinity, ease: 'linear' }}
+      >
+        <div className="absolute inset-1 bg-background rounded-full" />
+      </motion.div>
+    );
+  }
+
+  if (variant === 'glow') {
+    return (
+      <motion.div
+        className={cn('relative', className)}
+        animate={{
+          scale: [1, 1.05, 1],
+        }}
+        transition={{
+          duration: 2,
+          repeat: Infinity,
+          ease: 'easeInOut'
+        }}
+      >
+        <div className={cn(
+          'absolute -inset-1 bg-gradient-to-r from-primary to-purple-600 rounded-full blur opacity-50',
+          sizeClasses[size]
+        )} />
+        <motion.div
+          className={cn(
+            'relative bg-primary rounded-full',
+            sizeClasses[size]
+          )}
+          animate={{ rotate: 360 }}
+          transition={{ duration: 2, repeat: Infinity, ease: 'linear' }}
+        />
+      </motion.div>
+    );
+  }
+
+  // Default spinner
+  return (
+    <motion.div
+      className={cn(sizeClasses[size], className)}
+      animate={{ rotate: 360 }}
+      transition={{ duration: 1, repeat: Infinity, ease: 'linear' }}
+    >
+      <Loader2 className="w-full h-full text-primary" />
+    </motion.div>
+  );
+};
+
+// Loading State Wrapper
+export const LoadingState: React.FC<LoadingStateProps> = ({
+  loading,
+  children,
+  fallback,
+  delay = 0,
+  className
+}) => {
+  const [showLoading, setShowLoading] = React.useState(delay === 0 ? loading : false);
+
+  React.useEffect(() => {
+    if (loading && delay > 0) {
+      const timer = setTimeout(() => setShowLoading(true), delay);
+      return () => clearTimeout(timer);
+    } else {
+      setShowLoading(loading);
+    }
+  }, [loading, delay]);
+
+  return (
+    <div className={className}>
+      <AnimatePresence mode="wait">
+        {showLoading ? (
+          <motion.div
+            key="loading"
+            initial={{ opacity: 0 }}
+            animate={{ opacity: 1 }}
+            exit={{ opacity: 0 }}
+            transition={{ duration: 0.2 }}
+          >
+            {fallback || (
+              <div className="flex items-center justify-center p-8">
+                <LoadingSpinner variant="glow" size="lg" />
+              </div>
+            )}
+          </motion.div>
+        ) : (
+          <motion.div
+            key="content"
+            initial={{ opacity: 0 }}
+            animate={{ opacity: 1 }}
+            transition={{ duration: 0.2 }}
+          >
+            {children}
+          </motion.div>
+        )}
+      </AnimatePresence>
+    </div>
+  );
+};
+
+// Skeleton Component
+export const Skeleton: React.FC<SkeletonProps> = ({
+  className,
+  variant = 'default',
+  lines = 1,
+  animate = true
+}) => {
+  const baseClasses = cn(
+    'bg-gradient-to-r from-muted/50 to-muted/80 rounded',
+    animate && 'animate-pulse',
+    className
+  );
+
+  if (variant === 'avatar') {
+    return <div className={cn(baseClasses, 'w-10 h-10 rounded-full')} />;
+  }
+
+  if (variant === 'button') {
+    return <div className={cn(baseClasses, 'h-10 w-24 rounded-lg')} />;
+  }
+
+  if (variant === 'card') {
+    return (
+      <div className={cn('space-y-3', className)}>
+        <div className={cn(baseClasses, 'h-4 w-3/4')} />
+        <div className={cn(baseClasses, 'h-4 w-1/2')} />
+        <div className={cn(baseClasses, 'h-20 w-full')} />
+      </div>
+    );
+  }
+
+  if (variant === 'text') {
+    return (
+      <div className="space-y-2">
+        {Array.from({ length: lines }).map((_, i) => (
+          <div
+            key={i}
+            className={cn(
+              baseClasses,
+              'h-4',
+              i === lines - 1 ? 'w-3/4' : 'w-full'
+            )}
+          />
+        ))}
+      </div>
+    );
+  }
+
+  return <div className={cn(baseClasses, 'h-4 w-full')} />;
+};
+
+// Progressive Loading Component
+export const ProgressiveLoading: React.FC<ProgressiveLoadingProps> = ({
+  steps,
+  currentStep,
+  className
+}) => {
+  return (
+    <div className={cn('space-y-4', className)}>
+      {steps.map((step, index) => {
+        const isActive = step.id === currentStep;
+        const isCompleted = currentStep && steps.findIndex(s => s.id === currentStep) > index;
+        
+        return (
+          <motion.div
+            key={step.id}
+            className="flex items-center space-x-3"
+            initial={{ opacity: 0, x: -20 }}
+            animate={{ opacity: 1, x: 0 }}
+            transition={{ delay: index * 0.1 }}
+          >
+            <div className={cn(
+              'flex items-center justify-center w-8 h-8 rounded-full border-2 transition-all',
+              isCompleted && 'bg-green-500 border-green-500 text-white',
+              isActive && 'border-primary bg-primary/10 text-primary',
+              !isActive && !isCompleted && 'border-muted text-muted-foreground'
+            )}>
+              {isCompleted ? (
+                <motion.div
+                  initial={{ scale: 0 }}
+                  animate={{ scale: 1 }}
+                  transition={{ type: 'spring', stiffness: 300 }}
+                >
+                  ✓
+                </motion.div>
+              ) : isActive ? (
+                <LoadingSpinner size="xs" variant="gradient" />
+              ) : (
+                step.icon || <div className="w-2 h-2 rounded-full bg-current" />
+              )}
+            </div>
+            
+            <div className={cn(
+              'flex-1 text-sm font-medium transition-colors',
+              isActive && 'text-primary',
+              isCompleted && 'text-green-500',
+              !isActive && !isCompleted && 'text-muted-foreground'
+            )}>
+              {step.label}
+            </div>
+          </motion.div>
+        );
+      })}
+    </div>
+  );
+};
+
+// Specialized Loading Components for ZapDev
+export const AIThinkingLoader: React.FC<{ message?: string }> = ({
+  message = "AI is thinking..."
+}) => {
+  const thoughts = [
+    "Analyzing your request",
+    "Processing context",
+    "Generating response",
+    "Optimizing output"
+  ];
+
+  const [currentThought, setCurrentThought] = React.useState(0);
+
+  React.useEffect(() => {
+    const interval = setInterval(() => {
+      setCurrentThought(prev => (prev + 1) % thoughts.length);
+    }, 2000);
+    return () => clearInterval(interval);
+  }, [thoughts.length]);
+
+  return (
+    <div className="flex items-center space-x-3 p-4 glass rounded-lg">
+      <motion.div
+        className="relative"
+        animate={{
+          scale: [1, 1.1, 1],
+          rotate: [0, 180, 360]
+        }}
+        transition={{
+          duration: 3,
+          repeat: Infinity,
+          ease: 'easeInOut'
+        }}
+      >
+        <Brain className="w-6 h-6 text-primary" />
+        <motion.div
+          className="absolute -inset-2 bg-primary/20 rounded-full blur"
+          animate={{
+            opacity: [0.3, 0.7, 0.3],
+          }}
+          transition={{
+            duration: 2,
+            repeat: Infinity,
+            ease: 'easeInOut'
+          }}
+        />
+      </motion.div>
+      
+      <div className="flex-1">
+        <AnimatePresence mode="wait">
+          <motion.p
+            key={currentThought}
+            className="text-sm font-medium text-primary"
+            initial={{ opacity: 0, y: 10 }}
+            animate={{ opacity: 1, y: 0 }}
+            exit={{ opacity: 0, y: -10 }}
+            transition={{ duration: 0.3 }}
+          >
+            {thoughts[currentThought]}
+          </motion.p>
+        </AnimatePresence>
+        <div className="flex space-x-1 mt-2">
+          {[0, 1, 2].map((i) => (
+            <motion.div
+              key={i}
+              className="w-1 h-1 bg-primary rounded-full"
+              animate={{
+                opacity: [0.3, 1, 0.3],
+              }}
+              transition={{
+                duration: 1.5,
+                repeat: Infinity,
+                delay: i * 0.2,
+                ease: 'easeInOut'
+              }}
+            />
+          ))}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export const CodeExecutionLoader: React.FC<{ language?: string }> = ({
+  language = "JavaScript"
+}) => {
+  return (
+    <div className="flex items-center space-x-3 p-4 glass rounded-lg">
+      <motion.div
+        className="relative"
+        animate={{
+          rotate: [0, 360]
+        }}
+        transition={{
+          duration: 2,
+          repeat: Infinity,
+          ease: 'linear'
+        }}
+      >
+        <Cpu className="w-6 h-6 text-green-500" />
+        <motion.div
+          className="absolute -inset-2 bg-green-500/20 rounded-full blur"
+          animate={{
+            scale: [1, 1.2, 1],
+            opacity: [0.3, 0.7, 0.3],
+          }}
+          transition={{
+            duration: 2,
+            repeat: Infinity,
+            ease: 'easeInOut'
+          }}
+        />
+      </motion.div>
+      
+      <div className="flex-1">
+        <p className="text-sm font-medium text-green-500">
+          Executing {language} code...
+        </p>
+        <div className="flex items-center space-x-2 mt-2">
+          <div className="flex-1 h-1 bg-green-500/20 rounded-full overflow-hidden">
+            <motion.div
+              className="h-full bg-gradient-to-r from-green-500 to-emerald-500"
+              initial={{ width: 0 }}
+              animate={{ width: '100%' }}
+              transition={{
+                duration: 3,
+                repeat: Infinity,
+                ease: 'easeInOut'
+              }}
+            />
+          </div>
+          <Code className="w-3 h-3 text-green-500" />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export const NetworkLoader: React.FC<{ message?: string }> = ({
+  message = "Connecting..."
+}) => {
+  return (
+    <div className="flex items-center space-x-3 p-4 glass rounded-lg">
+      <motion.div
+        className="relative"
+      >
+        <Network className="w-6 h-6 text-blue-500" />
+        {[0, 1, 2].map((i) => (
+          <motion.div
+            key={i}
+            className="absolute -inset-2 border-2 border-blue-500/30 rounded-full"
+            animate={{
+              scale: [1, 2],
+              opacity: [1, 0],
+            }}
+            transition={{
+              duration: 2,
+              repeat: Infinity,
+              delay: i * 0.4,
+              ease: 'easeOut'
+            }}
+          />
+        ))}
+      </motion.div>
+      
+      <div className="flex-1">
+        <p className="text-sm font-medium text-blue-500">{message}</p>
+        <div className="flex space-x-1 mt-2">
+          {[0, 1, 2, 3, 4].map((i) => (
+            <motion.div
+              key={i}
+              className="w-0.5 bg-blue-500/60 rounded-full"
+              style={{ height: 4 + (i * 2) }}
+              animate={{
+                scaleY: [1, 1.5, 1],
+                opacity: [0.6, 1, 0.6],
+              }}
+              transition={{
+                duration: 1.5,
+                repeat: Infinity,
+                delay: i * 0.1,
+                ease: 'easeInOut'
+              }}
+            />
+          ))}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+// Page Loading Overlay
+export const PageLoadingOverlay: React.FC<{
+  message?: string;
+  progress?: number;
+}> = ({
+  message = "Loading ZapDev...",
+  progress
+}) => {
+  return (
+    <motion.div
+      className="fixed inset-0 z-50 flex items-center justify-center bg-[var(--color-chat-bg)] backdrop-blur-sm"
+      initial={{ opacity: 0 }}
+      animate={{ opacity: 1 }}
+      exit={{ opacity: 0 }}
+    >
+      <div className="text-center space-y-6">
+        {/* Logo */}
+        <motion.div
+          className="mx-auto w-16 h-16 glass-elevated rounded-2xl flex items-center justify-center"
+          animate={{
+            scale: [1, 1.1, 1],
+            rotate: [0, 360],
+          }}
+          transition={{
+            scale: { duration: 2, repeat: Infinity, ease: 'easeInOut' },
+            rotate: { duration: 3, repeat: Infinity, ease: 'linear' }
+          }}
+        >
+          <Zap className="w-8 h-8 text-primary" />
+        </motion.div>
+
+        {/* Message */}
+        <motion.div
+          initial={{ opacity: 0, y: 20 }}
+          animate={{ opacity: 1, y: 0 }}
+          transition={{ delay: 0.3 }}
+        >
+          <h3 className="text-xl font-semibold text-gradient-static mb-2">
+            {message}
+          </h3>
+          
+          {/* Progress bar */}
+          {progress !== undefined && (
+            <div className="w-64 h-1 bg-white/20 rounded-full overflow-hidden">
+              <motion.div
+                className="h-full bg-gradient-to-r from-primary to-purple-600"
+                initial={{ width: 0 }}
+                animate={{ width: `${progress}%` }}
+                transition={{ duration: 0.3 }}
+              />
+            </div>
+          )}
+        </motion.div>
+      </div>
+    </motion.div>
+  );
+};
+
+export default {
+  LoadingSpinner,
+  LoadingState,
+  Skeleton,
+  ProgressiveLoading,
+  AIThinkingLoader,
+  CodeExecutionLoader,
+  NetworkLoader,
+  PageLoadingOverlay
+};
\ No newline at end of file
diff --git a/src/components/Navigation.tsx b/src/components/Navigation.tsx
index 7929da4c..ba68532b 100644
--- a/src/components/Navigation.tsx
+++ b/src/components/Navigation.tsx
@@ -1,11 +1,12 @@
 
 import { useState, useEffect } from "react";
-import { Sparkles, Menu, User } from "lucide-react";
+import { Sparkles, Menu, User, Zap } from "lucide-react";
 import { Button } from "./ui/button";
 import { Sheet, SheetContent, SheetTrigger } from "./ui/sheet";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import { SignInButton, useClerk } from "@clerk/clerk-react";
 import { useAuth } from "@/hooks/useAuth";
+import { motion, AnimatePresence } from "framer-motion";
 
 const Navigation = () => {
   const [isScrolled, setIsScrolled] = useState(false);
@@ -56,165 +57,251 @@ const Navigation = () => {
   ];
 
   return (
-    <header
-      className={`fixed top-3.5 left-1/2 -translate-x-1/2 z-50 transition-all duration-300 rounded-full ${
+    <motion.header
+      initial={{ opacity: 0, y: -20 }}
+      animate={{ opacity: 1, y: 0 }}
+      transition={{ duration: 0.5, ease: "easeOut" }}
+      className={`fixed top-3.5 left-1/2 -translate-x-1/2 z-50 transition-smooth rounded-full ${
         isScrolled 
-          ? "h-14 bg-[#1B1B1B]/40 backdrop-blur-xl border border-white/10 scale-95 w-[90%] max-w-2xl" 
-          : "h-14 bg-[#1B1B1B] w-[95%] max-w-3xl"
+          ? "h-14 glass-elevated scale-95 w-[90%] max-w-2xl" 
+          : "h-14 glass w-[95%] max-w-3xl"
       }`}
     >
-      <div className="mx-auto h-full px-6">
+      {/* Enhanced glow effect */}
+      <div className="absolute -inset-0.5 bg-gradient-to-r from-primary/20 to-purple-600/20 rounded-full blur opacity-20 animate-pulse-glow" />
+      
+      <div className="relative mx-auto h-full px-6">
         <nav className="flex items-center justify-between h-full">
-          <div className="flex items-center gap-2">
-            <Sparkles className="w-5 h-5 text-primary" />
-            <span className="font-bold text-base">zapdev</span>
-          </div>
+          <motion.div 
+            className="flex items-center gap-3"
+            whileHover={{ scale: 1.05 }}
+            whileTap={{ scale: 0.95 }}
+          >
+            <motion.div
+              animate={{ rotate: 360 }}
+              transition={{ duration: 20, repeat: Infinity, ease: "linear" }}
+              className="relative"
+            >
+              <div className="absolute -inset-1 bg-gradient-to-r from-primary to-purple-600 rounded-full blur opacity-30" />
+              <div className="relative glass-elevated w-8 h-8 rounded-full flex items-center justify-center">
+                <Zap className="w-4 h-4 text-gradient" />
+              </div>
+            </motion.div>
+            <span className="font-bold text-lg text-gradient-static tracking-tight">ZapDev</span>
+          </motion.div>
 
-          {/* Desktop Navigation */}
-          <div className="hidden md:flex items-center gap-6">
-            {navItems.map((item) => (
-              item.isLink ? (
-                <Link
-                  key={item.name}
-                  to={item.href}
-                  className="text-sm text-muted-foreground hover:text-foreground transition-all duration-300 relative"
-                >
-                  {item.name}
-                  {item.isNew && (
-                    <span className="absolute -top-1 -right-4 text-xs bg-gradient-to-r from-purple-600 to-pink-600 text-white px-1 rounded-full">New</span>
-                  )}
-                </Link>
-              ) : (
-                <a
-                  key={item.name}
-                  href={item.href}
-                  onClick={(e) => {
-                    e.preventDefault();
-                    if (item.onClick) {
-                      item.onClick();
-                    }
-                  }}
-                  className="text-sm text-muted-foreground hover:text-foreground transition-all duration-300"
-                >
-                  {item.name}
-                </a>
-              )
+          {/* Enhanced Desktop Navigation */}
+          <div className="hidden md:flex items-center gap-1">
+            {navItems.map((item, index) => (
+              <motion.div
+                key={item.name}
+                initial={{ opacity: 0, y: -10 }}
+                animate={{ opacity: 1, y: 0 }}
+                transition={{ delay: index * 0.1 + 0.3 }}
+              >
+                {item.isLink ? (
+                  <Link
+                    to={item.href}
+                    className="relative px-4 py-2 text-sm font-medium text-muted-foreground hover:text-foreground transition-smooth rounded-lg glass-hover group"
+                  >
+                    <span className="relative z-10">{item.name}</span>
+                    {item.isNew && (
+                      <motion.span 
+                        className="absolute -top-1 -right-1 text-xs button-gradient text-white px-2 py-0.5 rounded-full"
+                        animate={{ scale: [1, 1.1, 1] }}
+                        transition={{ duration: 2, repeat: Infinity }}
+                      >
+                        New
+                      </motion.span>
+                    )}
+                    {/* Hover indicator */}
+                    <motion.div
+                      className="absolute inset-0 rounded-lg bg-gradient-to-r from-primary/10 to-purple-600/10 opacity-0 group-hover:opacity-100 transition-opacity"
+                      layoutId="navHover"
+                    />
+                  </Link>
+                ) : (
+                  <motion.a
+                    href={item.href}
+                    onClick={(e) => {
+                      e.preventDefault();
+                      if (item.onClick) {
+                        item.onClick();
+                      }
+                    }}
+                    className="relative px-4 py-2 text-sm font-medium text-muted-foreground hover:text-foreground transition-smooth rounded-lg glass-hover group"
+                    whileHover={{ scale: 1.02 }}
+                    whileTap={{ scale: 0.98 }}
+                  >
+                    <span className="relative z-10">{item.name}</span>
+                    <motion.div
+                      className="absolute inset-0 rounded-lg bg-gradient-to-r from-primary/10 to-purple-600/10 opacity-0 group-hover:opacity-100 transition-opacity"
+                      layoutId="navHover"
+                    />
+                  </motion.a>
+                )}
+              </motion.div>
             ))}
-            {isAuthenticated ? (
-              <div className="flex items-center gap-2">
-                <Button 
-                  onClick={() => navigate('/settings')}
-                  size="sm"
-                  variant="outline"
-                  className="border-gray-700"
-                >
-                  <User className="w-4 h-4 mr-2" />
-                  {user?.fullName?.split(' ')[0] || 'Profile'}
-                </Button>
-                <Button 
-                  onClick={() => signOut()}
-                  size="sm"
-                  variant="outline"
-                  className="border-gray-700"
-                >
-                  Sign Out
-                </Button>
-              </div>
-            ) : (
-              <SignInButton mode="redirect" forceRedirectUrl="/chat">
-                <Button 
-                  size="sm"
-                  className="button-gradient"
-                >
-                  Get Started
-                </Button>
-              </SignInButton>
-            )}
+            <motion.div 
+              className="flex items-center gap-3 ml-6"
+              initial={{ opacity: 0, x: 20 }}
+              animate={{ opacity: 1, x: 0 }}
+              transition={{ delay: 0.5 }}
+            >
+              {isAuthenticated ? (
+                <div className="flex items-center gap-2">
+                  <motion.div whileHover={{ scale: 1.02 }} whileTap={{ scale: 0.98 }}>
+                    <Button 
+                      onClick={() => navigate('/settings')}
+                      size="sm"
+                      variant="outline"
+                      className="glass-hover border-white/20 hover:border-white/40 transition-smooth"
+                    >
+                      <User className="w-4 h-4 mr-2" />
+                      {user?.fullName?.split(' ')[0] || 'Profile'}
+                    </Button>
+                  </motion.div>
+                  <motion.div whileHover={{ scale: 1.02 }} whileTap={{ scale: 0.98 }}>
+                    <Button 
+                      onClick={() => signOut()}
+                      size="sm"
+                      variant="outline"
+                      className="glass-hover border-white/20 hover:border-red-400/40 hover:text-red-400 transition-smooth"
+                    >
+                      Sign Out
+                    </Button>
+                  </motion.div>
+                </div>
+              ) : (
+                <SignInButton mode="redirect" forceRedirectUrl="/chat">
+                  <motion.div
+                    whileHover={{ scale: 1.05, y: -2 }}
+                    whileTap={{ scale: 0.95 }}
+                    className="relative"
+                  >
+                    <div className="absolute -inset-0.5 button-gradient rounded-lg blur opacity-50 animate-pulse-glow" />
+                    <Button 
+                      size="sm"
+                      className="relative button-gradient px-6 py-2 font-semibold"
+                    >
+                      Get Started
+                    </Button>
+                  </motion.div>
+                </SignInButton>
+              )}
+            </motion.div>
           </div>
 
-          {/* Mobile Navigation */}
+          {/* Enhanced Mobile Navigation */}
           <div className="md:hidden">
             <Sheet open={isMobileMenuOpen} onOpenChange={setIsMobileMenuOpen}>
               <SheetTrigger asChild>
-                <Button variant="outline" size="icon" className="glass">
-                  <Menu className="h-5 w-5" />
-                </Button>
+                <motion.div whileHover={{ scale: 1.05 }} whileTap={{ scale: 0.95 }}>
+                  <Button variant="outline" size="icon" className="glass-hover border-white/20">
+                    <motion.div
+                      animate={{ rotate: isMobileMenuOpen ? 90 : 0 }}
+                      transition={{ duration: 0.2 }}
+                    >
+                      <Menu className="h-5 w-5" />
+                    </motion.div>
+                  </Button>
+                </motion.div>
               </SheetTrigger>
-              <SheetContent className="bg-[#1B1B1B]">
-                <div className="flex flex-col gap-4 mt-8">
-                  {navItems.map((item) => (
-                    item.isLink ? (
-                      <Link
-                        key={item.name}
-                        to={item.href}
-                        className="text-lg text-muted-foreground hover:text-foreground transition-colors"
-                        onClick={() => setIsMobileMenuOpen(false)}
-                      >
-                        <span className="flex items-center gap-2">
+              <SheetContent className="glass border-white/20 backdrop-blur-xl">
+                <motion.div 
+                  className="flex flex-col gap-6 mt-8"
+                  initial={{ opacity: 0, x: 50 }}
+                  animate={{ opacity: 1, x: 0 }}
+                  transition={{ duration: 0.3 }}
+                >
+                  {navItems.map((item, index) => (
+                    <motion.div
+                      key={item.name}
+                      initial={{ opacity: 0, x: 30 }}
+                      animate={{ opacity: 1, x: 0 }}
+                      transition={{ delay: index * 0.1 + 0.1 }}
+                      className="glass-hover rounded-lg p-3 transition-smooth"
+                    >
+                      {item.isLink ? (
+                        <Link
+                          to={item.href}
+                          className="text-lg font-medium text-foreground hover:text-gradient-static transition-smooth flex items-center gap-3"
+                          onClick={() => setIsMobileMenuOpen(false)}
+                        >
+                          <span className="w-2 h-2 bg-primary rounded-full" />
+                          <span className="flex items-center gap-2">
+                            {item.name}
+                            {item.isNew && (
+                              <span className="text-xs button-gradient text-white px-2 py-0.5 rounded-full">New</span>
+                            )}
+                          </span>
+                        </Link>
+                      ) : (
+                        <a
+                          href={item.href}
+                          className="text-lg font-medium text-foreground hover:text-gradient-static transition-smooth flex items-center gap-3"
+                          onClick={(e) => {
+                            e.preventDefault();
+                            setIsMobileMenuOpen(false);
+                            if (item.onClick) {
+                              item.onClick();
+                            }
+                          }}
+                        >
+                          <span className="w-2 h-2 bg-primary rounded-full" />
                           {item.name}
-                          {item.isNew && (
-                            <span className="text-xs bg-gradient-to-r from-purple-600 to-pink-600 text-white px-2 py-0.5 rounded-full">New</span>
-                          )}
-                        </span>
-                      </Link>
-                    ) : (
-                      <a
-                        key={item.name}
-                        href={item.href}
-                        className="text-lg text-muted-foreground hover:text-foreground transition-colors"
-                        onClick={(e) => {
-                          e.preventDefault();
-                          setIsMobileMenuOpen(false);
-                          if (item.onClick) {
-                            item.onClick();
-                          }
-                        }}
-                      >
-                        {item.name}
-                      </a>
-                    )
+                        </a>
+                      )}
+                    </motion.div>
                   ))}
-                  {isAuthenticated ? (
-                    <div className="flex flex-col gap-2 mt-4">
-                      <Button 
-                        onClick={() => {
-                          setIsMobileMenuOpen(false);
-                          navigate('/settings');
-                        }}
-                        variant="outline"
-                        className="border-gray-700"
-                      >
-                        <User className="w-4 h-4 mr-2" />
-                        {user?.fullName?.split(' ')[0] || 'Profile'}
-                      </Button>
-                      <Button 
-                        onClick={() => {
-                          setIsMobileMenuOpen(false);
-                          signOut();
-                        }}
-                        variant="outline"
-                        className="border-gray-700"
-                      >
-                        Sign Out
-                      </Button>
-                    </div>
-                  ) : (
-                    <SignInButton mode="redirect" forceRedirectUrl="/chat">
-                      <Button 
-                        onClick={() => setIsMobileMenuOpen(false)}
-                        className="button-gradient mt-4"
-                      >
-                        Get Started
-                      </Button>
-                    </SignInButton>
-                  )}
-                </div>
+                  <motion.div
+                    initial={{ opacity: 0, y: 20 }}
+                    animate={{ opacity: 1, y: 0 }}
+                    transition={{ delay: 0.4 }}
+                    className="mt-8 pt-6 border-t border-white/10"
+                  >
+                    {isAuthenticated ? (
+                      <div className="flex flex-col gap-3">
+                        <Button 
+                          onClick={() => {
+                            setIsMobileMenuOpen(false);
+                            navigate('/settings');
+                          }}
+                          variant="outline"
+                          className="glass-hover border-white/20 justify-start text-left"
+                        >
+                          <User className="w-4 h-4 mr-3" />
+                          {user?.fullName?.split(' ')[0] || 'Profile'}
+                        </Button>
+                        <Button 
+                          onClick={() => {
+                            setIsMobileMenuOpen(false);
+                            signOut();
+                          }}
+                          variant="outline"
+                          className="glass-hover border-white/20 hover:border-red-400/40 hover:text-red-400 justify-start text-left transition-smooth"
+                        >
+                          Sign Out
+                        </Button>
+                      </div>
+                    ) : (
+                      <SignInButton mode="redirect" forceRedirectUrl="/chat">
+                        <Button 
+                          onClick={() => setIsMobileMenuOpen(false)}
+                          className="button-gradient w-full py-3 font-semibold text-base"
+                        >
+                          Get Started
+                        </Button>
+                      </SignInButton>
+                    )}
+                  </motion.div>
+                </motion.div>
               </SheetContent>
             </Sheet>
           </div>
         </nav>
       </div>
-    </header>
+    </motion.header>
   );
 };
 
diff --git a/src/components/NotificationCenter.tsx b/src/components/NotificationCenter.tsx
new file mode 100644
index 00000000..49f11e9e
--- /dev/null
+++ b/src/components/NotificationCenter.tsx
@@ -0,0 +1,641 @@
+import React, { createContext, useContext, useReducer, useCallback } from 'react';
+import { motion, AnimatePresence } from 'framer-motion';
+import { 
+  Bell, 
+  X, 
+  CheckCircle, 
+  AlertCircle, 
+  AlertTriangle, 
+  Info, 
+  Zap,
+  Bot,
+  Code,
+  Settings,
+  User,
+  CreditCard,
+  Shield,
+  Globe,
+  Clock,
+  Archive
+} from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import { Badge } from '@/components/ui/badge';
+import { ScrollArea } from '@/components/ui/scroll-area';
+import { cn } from '@/lib/utils';
+
+export enum NotificationType {
+  SUCCESS = 'success',
+  ERROR = 'error',
+  WARNING = 'warning',
+  INFO = 'info',
+  AI_UPDATE = 'ai_update',
+  CODE_EXECUTION = 'code_execution',
+  SYSTEM = 'system',
+  BILLING = 'billing',
+  SECURITY = 'security',
+  FEATURE = 'feature'
+}
+
+export enum NotificationPriority {
+  LOW = 'low',
+  MEDIUM = 'medium',
+  HIGH = 'high',
+  URGENT = 'urgent'
+}
+
+export interface Notification {
+  id: string;
+  type: NotificationType;
+  priority: NotificationPriority;
+  title: string;
+  message: string;
+  timestamp: number;
+  read: boolean;
+  persistent?: boolean;
+  actionLabel?: string;
+  actionUrl?: string;
+  onAction?: () => void;
+  autoHide?: boolean;
+  hideDelay?: number;
+  metadata?: Record<string, any>;
+}
+
+interface NotificationState {
+  notifications: Notification[];
+  isOpen: boolean;
+}
+
+type NotificationAction =
+  | { type: 'ADD_NOTIFICATION'; payload: Notification }
+  | { type: 'REMOVE_NOTIFICATION'; payload: string }
+  | { type: 'MARK_READ'; payload: string }
+  | { type: 'MARK_ALL_READ' }
+  | { type: 'CLEAR_ALL' }
+  | { type: 'TOGGLE_CENTER' }
+  | { type: 'SET_OPEN'; payload: boolean };
+
+const initialState: NotificationState = {
+  notifications: [],
+  isOpen: false
+};
+
+function notificationReducer(state: NotificationState, action: NotificationAction): NotificationState {
+  switch (action.type) {
+    case 'ADD_NOTIFICATION':
+      return {
+        ...state,
+        notifications: [action.payload, ...state.notifications.slice(0, 49)] // Keep max 50
+      };
+    case 'REMOVE_NOTIFICATION':
+      return {
+        ...state,
+        notifications: state.notifications.filter(n => n.id !== action.payload)
+      };
+    case 'MARK_READ':
+      return {
+        ...state,
+        notifications: state.notifications.map(n =>
+          n.id === action.payload ? { ...n, read: true } : n
+        )
+      };
+    case 'MARK_ALL_READ':
+      return {
+        ...state,
+        notifications: state.notifications.map(n => ({ ...n, read: true }))
+      };
+    case 'CLEAR_ALL':
+      return {
+        ...state,
+        notifications: []
+      };
+    case 'TOGGLE_CENTER':
+      return {
+        ...state,
+        isOpen: !state.isOpen
+      };
+    case 'SET_OPEN':
+      return {
+        ...state,
+        isOpen: action.payload
+      };
+    default:
+      return state;
+  }
+}
+
+interface NotificationContextType {
+  state: NotificationState;
+  addNotification: (notification: Omit<Notification, 'id' | 'timestamp' | 'read'>) => string;
+  removeNotification: (id: string) => void;
+  markAsRead: (id: string) => void;
+  markAllAsRead: () => void;
+  clearAll: () => void;
+  toggleCenter: () => void;
+  setOpen: (open: boolean) => void;
+}
+
+const NotificationContext = createContext<NotificationContextType | null>(null);
+
+export const useNotifications = () => {
+  const context = useContext(NotificationContext);
+  if (!context) {
+    throw new Error('useNotifications must be used within a NotificationProvider');
+  }
+  return context;
+};
+
+// Notification Provider
+export const NotificationProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
+  const [state, dispatch] = useReducer(notificationReducer, initialState);
+
+  const addNotification = useCallback((notification: Omit<Notification, 'id' | 'timestamp' | 'read'>) => {
+    const id = Math.random().toString(36).substring(2, 15);
+    const newNotification: Notification = {
+      ...notification,
+      id,
+      timestamp: Date.now(),
+      read: false,
+      autoHide: notification.autoHide ?? true,
+      hideDelay: notification.hideDelay ?? 5000
+    };
+
+    dispatch({ type: 'ADD_NOTIFICATION', payload: newNotification });
+
+    // Auto-remove notification if autoHide is enabled
+    if (newNotification.autoHide && !newNotification.persistent) {
+      setTimeout(() => {
+        dispatch({ type: 'REMOVE_NOTIFICATION', payload: id });
+      }, newNotification.hideDelay);
+    }
+
+    return id;
+  }, []);
+
+  const removeNotification = useCallback((id: string) => {
+    dispatch({ type: 'REMOVE_NOTIFICATION', payload: id });
+  }, []);
+
+  const markAsRead = useCallback((id: string) => {
+    dispatch({ type: 'MARK_READ', payload: id });
+  }, []);
+
+  const markAllAsRead = useCallback(() => {
+    dispatch({ type: 'MARK_ALL_READ' });
+  }, []);
+
+  const clearAll = useCallback(() => {
+    dispatch({ type: 'CLEAR_ALL' });
+  }, []);
+
+  const toggleCenter = useCallback(() => {
+    dispatch({ type: 'TOGGLE_CENTER' });
+  }, []);
+
+  const setOpen = useCallback((open: boolean) => {
+    dispatch({ type: 'SET_OPEN', payload: open });
+  }, []);
+
+  const value = {
+    state,
+    addNotification,
+    removeNotification,
+    markAsRead,
+    markAllAsRead,
+    clearAll,
+    toggleCenter,
+    setOpen
+  };
+
+  return (
+    <NotificationContext.Provider value={value}>
+      {children}
+      <NotificationCenter />
+      <NotificationToasts />
+    </NotificationContext.Provider>
+  );
+};
+
+// Notification Icon Component
+const getNotificationIcon = (type: NotificationType) => {
+  switch (type) {
+    case NotificationType.SUCCESS:
+      return <CheckCircle className="w-5 h-5 text-green-500" />;
+    case NotificationType.ERROR:
+      return <AlertCircle className="w-5 h-5 text-red-500" />;
+    case NotificationType.WARNING:
+      return <AlertTriangle className="w-5 h-5 text-orange-500" />;
+    case NotificationType.AI_UPDATE:
+      return <Bot className="w-5 h-5 text-primary" />;
+    case NotificationType.CODE_EXECUTION:
+      return <Code className="w-5 h-5 text-green-500" />;
+    case NotificationType.SYSTEM:
+      return <Settings className="w-5 h-5 text-blue-500" />;
+    case NotificationType.BILLING:
+      return <CreditCard className="w-5 h-5 text-purple-500" />;
+    case NotificationType.SECURITY:
+      return <Shield className="w-5 h-5 text-red-500" />;
+    case NotificationType.FEATURE:
+      return <Zap className="w-5 h-5 text-yellow-500" />;
+    default:
+      return <Info className="w-5 h-5 text-blue-500" />;
+  }
+};
+
+// Notification Bell Button
+export const NotificationBell: React.FC<{ className?: string }> = ({ className }) => {
+  const { state, toggleCenter } = useNotifications();
+  const unreadCount = state.notifications.filter(n => !n.read).length;
+  const hasUrgent = state.notifications.some(n => !n.read && n.priority === NotificationPriority.URGENT);
+
+  return (
+    <Button
+      variant="ghost"
+      size="icon"
+      onClick={toggleCenter}
+      className={cn('relative glass-hover', hasUrgent && 'animate-pulse', className)}
+    >
+      <Bell className="w-5 h-5" />
+      {unreadCount > 0 && (
+        <motion.div
+          initial={{ scale: 0 }}
+          animate={{ scale: 1 }}
+          className={cn(
+            'absolute -top-1 -right-1 min-w-5 h-5 rounded-full flex items-center justify-center text-xs font-bold text-white',
+            hasUrgent ? 'bg-red-500 animate-pulse' : 'bg-primary'
+          )}
+        >
+          {unreadCount > 99 ? '99+' : unreadCount}
+        </motion.div>
+      )}
+    </Button>
+  );
+};
+
+// Notification Center (Dropdown)
+const NotificationCenter: React.FC = () => {
+  const { state, markAsRead, markAllAsRead, clearAll, setOpen, removeNotification } = useNotifications();
+  const { notifications, isOpen } = state;
+
+  const unreadNotifications = notifications.filter(n => !n.read);
+  const readNotifications = notifications.filter(n => n.read);
+
+  const formatTime = (timestamp: number) => {
+    const now = Date.now();
+    const diff = now - timestamp;
+    const minutes = Math.floor(diff / 60000);
+    const hours = Math.floor(diff / 3600000);
+    const days = Math.floor(diff / 86400000);
+
+    if (days > 0) return `${days}d ago`;
+    if (hours > 0) return `${hours}h ago`;
+    if (minutes > 0) return `${minutes}m ago`;
+    return 'Just now';
+  };
+
+  if (!isOpen) return null;
+
+  return (
+    <motion.div
+      initial={{ opacity: 0, scale: 0.95, y: -10 }}
+      animate={{ opacity: 1, scale: 1, y: 0 }}
+      exit={{ opacity: 0, scale: 0.95, y: -10 }}
+      className="fixed top-16 right-4 z-50 w-96 max-h-[80vh] glass-elevated rounded-xl border border-white/20 shadow-2xl"
+    >
+      {/* Header */}
+      <div className="flex items-center justify-between p-4 border-b border-white/10">
+        <h3 className="font-semibold text-lg">Notifications</h3>
+        <div className="flex items-center gap-2">
+          {unreadNotifications.length > 0 && (
+            <Button
+              variant="ghost"
+              size="sm"
+              onClick={markAllAsRead}
+              className="text-xs"
+            >
+              Mark all read
+            </Button>
+          )}
+          <Button
+            variant="ghost"
+            size="sm"
+            onClick={clearAll}
+            className="text-xs text-muted-foreground"
+          >
+            Clear all
+          </Button>
+          <Button
+            variant="ghost"
+            size="icon"
+            onClick={() => setOpen(false)}
+            className="w-6 h-6"
+          >
+            <X className="w-4 h-4" />
+          </Button>
+        </div>
+      </div>
+
+      {/* Notifications List */}
+      <ScrollArea className="max-h-96">
+        <div className="p-2">
+          {notifications.length === 0 ? (
+            <div className="text-center py-8 text-muted-foreground">
+              <Bell className="w-12 h-12 mx-auto mb-2 opacity-50" />
+              <p>No notifications yet</p>
+            </div>
+          ) : (
+            <div className="space-y-2">
+              {/* Unread notifications */}
+              {unreadNotifications.map((notification) => (
+                <NotificationItem
+                  key={notification.id}
+                  notification={notification}
+                  onRead={markAsRead}
+                  onRemove={removeNotification}
+                  formatTime={formatTime}
+                />
+              ))}
+
+              {/* Separator */}
+              {unreadNotifications.length > 0 && readNotifications.length > 0 && (
+                <div className="flex items-center gap-2 py-2">
+                  <div className="flex-1 h-px bg-white/10" />
+                  <span className="text-xs text-muted-foreground">Earlier</span>
+                  <div className="flex-1 h-px bg-white/10" />
+                </div>
+              )}
+
+              {/* Read notifications (collapsed) */}
+              {readNotifications.slice(0, 10).map((notification) => (
+                <NotificationItem
+                  key={notification.id}
+                  notification={notification}
+                  onRead={markAsRead}
+                  onRemove={removeNotification}
+                  formatTime={formatTime}
+                />
+              ))}
+            </div>
+          )}
+        </div>
+      </ScrollArea>
+    </motion.div>
+  );
+};
+
+// Individual Notification Item
+const NotificationItem: React.FC<{
+  notification: Notification;
+  onRead: (id: string) => void;
+  onRemove: (id: string) => void;
+  formatTime: (timestamp: number) => string;
+}> = ({ notification, onRead, onRemove, formatTime }) => {
+  const handleClick = () => {
+    if (!notification.read) {
+      onRead(notification.id);
+    }
+    
+    if (notification.onAction) {
+      notification.onAction();
+    } else if (notification.actionUrl) {
+      window.open(notification.actionUrl, '_blank');
+    }
+  };
+
+  return (
+    <motion.div
+      initial={{ opacity: 0, x: -20 }}
+      animate={{ opacity: 1, x: 0 }}
+      exit={{ opacity: 0, x: 20 }}
+      className={cn(
+        'p-3 rounded-lg cursor-pointer transition-all group relative',
+        notification.read ? 'glass opacity-60' : 'glass-elevated',
+        notification.priority === NotificationPriority.URGENT && !notification.read && 'ring-2 ring-red-500/50'
+      )}
+      onClick={handleClick}
+    >
+      {/* Unread indicator */}
+      {!notification.read && (
+        <div className="absolute top-2 right-2 w-2 h-2 bg-primary rounded-full" />
+      )}
+
+      <div className="flex items-start gap-3">
+        {/* Icon */}
+        <div className="flex-shrink-0 mt-0.5">
+          {getNotificationIcon(notification.type)}
+        </div>
+
+        {/* Content */}
+        <div className="flex-1 min-w-0">
+          <h4 className={cn(
+            'font-medium text-sm mb-1',
+            notification.read ? 'text-muted-foreground' : 'text-foreground'
+          )}>
+            {notification.title}
+          </h4>
+          <p className={cn(
+            'text-sm leading-relaxed',
+            notification.read ? 'text-muted-foreground/70' : 'text-muted-foreground'
+          )}>
+            {notification.message}
+          </p>
+          
+          {/* Footer */}
+          <div className="flex items-center justify-between mt-2">
+            <span className="text-xs text-muted-foreground/60">
+              {formatTime(notification.timestamp)}
+            </span>
+            {(notification.actionLabel || notification.priority === NotificationPriority.URGENT) && (
+              <div className="flex items-center gap-2">
+                {notification.priority === NotificationPriority.URGENT && (
+                  <Badge variant="destructive" className="text-xs">
+                    Urgent
+                  </Badge>
+                )}
+                {notification.actionLabel && (
+                  <Button variant="ghost" size="sm" className="text-xs h-6 px-2">
+                    {notification.actionLabel}
+                  </Button>
+                )}
+              </div>
+            )}
+          </div>
+        </div>
+
+        {/* Remove button */}
+        <Button
+          variant="ghost"
+          size="icon"
+          onClick={(e) => {
+            e.stopPropagation();
+            onRemove(notification.id);
+          }}
+          className="w-6 h-6 opacity-0 group-hover:opacity-100 transition-opacity"
+        >
+          <X className="w-3 h-3" />
+        </Button>
+      </div>
+    </motion.div>
+  );
+};
+
+// Toast Notifications (for immediate feedback)
+const NotificationToasts: React.FC = () => {
+  const { state } = useNotifications();
+  
+  // Only show non-persistent notifications as toasts
+  const toastNotifications = state.notifications
+    .filter(n => !n.persistent && !n.read)
+    .slice(0, 3); // Max 3 toasts at once
+
+  return (
+    <div className="fixed bottom-4 right-4 z-50 space-y-2">
+      <AnimatePresence>
+        {toastNotifications.map((notification) => (
+          <NotificationToast
+            key={notification.id}
+            notification={notification}
+          />
+        ))}
+      </AnimatePresence>
+    </div>
+  );
+};
+
+// Individual Toast Notification
+const NotificationToast: React.FC<{
+  notification: Notification;
+}> = ({ notification }) => {
+  const { removeNotification, markAsRead } = useNotifications();
+
+  React.useEffect(() => {
+    if (notification.autoHide && !notification.persistent) {
+      const timer = setTimeout(() => {
+        removeNotification(notification.id);
+      }, notification.hideDelay || 5000);
+      return () => clearTimeout(timer);
+    }
+  }, [notification, removeNotification]);
+
+  const handleAction = () => {
+    markAsRead(notification.id);
+    removeNotification(notification.id);
+    
+    if (notification.onAction) {
+      notification.onAction();
+    } else if (notification.actionUrl) {
+      window.open(notification.actionUrl, '_blank');
+    }
+  };
+
+  return (
+    <motion.div
+      initial={{ opacity: 0, x: 300, scale: 0.8 }}
+      animate={{ opacity: 1, x: 0, scale: 1 }}
+      exit={{ opacity: 0, x: 300, scale: 0.8 }}
+      className="w-80 glass-elevated rounded-lg p-4 border border-white/20 shadow-lg"
+    >
+      <div className="flex items-start gap-3">
+        {/* Icon */}
+        <div className="flex-shrink-0">
+          {getNotificationIcon(notification.type)}
+        </div>
+
+        {/* Content */}
+        <div className="flex-1 min-w-0">
+          <h4 className="font-medium text-sm mb-1">
+            {notification.title}
+          </h4>
+          <p className="text-sm text-muted-foreground leading-relaxed">
+            {notification.message}
+          </p>
+          
+          {notification.actionLabel && (
+            <Button
+              variant="ghost"
+              size="sm"
+              onClick={handleAction}
+              className="mt-2 h-7 px-3 text-xs"
+            >
+              {notification.actionLabel}
+            </Button>
+          )}
+        </div>
+
+        {/* Close button */}
+        <Button
+          variant="ghost"
+          size="icon"
+          onClick={() => removeNotification(notification.id)}
+          className="w-6 h-6 flex-shrink-0"
+        >
+          <X className="w-3 h-3" />
+        </Button>
+      </div>
+    </motion.div>
+  );
+};
+
+// Utility hooks for common notification types
+export const useNotificationHelpers = () => {
+  const { addNotification } = useNotifications();
+
+  return {
+    success: (title: string, message: string, options?: Partial<Notification>) =>
+      addNotification({
+        type: NotificationType.SUCCESS,
+        priority: NotificationPriority.MEDIUM,
+        title,
+        message,
+        ...options
+      }),
+
+    error: (title: string, message: string, options?: Partial<Notification>) =>
+      addNotification({
+        type: NotificationType.ERROR,
+        priority: NotificationPriority.HIGH,
+        title,
+        message,
+        persistent: true,
+        autoHide: false,
+        ...options
+      }),
+
+    warning: (title: string, message: string, options?: Partial<Notification>) =>
+      addNotification({
+        type: NotificationType.WARNING,
+        priority: NotificationPriority.MEDIUM,
+        title,
+        message,
+        ...options
+      }),
+
+    info: (title: string, message: string, options?: Partial<Notification>) =>
+      addNotification({
+        type: NotificationType.INFO,
+        priority: NotificationPriority.LOW,
+        title,
+        message,
+        ...options
+      }),
+
+    aiUpdate: (title: string, message: string, options?: Partial<Notification>) =>
+      addNotification({
+        type: NotificationType.AI_UPDATE,
+        priority: NotificationPriority.MEDIUM,
+        title,
+        message,
+        ...options
+      }),
+
+    codeExecution: (title: string, message: string, options?: Partial<Notification>) =>
+      addNotification({
+        type: NotificationType.CODE_EXECUTION,
+        priority: NotificationPriority.MEDIUM,
+        title,
+        message,
+        ...options
+      })
+  };
+};
+
+export default NotificationProvider;
\ No newline at end of file
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
index 0ba42773..0d891324 100644
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -1,34 +1,49 @@
 import * as React from "react"
 import { Slot } from "@radix-ui/react-slot"
 import { cva, type VariantProps } from "class-variance-authority"
+import { motion, MotionProps } from "framer-motion"
 
 import { cn } from "@/lib/utils"
 
 const buttonVariants = cva(
-  "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
+  "inline-flex items-center justify-center whitespace-nowrap text-sm font-medium focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50 transition-smooth relative overflow-hidden",
   {
     variants: {
       variant: {
-        default: "bg-primary text-primary-foreground hover:bg-primary/90",
+        default: "button-gradient text-white font-semibold shadow-md hover:shadow-lg",
         destructive:
-          "bg-destructive text-destructive-foreground hover:bg-destructive/90",
+          "bg-destructive text-destructive-foreground hover:bg-destructive/90 shadow-md hover:shadow-lg",
         outline:
-          "border border-input bg-background hover:bg-accent hover:text-accent-foreground",
+          "border border-white/20 bg-transparent hover:bg-white/10 hover:border-white/40 backdrop-blur-sm",
         secondary:
-          "bg-secondary text-secondary-foreground hover:bg-secondary/80",
-        ghost: "hover:bg-accent hover:text-accent-foreground",
-        link: "text-primary underline-offset-4 hover:underline",
+          "glass text-foreground hover:bg-white/10 backdrop-blur-xl border border-white/10",
+        ghost: "hover:bg-white/10 text-muted-foreground hover:text-foreground backdrop-blur-sm",
+        link: "text-primary underline-offset-4 hover:underline bg-transparent",
+        glass: "glass text-foreground glass-hover border border-white/10",
+        glassElevated: "glass-elevated text-foreground glass-hover border border-white/20",
+        gradient: "button-gradient text-white font-semibold",
+        gradientOutline: "bg-transparent border-2 border-transparent bg-gradient-to-r from-primary to-purple-600 bg-clip-padding hover:shadow-glow",
       },
       size: {
-        default: "h-10 px-4 py-2",
-        sm: "h-9 rounded-md px-3",
-        lg: "h-11 rounded-md px-8",
-        icon: "h-10 w-10",
+        default: "h-10 px-4 py-2 rounded-lg",
+        sm: "h-8 rounded-lg px-3 text-xs",
+        lg: "h-12 rounded-xl px-8 text-base",
+        xl: "h-14 rounded-xl px-10 text-lg",
+        icon: "h-10 w-10 rounded-lg",
+        iconSm: "h-8 w-8 rounded-lg",
+        iconLg: "h-12 w-12 rounded-xl",
+      },
+      animation: {
+        none: "",
+        subtle: "hover:scale-105 active:scale-95",
+        bounce: "hover:scale-105 hover:-translate-y-1 active:scale-95 active:translate-y-0",
+        glow: "hover:animate-pulse-glow",
       },
     },
     defaultVariants: {
       variant: "default",
       size: "default",
+      animation: "subtle",
     },
   }
 )
@@ -37,20 +52,118 @@ export interface ButtonProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement>,
     VariantProps<typeof buttonVariants> {
   asChild?: boolean
+  motion?: boolean
+  motionProps?: MotionProps
+  loading?: boolean
+  loadingText?: string
+  leftIcon?: React.ReactNode
+  rightIcon?: React.ReactNode
 }
 
 const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
-  ({ className, variant, size, asChild = false, ...props }, ref) => {
-    const Comp = asChild ? Slot : "button"
+  ({ 
+    className, 
+    variant, 
+    size, 
+    animation,
+    asChild = false, 
+    motion = true,
+    motionProps = {},
+    loading = false,
+    loadingText = "Loading...",
+    leftIcon,
+    rightIcon,
+    children,
+    disabled,
+    ...props 
+  }, ref) => {
+    const Comp = asChild ? Slot : motion && !asChild ? motion.button : "button"
+    const isDisabled = disabled || loading
+    
+    const defaultMotionProps = motion && !asChild ? {
+      whileHover: animation !== 'none' ? { scale: 1.02, y: -1 } : undefined,
+      whileTap: animation !== 'none' ? { scale: 0.98, y: 0 } : undefined,
+      transition: { type: "spring", stiffness: 400, damping: 25 },
+      ...motionProps
+    } : {}
+    
+    const content = loading ? (
+      <>
+        <motion.div
+          className="w-4 h-4 mr-2 border-2 border-white/20 border-t-current rounded-full"
+          animate={{ rotate: 360 }}
+          transition={{ duration: 1, repeat: Infinity, ease: "linear" }}
+        />
+        {loadingText}
+      </>
+    ) : (
+      <>
+        {leftIcon && (
+          <span className="mr-2 -ml-1">
+            {leftIcon}
+          </span>
+        )}
+        {children}
+        {rightIcon && (
+          <span className="ml-2 -mr-1">
+            {rightIcon}
+          </span>
+        )}
+      </>
+    )
+    
     return (
       <Comp
-        className={cn(buttonVariants({ variant, size, className }))}
+        className={cn(buttonVariants({ variant, size, animation, className }))}
         ref={ref}
+        disabled={isDisabled}
+        {...(motion && !asChild ? defaultMotionProps : {})}
         {...props}
-      />
+      >
+        {/* Enhanced button effects */}
+        {(variant === 'default' || variant === 'gradient') && (
+          <>
+            {/* Shine effect */}
+            <div className="absolute inset-0 bg-gradient-to-r from-transparent via-white/20 to-transparent -translate-x-full hover:translate-x-full transition-transform duration-700" />
+            {/* Glow effect */}
+            <div className="absolute -inset-1 bg-gradient-to-r from-primary to-purple-600 rounded-xl blur opacity-0 group-hover:opacity-30 transition-opacity duration-500" />
+          </>
+        )}
+        
+        {/* Glass effect overlay for glass variants */}
+        {(variant === 'glass' || variant === 'glassElevated') && (
+          <div className="absolute inset-0 bg-gradient-to-r from-white/5 via-white/10 to-white/5 opacity-0 hover:opacity-100 transition-opacity rounded-inherit" />
+        )}
+        
+        <span className="relative z-10 flex items-center justify-center">
+          {content}
+        </span>
+      </Comp>
     )
   }
 )
 Button.displayName = "Button"
 
-export { Button, buttonVariants }
+// Enhanced button variants for common use cases
+const GradientButton = React.forwardRef<HTMLButtonElement, ButtonProps>(
+  (props, ref) => <Button {...props} ref={ref} variant="gradient" />
+)
+GradientButton.displayName = "GradientButton"
+
+const GlassButton = React.forwardRef<HTMLButtonElement, ButtonProps>(
+  (props, ref) => <Button {...props} ref={ref} variant="glass" />
+)
+GlassButton.displayName = "GlassButton"
+
+const GlassElevatedButton = React.forwardRef<HTMLButtonElement, ButtonProps>(
+  (props, ref) => <Button {...props} ref={ref} variant="glassElevated" />
+)
+GlassElevatedButton.displayName = "GlassElevatedButton"
+
+export { 
+  Button, 
+  buttonVariants, 
+  GradientButton, 
+  GlassButton, 
+  GlassElevatedButton 
+}
diff --git a/src/components/ui/input.tsx b/src/components/ui/input.tsx
index c73dd8cc..642fadda 100644
--- a/src/components/ui/input.tsx
+++ b/src/components/ui/input.tsx
@@ -1,24 +1,166 @@
 import * as React from "react"
+import { motion } from "framer-motion"
+import { cva, type VariantProps } from "class-variance-authority"
 
 import { cn } from "@/lib/utils"
 
-export type InputProps = React.InputHTMLAttributes<HTMLInputElement>
+const inputVariants = cva(
+  "flex w-full text-sm transition-smooth file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground/70 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50",
+  {
+    variants: {
+      variant: {
+        default: "border border-input bg-background rounded-md focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
+        glass: "glass border border-white/20 bg-transparent backdrop-blur-xl focus:border-primary/50 focus:bg-white/5 focus:ring-2 focus:ring-primary/20 rounded-lg",
+        glassElevated: "glass-elevated border border-white/30 bg-transparent backdrop-blur-xl focus:border-primary/70 focus:bg-white/10 focus:ring-2 focus:ring-primary/30 rounded-lg",
+        gradient: "bg-transparent border-2 border-transparent bg-gradient-to-r from-primary/20 to-purple-600/20 focus:from-primary/40 focus:to-purple-600/40 rounded-lg",
+        minimal: "bg-transparent border-0 border-b-2 border-white/20 focus:border-primary rounded-none px-0",
+      },
+      size: {
+        default: "h-10 px-3 py-2",
+        sm: "h-8 px-2 py-1 text-xs",
+        lg: "h-12 px-4 py-3 text-base",
+        xl: "h-14 px-5 py-4 text-lg",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+      size: "default",
+    },
+  }
+)
+
+export interface InputProps
+  extends React.InputHTMLAttributes<HTMLInputElement>,
+    VariantProps<typeof inputVariants> {
+  motion?: boolean
+  leftIcon?: React.ReactNode
+  rightIcon?: React.ReactNode
+  loading?: boolean
+  error?: boolean
+  success?: boolean
+}
 
 const Input = React.forwardRef<HTMLInputElement, InputProps>(
-  ({ className, type, ...props }, ref) => {
-    return (
-      <input
-        type={type}
-        className={cn(
-          "flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
-          className
+  ({ 
+    className, 
+    type, 
+    variant,
+    size,
+    motion = false,
+    leftIcon,
+    rightIcon,
+    loading = false,
+    error = false,
+    success = false,
+    ...props 
+  }, ref) => {
+    const [isFocused, setIsFocused] = React.useState(false)
+    const [hasValue, setHasValue] = React.useState(false)
+    
+    const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+      setHasValue(e.target.value.length > 0)
+      props.onChange?.(e)
+    }
+    
+    const inputElement = (
+      <div className="relative group">
+        {/* Background glow effect */}
+        {(variant === 'glass' || variant === 'glassElevated') && isFocused && (
+          <div className="absolute -inset-0.5 bg-gradient-to-r from-primary/20 to-purple-600/20 rounded-lg blur opacity-50 animate-pulse" />
         )}
-        ref={ref}
-        {...props}
-      />
+        
+        <div className="relative flex items-center">
+          {/* Left icon */}
+          {leftIcon && (
+            <div className="absolute left-3 z-10 text-muted-foreground group-focus-within:text-primary transition-colors">
+              {leftIcon}
+            </div>
+          )}
+          
+          <input
+            type={type}
+            className={cn(
+              inputVariants({ variant, size }),
+              {
+                "border-destructive focus:border-destructive focus:ring-destructive/20": error,
+                "border-green-500 focus:border-green-500 focus:ring-green-500/20": success,
+                "pl-10": leftIcon,
+                "pr-10": rightIcon || loading,
+              },
+              className
+            )}
+            ref={ref}
+            onFocus={(e) => {
+              setIsFocused(true)
+              props.onFocus?.(e)
+            }}
+            onBlur={(e) => {
+              setIsFocused(false)
+              props.onBlur?.(e)
+            }}
+            onChange={handleChange}
+            {...props}
+          />
+          
+          {/* Right icon or loading spinner */}
+          {(rightIcon || loading) && (
+            <div className="absolute right-3 z-10 text-muted-foreground">
+              {loading ? (
+                <motion.div
+                  className="w-4 h-4 border-2 border-muted-foreground/20 border-t-primary rounded-full"
+                  animate={{ rotate: 360 }}
+                  transition={{ duration: 1, repeat: Infinity, ease: "linear" }}
+                />
+              ) : (
+                rightIcon
+              )}
+            </div>
+          )}
+        </div>
+        
+        {/* Enhanced focus indicator for glass variants */}
+        {(variant === 'glass' || variant === 'glassElevated') && (
+          <motion.div
+            className="absolute inset-0 rounded-lg bg-gradient-to-r from-primary/5 to-purple-600/5 opacity-0 pointer-events-none"
+            animate={{ opacity: isFocused ? 1 : 0 }}
+            transition={{ duration: 0.2 }}
+          />
+        )}
+      </div>
     )
+    
+    if (motion) {
+      return (
+        <motion.div
+          initial={{ opacity: 0, y: 10 }}
+          animate={{ opacity: 1, y: 0 }}
+          transition={{ duration: 0.3 }}
+          whileFocus={{ scale: 1.01 }}
+        >
+          {inputElement}
+        </motion.div>
+      )
+    }
+    
+    return inputElement
   }
 )
 Input.displayName = "Input"
 
-export { Input }
+// Enhanced input variants for common use cases
+const GlassInput = React.forwardRef<HTMLInputElement, InputProps>(
+  (props, ref) => <Input {...props} ref={ref} variant="glass" />
+)
+GlassInput.displayName = "GlassInput"
+
+const GradientInput = React.forwardRef<HTMLInputElement, InputProps>(
+  (props, ref) => <Input {...props} ref={ref} variant="gradient" />
+)
+GradientInput.displayName = "GradientInput"
+
+const MinimalInput = React.forwardRef<HTMLInputElement, InputProps>(
+  (props, ref) => <Input {...props} ref={ref} variant="minimal" />
+)
+MinimalInput.displayName = "MinimalInput"
+
+export { Input, inputVariants, GlassInput, GradientInput, MinimalInput }
diff --git a/src/components/ui/textarea.tsx b/src/components/ui/textarea.tsx
index 12c91369..c270c66c 100644
--- a/src/components/ui/textarea.tsx
+++ b/src/components/ui/textarea.tsx
@@ -1,23 +1,171 @@
 import * as React from "react"
+import { motion } from "framer-motion"
+import { cva, type VariantProps } from "class-variance-authority"
 
 import { cn } from "@/lib/utils"
 
-export type TextareaProps = React.TextareaHTMLAttributes<HTMLTextAreaElement>
+const textareaVariants = cva(
+  "flex w-full text-sm transition-smooth placeholder:text-muted-foreground/70 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50 resize-none",
+  {
+    variants: {
+      variant: {
+        default: "border border-input bg-background rounded-md focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
+        glass: "glass border border-white/20 bg-transparent backdrop-blur-xl focus:border-primary/50 focus:bg-white/5 focus:ring-2 focus:ring-primary/20 rounded-lg",
+        glassElevated: "glass-elevated border border-white/30 bg-transparent backdrop-blur-xl focus:border-primary/70 focus:bg-white/10 focus:ring-2 focus:ring-primary/30 rounded-lg",
+        gradient: "bg-transparent border-2 border-transparent bg-gradient-to-r from-primary/20 to-purple-600/20 focus:from-primary/40 focus:to-purple-600/40 rounded-lg",
+        minimal: "bg-transparent border border-white/20 focus:border-primary rounded-lg",
+      },
+      size: {
+        default: "min-h-[80px] px-3 py-2",
+        sm: "min-h-[60px] px-2 py-1 text-xs",
+        lg: "min-h-[120px] px-4 py-3 text-base",
+        xl: "min-h-[160px] px-5 py-4 text-lg",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+      size: "default",
+    },
+  }
+)
+
+export interface TextareaProps
+  extends React.TextareaHTMLAttributes<HTMLTextAreaElement>,
+    VariantProps<typeof textareaVariants> {
+  motion?: boolean
+  error?: boolean
+  success?: boolean
+  autoResize?: boolean
+  maxHeight?: number
+}
 
 const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
-  ({ className, ...props }, ref) => {
-    return (
-      <textarea
-        className={cn(
-          "flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
-          className
+  ({ 
+    className, 
+    variant,
+    size,
+    motion = false,
+    error = false,
+    success = false,
+    autoResize = false,
+    maxHeight = 300,
+    ...props 
+  }, ref) => {
+    const [isFocused, setIsFocused] = React.useState(false)
+    const textareaRef = React.useRef<HTMLTextAreaElement>(null)
+    
+    // Auto-resize functionality
+    React.useEffect(() => {
+      if (autoResize && textareaRef.current) {
+        const textarea = textareaRef.current
+        textarea.style.height = 'auto'
+        const scrollHeight = Math.min(textarea.scrollHeight, maxHeight)
+        textarea.style.height = `${scrollHeight}px`
+      }
+    }, [props.value, autoResize, maxHeight])
+    
+    // Merge refs
+    React.useImperativeHandle(ref, () => textareaRef.current!, [textareaRef])
+    
+    const textareaElement = (
+      <div className="relative group">
+        {/* Background glow effect */}
+        {(variant === 'glass' || variant === 'glassElevated') && isFocused && (
+          <div className="absolute -inset-0.5 bg-gradient-to-r from-primary/20 to-purple-600/20 rounded-lg blur opacity-50 animate-pulse" />
         )}
-        ref={ref}
-        {...props}
-      />
+        
+        <div className="relative">
+          <textarea
+            ref={textareaRef}
+            className={cn(
+              textareaVariants({ variant, size }),
+              {
+                "border-destructive focus:border-destructive focus:ring-destructive/20": error,
+                "border-green-500 focus:border-green-500 focus:ring-green-500/20": success,
+                "resize-none overflow-hidden": autoResize,
+              },
+              className
+            )}
+            style={{ 
+              maxHeight: autoResize ? `${maxHeight}px` : undefined,
+              overflowY: autoResize ? 'hidden' : 'auto'
+            }}
+            onFocus={(e) => {
+              setIsFocused(true)
+              props.onFocus?.(e)
+            }}
+            onBlur={(e) => {
+              setIsFocused(false)
+              props.onBlur?.(e)
+            }}
+            onChange={(e) => {
+              if (autoResize) {
+                e.target.style.height = 'auto'
+                const scrollHeight = Math.min(e.target.scrollHeight, maxHeight)
+                e.target.style.height = `${scrollHeight}px`
+              }
+              props.onChange?.(e)
+            }}
+            {...props}
+          />
+          
+          {/* Character count indicator */}
+          {props.maxLength && (
+            <div className="absolute bottom-2 right-2 text-xs text-muted-foreground">
+              {(props.value?.toString().length || 0)}/{props.maxLength}
+            </div>
+          )}
+        </div>
+        
+        {/* Enhanced focus indicator for glass variants */}
+        {(variant === 'glass' || variant === 'glassElevated') && (
+          <motion.div
+            className="absolute inset-0 rounded-lg bg-gradient-to-r from-primary/5 to-purple-600/5 opacity-0 pointer-events-none"
+            animate={{ opacity: isFocused ? 1 : 0 }}
+            transition={{ duration: 0.2 }}
+          />
+        )}
+      </div>
     )
+    
+    if (motion) {
+      return (
+        <motion.div
+          initial={{ opacity: 0, y: 10 }}
+          animate={{ opacity: 1, y: 0 }}
+          transition={{ duration: 0.3 }}
+          whileFocus={{ scale: 1.01 }}
+        >
+          {textareaElement}
+        </motion.div>
+      )
+    }
+    
+    return textareaElement
   }
 )
 Textarea.displayName = "Textarea"
 
-export { Textarea }
+// Enhanced textarea variants for common use cases
+const GlassTextarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
+  (props, ref) => <Textarea {...props} ref={ref} variant="glass" />
+)
+GlassTextarea.displayName = "GlassTextarea"
+
+const AutoResizeTextarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
+  (props, ref) => <Textarea {...props} ref={ref} autoResize />
+)
+AutoResizeTextarea.displayName = "AutoResizeTextarea"
+
+const GlassAutoResizeTextarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
+  (props, ref) => <Textarea {...props} ref={ref} variant="glass" autoResize />
+)
+GlassAutoResizeTextarea.displayName = "GlassAutoResizeTextarea"
+
+export { 
+  Textarea, 
+  textareaVariants, 
+  GlassTextarea, 
+  AutoResizeTextarea, 
+  GlassAutoResizeTextarea 
+}
diff --git a/src/index.css b/src/index.css
index fca94aee..845e986e 100644
--- a/src/index.css
+++ b/src/index.css
@@ -1,5 +1,6 @@
 
 @import url('https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@300;400;500;600;700&display=swap');
 @import "tailwindcss";
 
 @theme {
@@ -31,10 +32,36 @@
   --color-sidebar-border: hsl(220 13% 91%);
   --color-sidebar-ring: hsl(217.2 91.2% 59.8%);
   
-  --font-family-sans: "Geist", sans-serif;
-  --font-family-inter: "Inter", sans-serif;
+  --font-family-sans: "Inter", sans-serif;
+  --font-family-mono: "JetBrains Mono", monospace;
   
   --radius: 0.75rem;
+  
+  /* Enhanced design tokens for ZapDev */
+  --color-chat-bg: hsl(0 0% 2.5%);
+  --color-chat-surface: hsl(0 0% 6%);
+  --color-chat-surface-elevated: hsl(0 0% 8%);
+  --color-chat-border: hsl(0 0% 15%);
+  --color-chat-user-bg: hsl(262 83% 58% / 0.1);
+  --color-chat-user-border: hsl(262 83% 58% / 0.2);
+  --color-chat-assistant-bg: hsl(0 0% 8% / 0.8);
+  --color-chat-assistant-border: hsl(0 0% 20% / 0.5);
+  
+  /* Gradient tokens */
+  --gradient-primary: linear-gradient(135deg, #3E6FF3 0%, #5577FF 50%, #7C3AED 100%);
+  --gradient-surface: linear-gradient(135deg, hsl(0 0% 8% / 0.9) 0%, hsl(0 0% 6% / 0.9) 100%);
+  --gradient-glow: radial-gradient(circle at center, hsl(262 83% 58% / 0.15) 0%, transparent 70%);
+  
+  /* Animation tokens */
+  --duration-fast: 150ms;
+  --duration-normal: 300ms;
+  --duration-slow: 500ms;
+  
+  /* Shadow tokens */
+  --shadow-soft: 0 2px 8px -2px hsl(0 0% 0% / 0.1);
+  --shadow-medium: 0 4px 16px -4px hsl(0 0% 0% / 0.15);
+  --shadow-strong: 0 8px 32px -8px hsl(0 0% 0% / 0.2);
+  --shadow-glow: 0 0 32px hsl(262 83% 58% / 0.3);
 }
 
 
@@ -59,11 +86,14 @@
   }
 }
 
+/* Enhanced glass morphism components */
 .glass {
-  @apply bg-white/5 backdrop-blur-lg;
-  border: 1px solid transparent;
-  background-clip: padding-box;
+  background: var(--gradient-surface);
+  backdrop-filter: blur(24px);
+  -webkit-backdrop-filter: blur(24px);
+  border: 1px solid hsl(0 0% 100% / 0.1);
   position: relative;
+  overflow: hidden;
 }
 
 .glass::before {
@@ -72,7 +102,10 @@
   inset: 0;
   border-radius: inherit;
   padding: 1px;
-  background: linear-gradient(225deg, rgba(255,255,255,0.2), rgba(255,255,255,0.05));
+  background: linear-gradient(135deg, 
+    hsl(0 0% 100% / 0.2) 0%, 
+    hsl(0 0% 100% / 0.05) 50%, 
+    hsl(0 0% 100% / 0.1) 100%);
   -webkit-mask: linear-gradient(#000 0 0) content-box, linear-gradient(#000 0 0);
   mask: linear-gradient(#000 0 0) content-box, linear-gradient(#000 0 0);
   -webkit-mask-composite: xor;
@@ -80,16 +113,213 @@
   pointer-events: none;
 }
 
+.glass-elevated {
+  background: var(--color-chat-surface-elevated);
+  backdrop-filter: blur(32px);
+  -webkit-backdrop-filter: blur(32px);
+  border: 1px solid hsl(0 0% 100% / 0.15);
+  box-shadow: var(--shadow-medium);
+}
+
 .glass-hover {
-  @apply transition-all duration-300 hover:bg-white/10;
+  transition: all var(--duration-normal) cubic-bezier(0.4, 0, 0.2, 1);
 }
 
+.glass-hover:hover {
+  background: hsl(0 0% 100% / 0.08);
+  border-color: hsl(0 0% 100% / 0.2);
+  transform: translateY(-1px);
+  box-shadow: var(--shadow-strong);
+}
+
+/* Enhanced text gradients */
 .text-gradient {
-  @apply bg-clip-text text-transparent bg-gradient-to-r from-primary to-[#5577FF];
+  background: var(--gradient-primary);
+  background-clip: text;
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+  background-size: 200% 200%;
+  animation: gradient-shift 3s ease-in-out infinite;
 }
 
+.text-gradient-static {
+  background: var(--gradient-primary);
+  background-clip: text;
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+
+/* Enhanced button components */
 .button-gradient {
-  @apply bg-gradient-to-r from-primary to-[#5577FF] hover:opacity-90 transition-opacity rounded-full;
+  background: var(--gradient-primary);
+  border: none;
+  position: relative;
+  overflow: hidden;
+  transition: all var(--duration-normal) cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.button-gradient::before {
+  content: '';
+  position: absolute;
+  inset: 0;
+  background: linear-gradient(135deg, hsl(0 0% 100% / 0.2), transparent);
+  opacity: 0;
+  transition: opacity var(--duration-fast);
+}
+
+.button-gradient:hover::before {
+  opacity: 1;
+}
+
+.button-gradient:hover {
+  transform: translateY(-2px);
+  box-shadow: var(--shadow-glow);
+}
+
+.button-gradient:active {
+  transform: translateY(0);
+}
+
+/* Chat-specific styling */
+.chat-bubble-user {
+  background: var(--color-chat-user-bg);
+  border: 1px solid var(--color-chat-user-border);
+  position: relative;
+}
+
+.chat-bubble-user::before {
+  content: '';
+  position: absolute;
+  inset: 0;
+  background: var(--gradient-glow);
+  border-radius: inherit;
+  opacity: 0;
+  transition: opacity var(--duration-normal);
+  pointer-events: none;
+}
+
+.chat-bubble-user:hover::before {
+  opacity: 1;
+}
+
+.chat-bubble-assistant {
+  background: var(--color-chat-assistant-bg);
+  border: 1px solid var(--color-chat-assistant-border);
+  backdrop-filter: blur(16px);
+  -webkit-backdrop-filter: blur(16px);
+}
+
+/* Enhanced animations */
+@keyframes gradient-shift {
+  0%, 100% { background-position: 0% 50%; }
+  50% { background-position: 100% 50%; }
+}
+
+@keyframes pulse-glow {
+  0%, 100% { box-shadow: 0 0 20px hsl(262 83% 58% / 0.3); }
+  50% { box-shadow: 0 0 40px hsl(262 83% 58% / 0.5); }
+}
+
+@keyframes float {
+  0%, 100% { transform: translateY(0px); }
+  50% { transform: translateY(-10px); }
+}
+
+@keyframes slide-up {
+  from {
+    opacity: 0;
+    transform: translateY(20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+@keyframes slide-in-right {
+  from {
+    opacity: 0;
+    transform: translateX(20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateX(0);
+  }
+}
+
+/* Utility classes */
+.animate-gradient {
+  animation: gradient-shift 3s ease-in-out infinite;
+}
+
+.animate-pulse-glow {
+  animation: pulse-glow 2s ease-in-out infinite;
+}
+
+.animate-float {
+  animation: float 3s ease-in-out infinite;
+}
+
+.animate-slide-up {
+  animation: slide-up 0.3s ease-out;
+}
+
+.animate-slide-in-right {
+  animation: slide-in-right 0.3s ease-out;
+}
+
+/* Smooth transitions */
+.transition-smooth {
+  transition: all var(--duration-normal) cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.transition-fast {
+  transition: all var(--duration-fast) ease-out;
+}
+
+.transition-slow {
+  transition: all var(--duration-slow) ease-out;
+}
+
+/* Enhanced scrollbar styling */
+.custom-scrollbar::-webkit-scrollbar {
+  width: 6px;
+}
+
+.custom-scrollbar::-webkit-scrollbar-track {
+  background: hsl(0 0% 8%);
+  border-radius: 3px;
+}
+
+.custom-scrollbar::-webkit-scrollbar-thumb {
+  background: hsl(0 0% 20%);
+  border-radius: 3px;
+  transition: background var(--duration-fast);
+}
+
+.custom-scrollbar::-webkit-scrollbar-thumb:hover {
+  background: hsl(0 0% 30%);
+}
+
+/* Enhanced focus styles */
+.focus-visible:focus-visible {
+  outline: 2px solid var(--color-primary);
+  outline-offset: 2px;
+  border-radius: var(--radius);
+}
+
+/* Typography enhancements */
+.font-code {
+  font-family: var(--font-family-mono);
+  font-feature-settings: 'liga' 1, 'calt' 1;
+}
+
+.text-balance {
+  text-wrap: balance;
+}
+
+.text-pretty {
+  text-wrap: pretty;
 }
 
 
diff --git a/src/lib/ai.ts b/src/lib/ai.ts
index 8ba48fe9..35d67fdd 100644
--- a/src/lib/ai.ts
+++ b/src/lib/ai.ts
@@ -18,6 +18,8 @@ import {
 } from './ai-utils'
 import { aiMonitoring } from './ai-monitoring'
 import { getSecureApiKey, getApiKeySource } from './secure-storage'
+import { apiKeyManager } from './api-key-manager'
+import { toast } from 'sonner'
 
 const { logger } = Sentry;
 
@@ -85,26 +87,55 @@ function checkCostLimit(estimatedCost: number): void {
   }
 }
 
-// Get user's API key securely
+// Get user's API key securely with validation
 async function getUserApiKey(): Promise<string | null> {
-  return await getSecureApiKey();
+  try {
+    const userKey = await getSecureApiKey();
+    if (userKey && userKey.startsWith('gsk_') && userKey.length > 20) {
+      return userKey;
+    }
+    return null;
+  } catch (error) {
+    logger.warn('Error retrieving user API key:', error);
+    return null;
+  }
 }
 
-// Create Groq instance with user key or fallback to env key
+// Create Groq instance with enhanced validation and error handling
 async function createGroqInstance() {
   const userApiKey = await getUserApiKey();
-  const apiKey = userApiKey || import.meta.env.VITE_GROQ_API_KEY || '';
+  const envApiKey = import.meta.env.VITE_GROQ_API_KEY;
+  const apiKey = userApiKey || envApiKey || '';
   
-  // Security: Never log API key information in production
-  if (import.meta.env.MODE === 'development') {
-    if (userApiKey) {
-      console.log('🔑 Using user-provided Groq API key');
-    } else if (import.meta.env.VITE_GROQ_API_KEY) {
-      console.log('🔑 Using environment Groq API key');
-    }
+  // Validate API key before creating instance
+  if (!apiKey || apiKey.length < 20) {
+    const error = new Error('Invalid or missing Groq API key. Please check your configuration.');
+    logger.error('Groq API key validation failed', { hasUserKey: !!userApiKey, hasEnvKey: !!envApiKey });
+    toast.error('AI service configuration error. Please check your API keys.');
+    throw error;
   }
   
-  return createGroq({ apiKey, baseURL: 'https://api.groq.com/openai/v1' });
+  // Validate key format
+  if (!apiKey.startsWith('gsk_')) {
+    const error = new Error('Invalid Groq API key format. Key should start with "gsk_".');
+    logger.error('Groq API key format validation failed');
+    toast.error('Invalid Groq API key format. Please check your key.');
+    throw error;
+  }
+  
+  // Security: No API key logging to prevent accidental exposure
+  
+  return createGroq({ 
+    apiKey, 
+    baseURL: 'https://api.groq.com/openai/v1',
+    // Add timeout and retry configuration
+    fetch: (input, init) => {
+      return fetch(input, {
+        ...init,
+        signal: AbortSignal.timeout(60000), // 60 second timeout
+      });
+    }
+  });
 }
 
 // OpenRouter as failsafe provider
@@ -309,7 +340,7 @@ export async function streamAIResponse(prompt: string, options?: { skipCache?: b
     async (span) => {
       const startTime = Date.now();
       try {
-        const userApiKey = getUserApiKey();
+        const userApiKey = await getUserApiKey();
         const envApiKey = import.meta.env.VITE_GROQ_API_KEY;
         const apiKeySource = getApiKeySource();
         
diff --git a/src/lib/api-key-manager.ts b/src/lib/api-key-manager.ts
new file mode 100644
index 00000000..14c5b510
--- /dev/null
+++ b/src/lib/api-key-manager.ts
@@ -0,0 +1,304 @@
+import { toast } from 'sonner';
+import * as Sentry from '@sentry/react';
+
+const { logger } = Sentry;
+
+interface APIKeyStatus {
+  configured: boolean;
+  valid?: boolean;
+  source: 'environment' | 'user' | 'none';
+  error?: string;
+}
+
+interface APIKeyValidationResult {
+  groq: APIKeyStatus;
+  e2b: APIKeyStatus;
+  openrouter: APIKeyStatus;
+  convex: APIKeyStatus;
+  clerk: APIKeyStatus;
+  overall: {
+    ready: boolean;
+    criticalMissing: string[];
+    warnings: string[];
+  };
+}
+
+/**
+ * Comprehensive API Key Manager for ZapDev
+ * Handles validation, status checking, and user feedback
+ */
+export class APIKeyManager {
+  private static instance: APIKeyManager;
+
+  public static getInstance(): APIKeyManager {
+    if (!APIKeyManager.instance) {
+      APIKeyManager.instance = new APIKeyManager();
+    }
+    return APIKeyManager.instance;
+  }
+
+  private constructor() {}
+
+  /**
+   * Validate API key format based on provider
+   */
+  private validateKeyFormat(key: string, provider: string): boolean {
+    if (!key || key.trim().length === 0) return false;
+    
+    const trimmed = key.trim();
+    
+    // Check for placeholder values
+    if (trimmed.includes('your-api-key') || trimmed.includes('YOUR_API_KEY') || 
+        trimmed.includes('xxxxxx') || trimmed === '') {
+      return false;
+    }
+
+    switch (provider) {
+      case 'groq':
+        return trimmed.startsWith('gsk_') && trimmed.length > 20;
+      
+      case 'e2b':
+        return trimmed.startsWith('e2b_') && trimmed.length > 20;
+      
+      case 'openrouter':
+        return (trimmed.startsWith('sk-or-') || trimmed.startsWith('sk_or_')) && trimmed.length > 20;
+      
+      case 'convex':
+        return trimmed.includes('.convex.cloud') || trimmed.startsWith('https://');
+      
+      case 'clerk':
+        return trimmed.startsWith('pk_') || trimmed.startsWith('clerk_');
+      
+      default:
+        return trimmed.length > 10; // Basic length check
+    }
+  }
+
+  /**
+   * Get API key status for a specific provider
+   */
+  private getKeyStatus(envKey: string | undefined, provider: string): APIKeyStatus {
+    if (!envKey) {
+      return {
+        configured: false,
+        source: 'none',
+        error: `${provider.toUpperCase()} API key not configured`
+      };
+    }
+
+    const valid = this.validateKeyFormat(envKey, provider);
+    
+    return {
+      configured: true,
+      valid,
+      source: 'environment',
+      error: valid ? undefined : `Invalid ${provider.toUpperCase()} API key format`
+    };
+  }
+
+  /**
+   * Comprehensive validation of all API keys
+   */
+  public async validateAllKeys(): Promise<APIKeyValidationResult> {
+    logger.info('Starting comprehensive API key validation');
+
+    const groqStatus = this.getKeyStatus(
+      import.meta.env.VITE_GROQ_API_KEY, 
+      'groq'
+    );
+
+    const e2bStatus = this.getKeyStatus(
+      import.meta.env.VITE_E2B_API_KEY, 
+      'e2b'
+    );
+
+    const openrouterStatus = this.getKeyStatus(
+      import.meta.env.VITE_OPENROUTER_API_KEY, 
+      'openrouter'
+    );
+
+    const convexStatus = this.getKeyStatus(
+      import.meta.env.VITE_CONVEX_URL, 
+      'convex'
+    );
+
+    const clerkStatus = this.getKeyStatus(
+      import.meta.env.VITE_CLERK_PUBLISHABLE_KEY, 
+      'clerk'
+    );
+
+    // Determine critical missing keys
+    const criticalMissing: string[] = [];
+    const warnings: string[] = [];
+
+    if (!groqStatus.configured || !groqStatus.valid) {
+      criticalMissing.push('Groq AI API key (required for AI responses)');
+    }
+
+    if (!convexStatus.configured || !convexStatus.valid) {
+      criticalMissing.push('Convex database URL (required for data storage)');
+    }
+
+    if (!clerkStatus.configured || !clerkStatus.valid) {
+      criticalMissing.push('Clerk authentication key (required for user auth)');
+    }
+
+    if (!e2bStatus.configured || !e2bStatus.valid) {
+      warnings.push('E2B API key (code execution will be limited)');
+    }
+
+    if (!openrouterStatus.configured || !openrouterStatus.valid) {
+      warnings.push('OpenRouter API key (AI fallback unavailable)');
+    }
+
+    const result: APIKeyValidationResult = {
+      groq: groqStatus,
+      e2b: e2bStatus,
+      openrouter: openrouterStatus,
+      convex: convexStatus,
+      clerk: clerkStatus,
+      overall: {
+        ready: criticalMissing.length === 0,
+        criticalMissing,
+        warnings
+      }
+    };
+
+    logger.info('API key validation completed', {
+      ready: result.overall.ready,
+      criticalMissing: criticalMissing.length,
+      warnings: warnings.length
+    });
+
+    return result;
+  }
+
+  /**
+   * Display user-friendly status messages
+   */
+  public async showStatus(): Promise<void> {
+    const validation = await this.validateAllKeys();
+    
+    if (validation.overall.ready) {
+      toast.success('🎉 All API keys configured correctly!');
+      return;
+    }
+
+    if (validation.overall.criticalMissing.length > 0) {
+      toast.error(
+        `❌ Missing critical API keys: ${validation.overall.criticalMissing.join(', ')}`,
+        {
+          duration: 8000,
+          description: 'Please configure these keys in your .env.local file to use the app.'
+        }
+      );
+    }
+
+    if (validation.overall.warnings.length > 0) {
+      toast.warning(
+        `⚠️ Optional API keys missing: ${validation.overall.warnings.join(', ')}`,
+        {
+          duration: 6000,
+          description: 'Some features will be limited without these keys.'
+        }
+      );
+    }
+  }
+
+  /**
+   * Get setup instructions for missing keys
+   */
+  public getSetupInstructions(validation: APIKeyValidationResult): string {
+    const instructions: string[] = [
+      '# ZapDev API Key Setup Guide',
+      '',
+      'To get your app fully working, please add these API keys to your .env.local file:',
+      ''
+    ];
+
+    if (!validation.groq.valid) {
+      instructions.push(
+        '## 1. Groq AI API Key (REQUIRED)',
+        '- Visit: https://console.groq.com/keys',
+        '- Create a new API key',
+        '- Add to .env.local: VITE_GROQ_API_KEY=gsk_your_key_here',
+        ''
+      );
+    }
+
+    if (!validation.e2b.valid) {
+      instructions.push(
+        '## 2. E2B Code Execution API Key (RECOMMENDED)',
+        '- Visit: https://e2b.dev/dashboard',
+        '- Create a new API key (free tier: 100 hours/month)',
+        '- Add to .env.local: VITE_E2B_API_KEY=e2b_your_key_here',
+        ''
+      );
+    }
+
+    if (!validation.convex.valid) {
+      instructions.push(
+        '## 3. Convex Database URL (REQUIRED)',
+        '- Visit: https://dashboard.convex.dev',
+        '- Create a new project',
+        '- Add to .env.local: VITE_CONVEX_URL=https://your-project.convex.cloud',
+        ''
+      );
+    }
+
+    if (!validation.clerk.valid) {
+      instructions.push(
+        '## 4. Clerk Authentication (REQUIRED)',
+        '- Visit: https://dashboard.clerk.com',
+        '- Create a new application',
+        '- Add to .env.local: VITE_CLERK_PUBLISHABLE_KEY=pk_test_your_key_here',
+        ''
+      );
+    }
+
+    if (!validation.openrouter.valid) {
+      instructions.push(
+        '## 5. OpenRouter API Key (OPTIONAL - AI Failsafe)',
+        '- Visit: https://openrouter.ai/dashboard',
+        '- Create a new API key',
+        '- Add to .env.local: VITE_OPENROUTER_API_KEY=sk-or-your_key_here',
+        ''
+      );
+    }
+
+    instructions.push(
+      '## After adding keys:',
+      '1. Restart your development server: bun dev',
+      '2. The app will automatically detect the new keys',
+      '3. Test AI functionality in the chat interface',
+      ''
+    );
+
+    return instructions.join('\n');
+  }
+
+  /**
+   * Check if critical features are available
+   */
+  public async checkFeatureAvailability(): Promise<{
+    aiChat: boolean;
+    codeExecution: boolean;
+    userAuth: boolean;
+    dataStorage: boolean;
+  }> {
+    const validation = await this.validateAllKeys();
+    
+    return {
+      aiChat: validation.groq.valid === true,
+      codeExecution: validation.e2b.valid === true,
+      userAuth: validation.clerk.valid === true,
+      dataStorage: validation.convex.valid === true
+    };
+  }
+}
+
+// Export singleton instance
+export const apiKeyManager = APIKeyManager.getInstance();
+
+// Export validation result type for use in components
+export type { APIKeyValidationResult };
\ No newline at end of file
diff --git a/src/lib/error-handler.ts b/src/lib/error-handler.ts
new file mode 100644
index 00000000..f377128f
--- /dev/null
+++ b/src/lib/error-handler.ts
@@ -0,0 +1,500 @@
+import * as Sentry from '@sentry/react';
+import { toast } from 'sonner';
+
+// Error types for better categorization
+export enum ErrorType {
+  NETWORK = 'NETWORK',
+  API = 'API',
+  VALIDATION = 'VALIDATION',
+  AUTHENTICATION = 'AUTHENTICATION',
+  AUTHORIZATION = 'AUTHORIZATION',
+  RATE_LIMIT = 'RATE_LIMIT',
+  SERVICE_UNAVAILABLE = 'SERVICE_UNAVAILABLE',
+  UNKNOWN = 'UNKNOWN',
+  USER_INPUT = 'USER_INPUT',
+  SYSTEM = 'SYSTEM'
+}
+
+export enum ErrorSeverity {
+  LOW = 'LOW',
+  MEDIUM = 'MEDIUM',
+  HIGH = 'HIGH',
+  CRITICAL = 'CRITICAL'
+}
+
+export interface ErrorContext {
+  userId?: string;
+  action?: string;
+  component?: string;
+  additionalData?: Record<string, any>;
+  timestamp?: number;
+  userAgent?: string;
+  url?: string;
+}
+
+export interface AppError extends Error {
+  type: ErrorType;
+  severity: ErrorSeverity;
+  code?: string;
+  statusCode?: number;
+  context?: ErrorContext;
+  isRetryable?: boolean;
+  userMessage?: string;
+  technicalMessage?: string;
+}
+
+// Enhanced error class
+export class EnhancedError extends Error implements AppError {
+  type: ErrorType;
+  severity: ErrorSeverity;
+  code?: string;
+  statusCode?: number;
+  context?: ErrorContext;
+  isRetryable: boolean;
+  userMessage: string;
+  technicalMessage: string;
+
+  constructor({
+    message,
+    type = ErrorType.UNKNOWN,
+    severity = ErrorSeverity.MEDIUM,
+    code,
+    statusCode,
+    context,
+    isRetryable = false,
+    userMessage,
+    technicalMessage,
+    cause
+  }: {
+    message: string;
+    type?: ErrorType;
+    severity?: ErrorSeverity;
+    code?: string;
+    statusCode?: number;
+    context?: ErrorContext;
+    isRetryable?: boolean;
+    userMessage?: string;
+    technicalMessage?: string;
+    cause?: Error;
+  }) {
+    super(message, { cause });
+    this.name = 'EnhancedError';
+    this.type = type;
+    this.severity = severity;
+    this.code = code;
+    this.statusCode = statusCode;
+    this.context = {
+      timestamp: Date.now(),
+      userAgent: typeof window !== 'undefined' ? navigator.userAgent : undefined,
+      url: typeof window !== 'undefined' ? window.location.href : undefined,
+      ...context
+    };
+    this.isRetryable = isRetryable;
+    this.userMessage = userMessage || this.getDefaultUserMessage();
+    this.technicalMessage = technicalMessage || message;
+  }
+
+  private getDefaultUserMessage(): string {
+    switch (this.type) {
+      case ErrorType.NETWORK:
+        return 'Network connection error. Please check your internet connection and try again.';
+      case ErrorType.API:
+        return 'Service temporarily unavailable. Please try again in a moment.';
+      case ErrorType.AUTHENTICATION:
+        return 'Please sign in to continue.';
+      case ErrorType.AUTHORIZATION:
+        return 'You don\'t have permission to perform this action.';
+      case ErrorType.RATE_LIMIT:
+        return 'Too many requests. Please wait a moment and try again.';
+      case ErrorType.VALIDATION:
+        return 'Please check your input and try again.';
+      case ErrorType.SERVICE_UNAVAILABLE:
+        return 'This service is currently unavailable. Please try again later.';
+      default:
+        return 'An unexpected error occurred. Please try again.';
+    }
+  }
+
+  toJSON() {
+    return {
+      name: this.name,
+      message: this.message,
+      type: this.type,
+      severity: this.severity,
+      code: this.code,
+      statusCode: this.statusCode,
+      context: this.context,
+      isRetryable: this.isRetryable,
+      userMessage: this.userMessage,
+      technicalMessage: this.technicalMessage,
+      stack: this.stack
+    };
+  }
+}
+
+// Error handler class
+class ErrorHandler {
+  private errorQueue: AppError[] = [];
+  private isOnline = typeof window !== 'undefined' ? navigator.onLine : true;
+  
+  constructor() {
+    this.setupGlobalErrorHandlers();
+    this.setupNetworkStatusHandlers();
+  }
+
+  private setupGlobalErrorHandlers() {
+    if (typeof window === 'undefined') return;
+
+    // Handle uncaught errors
+    window.addEventListener('error', (event) => {
+      const error = new EnhancedError({
+        message: event.message || 'Uncaught error',
+        type: ErrorType.SYSTEM,
+        severity: ErrorSeverity.HIGH,
+        context: {
+          component: 'Global',
+          action: 'uncaught-error',
+          additionalData: {
+            filename: event.filename,
+            lineno: event.lineno,
+            colno: event.colno
+          }
+        }
+      });
+      this.handleError(error, { silent: true });
+    });
+
+    // Handle unhandled promise rejections
+    window.addEventListener('unhandledrejection', (event) => {
+      const error = new EnhancedError({
+        message: event.reason?.message || 'Unhandled promise rejection',
+        type: ErrorType.SYSTEM,
+        severity: ErrorSeverity.HIGH,
+        context: {
+          component: 'Global',
+          action: 'unhandled-rejection',
+          additionalData: {
+            reason: event.reason
+          }
+        }
+      });
+      this.handleError(error, { silent: true });
+    });
+  }
+
+  private setupNetworkStatusHandlers() {
+    if (typeof window === 'undefined') return;
+
+    window.addEventListener('online', () => {
+      this.isOnline = true;
+      this.processErrorQueue();
+      toast.success('Connection restored');
+    });
+
+    window.addEventListener('offline', () => {
+      this.isOnline = false;
+      toast.error('Connection lost. Some features may be unavailable.');
+    });
+  }
+
+  // Main error handling method
+  public handleError(
+    error: Error | AppError, 
+    options: {
+      context?: ErrorContext;
+      showToast?: boolean;
+      silent?: boolean;
+      reportToSentry?: boolean;
+    } = {}
+  ): void {
+    const {
+      context = {},
+      showToast = true,
+      silent = false,
+      reportToSentry = true
+    } = options;
+
+    // Convert to EnhancedError if needed
+    let enhancedError: AppError;
+    if (error instanceof EnhancedError) {
+      enhancedError = error;
+      // Merge additional context
+      enhancedError.context = { ...enhancedError.context, ...context };
+    } else {
+      enhancedError = this.categorizeError(error, context);
+    }
+
+    // Log to console in development
+    if (process.env.NODE_ENV === 'development') {
+      console.error('ErrorHandler:', enhancedError);
+    }
+
+    // Show user notification unless silent
+    if (!silent && showToast) {
+      this.showUserNotification(enhancedError);
+    }
+
+    // Report to Sentry
+    if (reportToSentry && this.isOnline) {
+      this.reportToSentry(enhancedError);
+    } else if (reportToSentry && !this.isOnline) {
+      // Queue for later if offline
+      this.errorQueue.push(enhancedError);
+    }
+  }
+
+  // Categorize errors based on common patterns
+  private categorizeError(error: Error, context: ErrorContext = {}): AppError {
+    let type = ErrorType.UNKNOWN;
+    let severity = ErrorSeverity.MEDIUM;
+    let isRetryable = false;
+    let statusCode: number | undefined;
+
+    // Network errors
+    if (error.message.includes('fetch') || error.message.includes('Network')) {
+      type = ErrorType.NETWORK;
+      isRetryable = true;
+    }
+
+    // API errors (check for common HTTP status codes)
+    if (error.message.includes('401')) {
+      type = ErrorType.AUTHENTICATION;
+      statusCode = 401;
+    } else if (error.message.includes('403')) {
+      type = ErrorType.AUTHORIZATION;
+      statusCode = 403;
+    } else if (error.message.includes('429')) {
+      type = ErrorType.RATE_LIMIT;
+      statusCode = 429;
+      isRetryable = true;
+    } else if (error.message.includes('500') || error.message.includes('502') || error.message.includes('503')) {
+      type = ErrorType.SERVICE_UNAVAILABLE;
+      severity = ErrorSeverity.HIGH;
+      statusCode = parseInt(error.message.match(/\d{3}/)?.[0] || '500');
+      isRetryable = true;
+    }
+
+    // Validation errors
+    if (error.message.toLowerCase().includes('validation') || 
+        error.message.toLowerCase().includes('invalid')) {
+      type = ErrorType.VALIDATION;
+      severity = ErrorSeverity.LOW;
+    }
+
+    return new EnhancedError({
+      message: error.message,
+      type,
+      severity,
+      statusCode,
+      context,
+      isRetryable,
+      cause: error
+    });
+  }
+
+  // Show user-friendly notifications
+  private showUserNotification(error: AppError): void {
+    const toastOptions = {
+      duration: this.getToastDuration(error.severity),
+    };
+
+    switch (error.severity) {
+      case ErrorSeverity.LOW:
+        toast.info(error.userMessage, toastOptions);
+        break;
+      case ErrorSeverity.MEDIUM:
+        toast.error(error.userMessage, toastOptions);
+        break;
+      case ErrorSeverity.HIGH:
+        toast.error(error.userMessage, {
+          ...toastOptions,
+          action: error.isRetryable ? {
+            label: 'Retry',
+            onClick: () => this.triggerRetry(error)
+          } : undefined
+        });
+        break;
+      case ErrorSeverity.CRITICAL:
+        toast.error(error.userMessage, {
+          duration: Infinity,
+          action: {
+            label: 'Report Issue',
+            onClick: () => this.reportIssue(error)
+          }
+        });
+        break;
+    }
+  }
+
+  private getToastDuration(severity: ErrorSeverity): number {
+    switch (severity) {
+      case ErrorSeverity.LOW: return 3000;
+      case ErrorSeverity.MEDIUM: return 5000;
+      case ErrorSeverity.HIGH: return 7000;
+      case ErrorSeverity.CRITICAL: return Infinity;
+      default: return 5000;
+    }
+  }
+
+  private triggerRetry(error: AppError): void {
+    // This would trigger a retry mechanism
+    // Implementation depends on the specific context
+    toast.info('Retrying...');
+  }
+
+  private reportIssue(error: AppError): void {
+    // Generate issue report
+    const report = {
+      errorId: Math.random().toString(36).substring(2, 15),
+      error: error.toJSON(),
+      timestamp: new Date().toISOString(),
+    };
+
+    // Copy to clipboard for user to share
+    navigator.clipboard.writeText(JSON.stringify(report, null, 2))
+      .then(() => {
+        toast.success('Error report copied to clipboard. Please share this with support.');
+      })
+      .catch(() => {
+        toast.error('Failed to copy error report.');
+      });
+  }
+
+  private reportToSentry(error: AppError): void {
+    Sentry.withScope((scope) => {
+      // Set error context
+      scope.setTag('errorType', error.type);
+      scope.setLevel(this.getSentryLevel(error.severity));
+      scope.setContext('errorDetails', {
+        code: error.code,
+        statusCode: error.statusCode,
+        isRetryable: error.isRetryable,
+        userMessage: error.userMessage,
+        technicalMessage: error.technicalMessage
+      });
+
+      if (error.context) {
+        scope.setContext('appContext', error.context);
+        if (error.context.userId) {
+          scope.setUser({ id: error.context.userId });
+        }
+      }
+
+      Sentry.captureException(error);
+    });
+  }
+
+  private getSentryLevel(severity: ErrorSeverity): Sentry.SeverityLevel {
+    switch (severity) {
+      case ErrorSeverity.LOW: return 'info';
+      case ErrorSeverity.MEDIUM: return 'warning';
+      case ErrorSeverity.HIGH: return 'error';
+      case ErrorSeverity.CRITICAL: return 'fatal';
+      default: return 'error';
+    }
+  }
+
+  private processErrorQueue(): void {
+    if (!this.isOnline || this.errorQueue.length === 0) return;
+
+    const errors = [...this.errorQueue];
+    this.errorQueue = [];
+
+    errors.forEach(error => {
+      this.reportToSentry(error);
+    });
+
+    toast.success(`Uploaded ${errors.length} offline error reports`);
+  }
+
+  // Utility methods for specific error types
+  public handleNetworkError(error: Error, context?: ErrorContext): void {
+    const networkError = new EnhancedError({
+      message: error.message,
+      type: ErrorType.NETWORK,
+      severity: ErrorSeverity.MEDIUM,
+      context,
+      isRetryable: true
+    });
+    this.handleError(networkError);
+  }
+
+  public handleAPIError(error: Error, statusCode?: number, context?: ErrorContext): void {
+    const apiError = new EnhancedError({
+      message: error.message,
+      type: ErrorType.API,
+      severity: statusCode && statusCode >= 500 ? ErrorSeverity.HIGH : ErrorSeverity.MEDIUM,
+      statusCode,
+      context,
+      isRetryable: statusCode ? statusCode >= 500 || statusCode === 429 : false
+    });
+    this.handleError(apiError);
+  }
+
+  public handleValidationError(message: string, context?: ErrorContext): void {
+    const validationError = new EnhancedError({
+      message,
+      type: ErrorType.VALIDATION,
+      severity: ErrorSeverity.LOW,
+      context,
+      isRetryable: false,
+      userMessage: message // Show validation messages directly to user
+    });
+    this.handleError(validationError, { reportToSentry: false }); // Don't spam Sentry with validation errors
+  }
+
+  // Check if service is healthy
+  public async checkServiceHealth(serviceName: string): Promise<boolean> {
+    try {
+      // This would ping the service health endpoint
+      // Implementation depends on your backend setup
+      return true;
+    } catch (error) {
+      this.handleError(new EnhancedError({
+        message: `${serviceName} service health check failed`,
+        type: ErrorType.SERVICE_UNAVAILABLE,
+        severity: ErrorSeverity.HIGH,
+        context: { component: serviceName, action: 'health-check' }
+      }));
+      return false;
+    }
+  }
+}
+
+// Export singleton instance
+export const errorHandler = new ErrorHandler();
+
+// Utility functions for easy usage
+export const handleError = (error: Error | AppError, options?: Parameters<typeof errorHandler.handleError>[1]) => {
+  errorHandler.handleError(error, options);
+};
+
+export const handleNetworkError = (error: Error, context?: ErrorContext) => {
+  errorHandler.handleNetworkError(error, context);
+};
+
+export const handleAPIError = (error: Error, statusCode?: number, context?: ErrorContext) => {
+  errorHandler.handleAPIError(error, statusCode, context);
+};
+
+export const handleValidationError = (message: string, context?: ErrorContext) => {
+  errorHandler.handleValidationError(message, context);
+};
+
+// React hook for error handling in components
+export const useErrorHandler = () => {
+  return {
+    handleError: (error: Error | AppError, options?: Parameters<typeof errorHandler.handleError>[1]) => {
+      errorHandler.handleError(error, options);
+    },
+    handleNetworkError: (error: Error, context?: ErrorContext) => {
+      errorHandler.handleNetworkError(error, context);
+    },
+    handleAPIError: (error: Error, statusCode?: number, context?: ErrorContext) => {
+      errorHandler.handleAPIError(error, statusCode, context);
+    },
+    handleValidationError: (message: string, context?: ErrorContext) => {
+      errorHandler.handleValidationError(message, context);
+    }
+  };
+};
\ No newline at end of file
diff --git a/src/pages/Chat.tsx b/src/pages/Chat.tsx
index 7c139727..5d342f18 100644
--- a/src/pages/Chat.tsx
+++ b/src/pages/Chat.tsx
@@ -1,40 +1,97 @@
 import React from 'react';
 import { motion } from 'framer-motion';
 import Navigation from '@/components/Navigation';
-import ChatInterface from '@/components/ChatInterface';
+import EnhancedChatInterface from '@/components/EnhancedChatInterface';
 
-// Full page chat that visually matches the home page theme
+// Enhanced full page chat with stunning visuals
 const Chat: React.FC = () => {
   return (
-    <div className="min-h-screen bg-black text-foreground">
+    <div className="min-h-screen bg-[var(--color-chat-bg)] text-foreground">
       <Navigation />
 
-      {/* Background layer for home-page look */}
-      <div className="absolute inset-0 -z-10 bg-[#0A0A0A]" />
-      <div 
-        className="absolute left-0 top-0 w-full h-full -z-10 rounded-full"
-        style={{
-          background: '#377AFB',
-          opacity: 0.1,
-          boxShadow: '300px 300px 300px',
-          filter: 'blur(150px)'
-        }}
-      />
+      {/* Enhanced background with multiple gradients */}
+      <div className="absolute inset-0 -z-10">
+        {/* Base background */}
+        <div className="absolute inset-0 bg-[var(--color-chat-bg)]" />
+        
+        {/* Animated gradient orbs */}
+        <motion.div 
+          className="absolute top-1/4 left-1/4 w-96 h-96 rounded-full opacity-10"
+          animate={{
+            background: [
+              "radial-gradient(circle, hsl(262 83% 58%) 0%, transparent 70%)",
+              "radial-gradient(circle, hsl(224 82% 60%) 0%, transparent 70%)",
+              "radial-gradient(circle, hsl(280 90% 65%) 0%, transparent 70%)",
+              "radial-gradient(circle, hsl(262 83% 58%) 0%, transparent 70%)",
+            ],
+            scale: [1, 1.2, 0.8, 1],
+            x: [0, 50, -30, 0],
+            y: [0, -40, 60, 0],
+          }}
+          transition={{
+            duration: 20,
+            repeat: Infinity,
+            ease: "easeInOut"
+          }}
+          style={{ filter: 'blur(100px)' }}
+        />
+        
+        <motion.div 
+          className="absolute bottom-1/4 right-1/4 w-80 h-80 rounded-full opacity-10"
+          animate={{
+            background: [
+              "radial-gradient(circle, hsl(224 82% 60%) 0%, transparent 70%)",
+              "radial-gradient(circle, hsl(280 90% 65%) 0%, transparent 70%)",
+              "radial-gradient(circle, hsl(262 83% 58%) 0%, transparent 70%)",
+              "radial-gradient(circle, hsl(224 82% 60%) 0%, transparent 70%)",
+            ],
+            scale: [0.8, 1.3, 1, 0.8],
+            x: [0, -60, 40, 0],
+            y: [0, 50, -30, 0],
+          }}
+          transition={{
+            duration: 18,
+            repeat: Infinity,
+            ease: "easeInOut",
+            delay: 2
+          }}
+          style={{ filter: 'blur(120px)' }}
+        />
+        
+        {/* Subtle noise texture overlay */}
+        <div 
+          className="absolute inset-0 opacity-[0.02] mix-blend-overlay"
+          style={{
+            backgroundImage: `url("data:image/svg+xml,%3Csvg viewBox='0 0 256 256' xmlns='http://www.w3.org/2000/svg'%3E%3Cfilter id='noiseFilter'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='0.9' numOctaves='4' stitchTiles='stitch'/%3E%3C/filter%3E%3Crect width='100%25' height='100%25' filter='url(%23noiseFilter)'/%3E%3C/svg%3E")`,
+          }}
+        />
+      </div>
 
       <motion.main
-        initial={{ opacity: 0, y: 20 }}
+        initial={{ opacity: 0, y: 30 }}
         animate={{ opacity: 1, y: 0 }}
-        transition={{ duration: 0.5 }}
+        transition={{ duration: 0.8, ease: "easeOut" }}
         className="pt-20"
       >
         <div className="px-4">
           <motion.div
-            initial={{ opacity: 0, scale: 0.98 }}
+            initial={{ opacity: 0, scale: 0.95 }}
             animate={{ opacity: 1, scale: 1 }}
-            transition={{ duration: 0.4, delay: 0.1 }}
-            className="h-[calc(100vh-6rem)] bg-[#0F1012]/70 border border-white/10 rounded-2xl shadow-2xl overflow-hidden backdrop-blur-xl"
+            transition={{ 
+              duration: 0.6, 
+              delay: 0.2,
+              ease: "easeOut",
+              type: "spring",
+              stiffness: 100
+            }}
+            className="h-[calc(100vh-6rem)] glass-elevated rounded-2xl overflow-hidden relative"
           >
-            <ChatInterface />
+            {/* Enhanced border glow effect */}
+            <div className="absolute -inset-0.5 bg-gradient-to-r from-primary/20 via-purple-600/20 to-primary/20 rounded-2xl blur opacity-50 animate-pulse-glow" />
+            
+            <div className="relative h-full bg-[var(--color-chat-bg)]/95 backdrop-blur-xl rounded-2xl border border-white/10">
+              <EnhancedChatInterface />
+            </div>
           </motion.div>
         </div>
       </motion.main>