sonance-brand-mcp 1.3.100 → 1.3.102

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

@@ -1519,53 +1519,37 @@ function buildPhase2DesignPrompt(problems: DesignProblem[]): string {
     return ''; // No problems identified, skip design protocol
   }
 
-  const problemsJson = JSON.stringify(problems, null, 2);
+  // Create a simple, readable list of problems (no JSON complexity)
+  const problemsList = problems.map(p => `• ${p.description}`).join('\n');
   
   return `
 ═══════════════════════════════════════════════════════════════════════════════
-PHASE 2: TARGETED PATCH GENERATION
+DESIGN ISSUES TO FIX
 ═══════════════════════════════════════════════════════════════════════════════
 
-A visual analysis identified these specific problems in the UI:
+These visual issues were identified:
+${problemsList}
 
-${problemsJson}
+Fix these issues by modifying the code below.
 
-YOUR TASK: Generate patches that fix ONLY these specific problems.
+⚠️ CRITICAL - EXACT CODE MATCHING:
+Your "search" string MUST be copied CHARACTER-FOR-CHARACTER from the file.
+Use the line numbers on the left to find the exact code.
 
-STRICT RULES:
-1. Each patch MUST include a "problemId" field referencing one of the problems above
-2. Do NOT make changes unrelated to the identified problems
-3. Make the SMALLEST change that fixes each problem
-4. Do NOT change layout systems (flex→grid) unless absolutely necessary to fix a problem
-5. Preserve existing structure - adjust properties, don't restructure
+EXAMPLE:
+If line 42 shows:    42| <div className="mt-6 flex items-center">
+Your search must be: <div className="mt-6 flex items-center">
 
-For each problem, find the exact code that causes it and create a targeted fix.
+DO NOT:
+- Combine multiple lines into one search string
+- Add or remove classes/attributes
+- Invent code that "should" exist
+- Guess at the structure
 
-OUTPUT FORMAT (note the problemId and rationale fields):
-{
-  "modifications": [{
-    "filePath": "components/Example.tsx",
-    "patches": [
-      {
-        "problemId": "grouping-1",
-        "search": "<Badge className=\"absolute right-4\">",
-        "replace": "<Badge className=\"ml-2\">",
-        "rationale": "Removes absolute positioning to group badge with label"
-      },
-      {
-        "problemId": "spacing-1",
-        "search": "className=\"mt-8\"",
-        "replace": "className=\"mt-4\"",
-        "rationale": "Reduces excessive vertical gap"
-      }
-    ]
-  }]
-}
-
-VALIDATION:
-- Patches without a valid problemId will be REJECTED
-- Patches that don't trace to an identified problem will be REJECTED
-- Each patch must have search, replace, problemId, and rationale fields
+DO:
+- Copy the exact text from the numbered lines
+- Make small, targeted changes in the "replace" field
+- Keep patches focused on one change each
 `;
 }
 
