sonance-brand-mcp 1.3.47 → 1.3.48

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

@@ -468,6 +468,8 @@ Return search/replace patches (NOT full files). The system applies your patches
 - "replace" contains your modified version
 - Include 2-4 lines of context in "search" to make it unique
 - You may ONLY edit files provided in the PAGE CONTEXT section
+- CRITICAL: NEVER invent or guess code. Your "search" string MUST be copied EXACTLY from the provided file content. If you cannot find the exact code to modify, return an empty modifications array.
+- If the file content appears truncated, only modify code that is visible in the provided content.
 
 **SONANCE BRAND COLORS:**
 - Charcoal: #333F48 (primary text)
@@ -658,10 +660,10 @@ export async function POST(request: Request) {
       }
 
       // ========== SMART CONTEXT BUDGETING ==========
-      // Total budget: 100k chars (~25k tokens, safe for Claude)
-      // Priority: Recommended file (full) > Page file (limited) > Other components (dynamic)
-      const TOTAL_CONTEXT_BUDGET = 100000;
-      const MAX_RECOMMENDED_FILE = 80000; // 80k chars max for recommended file
+      // Claude can handle 200k tokens (~800k chars), so we can safely include large files
+      // Priority: Recommended file (NEVER truncate) > Page file (limited) > Other components (dynamic)
+      const TOTAL_CONTEXT_BUDGET = 500000; // 500k chars total budget
+      const MAX_RECOMMENDED_FILE = Infinity; // NEVER truncate the target file - AI needs full context
       const MAX_PAGE_FILE = 2000; // Page file is just a wrapper
       const MAX_GLOBALS_CSS = 1500;
       const MAX_FILES = 25;
