sonance-brand-mcp 1.3.85 → 1.3.87

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

@@ -94,22 +94,36 @@ function debugLog(message: string, data?: unknown) {
 /**
  * Extract JSON from LLM response that may contain preamble text
  * Handles: pure JSON, markdown code fences, and text with embedded JSON
+ * 
+ * PRIORITY ORDER:
+ * 1. Direct JSON (starts with {)
+ * 2. Explicit ```json fence (most reliable)
+ * 3. Raw JSON object in text (handles prose + JSON responses)
+ * 4. Generic code fence (last resort, may match tsx/js fences incorrectly)
  */
 function extractJsonFromResponse(text: string): string {
   // Try direct parse first - if it starts with {, it's likely pure JSON
   const trimmed = text.trim();
   if (trimmed.startsWith('{')) return trimmed;
   
-  // Extract from markdown code fence (```json ... ``` or ``` ... ```)
-  const fenceMatch = text.match(/```(?:json)?\s*([\s\S]*?)```/);
-  if (fenceMatch) {
-    const extracted = fenceMatch[1].trim();
-    debugLog("Extracted JSON from markdown fence", { previewLength: extracted.length });
+  // PRIORITY 1: Look specifically for ```json fence (most reliable)
+  const jsonFenceMatch = text.match(/```json\s*([\s\S]*?)```/);
+  if (jsonFenceMatch) {
+    const extracted = jsonFenceMatch[1].trim();
+    debugLog("Extracted JSON from explicit json fence", { previewLength: extracted.length });
     return extracted;
   }
   
-  // Find the JSON object in the text (for responses with preamble)
-  const jsonStart = text.indexOf('{');
+  // PRIORITY 2: Find raw JSON object in text (handles prose + JSON at end)
+  // Look for {"modifications" pattern which is our expected response format
+  const modMatch = text.match(/(\{"modifications"\s*:\s*\[[\s\S]*\](?:\s*,\s*"explanation"\s*:\s*"[^"]*")?\s*\})/);
+  if (modMatch) {
+    debugLog("Extracted JSON via modifications pattern", { length: modMatch[1].length });
+    return modMatch[1];
+  }
+  
+  // PRIORITY 3: Find any JSON object starting with {"
+  const jsonStart = text.indexOf('{"');
   const jsonEnd = text.lastIndexOf('}');
   if (jsonStart !== -1 && jsonEnd > jsonStart) {
     const extracted = text.slice(jsonStart, jsonEnd + 1);
@@ -120,6 +134,18 @@ function extractJsonFromResponse(text: string): string {
     return extracted;
   }
   
+  // PRIORITY 4 (last resort): Try generic code fence
+  // This may incorrectly match tsx/js fences, so it's lowest priority
+  const fenceMatch = text.match(/```\s*([\s\S]*?)```/);
+  if (fenceMatch) {
+    const extracted = fenceMatch[1].trim();
+    // Only use if it looks like JSON
+    if (extracted.startsWith('{')) {
+      debugLog("Extracted JSON from generic fence", { previewLength: extracted.length });
+      return extracted;
+    }
+  }
+  
   // Return as-is if no JSON structure found
   return text;
 }
@@ -944,41 +970,41 @@ export async function POST(request: Request) {
             });
           }
           
-          // CURSOR-STYLE: If focused element search has high confidence, use it directly
-          // Skip the LLM guessing phase - we found the file that contains the code
-          const HIGH_CONFIDENCE_THRESHOLD = 50; // Score of 50+ means we found exact matches
-          
-          if (focusedElementHints.length > 0 && focusedElementHints[0].score >= HIGH_CONFIDENCE_THRESHOLD) {
-            // HIGH CONFIDENCE: Use focused element match directly
+          // IMPROVED: Relative scoring - compare focused element vs smart search
+          // This prevents false positives from generic element IDs in wrong files
+          const smartSearchTopScore = searchResults[0]?.score || 0;
+          const smartSearchTopPath = searchResults[0]?.path || null;
+          const focusedTopScore = focusedElementHints[0]?.score || 0;
+          const focusedTopPath = focusedElementHints[0]?.path || null;
+
+          // Check if Phase 2a match (component-name) is confirmed by focused element search
+          const phase2aConfirmed = phase2aMatches.length > 0 && 
+            focusedElementHints.some(h => phase2aMatches.includes(h.path) && h.score > 0);
+
+          if (phase2aConfirmed) {
+            // PRIORITY 1: Phase 2a match confirmed by element search - highest confidence
+            const confirmedPath = phase2aMatches.find(p => 
+              focusedElementHints.some(h => h.path === p && h.score > 0)
+            );
             recommendedFile = {
-              path: focusedElementHints[0].path,
-              reason: `Content search found element (score: ${focusedElementHints[0].score}, matches: ${focusedElementHints[0].matches.join(', ')})`
+              path: confirmedPath!,
+              reason: `Phase 2a component-name match confirmed by element search`
             };
-            debugLog("HIGH CONFIDENCE: Using focused element match directly", recommendedFile);
-          } else if (searchResults.length > 0) {
-            // LOW CONFIDENCE: Fall back to LLM selection
-            const candidateFiles = searchResults.slice(0, 10).map(r => r.path);
-            const selectedFile = await selectBestFileFromList(
-              screenshot,
-              userPrompt,
-              candidateFiles,
-              apiKey,
-              focusedElementHints
-            );
-            
-            if (selectedFile) {
-              recommendedFile = {
-                path: selectedFile,
-                reason: `LLM selected from ${candidateFiles.length} candidate files`
-              };
-            } else {
-              // Fallback to highest score if LLM selection fails
-              recommendedFile = {
-                path: searchResults[0].path,
-                reason: `Highest content match score (${searchResults[0].score} points)`
-              };
-            }
-            debugLog("Recommended file for editing", recommendedFile);
+            debugLog("PRIORITY 1: Phase 2a confirmed by element search", recommendedFile);
+          } else if (focusedTopScore > smartSearchTopScore * 0.5 && focusedTopScore >= 400) {
+            // PRIORITY 2: Focused element has strong absolute score AND relative to smart search
+            recommendedFile = {
+              path: focusedTopPath!,
+              reason: `Focused element match (score: ${focusedTopScore}, exceeds threshold)`
+            };
+            debugLog("PRIORITY 2: Strong focused element match", recommendedFile);
+          } else if (smartSearchTopPath) {
+            // PRIORITY 3: Smart search top result - trusted baseline
+            recommendedFile = {
+              path: smartSearchTopPath,
+              reason: `Smart search top result (score: ${smartSearchTopScore})`
+            };
+            debugLog("PRIORITY 3: Using smart search top result", recommendedFile);
           }
           
           debugLog("Phase 1+2 complete", {

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

@@ -90,22 +90,36 @@ function debugLog(message: string, data?: unknown) {
 /**
  * Extract JSON from LLM response that may contain preamble text
  * Handles: pure JSON, markdown code fences, and text with embedded JSON
+ * 
+ * PRIORITY ORDER:
+ * 1. Direct JSON (starts with {)
+ * 2. Explicit ```json fence (most reliable)
+ * 3. Raw JSON object in text (handles prose + JSON responses)
+ * 4. Generic code fence (last resort, may match tsx/js fences incorrectly)
  */
 function extractJsonFromResponse(text: string): string {
   // Try direct parse first - if it starts with {, it's likely pure JSON
   const trimmed = text.trim();
   if (trimmed.startsWith('{')) return trimmed;
   
-  // Extract from markdown code fence (```json ... ``` or ``` ... ```)
-  const fenceMatch = text.match(/```(?:json)?\s*([\s\S]*?)```/);
-  if (fenceMatch) {
-    const extracted = fenceMatch[1].trim();
-    debugLog("Extracted JSON from markdown fence", { previewLength: extracted.length });
+  // PRIORITY 1: Look specifically for ```json fence (most reliable)
+  const jsonFenceMatch = text.match(/```json\s*([\s\S]*?)```/);
+  if (jsonFenceMatch) {
+    const extracted = jsonFenceMatch[1].trim();
+    debugLog("Extracted JSON from explicit json fence", { previewLength: extracted.length });
     return extracted;
   }
   
-  // Find the JSON object in the text (for responses with preamble)
-  const jsonStart = text.indexOf('{');
+  // PRIORITY 2: Find raw JSON object in text (handles prose + JSON at end)
+  // Look for {"modifications" pattern which is our expected response format
+  const modMatch = text.match(/(\{"modifications"\s*:\s*\[[\s\S]*\](?:\s*,\s*"explanation"\s*:\s*"[^"]*")?\s*\})/);
+  if (modMatch) {
+    debugLog("Extracted JSON via modifications pattern", { length: modMatch[1].length });
+    return modMatch[1];
+  }
+  
+  // PRIORITY 3: Find any JSON object starting with {"
+  const jsonStart = text.indexOf('{"');
   const jsonEnd = text.lastIndexOf('}');
   if (jsonStart !== -1 && jsonEnd > jsonStart) {
     const extracted = text.slice(jsonStart, jsonEnd + 1);
@@ -116,6 +130,18 @@ function extractJsonFromResponse(text: string): string {
     return extracted;
   }
   
+  // PRIORITY 4 (last resort): Try generic code fence
+  // This may incorrectly match tsx/js fences, so it's lowest priority
+  const fenceMatch = text.match(/```\s*([\s\S]*?)```/);
+  if (fenceMatch) {
+    const extracted = fenceMatch[1].trim();
+    // Only use if it looks like JSON
+    if (extracted.startsWith('{')) {
+      debugLog("Extracted JSON from generic fence", { previewLength: extracted.length });
+      return extracted;
+    }
+  }
+  
   // Return as-is if no JSON structure found
   return text;
 }
@@ -913,41 +939,41 @@ export async function POST(request: Request) {
             });
           }
           
-          // CURSOR-STYLE: If focused element search has high confidence, use it directly
-          // Skip the LLM guessing phase - we found the file that contains the code
-          const HIGH_CONFIDENCE_THRESHOLD = 50; // Score of 50+ means we found exact matches
-          
-          if (focusedElementHints.length > 0 && focusedElementHints[0].score >= HIGH_CONFIDENCE_THRESHOLD) {
-            // HIGH CONFIDENCE: Use focused element match directly
+          // IMPROVED: Relative scoring - compare focused element vs smart search
+          // This prevents false positives from generic element IDs in wrong files
+          const smartSearchTopScore = searchResults[0]?.score || 0;
+          const smartSearchTopPath = searchResults[0]?.path || null;
+          const focusedTopScore = focusedElementHints[0]?.score || 0;
+          const focusedTopPath = focusedElementHints[0]?.path || null;
+
+          // Check if Phase 2a match (component-name) is confirmed by focused element search
+          const phase2aConfirmed = phase2aMatches.length > 0 && 
+            focusedElementHints.some(h => phase2aMatches.includes(h.path) && h.score > 0);
+
+          if (phase2aConfirmed) {
+            // PRIORITY 1: Phase 2a match confirmed by element search - highest confidence
+            const confirmedPath = phase2aMatches.find(p => 
+              focusedElementHints.some(h => h.path === p && h.score > 0)
+            );
             recommendedFile = {
-              path: focusedElementHints[0].path,
-              reason: `Content search found element (score: ${focusedElementHints[0].score}, matches: ${focusedElementHints[0].matches.join(', ')})`
+              path: confirmedPath!,
+              reason: `Phase 2a component-name match confirmed by element search`
             };
-            debugLog("HIGH CONFIDENCE: Using focused element match directly", recommendedFile);
-          } else if (searchResults.length > 0) {
-            // LOW CONFIDENCE: Fall back to LLM selection
-            const candidateFiles = searchResults.slice(0, 10).map(r => r.path);
-            const selectedFile = await selectBestFileFromList(
-              screenshot,
-              userPrompt,
-              candidateFiles,
-              apiKey,
-              focusedElementHints
-            );
-            
-            if (selectedFile) {
-              recommendedFile = {
-                path: selectedFile,
-                reason: `LLM selected from ${candidateFiles.length} candidate files`
-              };
-            } else {
-              // Fallback to highest score if LLM selection fails
-              recommendedFile = {
-                path: searchResults[0].path,
-                reason: `Highest content match score (${searchResults[0].score} points)`
-              };
-            }
-            debugLog("Recommended file for editing", recommendedFile);
+            debugLog("PRIORITY 1: Phase 2a confirmed by element search", recommendedFile);
+          } else if (focusedTopScore > smartSearchTopScore * 0.5 && focusedTopScore >= 400) {
+            // PRIORITY 2: Focused element has strong absolute score AND relative to smart search
+            recommendedFile = {
+              path: focusedTopPath!,
+              reason: `Focused element match (score: ${focusedTopScore}, exceeds threshold)`
+            };
+            debugLog("PRIORITY 2: Strong focused element match", recommendedFile);
+          } else if (smartSearchTopPath) {
+            // PRIORITY 3: Smart search top result - trusted baseline
+            recommendedFile = {
+              path: smartSearchTopPath,
+              reason: `Smart search top result (score: ${smartSearchTopScore})`
+            };
+            debugLog("PRIORITY 3: Using smart search top result", recommendedFile);
           }
           
           debugLog("Phase 1+2 complete", {

package/package.json

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