@@ -2087,6 +2071,124 @@ 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);
+      let elementLocation: { lineNumber: number; snippet: string; confidence: 'high' | 'medium' | 'low'; matchedBy: string } | null = null;
+      
+      if (actualTargetFile && focusedElements && focusedElements.length > 0) {
+        const content = actualTargetFile.content;
+        
+        // Search for focused element in the file using multiple strategies
+        // Priority: DOM id > textContent > className patterns
+        for (const el of focusedElements) {
+          elementLocation = findElementLineInFile(content, el);
+          if (elementLocation) {
+            debugLog("Found focused element in file", {
+              matchedBy: elementLocation.matchedBy,
+              lineNumber: elementLocation.lineNumber,
+              confidence: elementLocation.confidence,
+              file: actualTargetFile.path,
+            });
+            break;
+          }
+        }
+        
+        // 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.
+        if (elementLocation && elementLocation.confidence !== 'high') {
+          const allTextContent = focusedElements
+            .filter(e => e.textContent && e.textContent.length > 5)
+            .map(e => e.textContent!);
+          
+          if (allTextContent.length > 0) {
+            debugLog("Medium/low confidence match - scoring imports for all text", {
+              currentFile: actualTargetFile.path,
+              currentConfidence: elementLocation.confidence,
+              textCount: allTextContent.length,
+              texts: allTextContent.slice(0, 5).map(t => t.substring(0, 25))
+            });
+            
+            const bestMatch = scoreFilesForTextContent(
+              allTextContent,
+              pageContext.componentSources
+            );
+            
+            const currentFileScore = allTextContent.filter(text => 
+              actualTargetFile!.content.includes(text.substring(0, 20))
+            ).length;
+            
+            debugLog("Text scoring comparison", {
+              currentFile: actualTargetFile.path,
+              currentScore: currentFileScore,
+              bestImport: bestMatch?.path || 'none',
+              bestImportScore: bestMatch?.score || 0
+            });
+            
+            if (bestMatch && bestMatch.score > currentFileScore) {
+              debugLog("TEXT REDIRECT: Imported file has more text matches", {
+                originalFile: actualTargetFile.path,
+                originalScore: currentFileScore,
+                redirectTo: bestMatch.path,
+                redirectScore: bestMatch.score,
+                matchedTexts: bestMatch.matchedTexts
+              });
+              
+              actualTargetFile = {
+                path: bestMatch.path,
+                content: bestMatch.content
+              };
+              
+              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: bestMatch.firstMatchLine,
+                snippet: lines.slice(snippetStart, snippetEnd).join('\n'),
+                confidence: 'high',
+                matchedBy: `text scoring: ${bestMatch.score} matches in imported file`
+              };
+            }
+          }
+        }
+        
+        // DYNAMIC IMPORT SEARCH: If not found in main file, search imported components
+        if (!elementLocation) {
+          debugLog("Element not in main file, searching imported components...", {
+            mainFile: actualTargetFile.path,
+            importedFilesCount: pageContext.componentSources.length
+          });
+          
+          const importedMatch = findElementInImportedFiles(
+            focusedElements[0],
+            pageContext.componentSources
+          );
+          
+          if (importedMatch) {
+            debugLog("REDIRECT: Element found in imported component", {
+              originalFile: actualTargetFile.path,
+              redirectTo: importedMatch.path,
+              matchedBy: importedMatch.matchedBy,
+              lineNumber: importedMatch.lineNumber
+            });
+            
+            actualTargetFile = {
+              path: importedMatch.path,
+              content: importedMatch.content
+            };
+            elementLocation = findElementLineInFile(importedMatch.content, focusedElements[0]);
+          }
+        }
+      }
+      
+      debugLog("File redirect complete", {
+        originalRecommended: recommendedFileContent?.path || 'none',
+        actualTarget: actualTargetFile?.path || 'none',
+        wasRedirected: actualTargetFile?.path !== recommendedFileContent?.path
+      });
+
       // Build text content
       let textContent = `VISION MODE EDIT REQUEST
 
@@ -2110,7 +2212,8 @@ User Request: "${userPrompt}"
         
         // Phase 1: Analyze the screenshot to identify specific problems
         // This is a SEPARATE LLM call that only identifies problems
-        const fileContentForAnalysis = recommendedFileContent?.content || pageContext.pageContent || '';
+        // Use actualTargetFile since redirect has already happened
+        const fileContentForAnalysis = actualTargetFile?.content || pageContext.pageContent || '';
         identifiedProblems = await analyzeDesignProblems(
           screenshot,
           fileContentForAnalysis,
@@ -2135,124 +2238,8 @@ User Request: "${userPrompt}"
 
       // ========== TARGET COMPONENT ONLY (with line numbers) ==========
       // CRITICAL: Only include the TARGET file to avoid overwhelming the LLM with noise
-      if (recommendedFileContent) {
-        const content = recommendedFileContent.content;
-        
-        // Search for focused element in the file using multiple strategies
-        // Priority: DOM id > textContent > className patterns
-        let elementLocation: { lineNumber: number; snippet: string; confidence: 'high' | 'medium' | 'low'; matchedBy: string } | null = null;
-        let actualTargetFile = recommendedFileContent; // May change if we redirect
-        
-      if (focusedElements && focusedElements.length > 0) {
-          for (const el of focusedElements) {
-            elementLocation = findElementLineInFile(content, el);
-            if (elementLocation) {
-              debugLog("Found focused element in file", {
-                matchedBy: elementLocation.matchedBy,
-                lineNumber: elementLocation.lineNumber,
-                confidence: elementLocation.confidence,
-                file: recommendedFileContent.path,
-              });
-              break;
-            }
-          }
-          
-          // 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') {
-            // Collect ALL text content from focused elements
-            const allTextContent = focusedElements
-              .filter(e => e.textContent && e.textContent.length > 5)
-              .map(e => e.textContent!);
-            
-            if (allTextContent.length > 0) {
-              debugLog("Medium/low confidence match - scoring imports for all text", {
-                currentFile: recommendedFileContent.path,
-                currentConfidence: elementLocation.confidence,
-                textCount: allTextContent.length,
-                texts: allTextContent.slice(0, 5).map(t => t.substring(0, 25))
-              });
-              
-              // Score all imported files
-              const bestMatch = scoreFilesForTextContent(
-                allTextContent,
-                pageContext.componentSources
-              );
-              
-              // 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,
-                  originalScore: currentFileScore,
-                  redirectTo: bestMatch.path,
-                  redirectScore: bestMatch.score,
-                  matchedTexts: bestMatch.matchedTexts
-                });
-                
-                // Switch target file to where most text content lives
-                actualTargetFile = {
-                  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: bestMatch.firstMatchLine,
-                  snippet: lines.slice(snippetStart, snippetEnd).join('\n'),
-                  confidence: 'high',
-                  matchedBy: `text scoring: ${bestMatch.score} matches in imported file`
-                };
-              }
-            }
-          }
-          
-          // DYNAMIC IMPORT SEARCH: If not found in main file, search imported components
-          if (!elementLocation) {
-            debugLog("Element not in main file, searching imported components...", {
-              mainFile: recommendedFileContent.path,
-              importedFilesCount: pageContext.componentSources.length
-            });
-            
-            const importedMatch = findElementInImportedFiles(
-              focusedElements[0],
-              pageContext.componentSources
-            );
-            
-            if (importedMatch) {
-              debugLog("REDIRECT: Element found in imported component", {
-                originalFile: recommendedFileContent.path,
-                redirectTo: importedMatch.path,
-                matchedBy: importedMatch.matchedBy,
-                lineNumber: importedMatch.lineNumber
-              });
-              
-              // Switch target file to where element actually is
-              actualTargetFile = {
-                path: importedMatch.path,
-                content: importedMatch.content
-              };
-              elementLocation = findElementLineInFile(importedMatch.content, focusedElements[0]);
-            }
-          }
-        }
-        
+      // Note: Redirect logic already ran above, so actualTargetFile is the correct file
+      if (actualTargetFile) {
         // Build focused elements section with precise targeting info
         if (focusedElements && focusedElements.length > 0) {
           textContent += `FOCUSED ELEMENTS (user clicked on these):\n`;
@@ -2316,7 +2303,7 @@ ${elementLocation.snippet}
             // Element NOT found in main file OR any imported components
             // BLOCK the LLM from guessing - require empty modifications
             debugLog("BLOCK: Could not locate focused element anywhere", {
-              mainFile: recommendedFileContent.path,
+              mainFile: actualTargetFile.path,
               searchedImports: pageContext.componentSources.length,
               focusedElements: focusedElements.map(el => ({
                 name: el.name,
@@ -2332,7 +2319,7 @@ ${elementLocation.snippet}
 ⛔ STOP: CANNOT LOCATE THE CLICKED ELEMENT
 
 The user clicked on a specific element, but it could NOT be found in:
-- ${recommendedFileContent.path} (main target file)
+- ${actualTargetFile.path} (main target file)
 - Any of the ${pageContext.componentSources.length} imported component files
 
 The element may be:
@@ -2447,7 +2434,8 @@ ${variantsMatch[0]}
       }
 
       // ========== SIMPLIFIED INSTRUCTIONS ==========
-      const targetPath = recommendedFileContent?.path || pageContext.pageFile || "unknown";
+      // Use actualTargetFile which may have been redirected to an imported component
+      const targetPath = actualTargetFile?.path || pageContext.pageFile || "unknown";
       
       textContent += `═══════════════════════════════════════════════════════════════════════════════
 HOW TO MAKE YOUR EDIT