@@ -695,9 +697,8 @@ ${focusedElements.map((el) => `- ${el.name} (${el.type}) at (${el.coordinates.x}
 
       // ========== TARGET COMPONENT (RECOMMENDED FILE) - SHOWN FIRST ==========
       if (recommendedFileContent) {
-        const content = recommendedFileContent.content.length > MAX_RECOMMENDED_FILE
-          ? recommendedFileContent.content.substring(0, MAX_RECOMMENDED_FILE) + "\n// ... (file truncated at 50k chars, showing component definition and main logic)"
-          : recommendedFileContent.content;
+        // Never truncate the recommended file - AI needs full context to avoid hallucination
+        const content = recommendedFileContent.content;
         
         textContent += `═══════════════════════════════════════════════════════════════════════════════
 ⚡ TARGET COMPONENT - YOU MUST EDIT THIS FILE
@@ -808,112 +809,148 @@ CRITICAL: Edit the TARGET COMPONENT (marked with ***), not the page wrapper.`;
         text: textContent,
       });
 
-      // Call Claude Vision API
+      // Call Claude Vision API with retry mechanism
       const anthropic = new Anthropic({ apiKey });
-
-      const response = await anthropic.messages.create({
-        model: "claude-sonnet-4-20250514",
-        max_tokens: 16384,
-        messages: [
+      
+      // Build set of valid file paths from page context (needed for validation)
+      const validFilePaths = new Set<string>();
+      if (pageContext.pageFile) {
+        validFilePaths.add(pageContext.pageFile);
+      }
+      for (const comp of pageContext.componentSources) {
+        validFilePaths.add(comp.path);
+      }
+      
+      // FIX: Add the recommended file to validFilePaths (it was spliced out for display purposes)
+      if (recommendedFileContent) {
+        validFilePaths.add(recommendedFileContent.path);
+      }
+      
+      // Retry loop for handling patch failures
+      const MAX_RETRIES = 1;
+      let retryCount = 0;
+      let lastPatchErrors: string[] = [];
+      let modifications: VisionFileModification[] = [];
+      let finalExplanation: string | undefined;
+      let finalReasoning: string | undefined;
+      
+      while (retryCount <= MAX_RETRIES) {
+        // Build messages for this attempt
+        const currentMessages: Anthropic.MessageCreateParams["messages"] = [
           {
             role: "user",
             content: messageContent,
           },
-        ],
-        system: VISION_SYSTEM_PROMPT,
-      });
+        ];
+        
+        // If this is a retry, add feedback about what went wrong
+        if (retryCount > 0 && lastPatchErrors.length > 0) {
+          debugLog("Retry attempt with feedback", { retryCount, errorCount: lastPatchErrors.length });
+          currentMessages.push({
+            role: "assistant",
+            content: "I'll analyze the screenshot and generate the patches now.",
+          });
+          currentMessages.push({
+            role: "user",
+            content: `PATCH APPLICATION FAILED. Your previous patches referenced code that does not exist in the file (hallucination detected).
 
-      // Extract text content from response
-      const textResponse = response.content.find((block) => block.type === "text");
-      if (!textResponse || textResponse.type !== "text") {
-        return NextResponse.json(
-          { error: "No text response from AI" },
-          { status: 500 }
-        );
-      }
+Failed patches:
+${lastPatchErrors.join("\n\n")}
+
+IMPORTANT: You must copy the "search" string EXACTLY from the file content I provided. Do NOT invent or guess code.
+Look carefully at the ACTUAL file content in the TARGET COMPONENT section above and try again.
+
+If you cannot find the exact code to modify, return an empty modifications array with an explanation.`,
+          });
+        }
 
-      // Parse AI response - now expecting patches instead of full file content
-      let aiResponse: {
-        reasoning?: string;
-        modifications: Array<{
-          filePath: string;
-          patches?: Patch[];
-          // Legacy support for modifiedContent (will be deprecated)
-          modifiedContent?: string;
+        const response = await anthropic.messages.create({
+          model: "claude-sonnet-4-20250514",
+          max_tokens: 16384,
+          messages: currentMessages,
+          system: VISION_SYSTEM_PROMPT,
+        });
+
+        // Extract text content from response
+        const textResponse = response.content.find((block) => block.type === "text");
+        if (!textResponse || textResponse.type !== "text") {
+          return NextResponse.json(
+            { error: "No text response from AI" },
+            { status: 500 }
+          );
+        }
+
+        // Parse AI response - now expecting patches instead of full file content
+        let aiResponse: {
+          reasoning?: string;
+          modifications: Array<{
+            filePath: string;
+            patches?: Patch[];
+            // Legacy support for modifiedContent (will be deprecated)
+            modifiedContent?: string;
+            explanation?: string;
+          }>;
           explanation?: string;
-        }>;
-        explanation?: string;
-      };
+        };
 
-      try {
-        let jsonText = textResponse.text.trim();
-
-        // Try to extract JSON from markdown code blocks
-        const jsonMatch = jsonText.match(/```json\n([\s\S]*?)\n```/) ||
-                         jsonText.match(/```\n([\s\S]*?)\n```/);
-
-        if (jsonMatch) {
-          jsonText = jsonMatch[1];
-        } else if (jsonText.includes("```json")) {
-          const start = jsonText.indexOf("```json") + 7;
-          const end = jsonText.lastIndexOf("```");
-          if (end > start) {
-            jsonText = jsonText.substring(start, end);
+        try {
+          let jsonText = textResponse.text.trim();
+
+          // Try to extract JSON from markdown code blocks
+          const jsonMatch = jsonText.match(/```json\n([\s\S]*?)\n```/) ||
+                           jsonText.match(/```\n([\s\S]*?)\n```/);
+
+          if (jsonMatch) {
+            jsonText = jsonMatch[1];
+          } else if (jsonText.includes("```json")) {
+            const start = jsonText.indexOf("```json") + 7;
+            const end = jsonText.lastIndexOf("```");
+            if (end > start) {
+              jsonText = jsonText.substring(start, end);
+            }
           }
-        }
 
-        jsonText = jsonText.trim();
-        
-        // Robust JSON extraction: find the first { and last } to extract JSON object
-        // This handles cases where the LLM includes preamble text before the JSON
-        const firstBrace = jsonText.indexOf('{');
-        const lastBrace = jsonText.lastIndexOf('}');
-        if (firstBrace !== -1 && lastBrace > firstBrace) {
-          jsonText = jsonText.substring(firstBrace, lastBrace + 1);
+          jsonText = jsonText.trim();
+          
+          // Robust JSON extraction: find the first { and last } to extract JSON object
+          // This handles cases where the LLM includes preamble text before the JSON
+          const firstBrace = jsonText.indexOf('{');
+          const lastBrace = jsonText.lastIndexOf('}');
+          if (firstBrace !== -1 && lastBrace > firstBrace) {
+            jsonText = jsonText.substring(firstBrace, lastBrace + 1);
+          }
+          
+          aiResponse = JSON.parse(jsonText);
+        } catch {
+          console.error("Failed to parse AI response:", textResponse.text);
+          return NextResponse.json(
+            { error: "Failed to parse AI response. Please try again." },
+            { status: 500 }
+          );
         }
-        
-        aiResponse = JSON.parse(jsonText);
-      } catch {
-        console.error("Failed to parse AI response:", textResponse.text);
-        return NextResponse.json(
-          { error: "Failed to parse AI response. Please try again." },
-          { status: 500 }
-        );
-      }
 
-      if (!aiResponse.modifications || aiResponse.modifications.length === 0) {
-        return NextResponse.json({
-          success: true,
-          sessionId: newSessionId,
-          modifications: [],
-          explanation: aiResponse.explanation || "No changes needed.",
-          reasoning: aiResponse.reasoning,
-        });
-      }
+        finalExplanation = aiResponse.explanation;
+        finalReasoning = aiResponse.reasoning;
 
-      // Build set of valid file paths from page context
-      const validFilePaths = new Set<string>();
-      if (pageContext.pageFile) {
-        validFilePaths.add(pageContext.pageFile);
-      }
-      for (const comp of pageContext.componentSources) {
-        validFilePaths.add(comp.path);
-      }
-      
-      // FIX: Add the recommended file to validFilePaths (it was spliced out for display purposes)
-      if (recommendedFileContent) {
-        validFilePaths.add(recommendedFileContent.path);
-      }
+        if (!aiResponse.modifications || aiResponse.modifications.length === 0) {
+          return NextResponse.json({
+            success: true,
+            sessionId: newSessionId,
+            modifications: [],
+            explanation: aiResponse.explanation || "No changes needed.",
+            reasoning: aiResponse.reasoning,
+          });
+        }
       
-      debugLog("VALIDATION: Valid file paths from page context", { 
-        pageFile: pageContext.pageFile,
-        validFilePaths: Array.from(validFilePaths),
-        aiRequestedFiles: aiResponse.modifications.map(m => m.filePath)
-      });
+        debugLog("VALIDATION: Valid file paths from page context", { 
+          pageFile: pageContext.pageFile,
+          validFilePaths: Array.from(validFilePaths),
+          aiRequestedFiles: aiResponse.modifications.map(m => m.filePath)
+        });
       
-      // Process modifications - apply patches to get modified content
-      const modifications: VisionFileModification[] = [];
-      const patchErrors: string[] = [];
+        // Process modifications - apply patches to get modified content
+        modifications = [];
+        const patchErrors: string[] = [];
       
       for (const mod of aiResponse.modifications) {
         // Validate that the file path is in the page context
@@ -947,6 +984,47 @@ CRITICAL: Edit the TARGET COMPONENT (marked with ***), not the page wrapper.`;
           // New patch-based approach
           console.log(`[Apply-First] Applying ${mod.patches.length} patches to ${mod.filePath}`);
           
+          // PRE-VALIDATION: Check if all search strings exist in the file BEFORE applying
+          const preValidationErrors: string[] = [];
+          for (const patch of mod.patches) {
+            const normalizedSearch = patch.search.replace(/\\n/g, "\n");
+            if (!originalContent.includes(normalizedSearch)) {
+              // Try fuzzy match as fallback
+              const fuzzyMatch = findFuzzyMatch(normalizedSearch, originalContent);
+              if (!fuzzyMatch) {
+                // Find the closest matching snippet to help with debugging
+                const searchPreview = normalizedSearch.substring(0, 80).replace(/\n/g, "\\n");
+                
+                // Look for partial matches to give helpful feedback
+                const searchLines = normalizedSearch.split("\n").filter(l => l.trim().length > 10);
+                const partialMatches: string[] = [];
+                for (const line of searchLines.slice(0, 3)) {
+                  const trimmedLine = line.trim();
+                  if (trimmedLine.length > 10 && originalContent.includes(trimmedLine)) {
+                    partialMatches.push(trimmedLine.substring(0, 50));
+                  }
+                }
+                
+                let errorMsg = `Patch search string not found: "${searchPreview}..."`;
+                if (partialMatches.length > 0) {
+                  errorMsg += ` (partial matches found: ${partialMatches.join(", ")})`;
+                }
+                preValidationErrors.push(errorMsg);
+                debugLog("Pre-validation failed: search string not found", {
+                  filePath: mod.filePath,
+                  searchPreview,
+                  partialMatches
+                });
+              }
+            }
+          }
+          
+          // If pre-validation failed, add to errors and skip this file
+          if (preValidationErrors.length > 0) {
+            patchErrors.push(`${mod.filePath}: AI generated patches with non-existent code (hallucination detected):\n${preValidationErrors.join("\n")}`);
+            continue;
+          }
+          
           const patchResult = applyPatches(originalContent, mod.patches);
           
           if (!patchResult.success) {
@@ -993,22 +1071,39 @@ CRITICAL: Edit the TARGET COMPONENT (marked with ***), not the page wrapper.`;
         });
       }
 
