lwazi 1.8.4 → 1.8.6

package/package.json

@@ -1,33 +1,33 @@
 {
-  "name": "lwazi",
-  "version": "1.8.4",
-  "description": "Lwazi is an AI assistant for Laravel. Install with one command to add an AI assistant to your Laravel app.",
-  "main": "bin/lwazi.js",
-  "bin": {
-    "lwazi": "bin/lwazi.js"
-  },
-  "scripts": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/nigelnkomo/lwazi.git"
-  },
-  "keywords": [
-    "laravel",
-    "ai",
-    "assistant",
-    "chatbot",
-    "ollama",
-    "php"
-  ],
-  "author": "Nigel Nkomo",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/nigelnkomo/lwazi/issues"
-  },
-  "homepage": "https://github.com/nigelnkomo/lwazi#readme",
-  "engines": {
-    "node": ">=14.0.0"
-  },
-  "dependencies": {},
-  "devDependencies": {}
+    "name": "lwazi",
+    "version": "1.8.6",
+    "description": "Lwazi is an AI assistant for Laravel. Install with one command to add an AI assistant to your Laravel app.",
+    "main": "bin/lwazi.js",
+    "bin": {
+        "lwazi": "bin/lwazi.js"
+    },
+    "scripts": {},
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/nigelnkomo/lwazi.git"
+    },
+    "keywords": [
+        "laravel",
+        "ai",
+        "assistant",
+        "chatbot",
+        "ollama",
+        "php"
+    ],
+    "author": "Nigel Nkomo",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/nigelnkomo/lwazi/issues"
+    },
+    "homepage": "https://github.com/nigelnkomo/lwazi#readme",
+    "engines": {
+        "node": ">=14.0.0"
+    },
+    "dependencies": {},
+    "devDependencies": {}
 }

package/src/Console/AnalyzeProjectCommand.php

@@ -202,7 +202,7 @@ class AnalyzeProjectCommand extends Command
                 
                 $manifest['flat'][$fullUrl] = [
                     'label' => $text ?: basename($fullUrl),
-                    'segments' => array_filter(explode('/', parse_url($fullUrl, PHP_PATH) ?? '')),
+                    'segments' => array_filter(explode('/', parse_url($fullUrl, PHP_URL_PATH) ?? '')),
                     '_path' => $fullUrl,
                     '_weight' => 1,
                 ];

package/src/Console/SetupCommand.php

@@ -210,7 +210,7 @@ class SetupCommand extends Command
                 
                 $manifest['flat'][$fullUrl] = [
                     'label' => $text ?: basename($fullUrl),
-                    'segments' => array_filter(explode('/', parse_url($fullUrl, PHP_PATH) ?? '')),
+                    'segments' => array_filter(explode('/', parse_url($fullUrl, PHP_URL_PATH) ?? '')),
                     '_path' => $fullUrl,
                     '_weight' => 1,
                 ];

package/src/Installer/NavigationCrawler.php

@@ -127,6 +127,9 @@ class NavigationCrawler
                     if ($weight > ($this->flatIndex[$normalized]['_weight'] ?? 0)) {
                         $this->flatIndex[$normalized]['_weight'] = $weight;
                     }