@@ -2491,10 +2479,14 @@ CRITICAL: Your "search" string MUST exist in the file. If you can't find the exa
         validFilePaths.add(comp.path);
       }
       
-      // FIX: Add the recommended file to validFilePaths (it was spliced out for display purposes)
+      // FIX: Add the recommended file and actual target file to validFilePaths
+      // (recommended was spliced out for display, actual may be different due to redirect)
       if (recommendedFileContent) {
         validFilePaths.add(recommendedFileContent.path);
       }
+      if (actualTargetFile && actualTargetFile.path !== recommendedFileContent?.path) {
+        validFilePaths.add(actualTargetFile.path);
+      }
       
       // Retry loop for handling patch failures
       const MAX_RETRIES = 1;
@@ -2630,7 +2622,8 @@ This is better than generating patches with made-up code.`,
         
         // CRITICAL: Warn if LLM is trying to modify a file OTHER than the TARGET COMPONENT
         // This usually means the LLM is trying to modify a file it doesn't have full visibility into
-        const targetComponentPath = recommendedFileContent?.path;
+        // Use actualTargetFile since it may have been redirected from recommendedFileContent
+        const targetComponentPath = actualTargetFile?.path;
         if (targetComponentPath && mod.filePath !== targetComponentPath) {
           debugLog("WARNING: LLM trying to modify non-target file", {
             targetComponent: targetComponentPath,
@@ -2655,36 +2648,17 @@ This is better than generating patches with made-up code.`,
           // New patch-based approach
           console.log(`[Apply-First] Applying ${mod.patches.length} patches to ${mod.filePath}`);
           
