sonance-brand-mcp 1.3.105 → 1.3.107

package/dist/assets/api/sonance-vision-apply/route.ts

@@ -624,6 +624,52 @@ function findElementLineInFile(
     }
   }
   
+  // ========== FALLBACK MATCHING (for non-Sonance codebases) ==========
+  // These are lower confidence but help find elements in ANY codebase
+  
+  // FALLBACK 1: Flexible text search (just find the text anywhere)
+  if (focusedElement.textContent && focusedElement.textContent.trim().length > 5) {
+    const searchText = focusedElement.textContent.trim().substring(0, 30);
+    for (let i = 0; i < lines.length; i++) {
+      if (lines[i].includes(searchText)) {
+        debugLog("Fallback: Flexible text match found", { searchText, lineNumber: i + 1 });
+        return {
+          lineNumber: i + 1,
+          snippet: lines.slice(Math.max(0, i - 3), i + 5).join('\n'),
+          confidence: 'low',
+          matchedBy: `flexible text match "${searchText}${focusedElement.textContent.length > 30 ? '...' : ''}"`
+        };
+      }
+    }
+  }
+  
+  // FALLBACK 2: Class fingerprint (use first few classes as unique identifier)
+  if (focusedElement.className && focusedElement.className.trim().length > 15) {
+    // Take first 2-3 distinctive classes as a fingerprint
+    const classes = focusedElement.className.trim().split(/\s+/);
+    // Filter out very common single-word utilities
+    const distinctiveClasses = classes.filter(c => 
+      c.length > 4 && !['flex', 'grid', 'block', 'hidden', 'relative', 'absolute'].includes(c)
+    ).slice(0, 3);
+    
+    if (distinctiveClasses.length >= 2) {
+      const fingerprint = distinctiveClasses.join(' ');
+      for (let i = 0; i < lines.length; i++) {
+        // Check if line contains ALL fingerprint classes
+        const lineHasAll = distinctiveClasses.every(cls => lines[i].includes(cls));
+        if (lineHasAll) {
+          debugLog("Fallback: Class fingerprint match found", { fingerprint, lineNumber: i + 1 });
+          return {
+            lineNumber: i + 1,
+            snippet: lines.slice(Math.max(0, i - 3), i + 5).join('\n'),
+            confidence: 'low',
+            matchedBy: `class fingerprint "${fingerprint}"`
+          };
+        }
+      }
+    }
+  }
+  
   return null;
 }
 
@@ -655,9 +701,14 @@ function scoreFilesForTextContent(
     filesCount: importedFiles.length
   });
   
-  // Only search component files (where JSX text lives)
+  // Search component files and page files (where JSX text lives)
+  // Expanded to work with ANY codebase structure
   const componentFiles = importedFiles.filter(f => 
-    f.path.includes('components/') || f.path.includes('/ui/')
+    f.path.includes('components/') || 
+    f.path.includes('/ui/') || 
+    f.path.includes('/_components/') ||
+    f.path.endsWith('.tsx') ||
+    f.path.endsWith('.jsx')
   );
   
   const results: { path: string; content: string; score: number; matchedTexts: string[]; firstMatchLine: number }[] = [];
