sonance-brand-mcp 1.3.96 → 1.3.97

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

@@ -524,14 +524,23 @@ function findElementLineInFile(
  * Example: "What's the essence of this process?" might be in EssenceTab.tsx
  * but the parent QuickAddProcessModal.tsx was selected by Phase 2a.
  */
-function findTextInImportedFiles(
-  textContent: string,
+/**
+ * Score imported files by how many discovered text strings they contain.
+ * This finds the TRUE file by matching ALL visible text, not just one substring.
+ * 
+ * Example: If annotation discovers ["What's the essence?", "Essence Quality", "Show Example"]
+ * and EssenceTab.tsx contains 2 of them while QuickAddProcessModal.tsx contains 1,
+ * EssenceTab.tsx wins with the higher score.
+ */
+function scoreFilesForTextContent(
+  textContents: string[],
   importedFiles: { path: string; content: string }[]
-): { path: string; lineNumber: number; snippet: string; content: string } | null {
-  if (!textContent || textContent.length < 5) return null;
+): { path: string; content: string; score: number; matchedTexts: string[]; firstMatchLine: number } | null {
+  if (!textContents || textContents.length === 0) return null;
   
-  debugLog("Searching imported files for text content", {
-    textContent: textContent.substring(0, 40),
+  debugLog("Scoring imported files for text content", {
+    textCount: textContents.length,
+    texts: textContents.slice(0, 5).map(t => t.substring(0, 30)),
     filesCount: importedFiles.length
   });
   
@@ -540,35 +549,63 @@ function findTextInImportedFiles(
     f.path.includes('components/') || f.path.includes('/ui/')
   );
   
-  // Use first 20 chars for matching (handles dynamic suffixes)
-  const searchText = textContent.substring(0, 20);
+  const results: { path: string; content: string; score: number; matchedTexts: string[]; firstMatchLine: number }[] = [];
   
   for (const file of componentFiles) {
-    const lines = file.content.split('\n');
-    for (let i = 0; i < lines.length; i++) {
-      const line = lines[i];
-      // Look for the text in JSX patterns: >Text<, "Text", 'Text', `Text`
-      if (line.includes(`>${searchText}`) ||
-          line.includes(`"${searchText}`) ||
-          line.includes(`'${searchText}`) ||
-          line.includes(`\`${searchText}`)) {
-        debugLog("Found text in imported file", {
-          path: file.path,
-          lineNumber: i + 1,
-          matchedText: searchText
-        });
-        return {
-          path: file.path,
-          lineNumber: i + 1,
-          snippet: lines.slice(Math.max(0, i - 3), i + 5).join('\n'),
-          content: file.content
-        };
+    let score = 0;
+    const matchedTexts: string[] = [];
+    let firstMatchLine = 0;
+    
+    for (const text of textContents) {
+      if (!text || text.length < 5) continue;
+      
+      // Use first 20 chars for matching (handles dynamic suffixes)
+      const searchText = text.substring(0, 20);
+      
+      // Check if this text exists in the file
+      if (file.content.includes(searchText)) {
+        score++;
+        matchedTexts.push(text.substring(0, 30) + (text.length > 30 ? '...' : ''));
+        
+        // Find line number for first match (for element location)
+        if (firstMatchLine === 0) {
+          const lines = file.content.split('\n');
+          for (let i = 0; i < lines.length; i++) {
+            if (lines[i].includes(searchText)) {
+              firstMatchLine = i + 1;
+              break;
+            }
+          }
+        }
       }
     }
+    
+    if (score > 0) {
+      results.push({ 
+        path: file.path, 
+        content: file.content, 
+        score, 
+        matchedTexts,
+        firstMatchLine 
+      });
+    }
   }
   
-  debugLog("Text not found in any imported component files");
-  return null;
+  // Sort by score descending (highest match count wins)
+  results.sort((a, b) => b.score - a.score);
+  
+  if (results.length > 0) {
+    debugLog("Text scoring results", {
+      topFile: results[0].path,
+      topScore: results[0].score,
+      topMatches: results[0].matchedTexts,
+      allResults: results.slice(0, 3).map(r => ({ path: r.path, score: r.score }))
+    });
+  } else {
+    debugLog("No text matches found in any imported component files");
+  }
+  
+  return results.length > 0 ? results[0] : null;
 }
 
 /**
@@ -1735,43 +1772,67 @@ User Request: "${userPrompt}"
             }
           }
           
-          // TEXT-FIRST REDIRECT: Before accepting medium/low confidence match,
-          // search imported files for the actual TEXT CONTENT.
-          // This handles cases where parent component is selected but text lives in child.
+          // TEXT SCORING REDIRECT: Score ALL imported files by how many discovered
+          // text strings they contain. The file with the highest score is the TRUE target.
+          // This handles parent/child component cases accurately.
           if (elementLocation && elementLocation.confidence !== 'high') {
-            // Find the first focused element with meaningful text content
-            const textToFind = focusedElements.find(e => e.textContent && e.textContent.length > 5)?.textContent;
+            // Collect ALL text content from focused elements
+            const allTextContent = focusedElements
+              .filter(e => e.textContent && e.textContent.length > 5)
+              .map(e => e.textContent!);
             
-            if (textToFind) {
-              debugLog("Medium/low confidence match - checking imports for text", {
+            if (allTextContent.length > 0) {
+              debugLog("Medium/low confidence match - scoring imports for all text", {
                 currentFile: recommendedFileContent.path,
                 currentConfidence: elementLocation.confidence,
-                searchingFor: textToFind.substring(0, 40)
+                textCount: allTextContent.length,
+                texts: allTextContent.slice(0, 5).map(t => t.substring(0, 25))
               });
               
-              const textMatch = findTextInImportedFiles(
-                textToFind,
+              // Score all imported files
+              const bestMatch = scoreFilesForTextContent(
+                allTextContent,
                 pageContext.componentSources
               );
               
-              if (textMatch) {
-                debugLog("TEXT REDIRECT: Found text in imported component", {
+              // Also score the current file for comparison
+              const currentFileScore = allTextContent.filter(text => 
+                recommendedFileContent.content.includes(text.substring(0, 20))
+              ).length;
+              
+              debugLog("Text scoring comparison", {
+                currentFile: recommendedFileContent.path,
+                currentScore: currentFileScore,
+                bestImport: bestMatch?.path || 'none',
+                bestImportScore: bestMatch?.score || 0
+              });
+              
+              // Redirect only if imported file has MORE matches than current file
+              if (bestMatch && bestMatch.score > currentFileScore) {
+                debugLog("TEXT REDIRECT: Imported file has more text matches", {
                   originalFile: recommendedFileContent.path,
-                  originalConfidence: elementLocation.confidence,
-                  redirectTo: textMatch.path,
-                  lineNumber: textMatch.lineNumber
+                  originalScore: currentFileScore,
+                  redirectTo: bestMatch.path,
+                  redirectScore: bestMatch.score,
+                  matchedTexts: bestMatch.matchedTexts
                 });
                 
-                // Switch target file to where the text actually is
+                // Switch target file to where most text content lives
                 actualTargetFile = {
-                  path: textMatch.path,
-                  content: textMatch.content
+                  path: bestMatch.path,
+                  content: bestMatch.content
                 };
+                
+                // Find a line with matched text for element location
+                const lines = bestMatch.content.split('\n');
+                const snippetStart = Math.max(0, bestMatch.firstMatchLine - 4);
+                const snippetEnd = Math.min(lines.length, bestMatch.firstMatchLine + 5);
+                
                 elementLocation = {
-                  lineNumber: textMatch.lineNumber,
-                  snippet: textMatch.snippet,
+                  lineNumber: bestMatch.firstMatchLine,
+                  snippet: lines.slice(snippetStart, snippetEnd).join('\n'),
                   confidence: 'high',
-                  matchedBy: `textContent in imported file "${textToFind.substring(0, 30)}..."`
+                  matchedBy: `text scoring: ${bestMatch.score} matches in imported file`
                 };
               }
             }

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

@@ -520,14 +520,23 @@ function findElementLineInFile(
  * Example: "What's the essence of this process?" might be in EssenceTab.tsx
  * but the parent QuickAddProcessModal.tsx was selected by Phase 2a.
  */
-function findTextInImportedFiles(
-  textContent: string,
+/**
+ * Score imported files by how many discovered text strings they contain.
+ * This finds the TRUE file by matching ALL visible text, not just one substring.
+ * 
+ * Example: If annotation discovers ["What's the essence?", "Essence Quality", "Show Example"]
+ * and EssenceTab.tsx contains 2 of them while QuickAddProcessModal.tsx contains 1,
+ * EssenceTab.tsx wins with the higher score.
+ */
+function scoreFilesForTextContent(
+  textContents: string[],
   importedFiles: { path: string; content: string }[]
-): { path: string; lineNumber: number; snippet: string; content: string } | null {
-  if (!textContent || textContent.length < 5) return null;
+): { path: string; content: string; score: number; matchedTexts: string[]; firstMatchLine: number } | null {
+  if (!textContents || textContents.length === 0) return null;
   
-  debugLog("Searching imported files for text content", {
-    textContent: textContent.substring(0, 40),
+  debugLog("Scoring imported files for text content", {
+    textCount: textContents.length,
+    texts: textContents.slice(0, 5).map(t => t.substring(0, 30)),
     filesCount: importedFiles.length
   });
   
@@ -536,35 +545,63 @@ function findTextInImportedFiles(
     f.path.includes('components/') || f.path.includes('/ui/')
   );
   
-  // Use first 20 chars for matching (handles dynamic suffixes)
-  const searchText = textContent.substring(0, 20);
+  const results: { path: string; content: string; score: number; matchedTexts: string[]; firstMatchLine: number }[] = [];
   
   for (const file of componentFiles) {
-    const lines = file.content.split('\n');
-    for (let i = 0; i < lines.length; i++) {
-      const line = lines[i];
-      // Look for the text in JSX patterns: >Text<, "Text", 'Text', `Text`
-      if (line.includes(`>${searchText}`) ||
-          line.includes(`"${searchText}`) ||
-          line.includes(`'${searchText}`) ||
-          line.includes(`\`${searchText}`)) {
-        debugLog("Found text in imported file", {
-          path: file.path,
-          lineNumber: i + 1,
-          matchedText: searchText
-        });
-        return {
-          path: file.path,
-          lineNumber: i + 1,
-          snippet: lines.slice(Math.max(0, i - 3), i + 5).join('\n'),
-          content: file.content
-        };
+    let score = 0;
+    const matchedTexts: string[] = [];
+    let firstMatchLine = 0;
+    
+    for (const text of textContents) {
+      if (!text || text.length < 5) continue;
+      
+      // Use first 20 chars for matching (handles dynamic suffixes)
+      const searchText = text.substring(0, 20);
+      
+      // Check if this text exists in the file
+      if (file.content.includes(searchText)) {
+        score++;
+        matchedTexts.push(text.substring(0, 30) + (text.length > 30 ? '...' : ''));
+        
+        // Find line number for first match (for element location)
+        if (firstMatchLine === 0) {
+          const lines = file.content.split('\n');
+          for (let i = 0; i < lines.length; i++) {
+            if (lines[i].includes(searchText)) {
+              firstMatchLine = i + 1;
+              break;
+            }
+          }
+        }
       }
     }
+    
+    if (score > 0) {
+      results.push({ 
+        path: file.path, 
+        content: file.content, 
+        score, 
+        matchedTexts,
+        firstMatchLine 
+      });
+    }
   }
   
-  debugLog("Text not found in any imported component files");
-  return null;
+  // Sort by score descending (highest match count wins)
+  results.sort((a, b) => b.score - a.score);
+  
+  if (results.length > 0) {
+    debugLog("Text scoring results", {
+      topFile: results[0].path,
+      topScore: results[0].score,
+      topMatches: results[0].matchedTexts,
+      allResults: results.slice(0, 3).map(r => ({ path: r.path, score: r.score }))
+    });
+  } else {
+    debugLog("No text matches found in any imported component files");
+  }
+  
+  return results.length > 0 ? results[0] : null;
 }
 
 /**
@@ -1704,43 +1741,67 @@ User Request: "${userPrompt}"
             }
           }
           
-          // TEXT-FIRST REDIRECT: Before accepting medium/low confidence match,
-          // search imported files for the actual TEXT CONTENT.
-          // This handles cases where parent component is selected but text lives in child.
+          // TEXT SCORING REDIRECT: Score ALL imported files by how many discovered
+          // text strings they contain. The file with the highest score is the TRUE target.
+          // This handles parent/child component cases accurately.
           if (elementLocation && elementLocation.confidence !== 'high') {
-            // Find the first focused element with meaningful text content
-            const textToFind = focusedElements.find(e => e.textContent && e.textContent.length > 5)?.textContent;
+            // Collect ALL text content from focused elements
+            const allTextContent = focusedElements
+              .filter(e => e.textContent && e.textContent.length > 5)
+              .map(e => e.textContent!);
             
-            if (textToFind) {
-              debugLog("Medium/low confidence match - checking imports for text", {
+            if (allTextContent.length > 0) {
+              debugLog("Medium/low confidence match - scoring imports for all text", {
                 currentFile: recommendedFileContent.path,
                 currentConfidence: elementLocation.confidence,
-                searchingFor: textToFind.substring(0, 40)
+                textCount: allTextContent.length,
+                texts: allTextContent.slice(0, 5).map(t => t.substring(0, 25))
               });
               
-              const textMatch = findTextInImportedFiles(
-                textToFind,
+              // Score all imported files
+              const bestMatch = scoreFilesForTextContent(
+                allTextContent,
                 pageContext.componentSources
               );
               
-              if (textMatch) {
-                debugLog("TEXT REDIRECT: Found text in imported component", {
+              // Also score the current file for comparison
+              const currentFileScore = allTextContent.filter(text => 
+                recommendedFileContent.content.includes(text.substring(0, 20))
+              ).length;
+              
+              debugLog("Text scoring comparison", {
+                currentFile: recommendedFileContent.path,
+                currentScore: currentFileScore,
+                bestImport: bestMatch?.path || 'none',
+                bestImportScore: bestMatch?.score || 0
+              });
+              
+              // Redirect only if imported file has MORE matches than current file
+              if (bestMatch && bestMatch.score > currentFileScore) {
+                debugLog("TEXT REDIRECT: Imported file has more text matches", {
                   originalFile: recommendedFileContent.path,
-                  originalConfidence: elementLocation.confidence,
-                  redirectTo: textMatch.path,
-                  lineNumber: textMatch.lineNumber
+                  originalScore: currentFileScore,
+                  redirectTo: bestMatch.path,
+                  redirectScore: bestMatch.score,
+                  matchedTexts: bestMatch.matchedTexts
                 });
                 
-                // Switch target file to where the text actually is
+                // Switch target file to where most text content lives
                 actualTargetFile = {
-                  path: textMatch.path,
-                  content: textMatch.content
+                  path: bestMatch.path,
+                  content: bestMatch.content
                 };
+                
+                // Find a line with matched text for element location
+                const lines = bestMatch.content.split('\n');
+                const snippetStart = Math.max(0, bestMatch.firstMatchLine - 4);
+                const snippetEnd = Math.min(lines.length, bestMatch.firstMatchLine + 5);
+                
                 elementLocation = {
-                  lineNumber: textMatch.lineNumber,
-                  snippet: textMatch.snippet,
+                  lineNumber: bestMatch.firstMatchLine,
+                  snippet: lines.slice(snippetStart, snippetEnd).join('\n'),
                   confidence: 'high',
-                  matchedBy: `textContent in imported file "${textToFind.substring(0, 30)}..."`
+                  matchedBy: `text scoring: ${bestMatch.score} matches in imported file`
                 };
               }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sonance-brand-mcp",
-  "version": "1.3.96",
+  "version": "1.3.97",
   "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",