-          // DESIGN VALIDATION: For design-heavy requests, validate patches have problemIds
-          let patchesToApply = mod.patches;
+          // Use patches directly - simplified approach focuses on exact code matching
+          // rather than problemId validation (which was causing LLM to prioritize
+          // problem-solving over exact code copying)
+          const patchesToApply = mod.patches;
+          
           if (isDesignRequest && identifiedProblems.length > 0) {
-            const validationResult = validateDesignPatches(mod.patches, identifiedProblems);
-            
-            if (validationResult.rejected.length > 0) {
-              debugLog("Design patch validation rejected some patches", {
-                filePath: mod.filePath,
-                validCount: validationResult.valid.length,
-                rejectedCount: validationResult.rejected.length,
-                rejectedReasons: validationResult.rejected.map(r => r.reason)
-              });
-              console.warn(`[Apply-First] ${validationResult.rejected.length} patches rejected for missing/invalid problemId`);
-            }
-            
-            // Only use validated patches
-            if (validationResult.valid.length === 0) {
-              patchErrors.push(`${mod.filePath}: All patches were rejected - they don't reference identified problems`);
-              continue;
-            }
-            
-            // Log which problems are being fixed
-            const problemsBeingFixed = [...new Set(validationResult.valid.map(p => p.problemId))];
-            debugLog("Design patches validated", {
+            debugLog("Design patches received", {
               filePath: mod.filePath,
-              problemsBeingFixed,
-              patchCount: validationResult.valid.length
+              patchCount: patchesToApply.length,
+              problemsIdentified: identifiedProblems.length
             });
-            
-            patchesToApply = validationResult.valid;
           }
           
           // PRE-VALIDATION: Check if all search strings exist in the file BEFORE applying

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

@@ -1515,53 +1515,37 @@ function buildPhase2DesignPrompt(problems: DesignProblem[]): string {
     return ''; // No problems identified, skip design protocol
   }
 
-  const problemsJson = JSON.stringify(problems, null, 2);
+  // Create a simple, readable list of problems (no JSON complexity)
+  const problemsList = problems.map(p => `• ${p.description}`).join('\n');
   
   return `
 ═══════════════════════════════════════════════════════════════════════════════
-PHASE 2: TARGETED PATCH GENERATION
+DESIGN ISSUES TO FIX
 ═══════════════════════════════════════════════════════════════════════════════
 
-A visual analysis identified these specific problems in the UI:
+These visual issues were identified:
+${problemsList}
 
-${problemsJson}
+Fix these issues by modifying the code below.
 
-YOUR TASK: Generate patches that fix ONLY these specific problems.
+⚠️ CRITICAL - EXACT CODE MATCHING:
+Your "search" string MUST be copied CHARACTER-FOR-CHARACTER from the file.
+Use the line numbers on the left to find the exact code.
 
-STRICT RULES:
-1. Each patch MUST include a "problemId" field referencing one of the problems above
-2. Do NOT make changes unrelated to the identified problems
-3. Make the SMALLEST change that fixes each problem
-4. Do NOT change layout systems (flex→grid) unless absolutely necessary to fix a problem
-5. Preserve existing structure - adjust properties, don't restructure
+EXAMPLE:
+If line 42 shows:    42| <div className="mt-6 flex items-center">
+Your search must be: <div className="mt-6 flex items-center">
 
-For each problem, find the exact code that causes it and create a targeted fix.
+DO NOT:
+- Combine multiple lines into one search string
+- Add or remove classes/attributes
+- Invent code that "should" exist
+- Guess at the structure
 
-OUTPUT FORMAT (note the problemId and rationale fields):
-{
-  "modifications": [{
-    "filePath": "components/Example.tsx",
-    "patches": [
-      {
-        "problemId": "grouping-1",
-        "search": "<Badge className=\"absolute right-4\">",
-        "replace": "<Badge className=\"ml-2\">",
-        "rationale": "Removes absolute positioning to group badge with label"
-      },
-      {
-        "problemId": "spacing-1",
-        "search": "className=\"mt-8\"",
-        "replace": "className=\"mt-4\"",
-        "rationale": "Reduces excessive vertical gap"
-      }
-    ]
-  }]
-}
-
-VALIDATION:
-- Patches without a valid problemId will be REJECTED
-- Patches that don't trace to an identified problem will be REJECTED
-- Each patch must have search, replace, problemId, and rationale fields
+DO:
+- Copy the exact text from the numbered lines
+- Make small, targeted changes in the "replace" field
+- Keep patches focused on one change each
 `;
 }
 
@@ -2056,6 +2040,124 @@ 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);
+      let elementLocation: { lineNumber: number; snippet: string; confidence: 'high' | 'medium' | 'low'; matchedBy: string } | null = null;
+      
+      if (actualTargetFile && focusedElements && focusedElements.length > 0) {
+        const content = actualTargetFile.content;
+        
+        // Search for focused element in the file using multiple strategies
+        // Priority: DOM id > textContent > className patterns
+        for (const el of focusedElements) {
+          elementLocation = findElementLineInFile(content, el);
+          if (elementLocation) {
+            debugLog("Found focused element in file", {
+              matchedBy: elementLocation.matchedBy,
+              lineNumber: elementLocation.lineNumber,
+              confidence: elementLocation.confidence,
+              file: actualTargetFile.path,
+            });
+            break;
+          }
+        }
+        
+        // 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.
+        if (elementLocation && elementLocation.confidence !== 'high') {
+          const allTextContent = focusedElements
+            .filter(e => e.textContent && e.textContent.length > 5)
+            .map(e => e.textContent!);
+          
+          if (allTextContent.length > 0) {
+            debugLog("Medium/low confidence match - scoring imports for all text", {
+              currentFile: actualTargetFile.path,
+              currentConfidence: elementLocation.confidence,
+              textCount: allTextContent.length,
+              texts: allTextContent.slice(0, 5).map(t => t.substring(0, 25))
+            });
+            
+            const bestMatch = scoreFilesForTextContent(
+              allTextContent,
+              pageContext.componentSources
+            );
+            
+            const currentFileScore = allTextContent.filter(text => 
+              actualTargetFile!.content.includes(text.substring(0, 20))
+            ).length;
+            
+            debugLog("Text scoring comparison", {
+              currentFile: actualTargetFile.path,
+              currentScore: currentFileScore,
+              bestImport: bestMatch?.path || 'none',
+              bestImportScore: bestMatch?.score || 0
+            });
+            
+            if (bestMatch && bestMatch.score > currentFileScore) {
+              debugLog("TEXT REDIRECT: Imported file has more text matches", {
+                originalFile: actualTargetFile.path,
+                originalScore: currentFileScore,
+                redirectTo: bestMatch.path,
+                redirectScore: bestMatch.score,
+                matchedTexts: bestMatch.matchedTexts
+              });
+              
+              actualTargetFile = {
+                path: bestMatch.path,
+                content: bestMatch.content
+              };
+              
+              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: bestMatch.firstMatchLine,
+                snippet: lines.slice(snippetStart, snippetEnd).join('\n'),
+                confidence: 'high',
+                matchedBy: `text scoring: ${bestMatch.score} matches in imported file`
+              };
+            }
+          }
+        }
+        
+        // DYNAMIC IMPORT SEARCH: If not found in main file, search imported components
+        if (!elementLocation) {
+          debugLog("Element not in main file, searching imported components...", {
+            mainFile: actualTargetFile.path,
+            importedFilesCount: pageContext.componentSources.length
+          });
+          
+          const importedMatch = findElementInImportedFiles(
+            focusedElements[0],
+            pageContext.componentSources
+          );
+          
+          if (importedMatch) {
+            debugLog("REDIRECT: Element found in imported component", {
+              originalFile: actualTargetFile.path,
+              redirectTo: importedMatch.path,
+              matchedBy: importedMatch.matchedBy,
+              lineNumber: importedMatch.lineNumber
+            });
+            
+            actualTargetFile = {
+              path: importedMatch.path,
+              content: importedMatch.content
+            };
+            elementLocation = findElementLineInFile(importedMatch.content, focusedElements[0]);
+          }
+        }
+      }
+      
+      debugLog("File redirect complete", {
+        originalRecommended: recommendedFileContent?.path || 'none',
+        actualTarget: actualTargetFile?.path || 'none',
+        wasRedirected: actualTargetFile?.path !== recommendedFileContent?.path
+      });
+
       // Build text content
       let textContent = `VISION MODE EDIT REQUEST
 
@@ -2079,7 +2181,8 @@ User Request: "${userPrompt}"
         
         // Phase 1: Analyze the screenshot to identify specific problems
         // This is a SEPARATE LLM call that only identifies problems
-        const fileContentForAnalysis = recommendedFileContent?.content || pageContext.pageContent || '';
+        // Use actualTargetFile since redirect has already happened
+        const fileContentForAnalysis = actualTargetFile?.content || pageContext.pageContent || '';
         identifiedProblems = await analyzeDesignProblems(
           screenshot,
           fileContentForAnalysis,
@@ -2104,124 +2207,8 @@ User Request: "${userPrompt}"
 
       // ========== TARGET COMPONENT ONLY (with line numbers) ==========
       // CRITICAL: Only include the TARGET file to avoid overwhelming the LLM with noise
-      if (recommendedFileContent) {
-        const content = recommendedFileContent.content;
-        
-        // Search for focused element in the file using multiple strategies
-        // Priority: DOM id > textContent > className patterns
-        let elementLocation: { lineNumber: number; snippet: string; confidence: 'high' | 'medium' | 'low'; matchedBy: string } | null = null;
-        let actualTargetFile = recommendedFileContent; // May change if we redirect
-        
-      if (focusedElements && focusedElements.length > 0) {
-          for (const el of focusedElements) {
-            elementLocation = findElementLineInFile(content, el);
-            if (elementLocation) {
-              debugLog("Found focused element in file", {
-                matchedBy: elementLocation.matchedBy,
-                lineNumber: elementLocation.lineNumber,
-                confidence: elementLocation.confidence,
-                file: recommendedFileContent.path,
-              });
-              break;
-            }
-          }
-          
-          // 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') {
-            // Collect ALL text content from focused elements
-            const allTextContent = focusedElements
-              .filter(e => e.textContent && e.textContent.length > 5)
-              .map(e => e.textContent!);
-            
-            if (allTextContent.length > 0) {
-              debugLog("Medium/low confidence match - scoring imports for all text", {
-                currentFile: recommendedFileContent.path,
-                currentConfidence: elementLocation.confidence,
-                textCount: allTextContent.length,
-                texts: allTextContent.slice(0, 5).map(t => t.substring(0, 25))
-              });
-              
-              // Score all imported files
-              const bestMatch = scoreFilesForTextContent(
-                allTextContent,
-                pageContext.componentSources
-              );
-              
-              // 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,
-                  originalScore: currentFileScore,
-                  redirectTo: bestMatch.path,
-                  redirectScore: bestMatch.score,
-                  matchedTexts: bestMatch.matchedTexts
-                });
-                
-                // Switch target file to where most text content lives
-                actualTargetFile = {
-                  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: bestMatch.firstMatchLine,
-                  snippet: lines.slice(snippetStart, snippetEnd).join('\n'),
-                  confidence: 'high',
-                  matchedBy: `text scoring: ${bestMatch.score} matches in imported file`
-                };
-              }
-            }
-          }
-          
-          // DYNAMIC IMPORT SEARCH: If not found in main file, search imported components
-          if (!elementLocation) {
-            debugLog("Element not in main file, searching imported components...", {
-              mainFile: recommendedFileContent.path,
-              importedFilesCount: pageContext.componentSources.length
-            });
-            
-            const importedMatch = findElementInImportedFiles(
-              focusedElements[0],
-              pageContext.componentSources
-            );
-            
-            if (importedMatch) {
-              debugLog("REDIRECT: Element found in imported component", {
-                originalFile: recommendedFileContent.path,
-                redirectTo: importedMatch.path,
-                matchedBy: importedMatch.matchedBy,
-                lineNumber: importedMatch.lineNumber
-              });
-              
-              // Switch target file to where element actually is
-              actualTargetFile = {
-                path: importedMatch.path,
-                content: importedMatch.content
-              };
-              elementLocation = findElementLineInFile(importedMatch.content, focusedElements[0]);
-            }
-          }
-        }
-        
+      // Note: Redirect logic already ran above, so actualTargetFile is the correct file
+      if (actualTargetFile) {
         // Build focused elements section with precise targeting info
         if (focusedElements && focusedElements.length > 0) {
           textContent += `FOCUSED ELEMENTS (user clicked on these):\n`;
@@ -2285,7 +2272,7 @@ ${elementLocation.snippet}
             // Element NOT found in main file OR any imported components
             // BLOCK the LLM from guessing - require empty modifications
             debugLog("BLOCK: Could not locate focused element anywhere", {
-              mainFile: recommendedFileContent.path,
+              mainFile: actualTargetFile.path,
               searchedImports: pageContext.componentSources.length,
               focusedElements: focusedElements.map(el => ({
                 name: el.name,
@@ -2301,7 +2288,7 @@ ${elementLocation.snippet}
 ⛔ STOP: CANNOT LOCATE THE CLICKED ELEMENT
 
 The user clicked on a specific element, but it could NOT be found in:
-- ${recommendedFileContent.path} (main target file)
+- ${actualTargetFile.path} (main target file)
 - Any of the ${pageContext.componentSources.length} imported component files
 
 The element may be:
@@ -2343,7 +2330,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
@@ -2416,7 +2403,8 @@ ${variantsMatch[0]}
       }
 
       // ========== SIMPLIFIED INSTRUCTIONS ==========
-      const targetPath = recommendedFileContent?.path || pageContext.pageFile || "unknown";
+      // Use actualTargetFile which may have been redirected to an imported component
+      const targetPath = actualTargetFile?.path || pageContext.pageFile || "unknown";
       
       textContent += `═══════════════════════════════════════════════════════════════════════════════
 HOW TO MAKE YOUR EDIT