-      // If all modifications failed, return error
-      if (patchErrors.length > 0 && modifications.length === 0) {
-        console.error("All AI patches failed:", patchErrors);
-        return NextResponse.json(
-          {
-            success: false,
-            error: `Patch application failed:\n\n${patchErrors.join("\n\n")}`,
-          },
-          { status: 400 }
-        );
-      }
+        // If all modifications failed, check if we should retry
+        if (patchErrors.length > 0 && modifications.length === 0) {
+          if (retryCount < MAX_RETRIES) {
+            console.warn(`[Apply-First] All patches failed, retrying (attempt ${retryCount + 1}/${MAX_RETRIES + 1})...`);
+            debugLog("Retry triggered due to patch failures", { 
+              retryCount, 
+              errorCount: patchErrors.length,
+              errors: patchErrors.slice(0, 3) // Log first 3 errors
+            });
+            lastPatchErrors = patchErrors;
+            retryCount++;
+            continue; // Retry the LLM call
+          }
+          
+          // Exhausted retries, return error
+          console.error("All AI patches failed after retries:", patchErrors);
+          return NextResponse.json(
+            {
+              success: false,
+              error: `Patch application failed (after ${retryCount} retry attempts):\n\n${patchErrors.join("\n\n")}`,
+            },
+            { status: 400 }
+          );
+        }
 