+                    if (!isset($this->linkWeights[$normalized])) {
+                        $this->linkWeights[$normalized] = 0;
+                    }
                     $this->linkWeights[$normalized] = max($this->linkWeights[$normalized], $weight);
 
                     if (!isset($this->visited[$normalized])) {

package/src/Services/LwaziService.php

@@ -38,6 +38,13 @@ class LwaziService
     {
         error_log('Lwazi chat: ' . $message);
 
+        // Extract context from message if user provides identifier
+        $extractedContext = $this->extractContextFromMessage($message);
+        if ($extractedContext && empty($this->currentContextId)) {
+            $this->currentContextId = $extractedContext;
+            error_log('Lwazi: extracted context: ' . $extractedContext);
+        }
+
         // Temporarily disable agent
         // if ($this->agent->isReady()) {
         //     return $this->agent->reply($message, $this->currentContextId);
@@ -100,16 +107,82 @@ class LwaziService
             return "I couldn't find information about that. Could you try a different question?";
         }
 
-        $prompt = $this->buildPrompt();
-        $messages = array_merge(
-            [['role' => 'system', 'content' => $prompt]],
-            $this->conversationHistory
-        );
+        // Check for general website questions BEFORE falling back to LLM
+        if ($intent === 'general' || $this->isGeneralWebsiteQuery($message)) {
+            // Simple greeting response first
+            if (preg_match('/^(hi|hello|hey|good morning|good afternoon|good evening|how are you)\b/i', $message)) {
+                $response = "Hello! I'm here to help you navigate this website. You can ask me things like 'where can I find events' or 'what is this website about'. What would you like to know?";
+                $this->conversationHistory[] = ['role' => 'assistant', 'content' => $response];
+                return $response;
+            }
+            
+            $summary = $this->getWebsiteSummary($message);
+            if ($summary) {
+                $this->conversationHistory[] = ['role' => 'assistant', 'content' => $summary];
+                return $summary;
+            }
+            
+            // Try content search as fallback
+            $contentResponse = $this->searchContent($message);
+            if ($contentResponse) {
+                $this->conversationHistory[] = ['role' => 'assistant', 'content' => $contentResponse];
+                return $contentResponse;
+            }
+        }
 
-        $response = $this->callOllama($messages);
-        $clean = $this->sanitizeUserResponse($response['content'] ?? '');
-        $this->conversationHistory[] = ['role' => 'assistant', 'content' => $clean];
-        return $clean;
+        if ($intent === null && $this->currentContextId) {
+            $dataResponse = $this->fetchRelevantData($message);
+            if ($dataResponse) {
+                $this->conversationHistory[] = ['role' => 'assistant', 'content' => $dataResponse];
+                return $dataResponse;
+            }
+        }
+
+        // Try content search as final fallback before LLM
+        $contentResponse = $this->searchContent($message);
+        if ($contentResponse) {
+            $this->conversationHistory[] = ['role' => 'assistant', 'content' => $contentResponse];
+            return $contentResponse;
+        }
+
+        // Last resort: check if this could be a content query and show what's available
+        if (!$this->looksLikeDataQuery($message)) {
+            $navResponse = $this->getNavigationSuggestions($message);
+            if ($navResponse) {
+                $this->conversationHistory[] = ['role' => 'assistant', 'content' => $navResponse];
+                return $navResponse;
+            }
+        }
+
+        // Try one more content search before LLM fallback
+        $contentResponse = $this->searchContent($message);
+        if ($contentResponse) {
+            $this->conversationHistory[] = ['role' => 'assistant', 'content' => $contentResponse];
+            return $contentResponse;
+        }
+
+        // Try navigation suggestions
+        $suggestions = $this->getNavigationSuggestions($message);
+        if ($suggestions) {
+            return $suggestions;
+        }
+
+        // Last resort - try LLM but with timeout protection
+        try {
+            $prompt = $this->buildPrompt();
+            $messages = array_merge(
+                [['role' => 'system', 'content' => $prompt]],
+                $this->conversationHistory
+            );
+
+            $response = $this->callOllama($messages, 10000); // 10 second timeout
+            $clean = $this->sanitizeUserResponse($response['content'] ?? '');
+            $this->conversationHistory[] = ['role' => 'assistant', 'content' => $clean];
+            return $clean;
+        } catch (\Throwable $e) {
+            // LLM failed, provide helpful fallback
+            return "I understand you're looking for something, but I'm having trouble processing that right now. You can try:\n- Asking about specific pages like 'events' or 'stories'\n- Using the navigation menu on the site\n- Contact support if you need immediate assistance.";
+        }
     }
 
     protected function selectIntentWithLLM(string $message): ?string
@@ -118,6 +191,10 @@ class LwaziService
             return 'data';
         }
 
+        if ($this->isGeneralWebsiteQuery($message)) {
+            return 'general';
+        }
+
         if ($this->looksLikeNavigationQuery($message) && !$this->looksLikeContentQuery($message)) {
             return 'navigation';
         }
