npm - lwazi - Versions diffs - 1.8.3 → 1.8.5 - Mend

lwazi 1.8.3 → 1.8.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/package.json +1 -1
package/src/Console/AnalyzeProjectCommand.php +1 -1
package/src/Console/BuildContentIndexCommand.php +84 -0
package/src/Console/SetupCommand.php +1 -1
package/src/Installer/ProjectAnalyzer.php +15 -1
package/src/Providers/LwaziServiceProvider.php +2 -0
package/src/Services/ContentIndexer.php +30 -6
package/src/Services/KnowledgeBaseGenerator.php +16 -1
package/src/Services/LwaziService.php +311 -49
package/src/Services/NavigationTree.php +43 -5

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "lwazi",
-  "version": "1.8.3",
+  "version": "1.8.5",
   "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": {

package/src/Console/AnalyzeProjectCommand.php CHANGED Viewed

@@ -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/BuildContentIndexCommand.php ADDED Viewed

@@ -0,0 +1,84 @@
+<?php
+namespace Lwazi\Core\Console;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\File;
+use Lwazi\Core\Services\ContentIndexer;
+class BuildContentIndexCommand extends Command
+{
+    protected $signature = 'lwazi:build-content-index';
+    protected $description = 'Build content index from blade files for website search';
+    public function handle(): int
+    {
+        $this->info('Building content index from blade files...');
+        $viewsPath = resource_path('views');
+        if (!is_dir($viewsPath)) {
+            $this->error('Views directory not found');
+            return Command::FAILURE;
+        }
+        $indexer = new ContentIndexer();
+        $this->indexBladeFiles($viewsPath, $indexer);
+        $docCount = $indexer->getDocumentCount();
+        $this->info('Indexed ' . $docCount . ' pages');
+        $data = $indexer->toArray();
+        $data['generated_at'] = now()->toIso8601String();
+        $path = storage_path('lwazi/content_index.json');
+        if (!is_dir(dirname($path))) {
+            mkdir(dirname($path), 0755, true);
+        }
+        file_put_contents($path, json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+        $this->info("Content index saved to: {$path}");
+        return Command::SUCCESS;
+    }
+    protected function indexBladeFiles(string $path, ContentIndexer $indexer): void
+    {
+        $files = File::allFiles($path);
+        foreach ($files as $file) {
+            $ext = $file->getExtension();
+            if ($ext !== 'blade.php' && $ext !== 'php') {
+                continue;
+            }
+            $filePath = $file->getPathname();
+            $relativePath = str_replace($path . '/', '', $filePath);
+            if (str_contains($relativePath, 'admin/') || str_contains($relativePath, '/admin.')) {
+                continue;
+            }
+            $content = File::get($filePath);
+            $content = preg_replace('/@php.*?@endphp/s', '', $content);
+            $content = preg_replace('/@section.*?@endsection/s', '', $content);
+            $content = preg_replace('/@yield.*?(?=\s|$)/', '', $content);
+            $content = preg_replace('/\{\{.*?\}\}/', '', $content);
+            $content = preg_replace('/\{!!.*?!!\}/', '', $content);
+            $content = strip_tags($content);
+            $content = preg_replace('/\s+/', ' ', $content);
+            $content = trim($content);
+            if (strlen($content) < 20) {
+                continue;
+            }
+            $pathName = '/' . str_replace(['.blade.php', '.php', '/'], ['', '', '-'], $relativePath);
+            $pathName = preg_replace('/-+/', '-', $pathName);
+            $pathName = rtrim($pathName, '-') ?: '/';
+            $indexer->indexPage($pathName, '<html><body><p>' . $content . '</p></body></html>');
+        }
+    }
+}

package/src/Console/SetupCommand.php CHANGED Viewed

@@ -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/ProjectAnalyzer.php CHANGED Viewed

@@ -338,8 +338,22 @@ class ProjectAnalyzer
         $pages = $this->knowledge['pages'] ?? [];
         $routes = $this->knowledge['routes'] ?? [];
+        $publicRoutes = array_filter($routes, function($r) {
+            $uri = $r['uri'] ?? '';
+            $name = $r['name'] ?? '';
+            if (str_starts_with($uri, '/admin') || str_starts_with($uri, '/api') || str_starts_with($uri, '/_')) {
+                return false;
+            }
+            if ($name && (str_starts_with($name, 'admin.') || str_starts_with($name, 'api.'))) {
+                return false;
+            }
+            return true;
+        });
         $tree->buildFromPages($pages);
-        $tree->buildFromRoutes($routes);
+        $tree->buildFromRoutes(array_values($publicRoutes));
         $this->knowledge['navigation_tree'] = $tree->toArray();

package/src/Providers/LwaziServiceProvider.php CHANGED Viewed

@@ -13,6 +13,7 @@ use Lwazi\Core\Services\LwaziAgent;
 use Lwazi\Core\Console\AnalyzeProjectCommand;
 use Lwazi\Core\Console\LwaziIngestCommand;
 use Lwazi\Core\Console\SetupCommand;
+use Lwazi\Core\Console\BuildContentIndexCommand;
 use Lwazi\Core\Http\Middleware\InjectLwaziChat;
 class LwaziServiceProvider extends ServiceProvider
@@ -36,6 +37,7 @@ class LwaziServiceProvider extends ServiceProvider
                 AnalyzeProjectCommand::class,
                 SetupCommand::class,
                 LwaziIngestCommand::class,
+                BuildContentIndexCommand::class,
             ]);
         }
     }

