sonance-brand-mcp 1.3.30 → 1.3.32

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

@@ -212,8 +212,8 @@ export async function POST(request: Request) {
       // Generate a unique session ID
       const newSessionId = randomUUID().slice(0, 8);
 
-      // Gather page context
-      const pageContext = gatherPageContext(pageRoute || "/", projectRoot);
+      // Gather page context (with keyword search based on user prompt)
+      const pageContext = gatherPageContext(pageRoute || "/", projectRoot, userPrompt);
 
       // Build user message with vision
       const messageContent: Anthropic.MessageCreateParams["messages"][0]["content"] = [];
@@ -746,17 +746,23 @@ function gatherAllImports(
   maxDepth: number = 4
 ): { path: string; content: string }[] {
   // Prevent infinite loops and limit total files
-  if (visited.has(filePath) || visited.size > 50) return [];
+  if (visited.has(filePath) || visited.size > 50) {
+    return [];
+  }
   visited.add(filePath);
   
   const results: { path: string; content: string }[] = [];
   const fullPath = path.join(projectRoot, filePath);
   
-  if (!fs.existsSync(fullPath)) return results;
+  if (!fs.existsSync(fullPath)) {
+    debugLog("[apply] gatherAllImports: file not found", { filePath, fullPath });
+    return results;
+  }
   
   try {
     const content = fs.readFileSync(fullPath, "utf-8");
     results.push({ path: filePath, content });
+    debugLog("[apply] gatherAllImports: added file", { filePath, contentLength: content.length });
     
     // Continue recursing if we haven't hit max depth
     if (maxDepth > 0) {
@@ -769,8 +775,8 @@ function gatherAllImports(
         }
       }
     }
-  } catch {
-    // Skip files that can't be read
+  } catch (e) {
+    debugLog("[apply] gatherAllImports: error reading file", { filePath, error: String(e) });
   }
   
   return results;
@@ -837,11 +843,12 @@ function discoverLayoutFiles(pageFile: string | null, projectRoot: string): stri
 
 /**
  * Gather context about the current page for AI analysis
- * Uses recursive import resolution to build complete component graph
+ * Uses recursive import resolution AND keyword search to build complete component graph
  */
 function gatherPageContext(
   pageRoute: string,
-  projectRoot: string
+  projectRoot: string,
+  userPrompt?: string
 ): {
   pageFile: string | null;
   pageContent: string;
@@ -880,6 +887,24 @@ function gatherPageContext(
     }
   }
 
+  // KEYWORD SEARCH: Find additional files based on user prompt keywords
+  // This catches files that aren't in the import chain but contain relevant UI text
+  if (userPrompt) {
+    const keywords = extractKeywordsFromPrompt(userPrompt);
+    if (keywords.length > 0) {
+      const searchResults = searchFilesForKeywords(keywords, projectRoot, 15);
+      
+      for (const result of searchResults) {
+        // Only add if not already in our list
+        if (!visited.has(result.path)) {
+          visited.add(result.path);
+          componentSources.push({ path: result.path, content: result.content });
+          debugLog("[apply] Added file from keyword search", { path: result.path, matchCount: result.matchCount });
+        }
+      }
+    }
+  }
+
   let globalsCSS = "";
   const globalsCSSPatterns = [
     "src/app/globals.css",
@@ -1081,40 +1106,266 @@ function findDynamicRoute(cleanRoute: string, projectRoot: string): string | nul
 }
 
 function extractImports(content: string): string[] {
-  const importRegex = /import\s+.*?\s+from\s+["'](@\/components\/[^"']+|\.\.?\/[^"']+)["']/g;
+  // Match both import AND export statements for @/ and relative paths
+  // This catches barrel files (index.ts) that use: export { Foo } from './Foo'
+  const importExportRegex = /(?:import|export)\s+.*?\s+from\s+["'](@\/[^"']+|\.\.?\/[^"']+)["']/g;
   const imports: string[] = [];
   let match;
 
-  while ((match = importRegex.exec(content)) !== null) {
+  while ((match = importExportRegex.exec(content)) !== null) {
     imports.push(match[1]);
   }
 
+  debugLog("[apply] Extracted imports/exports", { count: imports.length, imports: imports.slice(0, 10) });
   return imports;
 }
 
-function resolveImportPath(
-  importPath: string,
-  fromFile: string,
-  projectRoot: string
-): string | null {
-  if (importPath.startsWith("@/")) {
-    const resolved = importPath.replace("@/", "src/");
-    const withExt = resolved.endsWith(".tsx") ? resolved : `${resolved}.tsx`;
+/**
+ * Extract meaningful keywords from user prompt for file searching
+ * Looks for quoted strings, capitalized phrases, and specific patterns
+ */
+function extractKeywordsFromPrompt(prompt: string): string[] {
+  const keywords: string[] = [];
+  
+  // 1. Extract quoted strings (e.g., "View Assets", 'Edit Process')
+  const quotedRegex = /["']([^"']+)["']/g;
+  let match;
+  while ((match = quotedRegex.exec(prompt)) !== null) {
+    if (match[1].length > 2 && match[1].length < 50) {
+      keywords.push(match[1]);
+    }
+  }
+  
+  // 2. Extract capitalized phrases (e.g., "View Assets", "Quick Actions")
+  // Matches 2+ capitalized words together
+  const capitalizedRegex = /\b([A-Z][a-z]+(?:\s+[A-Z][a-z]+)+)\b/g;
+  while ((match = capitalizedRegex.exec(prompt)) !== null) {
+    if (!keywords.includes(match[1])) {
+      keywords.push(match[1]);
+    }
+  }
+  
+  // 3. Extract single capitalized words that might be component names
+  const singleCapRegex = /\b([A-Z][a-z]{3,})\b/g;
+  while ((match = singleCapRegex.exec(prompt)) !== null) {
+    // Skip common words
+    const skipWords = ["The", "This", "That", "Make", "Change", "Edit", "Update", "Add", "Remove", "Delete"];
+    if (!skipWords.includes(match[1]) && !keywords.includes(match[1])) {
+      keywords.push(match[1]);
+    }
+  }
+  
+  debugLog("[apply] Extracted keywords from prompt", { prompt: prompt.substring(0, 100), keywords });
+  return keywords;
+}
+
+/**
+ * Recursively search files in a directory for keyword matches
+ * Returns file paths that contain any of the keywords
+ */
+function searchFilesForKeywords(
+  keywords: string[],
+  projectRoot: string,
+  maxFiles: number = 10
+): { path: string; content: string; matchCount: number }[] {
+  if (keywords.length === 0) return [];
+  
+  const results: { path: string; content: string; matchCount: number }[] = [];
+  const searchDirs = ["components", "src/components", "app", "src/app", "pages", "src/pages"];
+  const extensions = [".tsx", ".jsx", ".ts", ".js"];
+  const visited = new Set<string>();
+  
+  function searchDir(dirPath: string, depth: number = 0) {
+    if (depth > 5 || results.length >= maxFiles) return;
+    
+    const fullDirPath = path.join(projectRoot, dirPath);
+    if (!fs.existsSync(fullDirPath) || visited.has(fullDirPath)) return;
+    visited.add(fullDirPath);
+    
+    try {
+      const entries = fs.readdirSync(fullDirPath, { withFileTypes: true });
+      
+      for (const entry of entries) {
+        if (results.length >= maxFiles) break;
+        
+        const entryPath = path.join(dirPath, entry.name);
+        const fullEntryPath = path.join(projectRoot, entryPath);
+        
+        if (entry.isDirectory()) {
+          // Skip node_modules, .git, etc.
+          if (!entry.name.startsWith(".") && entry.name !== "node_modules") {
+            searchDir(entryPath, depth + 1);
+          }
+        } else if (entry.isFile() && extensions.some(ext => entry.name.endsWith(ext))) {
+          try {
+            const content = fs.readFileSync(fullEntryPath, "utf-8");
+            
+            // Count keyword matches
+            let matchCount = 0;
+            for (const keyword of keywords) {
+              // Case-insensitive search
+              const regex = new RegExp(keyword.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), "gi");
+              const matches = content.match(regex);
+              if (matches) {
+                matchCount += matches.length;
+              }
+            }
+            
+            if (matchCount > 0) {
+              results.push({ path: entryPath, content, matchCount });
+            }
+          } catch {
+            // Skip files that can't be read
+          }
+        }
+      }
+    } catch {
+      // Skip directories that can't be read
+    }
+  }
+  
+  // Search each directory
+  for (const dir of searchDirs) {
+    searchDir(dir);
+    if (results.length >= maxFiles) break;
+  }
+  
+  // Sort by match count (most matches first)
+  results.sort((a, b) => b.matchCount - a.matchCount);
+  
+  debugLog("[apply] Keyword search results", { 
+    keywords, 
+    filesFound: results.length,
+    topMatches: results.slice(0, 5).map(r => ({ path: r.path, matchCount: r.matchCount }))
+  });
+  
+  return results.slice(0, maxFiles);
+}
+
+// Cache for tsconfig path aliases
+let cachedPathAliases: Map<string, string> | null = null;
+let cachedProjectRoot: string | null = null;
+
+/**
+ * Read and parse tsconfig.json to get path aliases
+ */
+function getPathAliases(projectRoot: string): Map<string, string> {
+  // Return cached if same project
+  if (cachedPathAliases && cachedProjectRoot === projectRoot) {
+    return cachedPathAliases;
+  }
+
+  const aliases = new Map<string, string>();
+  
+  // Try to read tsconfig.json
+  const tsconfigPath = path.join(projectRoot, "tsconfig.json");
+  if (fs.existsSync(tsconfigPath)) {
+    try {
+      const content = fs.readFileSync(tsconfigPath, "utf-8");
+      // Remove comments (tsconfig allows them)
+      const cleanContent = content.replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "");
+      const tsconfig = JSON.parse(cleanContent);
+      
+      const paths = tsconfig.compilerOptions?.paths || {};
+      const baseUrl = tsconfig.compilerOptions?.baseUrl || ".";
+      
+      // Parse path mappings
+      for (const [alias, targets] of Object.entries(paths)) {
+        if (Array.isArray(targets) && targets.length > 0) {
+          // Convert @/* to @/ and src/* to src/
+          const cleanAlias = alias.replace("/*", "/");
+          const cleanTarget = (targets[0] as string).replace("/*", "/").replace("./", "");
+          aliases.set(cleanAlias, cleanTarget);
+        }
+      }
+      
+      debugLog("[apply] Loaded tsconfig path aliases", { aliases: Object.fromEntries(aliases) });
+    } catch (e) {
+      debugLog("[apply] Failed to parse tsconfig.json", { error: String(e) });
+    }
+  }
+  
+  // If no @/ alias found, try common defaults
+  if (!aliases.has("@/")) {
+    // Check if src/ exists
+    if (fs.existsSync(path.join(projectRoot, "src"))) {
+      aliases.set("@/", "src/");
+    } else if (fs.existsSync(path.join(projectRoot, "app"))) {
+      // Next.js App Router without src/
+      aliases.set("@/", "");
+    } else {
+      aliases.set("@/", "");
+    }
+    debugLog("[apply] Using default @/ alias", { alias: aliases.get("@/") });
+  }
+  
+  cachedPathAliases = aliases;
+  cachedProjectRoot = projectRoot;
+  return aliases;
+}
+
+/**
+ * Try multiple file extensions for an import
+ */
+function tryFileExtensions(basePath: string, projectRoot: string): string | null {
+  const extensions = [".tsx", ".ts", ".jsx", ".js"];
+  
+  // First try exact path (if already has extension)
+  if (extensions.some(ext => basePath.endsWith(ext))) {
+    if (fs.existsSync(path.join(projectRoot, basePath))) {
+      return basePath;
+    }
+  }
+  
+  // Try each extension
+  for (const ext of extensions) {
+    const withExt = `${basePath}${ext}`;
     if (fs.existsSync(path.join(projectRoot, withExt))) {
       return withExt;
     }
-    const indexPath = `${resolved}/index.tsx`;
+  }
+  
+  // Try as directory with index file
+  for (const ext of extensions) {
+    const indexPath = `${basePath}/index${ext}`;
     if (fs.existsSync(path.join(projectRoot, indexPath))) {
       return indexPath;
     }
-    return withExt;
   }
+  
+  return null;
+}
 
+function resolveImportPath(
+  importPath: string,
+  fromFile: string,
+  projectRoot: string
+): string | null {
+  const aliases = getPathAliases(projectRoot);
+  
+  // Handle aliased imports (e.g., @/, ~/, etc.)
+  for (const [alias, target] of aliases) {
+    if (importPath.startsWith(alias)) {
+      const resolved = importPath.replace(alias, target);
+      const result = tryFileExtensions(resolved, projectRoot);
+      if (result) {
+        debugLog("[apply] Resolved alias import", { importPath, resolved: result });
+        return result;
+      }
+      // Return best guess even if file not found
+      return `${resolved}.tsx`;
+    }
+  }
+
+  // Handle relative imports
   if (importPath.startsWith(".")) {
     const dir = path.dirname(fromFile);
     const resolved = path.join(dir, importPath);
-    const withExt = resolved.endsWith(".tsx") ? resolved : `${resolved}.tsx`;
-    return withExt;
+    const result = tryFileExtensions(resolved, projectRoot);
+    if (result) {
+      return result;
+    }
+    return `${resolved}.tsx`;
   }
 
   return null;

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

@@ -222,8 +222,8 @@ export async function POST(request: Request) {
         );
       }
 
-      // Gather page context (including focused element files via project-wide search)
-      const pageContext = gatherPageContext(pageRoute, projectRoot, focusedElements);
+      // Gather page context (including focused element files and keyword search)
+      const pageContext = gatherPageContext(pageRoute, projectRoot, focusedElements, userPrompt);
 
       // Build user message with vision
       const messageContent: Anthropic.MessageCreateParams["messages"][0]["content"] = [];
@@ -614,17 +614,23 @@ function gatherAllImports(
   maxDepth: number = 4
 ): { path: string; content: string }[] {
   // Prevent infinite loops and limit total files
-  if (visited.has(filePath) || visited.size > 50) return [];
+  if (visited.has(filePath) || visited.size > 50) {
+    return [];
+  }
   visited.add(filePath);
   
   const results: { path: string; content: string }[] = [];
   const fullPath = path.join(projectRoot, filePath);
   
-  if (!fs.existsSync(fullPath)) return results;
+  if (!fs.existsSync(fullPath)) {
+    debugLog("[edit] gatherAllImports: file not found", { filePath, fullPath });
+    return results;
+  }
   
   try {
     const content = fs.readFileSync(fullPath, "utf-8");
     results.push({ path: filePath, content });
+    debugLog("[edit] gatherAllImports: added file", { filePath, contentLength: content.length });
     
     // Continue recursing if we haven't hit max depth
     if (maxDepth > 0) {
@@ -637,8 +643,8 @@ function gatherAllImports(
         }
       }
     }
-  } catch {
-    // Skip files that can't be read
+  } catch (e) {
+    debugLog("[edit] gatherAllImports: error reading file", { filePath, error: String(e) });
   }
   
   return results;
@@ -705,12 +711,13 @@ function discoverLayoutFiles(pageFile: string | null, projectRoot: string): stri
 
 /**
  * Gather context about the current page for AI analysis
- * Uses recursive import resolution to build complete component graph
+ * Uses recursive import resolution AND keyword search to build complete component graph
  */
 function gatherPageContext(
   pageRoute: string,
   projectRoot: string,
-  focusedElements?: VisionFocusedElement[]
+  focusedElements?: VisionFocusedElement[],
+  userPrompt?: string
 ): {
   pageFile: string | null;
   pageContent: string;
@@ -762,6 +769,24 @@ function gatherPageContext(
     }
   }
 
+  // KEYWORD SEARCH: Find additional files based on user prompt keywords
+  // This catches files that aren't in the import chain but contain relevant UI text
+  if (userPrompt) {
+    const keywords = extractKeywordsFromPrompt(userPrompt);
+    if (keywords.length > 0) {
+      const searchResults = searchFilesForKeywords(keywords, projectRoot, 15);
+      
+      for (const result of searchResults) {
+        // Only add if not already in our list
+        if (!visited.has(result.path)) {
+          visited.add(result.path);
+          componentSources.push({ path: result.path, content: result.content });
+          debugLog("[edit] Added file from keyword search", { path: result.path, matchCount: result.matchCount });
+        }
+      }
+    }
+  }
+
   // Read globals.css - check multiple possible locations
   let globalsCSS = "";
   const globalsCSSPatterns = [
@@ -972,17 +997,236 @@ function findDynamicRoute(cleanRoute: string, projectRoot: string): string | nul
  * Extract import paths from file content
  */
 function extractImports(content: string): string[] {
-  const importRegex = /import\s+.*?\s+from\s+["'](@\/components\/[^"']+|\.\.?\/[^"']+)["']/g;
+  // Match both import AND export statements for @/ and relative paths
+  // This catches barrel files (index.ts) that use: export { Foo } from './Foo'
+  const importExportRegex = /(?:import|export)\s+.*?\s+from\s+["'](@\/[^"']+|\.\.?\/[^"']+)["']/g;
   const imports: string[] = [];
   let match;
 
-  while ((match = importRegex.exec(content)) !== null) {
+  while ((match = importExportRegex.exec(content)) !== null) {
     imports.push(match[1]);
   }
 
+  debugLog("[edit] Extracted imports/exports", { count: imports.length, imports: imports.slice(0, 10) });
   return imports;
 }
 
+/**
+ * Extract meaningful keywords from user prompt for file searching
+ * Looks for quoted strings, capitalized phrases, and specific patterns
+ */
+function extractKeywordsFromPrompt(prompt: string): string[] {
+  const keywords: string[] = [];
+  
+  // 1. Extract quoted strings (e.g., "View Assets", 'Edit Process')
+  const quotedRegex = /["']([^"']+)["']/g;
+  let match;
+  while ((match = quotedRegex.exec(prompt)) !== null) {
+    if (match[1].length > 2 && match[1].length < 50) {
+      keywords.push(match[1]);
+    }
+  }
+  
+  // 2. Extract capitalized phrases (e.g., "View Assets", "Quick Actions")
+  // Matches 2+ capitalized words together
+  const capitalizedRegex = /\b([A-Z][a-z]+(?:\s+[A-Z][a-z]+)+)\b/g;
+  while ((match = capitalizedRegex.exec(prompt)) !== null) {
+    if (!keywords.includes(match[1])) {
+      keywords.push(match[1]);
+    }
+  }
+  
+  // 3. Extract single capitalized words that might be component names
+  const singleCapRegex = /\b([A-Z][a-z]{3,})\b/g;
+  while ((match = singleCapRegex.exec(prompt)) !== null) {
+    // Skip common words
+    const skipWords = ["The", "This", "That", "Make", "Change", "Edit", "Update", "Add", "Remove", "Delete"];
+    if (!skipWords.includes(match[1]) && !keywords.includes(match[1])) {
+      keywords.push(match[1]);
+    }
+  }
+  
+  debugLog("[edit] Extracted keywords from prompt", { prompt: prompt.substring(0, 100), keywords });
+  return keywords;
+}
+
+/**
+ * Recursively search files in a directory for keyword matches
+ * Returns file paths that contain any of the keywords
+ */
+function searchFilesForKeywords(
+  keywords: string[],
+  projectRoot: string,
+  maxFiles: number = 10
+): { path: string; content: string; matchCount: number }[] {
+  if (keywords.length === 0) return [];
+  
+  const results: { path: string; content: string; matchCount: number }[] = [];
+  const searchDirs = ["components", "src/components", "app", "src/app", "pages", "src/pages"];
+  const extensions = [".tsx", ".jsx", ".ts", ".js"];
+  const visited = new Set<string>();
+  
+  function searchDir(dirPath: string, depth: number = 0) {
+    if (depth > 5 || results.length >= maxFiles) return;
+    
+    const fullDirPath = path.join(projectRoot, dirPath);
+    if (!fs.existsSync(fullDirPath) || visited.has(fullDirPath)) return;
+    visited.add(fullDirPath);
+    
+    try {
+      const entries = fs.readdirSync(fullDirPath, { withFileTypes: true });
+      
+      for (const entry of entries) {
+        if (results.length >= maxFiles) break;
+        
+        const entryPath = path.join(dirPath, entry.name);
+        const fullEntryPath = path.join(projectRoot, entryPath);
+        
+        if (entry.isDirectory()) {
+          // Skip node_modules, .git, etc.
+          if (!entry.name.startsWith(".") && entry.name !== "node_modules") {
+            searchDir(entryPath, depth + 1);
+          }
+        } else if (entry.isFile() && extensions.some(ext => entry.name.endsWith(ext))) {
+          try {
+            const content = fs.readFileSync(fullEntryPath, "utf-8");
+            
+            // Count keyword matches
+            let matchCount = 0;
+            for (const keyword of keywords) {
+              // Case-insensitive search
+              const regex = new RegExp(keyword.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), "gi");
+              const matches = content.match(regex);
+              if (matches) {
+                matchCount += matches.length;
+              }
+            }
+            
+            if (matchCount > 0) {
+              results.push({ path: entryPath, content, matchCount });
+            }
+          } catch {
+            // Skip files that can't be read
+          }
+        }
+      }
+    } catch {
+      // Skip directories that can't be read
+    }
+  }
+  
+  // Search each directory
+  for (const dir of searchDirs) {
+    searchDir(dir);
+    if (results.length >= maxFiles) break;
+  }
+  
+  // Sort by match count (most matches first)
+  results.sort((a, b) => b.matchCount - a.matchCount);
+  
+  debugLog("[edit] Keyword search results", { 
+    keywords, 
+    filesFound: results.length,
+    topMatches: results.slice(0, 5).map(r => ({ path: r.path, matchCount: r.matchCount }))
+  });
+  
+  return results.slice(0, maxFiles);
+}
+
+// Cache for tsconfig path aliases
+let cachedPathAliases: Map<string, string> | null = null;
+let cachedProjectRoot: string | null = null;
+
+/**
+ * Read and parse tsconfig.json to get path aliases
+ */
+function getPathAliases(projectRoot: string): Map<string, string> {
+  // Return cached if same project
+  if (cachedPathAliases && cachedProjectRoot === projectRoot) {
+    return cachedPathAliases;
+  }
+
+  const aliases = new Map<string, string>();
+  
+  // Try to read tsconfig.json
+  const tsconfigPath = path.join(projectRoot, "tsconfig.json");
+  if (fs.existsSync(tsconfigPath)) {
+    try {
+      const content = fs.readFileSync(tsconfigPath, "utf-8");
+      // Remove comments (tsconfig allows them)
+      const cleanContent = content.replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "");
+      const tsconfig = JSON.parse(cleanContent);
+      
+      const paths = tsconfig.compilerOptions?.paths || {};
+      const baseUrl = tsconfig.compilerOptions?.baseUrl || ".";
+      
+      // Parse path mappings
+      for (const [alias, targets] of Object.entries(paths)) {
+        if (Array.isArray(targets) && targets.length > 0) {
+          // Convert @/* to @/ and src/* to src/
+          const cleanAlias = alias.replace("/*", "/");
+          const cleanTarget = (targets[0] as string).replace("/*", "/").replace("./", "");
+          aliases.set(cleanAlias, cleanTarget);
+        }
+      }
+      
+      debugLog("[edit] Loaded tsconfig path aliases", { aliases: Object.fromEntries(aliases) });
+    } catch (e) {
+      debugLog("[edit] Failed to parse tsconfig.json", { error: String(e) });
+    }
+  }
+  
+  // If no @/ alias found, try common defaults
+  if (!aliases.has("@/")) {
+    // Check if src/ exists
+    if (fs.existsSync(path.join(projectRoot, "src"))) {
+      aliases.set("@/", "src/");
+    } else if (fs.existsSync(path.join(projectRoot, "app"))) {
+      // Next.js App Router without src/
+      aliases.set("@/", "");
+    } else {
+      aliases.set("@/", "");
+    }
+    debugLog("[edit] Using default @/ alias", { alias: aliases.get("@/") });
+  }
+  
+  cachedPathAliases = aliases;
+  cachedProjectRoot = projectRoot;
+  return aliases;
+}
+
+/**
+ * Try multiple file extensions for an import
+ */
+function tryFileExtensions(basePath: string, projectRoot: string): string | null {
+  const extensions = [".tsx", ".ts", ".jsx", ".js"];
+  
+  // First try exact path (if already has extension)
+  if (extensions.some(ext => basePath.endsWith(ext))) {
+    if (fs.existsSync(path.join(projectRoot, basePath))) {
+      return basePath;
+    }
+  }
+  
+  // Try each extension
+  for (const ext of extensions) {
+    const withExt = `${basePath}${ext}`;
+    if (fs.existsSync(path.join(projectRoot, withExt))) {
+      return withExt;
+    }
+  }
+  
+  // Try as directory with index file
+  for (const ext of extensions) {
+    const indexPath = `${basePath}/index${ext}`;
+    if (fs.existsSync(path.join(projectRoot, indexPath))) {
+      return indexPath;
+    }
+  }
+  
+  return null;
+}
+
 /**
  * Resolve an import path to a file system path
  */
@@ -991,28 +1235,31 @@ function resolveImportPath(
   fromFile: string,
   projectRoot: string
 ): string | null {
-  // Handle @ alias (maps to src/)
-  if (importPath.startsWith("@/")) {
-    const resolved = importPath.replace("@/", "src/");
-    // Try with .tsx extension
-    const withExt = resolved.endsWith(".tsx") ? resolved : `${resolved}.tsx`;
-    if (fs.existsSync(path.join(projectRoot, withExt))) {
-      return withExt;
-    }
-    // Try as directory with index
-    const indexPath = `${resolved}/index.tsx`;
-    if (fs.existsSync(path.join(projectRoot, indexPath))) {
-      return indexPath;
+  const aliases = getPathAliases(projectRoot);
+  
+  // Handle aliased imports (e.g., @/, ~/, etc.)
+  for (const [alias, target] of aliases) {
+    if (importPath.startsWith(alias)) {
+      const resolved = importPath.replace(alias, target);
+      const result = tryFileExtensions(resolved, projectRoot);
+      if (result) {
+        debugLog("[edit] Resolved alias import", { importPath, resolved: result });
+        return result;
+      }
+      // Return best guess even if file not found
+      return `${resolved}.tsx`;
     }
-    return withExt; // Return even if not found for context
   }
 
   // Handle relative imports
   if (importPath.startsWith(".")) {
     const dir = path.dirname(fromFile);
     const resolved = path.join(dir, importPath);
-    const withExt = resolved.endsWith(".tsx") ? resolved : `${resolved}.tsx`;
-    return withExt;
+    const result = tryFileExtensions(resolved, projectRoot);
+    if (result) {
+      return result;
+    }
+    return `${resolved}.tsx`;
   }
 
   return null;

package/package.json

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