@@ -128,6 +205,11 @@ class LwaziService
             return 'content';
         }
 
+        // Check for greetings and casual conversation
+        if (preg_match('/^(hi|hello|hey|good morning|good afternoon|good evening|how are you|thanks|thank you)\b/i', $msgLower)) {
+            return 'general';
+        }
+
         $prompt =
             "Classify the user's intent as one of: navigation, content, data, general. Return JSON: {\"intent\":\"navigation|content|data|general\"}.\n\n" .
             "- navigation: user wants to find a specific page or link (where, which page, how do i get to)\n" .
@@ -161,9 +243,11 @@ class LwaziService
         $msgLower = strtolower($message);
         
         $personalPatterns = [
-            '/\bmy\b/', '/\bme\b/', '/\bmine\b/', '/\bmy own\b/',
+            '/\bmy\b/', '/\bmine\b/', '/\bmy own\b/',
             '/\bmy account\b/', '/\bmy profile\b/', '/\bmy data\b/',
             '/\bmy records\b/', '/\bmy applications\b/', '/\bmy submissions\b/',
+            '/\bmy courses?\b/', '/\bmy results?\b/', '/\bmy fees\b/',
+            '/\bmy grades?\b/', '/\bmy profile\b/', '/\bmy information\b/',
         ];
         
         foreach ($personalPatterns as $pattern) {
@@ -175,6 +259,48 @@ class LwaziService
         return false;
     }
 
+    protected function isGeneralWebsiteQuery(string $message): bool
+    {
+        $patterns = [
+            '/\bwhat.*this (site|website|app|platform)\b/i',
+            '/\babout (this|the) (site|website|app|platform)\b/i',
+            '/\bwhat.*(do you|does this).*(offer|provide|have)\b/i',
+            '/\btell me about (this|the) (site|website|app)\b/i',
+            '/\bwhat is (this|it)\b/i',
+            '/\bwhat can (i|you) do (here|on this)\b/i',
+            '/\bhow (does|does this) (work|site work)\b/i',
+            '/\b(on|about) this (site|website)\b/i',
+            '/\bis .* on (this|the) (site|website)\b/i',
+        ];
+        
+        foreach ($patterns as $pattern) {
+            if (preg_match($pattern, $message)) {
+                return true;
+            }
+        }
+        
+        return false;
+    }
+
+    protected function getWebsiteSummary(string $message): ?string
+    {
+        // For now, provide a helpful generic response based on navigation
+        $tree = $this->ragService->getNavigationTree();
+        if ($tree) {
+            $flat = $tree->getFlatIndex();
+            $pages = array_keys($flat);
+            
+            if (!empty($pages)) {
+                $pageList = array_slice($pages, 0, 8);
+                $list = implode(', ', array_map(fn($p) => str_replace('-', ' ', trim($p, '/')), $pageList));
+                
+                return "This appears to be a web application with pages like: {$list}. You can navigate to any of these pages, or ask me to help you find specific content. Use the menu or tell me what you're looking for!";
+            }
+        }
+        
+        return "This is a web application. You can use the navigation menu to find pages, or ask me to help you locate specific content. What would you like to find?";
+    }
+
     protected function looksLikeContentQuery(string $message): bool
     {
         return (bool) preg_match(
@@ -183,6 +309,26 @@ class LwaziService
         );
     }
 