package/src/Services/ContentIndexer.php CHANGED Viewed

@@ -184,13 +184,31 @@ class ContentIndexer
     protected function generateSnippet(array $doc, array $terms): string
     {
-        $text = implode(' ', $doc['paragraphs'] ?? []);
+        if (!is_array($doc)) {
+            return '';
+        }
+        $paragraphs = $doc['paragraphs'] ?? null;
+        $text = '';
-        if (empty($text)) {
-            $text = implode(' ', $doc['lists'] ?? []);
+        if (is_array($paragraphs) && count($paragraphs) > 0) {
+            $first = $paragraphs[0];
+            if (is_string($first)) {
+                $text = implode(' ', $paragraphs);
+            }
         }
-        if (empty($text)) {
+        if ($text === '') {
+            $lists = $doc['lists'] ?? null;
+            if (is_array($lists) && count($lists) > 0) {
+                $first = $lists[0];
+                if (is_string($first)) {
+                    $text = implode(' ', $lists);
+                }
+            }
+        }
+        if ($text === '' || !is_string($text)) {
             return '';
         }
@@ -199,6 +217,7 @@ class ContentIndexer
         $bestLen = PHP_INT_MAX;
         foreach ($terms as $term) {
+            if (!is_string($term)) continue;
             $term = strtolower($term);
             $pos = strpos($text, $term);
             if ($pos !== false && $pos < $bestLen) {
@@ -218,9 +237,9 @@ class ContentIndexer
             $snippet = '...' . $snippet;
         }
-        $snippet = preg_replace('/\s+/', ' ', $snippet);
+        $snippet = preg_replace('/\s+/', ' ', $snippet ?? '');
-        return trim($snippet) . '...';
+        return (is_string($snippet) ? trim($snippet) : '') . '...';
     }
     public function toArray(): array
@@ -233,6 +252,11 @@ class ContentIndexer
         ];
     }
+    public function getDocumentCount(): int
+    {
+        return $this->totalDocuments;
+    }
     public static function fromArray(array $data): self
     {
         $indexer = new self();

package/src/Services/KnowledgeBaseGenerator.php CHANGED Viewed

@@ -50,8 +50,23 @@ class KnowledgeBaseGenerator
     protected function buildNavigationTree(array $pages, array $routes): array
     {
         $tree = new NavigationTree();
+        $publicRoutes = array_filter($routes, function($r) {
+            $uri = $r['uri'] ?? '';
+            $name = $r['name'] ?? '';
+            if (str_starts_with($uri, '/admin') || str_starts_with($uri, '/api') || str_starts_with($uri, '/_')) {
+                return false;
+            }
+            if ($name && (str_starts_with($name, 'admin.') || str_starts_with($name, 'api.'))) {
+                return false;
+            }
+            return true;
+        });
         $tree->buildFromPages($pages);
-        $tree->buildFromRoutes($routes);
+        $tree->buildFromRoutes(array_values($publicRoutes));
         return $tree->toArray();
     }

package/src/Services/LwaziService.php CHANGED Viewed

@@ -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);
@@ -45,7 +52,7 @@ class LwaziService
         $this->conversationHistory[] = ['role' => 'user', 'content' => $message];
-        if ($this->looksLikeNavigationQuery($message)) {
+        if ($this->looksLikeNavigationQuery($message) && !$this->looksLikeDataQuery($message)) {
             error_log('Lwazi: looks like navigation query');
             $nav = $this->findNavigationAnswer($message);
             if ($nav) {
@@ -53,11 +60,10 @@ class LwaziService
                 $this->conversationHistory[] = ['role' => 'assistant', 'content' => $nav];
                 return $nav;
             }
-            $fallback = $this->navigationFallbackWithLLM($message);
-            if ($fallback) {
-                error_log('Lwazi: found fallback: ' . $fallback);
-                $this->conversationHistory[] = ['role' => 'assistant', 'content' => $fallback];
-                return $fallback;
+            $contentResponse = $this->searchContent($message);
+            if ($contentResponse) {
+                $this->conversationHistory[] = ['role' => 'assistant', 'content' => $contentResponse];
+                return $contentResponse;
             }
         }
@@ -70,30 +76,53 @@ class LwaziService
                 $this->conversationHistory[] = ['role' => 'assistant', 'content' => $nav];
                 return $nav;
             }
-            $fallback = $this->navigationFallbackWithLLM($message);
-            if ($fallback) {
-                $this->conversationHistory[] = ['role' => 'assistant', 'content' => $fallback];
-                return $fallback;
+            $contentResponse = $this->searchContent($message);
+            if ($contentResponse) {
+                $this->conversationHistory[] = ['role' => 'assistant', 'content' => $contentResponse];
+                return $contentResponse;
             }
+            return "I couldn't find a page matching that. Could you try a different question?";
         }
-        if ($intent === 'content' || $intent === 'navigation') {
+        if ($intent === 'content') {
             $contentResponse = $this->searchContent($message);
             if ($contentResponse) {
                 $this->conversationHistory[] = ['role' => 'assistant', 'content' => $contentResponse];
                 return $contentResponse;
             }
+            return "I couldn't find information about that. Could you try a different question?";
         }
-        if ($intent === 'navigation') {
-            $nav = $this->navigationFallbackWithLLM($message);
-            if ($nav) {
-                $this->conversationHistory[] = ['role' => 'assistant', 'content' => $nav];
-                return $nav;
+        if ($intent === 'data') {
+            $dataResponse = $this->fetchRelevantData($message);
+            if ($dataResponse) {
+                $this->conversationHistory[] = ['role' => 'assistant', 'content' => $dataResponse];
+                return $dataResponse;
             }
+            $contentResponse = $this->searchContent($message);
+            if ($contentResponse) {
+                $this->conversationHistory[] = ['role' => 'assistant', 'content' => $contentResponse];
+                return $contentResponse;
+            }
+            return "I couldn't find information about that. Could you try a different question?";
         }
-        if ($intent === 'content') {
+        // 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];
@@ -101,7 +130,7 @@ class LwaziService
             }
         }
-        if ($intent === 'data') {
+        if ($intent === null && $this->currentContextId) {
             $dataResponse = $this->fetchRelevantData($message);
             if ($dataResponse) {
                 $this->conversationHistory[] = ['role' => 'assistant', 'content' => $dataResponse];
@@ -109,6 +138,22 @@ class LwaziService
             }
         }
+        // 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;
+            }
+        }
         $prompt = $this->buildPrompt();
         $messages = array_merge(
             [['role' => 'system', 'content' => $prompt]],
@@ -123,16 +168,35 @@ class LwaziService
     protected function selectIntentWithLLM(string $message): ?string
     {
-        if ($this->looksLikeNavigationQuery($message)) {
+        if ($this->looksLikeDataQuery($message)) {
+            return 'data';
+        }
+        if ($this->isGeneralWebsiteQuery($message)) {
+            return 'general';
+        }
+        if ($this->looksLikeNavigationQuery($message) && !$this->looksLikeContentQuery($message)) {
             return 'navigation';
         }
+        $msgLower = strtolower($message);
+        if (preg_match('/\b(is there|are there|do i have|can i find|show me|find|get|list|what.*contain|information about|info about)\b/i', $message)) {
+            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 page or link\n" .
-            "- content: user is asking for information that might be on a page (not data)\n" .
-            "- data: user wants to query database records\n" .
-            "- general: casual conversation\n\n" .
+            "- navigation: user wants to find a specific page or link (where, which page, how do i get to)\n" .
+            "- content: user is asking for information that might be on a webpage, NOT database data (is there, are there, show me, what does X contain)\n" .
+            "- data: user explicitly wants to query database records about their own data (my data, my records, my account)\n" .
+            "- general: casual conversation, greetings\n\n" .
             "QUESTION:\n" .
             $message;
@@ -155,6 +219,95 @@ class LwaziService
         return null;
     }
+    protected function looksLikeDataQuery(string $message): bool
+    {
+        $msgLower = strtolower($message);
+        $personalPatterns = [
+            '/\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) {
+            if (preg_match($pattern, $msgLower)) {
+                return true;
+            }
+        }
+        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',
+        ];
+        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(
+            '/\b(is there|are there|can i find|show me|what.*contain|information about|passed|failed|grade|result|score|check if)\b/i',
+            $message
+        );
+    }
+    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(
@@ -276,54 +429,157 @@ class LwaziService
         $response = "I found some relevant information:\n\n";
         foreach ($results as $result) {
-            $response .= "**{$result['title']}**\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);
+            $response .= "**{$title}**\n";
             $response .= "{$result['snippet']}\n";
-            $response .= "[Read more]({$result['url']})\n\n";
+            $response .= "[View page]({$url})\n\n";
         }
         return $response;
     }
+    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;
+        }
+        // Get a few random pages to suggest
+        $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
     {
+        $filtered = array_filter($routes, function($r) {
+            $uri = $r['uri'] ?? '';
+            if (str_starts_with($uri, '/admin') || str_starts_with($uri, '/api') || str_starts_with($uri, '/_')) {
+                return false;
+            }
+            return true;
+        });
+        $routes = array_values($filtered);
+        if (empty($routes)) {
+            return null;
+        }
         $scored = [];
         $termSet = array_filter(array_map('strtolower', array_map('trim', $terms)), fn($t) => strlen($t) >= 3);
@@ -593,6 +849,12 @@ class LwaziService
     protected function fetchRelevantData(string $message): ?string
     {
+        if ($this->isPersonalQuery($message) && empty($this->currentContextId)) {
+            $context = $this->ragService->getContextConfig();
+            $contextParam = $context['param'] ?? config('lwazi.context_param', 'context_id');
+            return "I can look that up for you, but I need your {$contextParam} to access your personal information.";
+        }
         $fieldInfo = $this->selectFieldWithLLM($message) ?: $this->ragService->findFieldForQuery($message);
         if ($fieldInfo) {

package/src/Services/NavigationTree.php CHANGED Viewed

@@ -126,6 +126,10 @@ class NavigationTree
         $heading = $page['heading'] ?? '';
         $links = $page['links'] ?? [];
+        if (preg_match('#/admin/#', $file) || preg_match('#/admin\.blade\.php$#', $file)) {
+            return;
+        }
         $labels = array_filter([$title, $heading]);
         $primaryLabel = reset($labels) ?: basename($file, '.blade.php');
@@ -137,6 +141,10 @@ class NavigationTree
                 continue;
             }
+            if (str_starts_with($href, '/admin') || str_starts_with($href, '/api') || str_starts_with($href, '/_')) {
+                continue;
+            }
             $this->addPath($href, $text, $primaryLabel);
         }
     }
@@ -221,6 +229,11 @@ class NavigationTree
     {
         $queryNormalized = $this->normalizeText($query);
         $queryTokens = $this->tokenize($query);
+        if (count($queryTokens) === 0) {
+            return null;
+        }
         $expandedTokens = $this->expandWithSynonyms($queryTokens);
         $candidates = [];
@@ -238,7 +251,11 @@ class NavigationTree
         usort($candidates, fn($a, $b) => $b['score'] <=> $a['score']);
-        return $candidates[0] ?? null;
+        if (empty($candidates) || $candidates[0]['score'] < 15) {
+            return null;
+        }
+        return $candidates[0];
     }
     public function searchTree(string $query): ?array
@@ -326,16 +343,19 @@ class NavigationTree
         $labelNormalized = $entry['normalizedLabel'] ?? $this->normalizeText($entry['label'] ?? '');
         foreach ($queryTokens as $token) {
+            if (strlen($token) < 3) continue;
             if ($token === $labelNormalized) {
                 $score += 20;
-            } elseif (str_contains($labelNormalized, $token)) {
+            } elseif (strlen($token) >= 4 && str_contains($labelNormalized, $token)) {
                 $score += 10;
-            } elseif ($this->fuzzyMatch($labelNormalized, $token)) {
+            } elseif (strlen($token) >= 4 && $this->fuzzyMatch($labelNormalized, $token)) {
                 $score += 15;
             }
         }
         foreach ($expandedTokens as $token) {
+            if (strlen($token) < 4) continue;
             if (str_contains($labelNormalized, $token)) {
                 $score += 5;
             }
@@ -369,13 +389,27 @@ class NavigationTree
             return true;
         }
+        $commonPrefix = 0;
+        $minLen = min(strlen($a), strlen($b));
+        for ($i = 0; $i < $minLen; $i++) {
+            if ($a[$i] === $b[$i]) {
+                $commonPrefix++;
+            } else {
+                break;
+            }
+        }
+        if ($commonPrefix < 3) {
+            return false;
+        }
         $lev = levenshtein($a, $b);
         $maxLen = max(strlen($a), strlen($b));
         if ($maxLen === 0) {
             return false;
         }
-        return $lev / $maxLen < 0.3;
+        return $lev / $maxLen < 0.2;
     }
     protected function normalizeText(string $text): string
@@ -506,6 +540,10 @@ class NavigationTree
         $queryStems = $tokenizer->tokenizeAndStem($query);
         $queryStems = $tokenizer->removeStopWords($queryStems);
+        if (count($queryStems) === 0) {
+            return null;
+        }
         $candidates = [];
         foreach ($this->stemmedIndex as $path => $stems) {
@@ -525,7 +563,7 @@ class NavigationTree
             }
         }
-        if (empty($candidates)) {
+        if (empty($candidates) || $candidates[0]['score'] < 2) {
             return null;
         }