@@ -2628,41 +2616,17 @@ This is better than generating patches with made-up code.`,
           // New patch-based approach
           console.log(`[Vision Mode] Applying ${mod.patches.length} patches to ${mod.filePath}`);
           
-          // DESIGN VALIDATION: For design-heavy requests, validate patches have problemIds
-          let patchesToApply = mod.patches;
+          // Use patches directly - simplified approach focuses on exact code matching
+          // rather than problemId validation (which was causing LLM to prioritize
+          // problem-solving over exact code copying)
+          const patchesToApply = mod.patches;
+          
           if (isDesignRequest && identifiedProblems.length > 0) {
-            const validationResult = validateDesignPatches(mod.patches, identifiedProblems);
-            
-            if (validationResult.rejected.length > 0) {
-              debugLog("Design patch validation rejected some patches", {
-                filePath: mod.filePath,
-                validCount: validationResult.valid.length,
-                rejectedCount: validationResult.rejected.length,
-                rejectedReasons: validationResult.rejected.map(r => r.reason)
-              });
-              console.warn(`[Vision Mode] ${validationResult.rejected.length} patches rejected for missing/invalid problemId`);
-            }
-            
-            // Only use validated patches
-            if (validationResult.valid.length === 0) {
-              patchErrors.push(`${mod.filePath}: All patches were rejected - they don't reference identified problems`);
-              continue;
-            }
-            
-            // Log which problems are being fixed
-            const problemsBeingFixed = [...new Set(validationResult.valid.map(p => p.problemId))];
-            debugLog("Design patches validated", {
+            debugLog("Design patches received", {
               filePath: mod.filePath,
-              problemsBeingFixed,
-              patchCount: validationResult.valid.length
+              patchCount: patchesToApply.length,
+              problemsIdentified: identifiedProblems.length
             });
-            
-            // Map validated patches to Patch interface (rationale -> explanation)
-            patchesToApply = validationResult.valid.map(p => ({
-              search: p.search,
-              replace: p.replace,
-              explanation: `[${p.problemId}] ${p.rationale}`
-            }));
           }
           
           // PRE-VALIDATION: Check if all search strings exist in the file BEFORE applying

package/package.json

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