+    protected function extractContextFromMessage(string $message): ?string
+    {
+        $contextParam = config('lwazi.context_param', 'context_id');
+        
+        if (str_contains($contextParam, 'student')) {
+            if (preg_match('/\b(STU\d+)\b/i', $message, $matches)) {
+                return $matches[1];
+            }
+            if (preg_match('/\b(\d{6,})\b/', $message, $matches)) {
+                return $matches[1];
+            }
+        }
+        
+        if (preg_match('/\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}\b/i', $message, $matches)) {
+            return strtolower($matches[0]);
+        }
+        
+        return null;
+    }
+
     public function looksLikeNavigationQuery(string $message): bool
     {
         return (bool) preg_match(
@@ -304,50 +450,197 @@ class LwaziService
         $response = "I found some relevant information:\n\n";
         
         foreach ($results as $result) {
-            $response .= "**{$result['title']}**\n";
-            $response .= "{$result['snippet']}\n";
-            $response .= "[Read more]({$result['url']})\n\n";
+            $url = $result['url'] ?? '/';
+            // Try to match with navigation for better URL
+            $navMatch = $this->getMatchingNavPath($url);
+            if ($navMatch) {
+                $url = $navMatch;
+            }
+            
+            $title = $result['title'] ?? basename($url);
+            $snippet = $this->cleanSnippet($result['snippet'] ?? '');
+            
+            $response .= "**{$title}**\n";
+            if (!empty($snippet)) {
+                $response .= "{$snippet}\n";
+            }
+            $response .= "[View page]({$url})\n\n";
         }
 
         return $response;
     }
 
+    protected function cleanSnippet(string $snippet): string
+    {
+        // Remove everything that looks like code/CSS
+        $lines = preg_split('/[\n;]/', $snippet);
+        $textLines = [];
+        
+        foreach ($lines as $line) {
+            $line = trim($line);
+            // Skip lines that are mostly CSS-like
+            if (preg_match('/^[.#@]?[a-z0-9_-]+\s*\{?/', $line)) continue;
+            if (preg_match('/^[a-z-]+:\s*[0-9a-z#%,]+;?$/i', $line)) continue;
+            if (preg_match('/var\(--/', $line)) continue;
+            if (strlen($line) < 10) continue;
+            
+            $letters = preg_match_all('/[a-zA-Z]/', $line);
+            if ($letters > strlen($line) * 0.5) {
+                $textLines[] = $line;
+            }
+        }
+        
+        if (empty($textLines)) {
+            return substr($snippet, 0, 80);
+        }
+        
+        // Join and truncate
+        $text = implode('. ', $textLines);
+        return substr($text, 0, 120) . (strlen($text) > 120 ? '...' : '');
+    }
+
+    protected function getMatchingNavPath(string $contentUrl): ?string
+    {
+        $tree = $this->ragService->getNavigationTree();
+        if (!$tree) {
+            return null;
+        }
+        
+        $flat = $tree->getFlatIndex();
+        
+        // Try exact match first
+        if (isset($flat[$contentUrl])) {
+            return $contentUrl;
+        }
+        
+        // Try fuzzy match
+        $contentSlug = basename($contentUrl);
+        foreach ($flat as $path => $entry) {
+            $pathSlug = basename($path);
+            if (levenshtein(strtolower($contentSlug), strtolower($pathSlug)) <= 3) {
+                return $path;
+            }
+        }
+        
+        return null;
+    }
+
+    protected function getNavigationSuggestions(string $message): ?string
+    {
+        $tree = $this->ragService->getNavigationTree();
+        if (!$tree) {
+            return null;
+        }
+        
+        $flat = $tree->getFlatIndex();
+        if (empty($flat)) {
+            return null;
+        }
+        
+        // Try to find partial matches based on message keywords
+        $msgLower = strtolower($message);
+        $keywords = preg_split('/\s+/', $msgLower);
+        $keywords = array_filter($keywords, fn($w) => strlen($w) >= 3);
+        
+        $matched = [];
+        foreach ($flat as $path => $entry) {
+            $label = strtolower($flat[$path]['label'] ?? '');
+            foreach ($keywords as $kw) {
+                if (str_contains($label, $kw) || str_contains($path, $kw)) {
+                    $matched[] = ['path' => $path, 'label' => $flat[$path]['label'] ?? basename($path)];
+                    break;
+                }
+            }
+        }
+        
+        // If we found matches, use those
+        if (!empty($matched)) {
+            $list = [];
+            foreach (array_slice($matched, 0, 5) as $m) {
+                $list[] = "- {$m['label']}: {$m['path']}";
+            }
+            return "I couldn't find an exact match, but here are some related pages:\n" . implode("\n", $list);
+        }
+        
+        // Otherwise show general suggestions
+        $pages = array_keys($flat);
+        $suggestions = array_slice($pages, 0, 5);
+        
+        if (empty($suggestions)) {
+            return null;
+        }
+        
+        $list = [];
+        foreach ($suggestions as $path) {
+            $label = $flat[$path]['label'] ?? basename($path);
+            $list[] = "- {$label}: {$path}";
+        }
+        
+        return "Here are some pages on this site:\n" . implode("\n", $list) . "\n\nYou can navigate to any of these, or ask me to help you find something specific.";
+    }
+
     protected function extractSearchTerms(string $message): array
     {
-        preg_match('/\b(my|the|their|our|all|this|these)\s+(\w+)/i', $message, $matches);
-        $topic = $matches[2] ?? '';
+        $msgLower = strtolower($message);
         
-        if (empty($topic) || strlen($topic) < 3) {
-            $words = preg_split('/\s+/', strtolower($message));
-            $stopWords = ['where', 'can', 'find', 'get', 'look', 'show', 'list', 'tell', 'know', 'want', 'need', 'help', 'give', 'me', 'i', 'is', 'are', 'was', 'were', 'has', 'have', 'had', 'do', 'does', 'did', 'will', 'would', 'could', 'should', 'what', 'how', 'why'];
+        // Extract topic from common question patterns
+        $patterns = [
+            '/\babout\s+(\w+)/i',
+            '/\b(?:is there|are there|can i find)\s+(?:any\s+)?(\w+)/i',
+            '/\binfo(?:rmation)?\s+about\s+(\w+)/i',
+            '/\btell me (?:about|the)\s+(\w+)/i',
+        ];
+        
+        $topics = [];
+        foreach ($patterns as $pattern) {
+            if (preg_match($pattern, $msgLower, $matches)) {
+                if (strlen($matches[1]) >= 3) {
+                    $topics[] = $matches[1];
+                }
+            }
+        }
+        
+        if (empty($topics)) {
+            // Look for known keywords in the message
+            $keywords = ['alumni', 'event', 'events', 'news', 'scholarship', 'scholarships', 'certificate', 'certificates', 'profile', 'profiles', 'course', 'courses', 'result', 'results', 'fee', 'fees', 'benefit', 'benefits', 'story', 'stories'];
+            foreach ($keywords as $kw) {
+                if (str_contains($msgLower, $kw)) {
+                    $topics[] = $kw;
+                }
+            }
+        }
+        
+        if (empty($topics)) {
+            // Fall back to extracting significant words
+            $words = preg_split('/\s+/', $msgLower);
+            $stopWords = ['where', 'can', 'find', 'get', 'look', 'show', 'list', 'tell', 'know', 'want', 'need', 'help', 'give', 'me', 'i', 'is', 'are', 'was', 'were', 'has', 'have', 'had', 'do', 'does', 'did', 'will', 'would', 'could', 'should', 'what', 'how', 'why', 'there', 'here', 'this', 'that', 'with', 'from', 'your', 'you', 'for', 'about', 'any'];
             foreach ($words as $w) {
-                if (strlen($w) >= 4 && !in_array($w, $stopWords)) {
-                    $topic = $w;
-                    break;
+                $clean = preg_replace('/[^a-z]/', '', $w);
+                if (strlen($clean) >= 4 && !in_array($clean, $stopWords)) {
+                    $topics[] = $clean;
+                    if (count($topics) >= 2) break;
                 }
             }
         }
         
-        if (empty($topic) || strlen($topic) < 3) {
+        if (empty($topics)) {
             return [];
         }
-
-        $prompt = "List 5 synonyms for: {$topic}. Return ONLY JSON array like: [\"word1\",\"word2\"]";
-
-        $response = $this->callOllama([
-            ['role' => 'system', 'content' => 'Return only valid JSON.'],
-            ['role' => 'user', 'content' => $prompt],
-        ]);
-
-        $json = $this->extractJson($response['content'] ?? '');
-        $terms = is_array($json) ? array_values($json) : [];
         
-        $first = explode(' ', $topic)[0];
-        if (strlen($first) >= 3) {
-            $terms[] = strtolower($first);
+        $topic = $topics[0];
+        
+        // Build search terms including the original topic
+        $terms = array_filter([strtolower($topic)], fn($t) => strlen($t) >= 3);
+        
+        // Add common variations
+        $terms[] = strtolower($topic);
+        if (str_ends_with($topic, 's')) {
+            $terms[] = rtrim($topic, 's');
+        } else {
+            $terms[] = $topic . 's';
         }
-
-        return $terms;
+        
+        return array_values(array_unique($terms));
     }
 
     protected function findBestRouteWithTerms(array $routes, array $terms): ?string
@@ -872,10 +1165,10 @@ Remember: You understand this project's structure from the analysis done during
 PROMPT;
     }
 
-    protected function callOllama(array $messages): array
+    protected function callOllama(array $messages, int $timeout = 120): array
     {
         try {
-            $response = Http::timeout(120)->post("{$this->ollamaUrl}/api/chat", [
+            $response = Http::timeout($timeout)->post("{$this->ollamaUrl}/api/chat", [
                 'model' => $this->model,
                 'messages' => $messages,
                 'stream' => false,
@@ -887,7 +1180,7 @@ PROMPT;
 
             return ['content' => $response->json()['message']['content'] ?? 'No response'];
         } catch (\Exception $e) {
-            return ['content' => 'AI service unavailable: ' . $e->getMessage()];
+            throw new \Exception('AI service unavailable: ' . $e->getMessage());
         }
     }
 

package/src/Services/NavigationTree.php

@@ -2,17 +2,22 @@
 
 namespace Lwazi\Core\Services;
 
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Config;
+
 class NavigationTree
 {
     protected array $tree = [];
-    protected array $synonyms = [];
     protected array $flatIndex = [];
-    protected array $synonymUsage = [];
     protected ?TokenizerService $tokenizer = null;
     protected array $stemmedIndex = [];
+    protected string $ollamaUrl;
+    protected string $model;
 
     public function __construct()
     {
+        $this->ollamaUrl = config('lwazi.ollama_url', 'http://localhost:11434');
+        $this->model = config('lwazi.model', 'llama3.2:1b');
     }
 
     protected function getTokenizer(): TokenizerService
@@ -23,47 +28,6 @@ class NavigationTree
         return $this->tokenizer;
     }
 
-    protected function loadDefaultSynonyms(): void
-    {
-        $this->synonyms = [
-            'jobs' => [
-                'job',
-                'job posting',
-                'vacancy',
-                'vacancies',
-                'employment',
-                'career',
-                'careers',
-                'position',
-                'positions',
-                'work',
-            ],
-            'about' => ['about us', 'information', 'who we are', 'our story'],
-            'contact' => ['contact us', 'reach us', 'get in touch', 'support', 'help'],
-            'home' => ['homepage', 'main page', 'landing', 'start'],
-            'login' => ['sign in', 'log in', 'sign on', 'authenticate'],
-            'register' => ['sign up', 'sign on', 'create account', 'join'],
-            'profile' => ['account', 'my account', 'settings', 'preferences'],
-            'dashboard' => ['panel', 'control panel', 'home'],
-            'search' => ['find', 'lookup', 'browse', 'filter'],
-            'admin' => ['administration', 'manage', 'management', 'backend'],
-            'list' => ['lists', 'listing', 'all', 'view all', 'browse'],
-            'create' => ['add', 'new', 'add new', 'submit'],
-            'edit' => ['update', 'modify', 'change', 'alter'],
-            'delete' => ['remove', 'destroy', 'drop'],
-            'show' => ['view', 'display', 'detail', 'details'],
-            'store' => ['save', 'persist', 'create'],
-            'news' => ['news', 'updates', 'announcements', 'blog', 'articles', 'events'],
-            'gallery' => ['photos', 'images', 'pictures', 'media'],
-            'faq' => ['questions', 'help', 'support', 'answers', 'guide'],
-            'terms' => ['terms', 'conditions', 'terms of service', 'legal'],
-            'privacy' => ['privacy policy', 'privacy', 'data protection'],
-            'result' => ['grade', 'score', 'mark', 'outcome', 'status', 'academic record', 'transcript', 'performance'],
-            'passed' => ['success', 'approved', 'qualified', 'cleared', 'completed'],
-            'failed' => ['unsuccessful', 'rejected', 'not qualified', 'failed', 'not passed'],
-        ];
-    }
-
     public function buildFromPages(array $pages): void
     {
         $this->tree = [];
@@ -234,12 +198,10 @@ class NavigationTree
             return null;
         }
 
-        $expandedTokens = $this->expandWithSynonyms($queryTokens);
-
         $candidates = [];
 
         foreach ($this->flatIndex as $path => $entry) {
-            $score = $this->scoreMatch($entry, $queryNormalized, $queryTokens, $expandedTokens);
+            $score = $this->scoreMatch($entry, $queryNormalized, $queryTokens);
             if ($score > 0) {
                 $candidates[] = [
                     'path' => $path,
@@ -251,6 +213,26 @@ class NavigationTree
 
         usort($candidates, fn($a, $b) => $b['score'] <=> $a['score']);
 
+        if (empty($candidates) || $candidates[0]['score'] < 15) {
+            $llmSynonyms = $this->generateSynonymsWithLLM($query);
+            if (!empty($llmSynonyms)) {
+                $allTokens = array_unique(array_merge($queryTokens, $llmSynonyms));
+                
+                foreach ($this->flatIndex as $path => $entry) {
+                    $score = $this->scoreMatch($entry, $queryNormalized, $allTokens);
+                    if ($score > 0) {
+                        $candidates[] = [
+                            'path' => $path,
+                            'label' => $entry['label'],
+                            'score' => $score,
+                        ];
+                    }
+                }
+                
+                usort($candidates, fn($a, $b) => $b['score'] <=> $a['score']);
+            }
+        }
+
         if (empty($candidates) || $candidates[0]['score'] < 15) {
             return null;
         }
@@ -261,9 +243,60 @@ class NavigationTree
     public function searchTree(string $query): ?array
     {
         $queryTokens = $this->tokenize($query);
-        $expandedTokens = $this->expandWithSynonyms($queryTokens);
+        
+        $result = $this->searchTreeRecursive($this->tree, $queryTokens, $queryTokens);
+        
+        if ($result && $result['score'] >= 15) {
+            return $result;
+        }
+        
+        $llmSynonyms = $this->generateSynonymsWithLLM($query);
+        if (!empty($llmSynonyms)) {
+            $allTokens = array_unique(array_merge($queryTokens, $llmSynonyms));
+            $result = $this->searchTreeRecursive($this->tree, $allTokens, $queryTokens);
+            if ($result) {
+                return $result;
+            }
+        }
+        
+        return $result;
+    }
 
-        return $this->searchTreeRecursive($this->tree, $expandedTokens, $queryTokens);
+    protected function generateSynonymsWithLLM(string $query): array
+    {
+        try {
+            $response = Http::timeout(30)->post("{$this->ollamaUrl}/api/chat", [
+                'model' => $this->model,
+                'messages' => [
+                    [
+                        'role' => 'system',
+                        'content' => 'You are a website navigation assistant. Generate synonyms to help find pages on a website.'
+                    ],
+                    [
+                        'role' => 'user',
+                        'content' => "Generate 10 synonyms, related terms, and variations for searching this website query: \"{$query}\". Return ONLY a JSON array of strings like: [\"synonym1\", \"synonym2\"]"
+                    ]
+                ],
+                'stream' => false,
+            ]);
+
+            if (!$response->successful()) {
+                return [];
+            }
+
+            $content = $response->json()['message']['content'] ?? '';
+            
+            if (preg_match('/\[[\s\S]*\]/', $content, $matches)) {
+                $synonyms = json_decode($matches[0], true);
+                if (is_array($synonyms)) {
+                    return array_map(fn($s) => $this->normalizeText($s), $synonyms);
+                }
+            }
+        } catch (\Exception $e) {
+            error_log('NavigationTree LLM synonym generation failed: ' . $e->getMessage());
+        }
+        
+        return [];
     }
 
     protected function searchTreeRecursive(
@@ -337,7 +370,7 @@ class NavigationTree
         array $entry,
         string $queryNormalized,
         array $queryTokens,
-        array $expandedTokens,
+        array $expandedTokens = [],
     ): int {
         $score = 0;
         $labelNormalized = $entry['normalizedLabel'] ?? $this->normalizeText($entry['label'] ?? '');
@@ -364,22 +397,6 @@ class NavigationTree
         return $score;
     }
 
-    protected function expandWithSynonyms(array $tokens): array
-    {
-        $expanded = $tokens;
-
-        foreach ($tokens as $token) {
-            foreach ($this->synonyms as $key => $syns) {
-                if ($token === $key || in_array($token, $syns, true)) {
-                    $expanded = array_merge($expanded, $syns);
-                    break;
-                }
-            }
-        }
-
-        return array_unique($expanded);
-    }
-
     protected function fuzzyMatch(string $a, string $b): bool
     {
         $a = strtolower($a);
@@ -389,6 +406,13 @@ class NavigationTree
             return true;
         }
 
+        if (str_contains($a, $b) || str_contains($b, $a)) {
+            $minLen = min(strlen($a), strlen($b));
+            if ($minLen > 0 && abs(strlen($a) - strlen($b)) <= 2) {
+                return true;
+            }
+        }
+
         $commonPrefix = 0;
         $minLen = min(strlen($a), strlen($b));
         for ($i = 0; $i < $minLen; $i++) {
@@ -399,7 +423,7 @@ class NavigationTree
             }
         }
 
-        if ($commonPrefix < 3) {
+        if ($commonPrefix < 2) {
             return false;
         }
 
@@ -409,7 +433,11 @@ class NavigationTree
             return false;
         }
 
-        return $lev / $maxLen < 0.2;
+        if ($maxLen < 5 && $lev <= 1) {
+            return true;
+        }
+
+        return $lev / $maxLen < 0.35;
     }
 
     protected function normalizeText(string $text): string
@@ -480,43 +508,6 @@ class NavigationTree
         return $this->flatIndex;
     }
 
-    public function recordSynonymUsage(array $keywords): void
-    {
-        foreach ($keywords as $keyword) {
-            $key = strtolower(trim($keyword));
-            if (!isset($this->synonymUsage[$key])) {
-                $this->synonymUsage[$key] = 0;
-            }
-            $this->synonymUsage[$key]++;
-        }
-    }
-
-    public function getTopSynonyms(int $limit = 20): array
-    {
-        arsort($this->synonymUsage);
-        return array_slice($this->synonymUsage, 0, $limit, true);
-    }
-
-    public function saveSynonymCache(string $path): void
-    {
-        $data = [
-            'synonym_usage' => $this->synonymUsage,
-            'saved_at' => date('c'),
-        ];
-        if (!is_dir(dirname($path))) {
-            mkdir(dirname($path), 0755, true);
-        }
-        file_put_contents($path, json_encode($data, JSON_PRETTY_PRINT));
-    }
-
-    public function loadSynonymCache(string $path): void
-    {
-        if (file_exists($path)) {
-            $data = json_decode(file_get_contents($path), true);
-            $this->synonymUsage = $data['synonym_usage'] ?? [];
-        }
-    }
-
     public function buildStemmedIndex(): void
     {
         $tokenizer = $this->getTokenizer();
@@ -576,7 +567,6 @@ class NavigationTree
         return [
             'tree' => $this->tree,
             'flat' => $this->flatIndex,
-            'synonyms' => $this->synonyms,
             'stemmed' => $this->stemmedIndex,
         ];
     }
@@ -586,7 +576,6 @@ class NavigationTree
         $instance = new self();
         $instance->tree = $data['tree'] ?? [];
         $instance->flatIndex = $data['flat'] ?? [];
-        $instance->synonyms = $data['synonyms'] ?? $instance->synonyms;
         $instance->stemmedIndex = $data['stemmed'] ?? [];
         return $instance;
     }