-      // Log patch errors as warnings if some modifications succeeded
-      if (patchErrors.length > 0) {
-        console.warn("Some patches failed:", patchErrors);
-      }
+        // Log patch errors as warnings if some modifications succeeded
+        if (patchErrors.length > 0) {
+          console.warn("Some patches failed:", patchErrors);
+        }
+        
+        // Successfully processed at least some modifications - break out of retry loop
+        break;
+      } // End of retry loop
 
       // Create backups and apply changes atomically
       const applyResult = await applyChangesWithBackup(
@@ -1029,8 +1124,8 @@ CRITICAL: Edit the TARGET COMPONENT (marked with ***), not the page wrapper.`;
         sessionId: newSessionId,
         modifications,
         backupPaths: applyResult.backupPaths,
-        explanation: aiResponse.explanation,
-        reasoning: aiResponse.reasoning,
+        explanation: finalExplanation,
+        reasoning: finalReasoning,
       });
     }
 

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

@@ -466,6 +466,8 @@ Return search/replace patches (NOT full files). The system applies your patches
 - "replace" contains your modified version
 - Include 2-4 lines of context in "search" to make it unique
 - You may ONLY edit files provided in the PAGE CONTEXT section
+- CRITICAL: NEVER invent or guess code. Your "search" string MUST be copied EXACTLY from the provided file content. If you cannot find the exact code to modify, return an empty modifications array.
+- If the file content appears truncated, only modify code that is visible in the provided content.
 
 **SONANCE BRAND COLORS:**
 - Charcoal: #333F48 (primary text)
@@ -668,10 +670,10 @@ export async function POST(request: Request) {
       }
 
       // ========== SMART CONTEXT BUDGETING ==========
-      // Total budget: 100k chars (~25k tokens, safe for Claude)
-      // Priority: Recommended file (full) > Page file (limited) > Other components (dynamic)
-      const TOTAL_CONTEXT_BUDGET = 100000;
-      const MAX_RECOMMENDED_FILE = 80000; // 80k chars max for recommended file
+      // Claude can handle 200k tokens (~800k chars), so we can safely include large files
+      // Priority: Recommended file (NEVER truncate) > Page file (limited) > Other components (dynamic)
+      const TOTAL_CONTEXT_BUDGET = 500000; // 500k chars total budget
+      const MAX_RECOMMENDED_FILE = Infinity; // NEVER truncate the target file - AI needs full context
       const MAX_PAGE_FILE = 2000; // Page file is just a wrapper
       const MAX_GLOBALS_CSS = 1500;
       const MAX_FILES = 25;
@@ -705,9 +707,8 @@ ${focusedElements.map((el) => `- ${el.name} (${el.type}) at (${el.coordinates.x}
 
       // ========== TARGET COMPONENT (RECOMMENDED FILE) - SHOWN FIRST ==========
       if (recommendedFileContent) {
-        const content = recommendedFileContent.content.length > MAX_RECOMMENDED_FILE
-          ? recommendedFileContent.content.substring(0, MAX_RECOMMENDED_FILE) + "\n// ... (file truncated at 50k chars, showing component definition and main logic)"
-          : recommendedFileContent.content;
+        // Never truncate the recommended file - AI needs full context to avoid hallucination
+        const content = recommendedFileContent.content;
         
         textContent += `═══════════════════════════════════════════════════════════════════════════════
 ⚡ TARGET COMPONENT - YOU MUST EDIT THIS FILE
@@ -818,97 +819,135 @@ CRITICAL: Edit the TARGET COMPONENT (marked with ***), not the page wrapper.`;
         text: textContent,
       });
 
-      // Call Claude Vision API
+      // Call Claude Vision API with retry mechanism
       const anthropic = new Anthropic({ apiKey });
-
-      const response = await anthropic.messages.create({
-        model: "claude-sonnet-4-20250514",
-        max_tokens: 16384,
-        messages: [
+      
+      // Build list of known file paths (for logging)
+      const knownPaths = new Set<string>();
+      if (pageContext.pageFile) {
+        knownPaths.add(pageContext.pageFile);
+      }
+      for (const comp of pageContext.componentSources) {
+        knownPaths.add(comp.path);
+      }
+      
+      // Retry loop for handling patch failures
+      const MAX_RETRIES = 1;
+      let retryCount = 0;
+      let lastPatchErrors: string[] = [];
+      let modificationsWithOriginals: VisionFileModification[] = [];
+      let finalExplanation: string | undefined;
+      let finalReasoning: string | undefined;
+      let finalAggregatedCSS: string | undefined;
+      
+      while (retryCount <= MAX_RETRIES) {
+        // Build messages for this attempt
+        const currentMessages: Anthropic.MessageCreateParams["messages"] = [
           {
             role: "user",
             content: messageContent,
           },
-        ],
-        system: VISION_SYSTEM_PROMPT,
-      });
+        ];
+        
+        // If this is a retry, add feedback about what went wrong
+        if (retryCount > 0 && lastPatchErrors.length > 0) {
+          debugLog("Retry attempt with feedback", { retryCount, errorCount: lastPatchErrors.length });
+          currentMessages.push({
+            role: "assistant",
+            content: "I'll analyze the screenshot and generate the patches now.",
+          });
+          currentMessages.push({
+            role: "user",
+            content: `PATCH APPLICATION FAILED. Your previous patches referenced code that does not exist in the file (hallucination detected).
 
-      // Extract text content from response
-      const textResponse = response.content.find((block) => block.type === "text");
-      if (!textResponse || textResponse.type !== "text") {
-        return NextResponse.json(
-          { error: "No text response from AI" },
-          { status: 500 }
-        );
-      }
+Failed patches:
+${lastPatchErrors.join("\n\n")}
 
-      // Parse AI response - now expecting patches instead of full file content
-      let aiResponse: {
-        reasoning?: string;
-        modifications: Array<{
-          filePath: string;
-          patches?: Patch[];
-          // Legacy support for modifiedContent (will be deprecated)
-          modifiedContent?: string;
-          explanation?: string;
-          previewCSS?: string;
-        }>;
-        aggregatedPreviewCSS?: string;
-        explanation?: string;
-      };
+IMPORTANT: You must copy the "search" string EXACTLY from the file content I provided. Do NOT invent or guess code.
+Look carefully at the ACTUAL file content in the TARGET COMPONENT section above and try again.
 
-      try {
-        let jsonText = textResponse.text.trim();
-        
-        // Try to extract JSON from markdown code blocks
-        const jsonMatch = jsonText.match(/```json\n([\s\S]*?)\n```/) || 
-                         jsonText.match(/```\n([\s\S]*?)\n```/);
-        
-        if (jsonMatch) {
-          jsonText = jsonMatch[1];
-        } else if (jsonText.includes("```json")) {
-            // Fallback for cases where regex might miss due to newlines
-            const start = jsonText.indexOf("```json") + 7;
-            const end = jsonText.lastIndexOf("```");
-            if (end > start) {
-                jsonText = jsonText.substring(start, end);
-            }
+If you cannot find the exact code to modify, return an empty modifications array with an explanation.`,
+          });
         }
 
-        // Clean up any remaining whitespace
-        jsonText = jsonText.trim();
-        
-        // Robust JSON extraction: find the first { and last } to extract JSON object
-        // This handles cases where the LLM includes preamble text before the JSON
-        const firstBrace = jsonText.indexOf('{');
-        const lastBrace = jsonText.lastIndexOf('}');
-        if (firstBrace !== -1 && lastBrace > firstBrace) {
-          jsonText = jsonText.substring(firstBrace, lastBrace + 1);
+        const response = await anthropic.messages.create({
+          model: "claude-sonnet-4-20250514",
+          max_tokens: 16384,
+          messages: currentMessages,
+          system: VISION_SYSTEM_PROMPT,
+        });
+
+        // Extract text content from response
+        const textResponse = response.content.find((block) => block.type === "text");
+        if (!textResponse || textResponse.type !== "text") {
+          return NextResponse.json(
+            { error: "No text response from AI" },
+            { status: 500 }
+          );
         }
-        
-        aiResponse = JSON.parse(jsonText);
-      } catch {
-        console.error("Failed to parse AI response:", textResponse.text);
-        return NextResponse.json(
-          { error: "Failed to parse AI response. Please try again." },
-          { status: 500 }
-        );
-      }
 
-      // Build list of known file paths (for logging)
-      const knownPaths = new Set<string>();
-      if (pageContext.pageFile) {
-        knownPaths.add(pageContext.pageFile);
-      }
-      for (const comp of pageContext.componentSources) {
-        knownPaths.add(comp.path);
-      }
+        // Parse AI response - now expecting patches instead of full file content
+        let aiResponse: {
+          reasoning?: string;
+          modifications: Array<{
+            filePath: string;
+            patches?: Patch[];
+            // Legacy support for modifiedContent (will be deprecated)
+            modifiedContent?: string;
+            explanation?: string;
+            previewCSS?: string;
+          }>;
+          aggregatedPreviewCSS?: string;
+          explanation?: string;
+        };
 
-      debugLog("VALIDATION: Known file paths from page context", {
-        pageFile: pageContext.pageFile,
-        knownPaths: Array.from(knownPaths),
-        aiRequestedFiles: (aiResponse.modifications || []).map(m => m.filePath)
-      });
+        try {
+          let jsonText = textResponse.text.trim();
+          
+          // Try to extract JSON from markdown code blocks
+          const jsonMatch = jsonText.match(/```json\n([\s\S]*?)\n```/) || 
+                           jsonText.match(/```\n([\s\S]*?)\n```/);
+          
+          if (jsonMatch) {
+            jsonText = jsonMatch[1];
+          } else if (jsonText.includes("```json")) {
+              // Fallback for cases where regex might miss due to newlines
+              const start = jsonText.indexOf("```json") + 7;
+              const end = jsonText.lastIndexOf("```");
+              if (end > start) {
+                  jsonText = jsonText.substring(start, end);
+              }
+          }
+
+          // Clean up any remaining whitespace
+          jsonText = jsonText.trim();
+          
+          // Robust JSON extraction: find the first { and last } to extract JSON object
+          // This handles cases where the LLM includes preamble text before the JSON
+          const firstBrace = jsonText.indexOf('{');
+          const lastBrace = jsonText.lastIndexOf('}');
+          if (firstBrace !== -1 && lastBrace > firstBrace) {
+            jsonText = jsonText.substring(firstBrace, lastBrace + 1);
+          }
+          
+          aiResponse = JSON.parse(jsonText);
+        } catch {
+          console.error("Failed to parse AI response:", textResponse.text);
+          return NextResponse.json(
+            { error: "Failed to parse AI response. Please try again." },
+            { status: 500 }
+          );
+        }
+
+        finalExplanation = aiResponse.explanation;
+        finalReasoning = aiResponse.reasoning;
+        finalAggregatedCSS = aiResponse.aggregatedPreviewCSS;
+
+        debugLog("VALIDATION: Known file paths from page context", {
+          pageFile: pageContext.pageFile,
+          knownPaths: Array.from(knownPaths),
+          aiRequestedFiles: (aiResponse.modifications || []).map(m => m.filePath)
+        });
 
       // Validate AI response - trust the LLM to identify the correct file
       // Only reject paths that are outside the project or don't exist
@@ -949,9 +988,9 @@ CRITICAL: Edit the TARGET COMPONENT (marked with ***), not the page wrapper.`;
         }
       }
 
-      // Process modifications - apply patches to get modified content
-      const modificationsWithOriginals: VisionFileModification[] = [];
-      const patchErrors: string[] = [];
+        // Process modifications - apply patches to get modified content
+        modificationsWithOriginals = [];
+        const patchErrors: string[] = [];
       
       for (const mod of aiResponse.modifications || []) {
         const fullPath = path.join(projectRoot, mod.filePath);
@@ -968,6 +1007,47 @@ CRITICAL: Edit the TARGET COMPONENT (marked with ***), not the page wrapper.`;
           // New patch-based approach
           console.log(`[Vision Mode] Applying ${mod.patches.length} patches to ${mod.filePath}`);
           
+          // PRE-VALIDATION: Check if all search strings exist in the file BEFORE applying
+          const preValidationErrors: string[] = [];
+          for (const patch of mod.patches) {
+            const normalizedSearch = patch.search.replace(/\\n/g, "\n");
+            if (!originalContent.includes(normalizedSearch)) {
+              // Try fuzzy match as fallback
+              const fuzzyMatch = findFuzzyMatch(normalizedSearch, originalContent);
+              if (!fuzzyMatch) {
+                // Find the closest matching snippet to help with debugging
+                const searchPreview = normalizedSearch.substring(0, 80).replace(/\n/g, "\\n");
+                
+                // Look for partial matches to give helpful feedback
+                const searchLines = normalizedSearch.split("\n").filter(l => l.trim().length > 10);
+                const partialMatches: string[] = [];
+                for (const line of searchLines.slice(0, 3)) {
+                  const trimmedLine = line.trim();
+                  if (trimmedLine.length > 10 && originalContent.includes(trimmedLine)) {
+                    partialMatches.push(trimmedLine.substring(0, 50));
+                  }
+                }
+                
+                let errorMsg = `Patch search string not found: "${searchPreview}..."`;
+                if (partialMatches.length > 0) {
+                  errorMsg += ` (partial matches found: ${partialMatches.join(", ")})`;
+                }
+                preValidationErrors.push(errorMsg);
+                debugLog("Pre-validation failed: search string not found", {
+                  filePath: mod.filePath,
+                  searchPreview,
+                  partialMatches
+                });
+              }
+            }
+          }
+          
+          // If pre-validation failed, add to errors and skip this file
+          if (preValidationErrors.length > 0) {
+            patchErrors.push(`${mod.filePath}: AI generated patches with non-existent code (hallucination detected):\n${preValidationErrors.join("\n")}`);
+            continue;
+          }
+          
           const patchResult = applyPatches(originalContent, mod.patches);
           
           if (!patchResult.success) {
@@ -1015,22 +1095,39 @@ CRITICAL: Edit the TARGET COMPONENT (marked with ***), not the page wrapper.`;
         });
       }
 
-      // If all modifications failed, return error
-      if (patchErrors.length > 0 && modificationsWithOriginals.length === 0) {
-        console.error("All AI patches failed:", patchErrors);
-        return NextResponse.json(
-          {
-            success: false,
-            error: `Patch application failed:\n\n${patchErrors.join("\n\n")}`,
-          } as VisionEditResponse,
-          { status: 400 }
-        );
-      }
+        // If all modifications failed, check if we should retry
+        if (patchErrors.length > 0 && modificationsWithOriginals.length === 0) {
+          if (retryCount < MAX_RETRIES) {
+            console.warn(`[Vision Mode] All patches failed, retrying (attempt ${retryCount + 1}/${MAX_RETRIES + 1})...`);
+            debugLog("Retry triggered due to patch failures", { 
+              retryCount, 
+              errorCount: patchErrors.length,
+              errors: patchErrors.slice(0, 3) // Log first 3 errors
+            });
+            lastPatchErrors = patchErrors;
+            retryCount++;
+            continue; // Retry the LLM call
+          }
+          
+          // Exhausted retries, return error
+          console.error("All AI patches failed after retries:", patchErrors);
+          return NextResponse.json(
+            {
+              success: false,
+              error: `Patch application failed (after ${retryCount} retry attempts):\n\n${patchErrors.join("\n\n")}`,
+            } as VisionEditResponse,
+            { status: 400 }
+          );
+        }
 
-      // Log patch errors as warnings if some modifications succeeded
-      if (patchErrors.length > 0) {
-        console.warn("Some patches failed:", patchErrors);
-      }
+        // Log patch errors as warnings if some modifications succeeded
+        if (patchErrors.length > 0) {
+          console.warn("Some patches failed:", patchErrors);
+        }
+        
+        // Successfully processed at least some modifications - break out of retry loop
+        break;
+      } // End of retry loop
 
       // Aggregate preview CSS
       const aggregatedCSS = modificationsWithOriginals
@@ -1041,9 +1138,9 @@ CRITICAL: Edit the TARGET COMPONENT (marked with ***), not the page wrapper.`;
       return NextResponse.json({
         success: true,
         modifications: modificationsWithOriginals,
-        aggregatedPreviewCSS: aiResponse.aggregatedPreviewCSS || aggregatedCSS,
-        explanation: aiResponse.explanation,
-        reasoning: aiResponse.reasoning,
+        aggregatedPreviewCSS: finalAggregatedCSS || aggregatedCSS,
+        explanation: finalExplanation,
+        reasoning: finalReasoning,
       } as VisionEditResponse);
     }
 

package/package.json

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