@@ -753,19 +804,42 @@ function findElementInImportedFiles(
   const routeName = pageDir.split('/').pop() || ''; // e.g., "typography"
   
   for (const file of importedFiles) {
-    // Focus on component files (where UI elements live)
+    // Focus on component/page files (where UI elements live)
     // Skip types, stores, utils, hooks - they don't contain JSX elements
-    if (!file.path.includes('components/') && !file.path.includes('/ui/') && !file.path.includes('/_components/')) continue;
+    // Expanded to work with ANY codebase structure
+    const isComponentFile = 
+      file.path.includes('components/') || 
+      file.path.includes('/ui/') || 
+      file.path.includes('/_components/') ||
+      file.path.endsWith('.tsx') ||
+      file.path.endsWith('.jsx');
+    
+    // Skip non-component files but allow page files
+    if (!isComponentFile) continue;
+    
+    // Skip known non-UI files
+    if (file.path.includes('/types') || 
+        file.path.includes('/hooks/') || 
+        file.path.includes('/utils/') || 
+        file.path.includes('/lib/') ||
+        file.path.includes('.d.ts')) continue;
     
     const result = findElementLineInFile(file.content, focusedElement);
-    if (result && result.confidence !== 'low') {
+    // Accept ALL matches including low confidence - let the scoring decide
+    // Low confidence matches from fallback logic (text/class fingerprint) are still useful
+    if (result) {
       let score = 0;
       
       // Text content match is highest priority (+100)
-      if (result.matchedBy.includes('textContent') || result.matchedBy.includes('word match')) {
+      if (result.matchedBy.includes('textContent') || result.matchedBy.includes('word match') || result.matchedBy.includes('flexible text')) {
         score += 100;
       }
       
+      // Class fingerprint match gets medium score (+60)
+      if (result.matchedBy.includes('class fingerprint')) {
+        score += 60;
+      }
+      
       // Directory proximity - same directory tree as page file (+50)
       // e.g., for page src/app/typography/page.tsx, prefer src/app/typography/_components/
       if (pageDir && file.path.includes(pageDir)) {
@@ -778,8 +852,8 @@ function findElementInImportedFiles(
         score += 30;
       }
       
-      // Confidence bonus
-      score += result.confidence === 'high' ? 20 : 10;
+      // Confidence bonus - low confidence still gets some points
+      score += result.confidence === 'high' ? 30 : result.confidence === 'medium' ? 20 : 5;
       
       matches.push({
         path: file.path,
@@ -2232,9 +2306,25 @@ export async function POST(request: Request) {
       
       let usedContext = 0;
       
+      // ========== PHASE 0 PRIORITY: If Phase 0 found a file, use it directly ==========
+      // Phase 0 is deterministic (ID match) so it should ALWAYS take priority
+      let phase0FileContent: { path: string; content: string } | null = null;
+      if (deterministicMatch) {
+        const fullPath = path.join(projectRoot, deterministicMatch.path);
+        if (fs.existsSync(fullPath)) {
+          const content = fs.readFileSync(fullPath, 'utf-8');
+          phase0FileContent = { path: deterministicMatch.path, content };
+          debugLog("PHASE 0 PRIORITY: Using deterministic match as target file", {
+            path: deterministicMatch.path,
+            lineNumber: deterministicMatch.lineNumber,
+            contentLength: content.length
+          });
+        }
+      }
+      
       // Extract recommended file from component sources (to show first, avoid duplication)
       let recommendedFileContent: { path: string; content: string } | null = null;
-      if (recommendedFile) {
+      if (recommendedFile && !phase0FileContent) {
         // Check componentSources first
         const idx = pageContext.componentSources.findIndex(c => c.path === recommendedFile.path);
         if (idx !== -1) {
@@ -2250,10 +2340,28 @@ export async function POST(request: Request) {
       // ========== FILE REDIRECT LOGIC (runs BEFORE building instructions) ==========
       // This determines the ACTUAL target file by checking for text matches in imported components
       // Must run first so that all subsequent code uses the correct file path
-      let actualTargetFile = recommendedFileContent || (pageContext.pageContent ? { path: pageContext.pageFile, content: pageContext.pageContent } : null);
+      // PHASE 0 FILES SKIP REDIRECT - they're already definitively correct
+      let actualTargetFile = phase0FileContent || recommendedFileContent || (pageContext.pageContent ? { path: pageContext.pageFile, content: pageContext.pageContent } : null);
       let elementLocation: { lineNumber: number; snippet: string; confidence: 'high' | 'medium' | 'low'; matchedBy: string } | null = null;
       
-      if (actualTargetFile && focusedElements && focusedElements.length > 0) {
+      // If Phase 0 succeeded, we already know the exact line - use it directly
+      if (phase0FileContent && deterministicMatch) {
+        const lines = phase0FileContent.content.split('\n');
+        const lineNum = deterministicMatch.lineNumber;
+        elementLocation = {
+          lineNumber: lineNum,
+          snippet: lines.slice(Math.max(0, lineNum - 4), lineNum + 5).join('\n'),
+          confidence: 'high',
+          matchedBy: 'Phase 0 deterministic ID match'
+        };
+        debugLog("PHASE 0: Set element location from deterministic match", {
+          lineNumber: lineNum,
+          confidence: 'high'
+        });
+      }
+      
+      // SKIP REDIRECT LOGIC if Phase 0 already determined the file (it's already correct)
+      if (!phase0FileContent && actualTargetFile && focusedElements && focusedElements.length > 0) {
         const content = actualTargetFile.content;
         
         // Search for focused element in the file using multiple strategies
@@ -2580,7 +2688,7 @@ ${linesWithNumbers}
           path: actualTargetFile.path, 
           lines: targetContent.split('\n').length,
           size: targetContent.length,
-          wasRedirected: actualTargetFile.path !== recommendedFileContent.path
+          wasRedirected: actualTargetFile.path !== recommendedFileContent?.path
         });
       } else if (pageContext.pageContent) {
         // Fallback: use page file if no recommended file

package/dist/assets/api/sonance-vision-edit/route.ts

@@ -620,6 +620,52 @@ function findElementLineInFile(
     }
   }
   
+  // ========== FALLBACK MATCHING (for non-Sonance codebases) ==========
+  // These are lower confidence but help find elements in ANY codebase
+  
+  // FALLBACK 1: Flexible text search (just find the text anywhere)
+  if (focusedElement.textContent && focusedElement.textContent.trim().length > 5) {
+    const searchText = focusedElement.textContent.trim().substring(0, 30);
+    for (let i = 0; i < lines.length; i++) {
+      if (lines[i].includes(searchText)) {
+        debugLog("Fallback: Flexible text match found", { searchText, lineNumber: i + 1 });
+        return {
+          lineNumber: i + 1,
+          snippet: lines.slice(Math.max(0, i - 3), i + 5).join('\n'),
+          confidence: 'low',
+          matchedBy: `flexible text match "${searchText}${focusedElement.textContent.length > 30 ? '...' : ''}"`
+        };
+      }
+    }
+  }
+  
+  // FALLBACK 2: Class fingerprint (use first few classes as unique identifier)
+  if (focusedElement.className && focusedElement.className.trim().length > 15) {
+    // Take first 2-3 distinctive classes as a fingerprint
+    const classes = focusedElement.className.trim().split(/\s+/);
+    // Filter out very common single-word utilities
+    const distinctiveClasses = classes.filter(c => 
+      c.length > 4 && !['flex', 'grid', 'block', 'hidden', 'relative', 'absolute'].includes(c)
+    ).slice(0, 3);
+    
+    if (distinctiveClasses.length >= 2) {
+      const fingerprint = distinctiveClasses.join(' ');
+      for (let i = 0; i < lines.length; i++) {
+        // Check if line contains ALL fingerprint classes
+        const lineHasAll = distinctiveClasses.every(cls => lines[i].includes(cls));
+        if (lineHasAll) {
+          debugLog("Fallback: Class fingerprint match found", { fingerprint, lineNumber: i + 1 });
+          return {
+            lineNumber: i + 1,
+            snippet: lines.slice(Math.max(0, i - 3), i + 5).join('\n'),
+            confidence: 'low',
+            matchedBy: `class fingerprint "${fingerprint}"`
+          };
+        }
+      }
+    }
+  }
+  
   return null;
 }
 
@@ -651,9 +697,14 @@ function scoreFilesForTextContent(
     filesCount: importedFiles.length
   });
   
-  // Only search component files (where JSX text lives)
+  // Search component files and page files (where JSX text lives)
+  // Expanded to work with ANY codebase structure
   const componentFiles = importedFiles.filter(f => 
-    f.path.includes('components/') || f.path.includes('/ui/')
+    f.path.includes('components/') || 
+    f.path.includes('/ui/') || 
+    f.path.includes('/_components/') ||
+    f.path.endsWith('.tsx') ||
+    f.path.endsWith('.jsx')
   );
   
   const results: { path: string; content: string; score: number; matchedTexts: string[]; firstMatchLine: number }[] = [];
@@ -749,19 +800,42 @@ function findElementInImportedFiles(
   const routeName = pageDir.split('/').pop() || ''; // e.g., "typography"
   
   for (const file of importedFiles) {
-    // Focus on component files (where UI elements live)
+    // Focus on component/page files (where UI elements live)
     // Skip types, stores, utils, hooks - they don't contain JSX elements
-    if (!file.path.includes('components/') && !file.path.includes('/ui/') && !file.path.includes('/_components/')) continue;
+    // Expanded to work with ANY codebase structure
+    const isComponentFile = 
+      file.path.includes('components/') || 
+      file.path.includes('/ui/') || 
+      file.path.includes('/_components/') ||
+      file.path.endsWith('.tsx') ||
+      file.path.endsWith('.jsx');
+    
+    // Skip non-component files but allow page files
+    if (!isComponentFile) continue;
+    
+    // Skip known non-UI files
+    if (file.path.includes('/types') || 
+        file.path.includes('/hooks/') || 
+        file.path.includes('/utils/') || 
+        file.path.includes('/lib/') ||
+        file.path.includes('.d.ts')) continue;
     
     const result = findElementLineInFile(file.content, focusedElement);
-    if (result && result.confidence !== 'low') {
+    // Accept ALL matches including low confidence - let the scoring decide
+    // Low confidence matches from fallback logic (text/class fingerprint) are still useful
+    if (result) {
       let score = 0;
       
       // Text content match is highest priority (+100)
-      if (result.matchedBy.includes('textContent') || result.matchedBy.includes('word match')) {
+      if (result.matchedBy.includes('textContent') || result.matchedBy.includes('word match') || result.matchedBy.includes('flexible text')) {
         score += 100;
       }
       
+      // Class fingerprint match gets medium score (+60)
+      if (result.matchedBy.includes('class fingerprint')) {
+        score += 60;
+      }
+      
       // Directory proximity - same directory tree as page file (+50)
       // e.g., for page src/app/typography/page.tsx, prefer src/app/typography/_components/
       if (pageDir && file.path.includes(pageDir)) {
@@ -774,8 +848,8 @@ function findElementInImportedFiles(
         score += 30;
       }
       
-      // Confidence bonus
-      score += result.confidence === 'high' ? 20 : 10;
+      // Confidence bonus - low confidence still gets some points
+      score += result.confidence === 'high' ? 30 : result.confidence === 'medium' ? 20 : 5;
       
       matches.push({
         path: file.path,
@@ -2201,9 +2275,25 @@ export async function POST(request: Request) {
       
       let usedContext = 0;
       
+      // ========== PHASE 0 PRIORITY: If Phase 0 found a file, use it directly ==========
+      // Phase 0 is deterministic (ID match) so it should ALWAYS take priority
+      let phase0FileContent: { path: string; content: string } | null = null;
+      if (deterministicMatch) {
+        const fullPath = path.join(projectRoot, deterministicMatch.path);
+        if (fs.existsSync(fullPath)) {
+          const content = fs.readFileSync(fullPath, 'utf-8');
+          phase0FileContent = { path: deterministicMatch.path, content };
+          debugLog("PHASE 0 PRIORITY: Using deterministic match as target file", {
+            path: deterministicMatch.path,
+            lineNumber: deterministicMatch.lineNumber,
+            contentLength: content.length
+          });
+        }
+      }
+      
       // Extract recommended file from component sources (to show first, avoid duplication)
       let recommendedFileContent: { path: string; content: string } | null = null;
-      if (recommendedFile) {
+      if (recommendedFile && !phase0FileContent) {
         // Check componentSources first
         const idx = pageContext.componentSources.findIndex(c => c.path === recommendedFile.path);
         if (idx !== -1) {
@@ -2219,10 +2309,28 @@ export async function POST(request: Request) {
       // ========== FILE REDIRECT LOGIC (runs BEFORE building instructions) ==========
       // This determines the ACTUAL target file by checking for text matches in imported components
       // Must run first so that all subsequent code uses the correct file path
-      let actualTargetFile = recommendedFileContent || (pageContext.pageContent ? { path: pageContext.pageFile, content: pageContext.pageContent } : null);
+      // PHASE 0 FILES SKIP REDIRECT - they're already definitively correct
+      let actualTargetFile = phase0FileContent || recommendedFileContent || (pageContext.pageContent ? { path: pageContext.pageFile, content: pageContext.pageContent } : null);
       let elementLocation: { lineNumber: number; snippet: string; confidence: 'high' | 'medium' | 'low'; matchedBy: string } | null = null;
       
-      if (actualTargetFile && focusedElements && focusedElements.length > 0) {
+      // If Phase 0 succeeded, we already know the exact line - use it directly
+      if (phase0FileContent && deterministicMatch) {
+        const lines = phase0FileContent.content.split('\n');
+        const lineNum = deterministicMatch.lineNumber;
+        elementLocation = {
+          lineNumber: lineNum,
+          snippet: lines.slice(Math.max(0, lineNum - 4), lineNum + 5).join('\n'),
+          confidence: 'high',
+          matchedBy: 'Phase 0 deterministic ID match'
+        };
+        debugLog("PHASE 0: Set element location from deterministic match", {
+          lineNumber: lineNum,
+          confidence: 'high'
+        });
+      }
+      
+      // SKIP REDIRECT LOGIC if Phase 0 already determined the file (it's already correct)
+      if (!phase0FileContent && actualTargetFile && focusedElements && focusedElements.length > 0) {
         const content = actualTargetFile.content;
         
         // Search for focused element in the file using multiple strategies

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sonance-brand-mcp",
-  "version": "1.3.105",
+  "version": "1.3.107",
   "description": "MCP Server for Sonance Brand Guidelines and Component Library - gives Claude instant access to brand colors, typography, and UI components.",
   "main": "dist/index.js",
   "type": "module",