sonance-brand-mcp 1.3.12 → 1.3.14

package/dist/assets/api/sonance-analyze/route.ts

@@ -51,6 +51,9 @@ interface ScannedElement {
   textContent?: string;        // Truncated text content (for headings/paragraphs)
   // Component-specific fields
   variant?: string;            // variant prop if present
+  // Interactive element fields (Button, Link, etc.)
+  onClickHandler?: string;     // onClick handler name (e.g., "handleReset")
+  iconName?: string;           // Icon component inside (e.g., "RotateCcw")
   // Input-specific fields
   inputName?: string;          // name or placeholder if present
   inputType?: string;          // type attribute if present
@@ -140,6 +143,27 @@ const ELEMENT_CATEGORIES: Record<string, ElementCategory> = {
 // All element tags to scan for
 const ALL_ELEMENT_TAGS = Object.keys(ELEMENT_CATEGORIES);
 
+/**
+ * Detect project structure by checking where layout.tsx lives
+ */
+function detectProjectStructure(projectRoot: string): { baseDir: string; useSrcDir: boolean } {
+  const hasRootLayout = fs.existsSync(path.join(projectRoot, "app/layout.tsx"));
+  const hasSrcLayout = fs.existsSync(path.join(projectRoot, "src/app/layout.tsx"));
+
+  let useSrcDir: boolean;
+  if (hasRootLayout) {
+    useSrcDir = false;
+  } else if (hasSrcLayout) {
+    useSrcDir = true;
+  } else {
+    // Fallback to directory detection
+    useSrcDir = fs.existsSync(path.join(projectRoot, "src/app")) || 
+                fs.existsSync(path.join(projectRoot, "src/components"));
+  }
+
+  return { baseDir: useSrcDir ? "src" : "", useSrcDir };
+}
+
 /**
  * Extracts all design-related elements from a file using pattern matching.
  * This is a simplified AST approach that handles common patterns.
@@ -316,13 +340,38 @@ function extractElements(
       }
     }
     
-    // Component-specific extraction
-    if (category === "component") {
+    // Interactive element extraction (Button, Link, etc.)
+    if (category === "interactive") {
       // Extract variant
       const variantMatch = elementContent.match(/variant=["']([^"']+)["']/);
       if (variantMatch) {
         element.variant = variantMatch[1];
       }
+      
+      // Extract onClick handler name
+      const onClickMatch = elementContent.match(/onClick=\{([a-zA-Z_][a-zA-Z0-9_]*)\}/);
+      if (onClickMatch) {
+        element.onClickHandler = onClickMatch[1];
+      }
+      
+      // Extract icon name (first PascalCase component inside the element)
+      const iconMatch = elementContent.match(/<([A-Z][a-zA-Z0-9]*)\s/);
+      if (iconMatch && iconMatch[1] !== elementType) {
+        element.iconName = iconMatch[1];
+      }
+      
+      // Extract text content between > and </ElementType>
+      const afterOpenTag = fullContent.substring(elementEnd);
+      const closeTagMatch = afterOpenTag.match(new RegExp(`^([^<]*)<\\/${elementType}>`));
+      if (closeTagMatch && closeTagMatch[1].trim()) {
+        element.textContent = closeTagMatch[1].trim().substring(0, 50);
+      } else {
+        // Try to find text after any icons/nested elements
+        const textAfterIcons = afterOpenTag.match(new RegExp(`^(?:<[^>]+>\\s*)*([^<]+)<\\/${elementType}>`));
+        if (textAfterIcons && textAfterIcons[1].trim()) {
+          element.textContent = textAfterIcons[1].trim().substring(0, 50);
+        }
+      }
     }
     
     // Input-specific extraction
@@ -422,15 +471,49 @@ function generateSuggestedId(element: ScannedElement): string {
       break;
     }
     
-    case "component": {
-      // Add element type (button, link, etc.)
-      parts.push(elementType.toLowerCase());
+    case "interactive": {
+      // Add prefix based on element type
+      const prefix = elementType === "Button" ? "btn" : 
+                     elementType === "Link" || elementType === "a" ? "link" : "action";
+      parts.push(prefix);
       
-      // Add variant if present
-      if (variant) {
+      // Priority 1: Use text content if available
+      if (textContent) {
+        const cleanText = textContent.toLowerCase()
+          .replace(/[^a-z0-9\s]/g, "")
+          .replace(/\s+/g, "-")
+          .substring(0, 25);
+        if (cleanText && cleanText.length > 1) {
+          parts.push(cleanText);
+        }
+      }
+      
+      // Priority 2: Use onClick handler name
+      if (parts.length === 1 && element.onClickHandler) {
+        // Convert camelCase to kebab-case (handleReset -> handle-reset)
+        const handlerName = element.onClickHandler
+          .replace(/^(handle|on)/i, "") // Remove handle/on prefix
+          .replace(/([A-Z])/g, "-$1")
+          .toLowerCase()
+          .replace(/^-/, "");
+        if (handlerName) parts.push(handlerName);
+      }
+      
+      // Priority 3: Use icon name if no text
+      if (parts.length === 1 && element.iconName) {
+        const iconName = element.iconName
+          .replace(/([A-Z])/g, "-$1")
+          .toLowerCase()
+          .replace(/^-/, "");
+        parts.push(iconName);
+      }
+      
+      // Priority 4: Use variant
+      if (parts.length === 1 && variant) {
         parts.push(variant.toLowerCase());
       }
       
+      // Fallback: add "action" if still only prefix
       if (parts.length === 1) parts.push("action");
       break;
     }
@@ -622,6 +705,7 @@ function analyzeColorArchitecture(sources: ColorSource[]): ColorArchitecture {
 function scanDirectory(
   dir: string,
   projectRoot: string,
+  baseDir: string = "src",
   extensions: string[] = [".tsx", ".jsx", ".js", ".ts", ".css"]
 ): { elements: ScannedElement[]; images: ScannedElement[]; themeFiles: ThemeFile[]; colorSources: ColorSource[]; filesScanned: number } {
   const elements: ScannedElement[] = [];
@@ -661,11 +745,13 @@ function scanDirectory(
             elements.push(...fileElements);
           }
           
-          // Detect component definitions (files in src/components/ui or src/components/layout)
+          // Detect component definitions (files in components/ui or components/layout)
           if (entry.name.endsWith(".tsx") && !entry.name.endsWith(".stories.tsx")) {
+            const componentsUiPath = baseDir ? `${baseDir}/components/ui/` : "components/ui/";
+            const componentsLayoutPath = baseDir ? `${baseDir}/components/layout/` : "components/layout/";
             const isComponentDef = 
-              relativePath.startsWith("src/components/ui/") || 
-              relativePath.startsWith("src/components/layout/");
+              relativePath.startsWith(componentsUiPath) || 
+              relativePath.startsWith(componentsLayoutPath);
             
             if (isComponentDef) {
               const componentName = entry.name.replace(".tsx", "");
@@ -723,7 +809,23 @@ function scanDirectory(
  * Tags a component definition file with data-sonance-name attribute.
  * Uses multiple regex patterns to handle different component structures.
  */
-function tagComponentDefinition(filePath: string, content: string, componentName: string): { success: boolean; content: string; error?: string } {
+function tagComponentDefinition(filePath: string, content: string, componentName: string): { success: boolean; content: string; error?: string; skipped?: boolean } {
+  // Check for pure re-exports (no JSX to tag)
+  // Pattern: const ComponentName = SomePrimitive.Element or export const X = Y
+  const pureReExportPattern = new RegExp(
+    `(?:const|export\\s+const)\\s+${componentName}\\s*=\\s*[A-Z][a-zA-Z0-9]*(?:\\.[A-Z][a-zA-Z0-9]*)?\\s*[;\\n]`,
+    'g'
+  );
+  if (pureReExportPattern.test(content) && !content.includes(`<`) || 
+      (content.match(/<[A-Z]/g) || []).length === 0) {
+    return { 
+      success: true, 
+      content, 
+      skipped: true,
+      error: "Pure re-export - no JSX to tag" 
+    };
+  }
+  
   // Helper to inject tag only if not present in the match
   const injectTag = (match: string, p1: string, p2: string) => {
     if (match.includes("data-sonance-name=")) return match;
@@ -816,6 +918,39 @@ function tagComponentDefinition(filePath: string, content: string, componentName
     }
   }
 
+  // Pattern 8: forwardRef with implicit return and element without attributes (needs to add space)
+  // Matches: ) => (\n  <Element.Sub>\n or ) => (\n  <Element>\n
+  if (!modified) {
+    const forwardRefNoAttrsPattern = /(\)\s*=>\s*\(\s*<(?:[A-Z][a-zA-Z0-9]*\.)?[A-Z][a-zA-Z0-9]*)(?![^>]*data-sonance-name=)(>)/;
+    if (forwardRefNoAttrsPattern.test(result)) {
+      // Different injection - we need to add space before the >
+      const newContent = result.replace(forwardRefNoAttrsPattern, (match, p1, p2) => {
+        if (match.includes("data-sonance-name=")) return match;
+        return `${p1} data-sonance-name="${componentName}"${p2}`;
+      });
+      if (newContent !== result) {
+        result = newContent;
+        modified = true;
+      }
+    }
+  }
+
+  // Pattern 9: Standard function component returning element without attributes
+  // Matches: return (\n    <DropdownMenu>\n
+  if (!modified) {
+    const returnNoAttrsPattern = /(return\s*\(\s*<(?:[A-Z][a-zA-Z0-9]*\.)?[A-Z][a-zA-Z0-9]*)(?![^>]*data-sonance-name=)(>)/;
+    if (returnNoAttrsPattern.test(result)) {
+      const newContent = result.replace(returnNoAttrsPattern, (match, p1, p2) => {
+        if (match.includes("data-sonance-name=")) return match;
+        return `${p1} data-sonance-name="${componentName}"${p2}`;
+      });
+      if (newContent !== result) {
+        result = newContent;
+        modified = true;
+      }
+    }
+  }
+
   if (modified) {
     return { success: true, content: result };
   } else {
@@ -838,10 +973,11 @@ export async function GET() {
   
   try {
     const projectRoot = process.cwd();
-    const srcDir = path.join(projectRoot, "src");
+    const { baseDir } = detectProjectStructure(projectRoot);
+    const scanRoot = baseDir ? path.join(projectRoot, baseDir) : projectRoot;
     
     // Scan the codebase
-    const { elements, images, themeFiles, colorSources, filesScanned } = scanDirectory(srcDir, projectRoot);
+    const { elements, images, themeFiles, colorSources, filesScanned } = scanDirectory(scanRoot, projectRoot, baseDir);
     
     // Analyze color architecture
     const colorArchitecture = analyzeColorArchitecture(colorSources);
@@ -920,10 +1056,11 @@ export async function POST(request: Request) {
     if (action === "auto-tag-all") {
       // Bulk inject IDs into elements missing them
       const projectRoot = process.cwd();
-      const srcDir = path.join(projectRoot, "src");
+      const { baseDir } = detectProjectStructure(projectRoot);
+      const scanRoot = baseDir ? path.join(projectRoot, baseDir) : projectRoot;
       
       // Re-scan to get fresh data
-      const { elements } = scanDirectory(srcDir, projectRoot);
+      const { elements } = scanDirectory(scanRoot, projectRoot, baseDir);
       
       // Filter to elements that need IDs
       let targetElements = elements.filter(el => !el.hasId);
@@ -974,7 +1111,10 @@ export async function POST(request: Request) {
             const componentName = element.context.parentComponent || element.suggestedId;
             const tagResult = tagComponentDefinition(fullPath, content, componentName);
             
-            if (tagResult.success) {
+            if (tagResult.skipped) {
+              // Pure re-export - no JSX to tag, mark as skipped (not a failure)
+              results.push({ id: element.id, success: true, skipped: true });
+            } else if (tagResult.success) {
               fs.writeFileSync(fullPath, tagResult.content, "utf-8");
               results.push({ id: element.id, success: true });
             } else {

package/dist/index.js

@@ -27,6 +27,8 @@ function getClaudeConfigPath() {
         return path.join(os.homedir(), ".config", "Claude", "claude_desktop_config.json");
     }
 }
+// ---- DevTools Installation Manifest ----
+const MANIFEST_FILENAME = ".sonance-devtools-manifest.json";
 /**
  * Run the installer to add sonance-brand to Claude Desktop config
  */
@@ -430,25 +432,34 @@ function runDevToolsInstaller() {
     console.log("  📂 Installing files...");
     // Path prefix for logging (shows "src/" or "" based on detected structure)
     const pathPrefix = baseDir ? `${baseDir}/` : "";
+    // Track all created files and directories for the manifest
+    const createdFiles = [];
+    const createdDirectories = [];
+    const modifiedFiles = [];
     // 1. Install lib files (brand-system.ts, brand-context.tsx, utils.ts)
     if (!fs.existsSync(libDir)) {
         fs.mkdirSync(libDir, { recursive: true });
     }
     fs.copyFileSync(sourceBrandSystem, path.join(libDir, "brand-system.ts"));
+    createdFiles.push(`${pathPrefix}lib/brand-system.ts`);
     console.log(`  ✓ Created ${pathPrefix}lib/brand-system.ts`);
     fs.copyFileSync(sourceBrandContext, path.join(libDir, "brand-context.tsx"));
+    createdFiles.push(`${pathPrefix}lib/brand-context.tsx`);
     console.log(`  ✓ Created ${pathPrefix}lib/brand-context.tsx`);
     fs.copyFileSync(sourceUtils, path.join(libDir, "utils.ts"));
+    createdFiles.push(`${pathPrefix}lib/utils.ts`);
     console.log(`  ✓ Created ${pathPrefix}lib/utils.ts`);
     // 2. Install DevTools components
     if (!fs.existsSync(devToolsDir)) {
         fs.mkdirSync(devToolsDir, { recursive: true });
     }
+    createdDirectories.push(`${pathPrefix}components/dev-tools`);
     // Copy directory contents
     const entries = fs.readdirSync(sourceDevTools, { withFileTypes: true });
     for (const entry of entries) {
         if (entry.isFile()) {
             fs.copyFileSync(path.join(sourceDevTools, entry.name), path.join(devToolsDir, entry.name));
+            createdFiles.push(`${pathPrefix}components/dev-tools/${entry.name}`);
         }
     }
     console.log(`  ✓ Created ${pathPrefix}components/dev-tools/`);
@@ -456,47 +467,61 @@ function runDevToolsInstaller() {
     if (!fs.existsSync(apiThemeDir)) {
         fs.mkdirSync(apiThemeDir, { recursive: true });
     }
+    createdDirectories.push(`${pathPrefix}app/api/sonance-theme`);
     fs.copyFileSync(sourceApiTheme, path.join(apiThemeDir, "route.ts"));
+    createdFiles.push(`${pathPrefix}app/api/sonance-theme/route.ts`);
     console.log(`  ✓ Created ${pathPrefix}app/api/sonance-theme/route.ts`);
     // 4. Install API route for component detection
     if (!fs.existsSync(apiComponentsDir)) {
         fs.mkdirSync(apiComponentsDir, { recursive: true });
     }
+    createdDirectories.push(`${pathPrefix}app/api/sonance-components`);
     fs.copyFileSync(sourceApiComponents, path.join(apiComponentsDir, "route.ts"));
+    createdFiles.push(`${pathPrefix}app/api/sonance-components/route.ts`);
     console.log(`  ✓ Created ${pathPrefix}app/api/sonance-components/route.ts`);
     // 5. Install API route for saving logo configuration
     if (!fs.existsSync(apiSaveLogoDir)) {
         fs.mkdirSync(apiSaveLogoDir, { recursive: true });
     }
+    createdDirectories.push(`${pathPrefix}app/api/sonance-save-logo`);
     fs.copyFileSync(sourceApiSaveLogo, path.join(apiSaveLogoDir, "route.ts"));
+    createdFiles.push(`${pathPrefix}app/api/sonance-save-logo/route.ts`);
     console.log(`  ✓ Created ${pathPrefix}app/api/sonance-save-logo/route.ts`);
     // 7. Install API route for listing logo assets
     if (!fs.existsSync(apiAssetsDir)) {
         fs.mkdirSync(apiAssetsDir, { recursive: true });
     }
+    createdDirectories.push(`${pathPrefix}app/api/sonance-assets`);
     fs.copyFileSync(sourceApiAssets, path.join(apiAssetsDir, "route.ts"));
+    createdFiles.push(`${pathPrefix}app/api/sonance-assets/route.ts`);
     console.log(`  ✓ Created ${pathPrefix}app/api/sonance-assets/route.ts`);
     // 8. Install API route for auto-fixing logo IDs
     if (!fs.existsSync(apiInjectIdDir)) {
         fs.mkdirSync(apiInjectIdDir, { recursive: true });
     }
+    createdDirectories.push(`${pathPrefix}app/api/sonance-inject-id`);
     fs.copyFileSync(sourceApiInjectId, path.join(apiInjectIdDir, "route.ts"));
+    createdFiles.push(`${pathPrefix}app/api/sonance-inject-id/route.ts`);
     console.log(`  ✓ Created ${pathPrefix}app/api/sonance-inject-id/route.ts`);
     // 9. Install API route for project analysis
     if (!fs.existsSync(apiAnalyzeDir)) {
         fs.mkdirSync(apiAnalyzeDir, { recursive: true });
     }
+    createdDirectories.push(`${pathPrefix}app/api/sonance-analyze`);
     fs.copyFileSync(sourceApiAnalyze, path.join(apiAnalyzeDir, "route.ts"));
+    createdFiles.push(`${pathPrefix}app/api/sonance-analyze/route.ts`);
     console.log(`  ✓ Created ${pathPrefix}app/api/sonance-analyze/route.ts`);
     // 11. Install brand-overrides.css for production logo sizing
     if (!fs.existsSync(stylesDir)) {
         fs.mkdirSync(stylesDir, { recursive: true });
     }
     fs.copyFileSync(sourceBrandOverridesCss, path.join(stylesDir, "brand-overrides.css"));
+    createdFiles.push(`${pathPrefix}styles/brand-overrides.css`);
     console.log(`  ✓ Created ${pathPrefix}styles/brand-overrides.css`);
     // 12. Create theme directory with initial files
     if (!fs.existsSync(themeDir)) {
         fs.mkdirSync(themeDir, { recursive: true });
+        createdDirectories.push(`${pathPrefix}theme`);
         // Create initial theme CSS
         const initialCss = `/**
  * Sonance Theme - Auto-generated by DevTools
@@ -508,6 +533,7 @@ function runDevToolsInstaller() {
 }
 `;
         fs.writeFileSync(path.join(themeDir, "sonance-theme.css"), initialCss, "utf-8");
+        createdFiles.push(`${pathPrefix}theme/sonance-theme.css`);
         // Create initial config
         const initialConfig = {
             baseColor: "#333F48",
@@ -519,6 +545,7 @@ function runDevToolsInstaller() {
             spacing: "default"
         };
         fs.writeFileSync(path.join(themeDir, "sonance-config.json"), JSON.stringify(initialConfig, null, 2), "utf-8");
+        createdFiles.push(`${pathPrefix}theme/sonance-config.json`);
         console.log(`  ✓ Created ${pathPrefix}theme/ with initial files`);
     }
     // Detect user's file paths
@@ -571,6 +598,7 @@ function runDevToolsInstaller() {
             if (newImports.length > 0) {
                 cssContent = newImports.join("\n") + "\n" + cssContent;
                 fs.writeFileSync(globalsFullPath, cssContent, "utf-8");
+                modifiedFiles.push({ path: detectedGlobalsCss, modification: "css-import" });
             }
             cssAutoConfigured = true;
         }
@@ -626,6 +654,7 @@ function runDevToolsInstaller() {
             }
             if (modified) {
                 fs.writeFileSync(layoutFullPath, layoutContent, "utf-8");
+                modifiedFiles.push({ path: detectedLayout, modification: "layout-component" });
             }
             // Check if layout was fully configured
             layoutAutoConfigured = layoutContent.includes("SonanceDevTools") && layoutContent.includes("<SonanceDevTools");
@@ -664,6 +693,18 @@ function runDevToolsInstaller() {
         console.log("  🚀 DONE! Run your dev server and look for the DevTools button.");
     }
     console.log("");
+    // Write installation manifest for safe uninstall
+    const manifest = {
+        version: "1.3.12",
+        installedAt: new Date().toISOString(),
+        structure: useSrcDir ? "src" : "root",
+        files: createdFiles,
+        directories: createdDirectories,
+        modifiedFiles: modifiedFiles
+    };
+    fs.writeFileSync(path.join(targetDir, MANIFEST_FILENAME), JSON.stringify(manifest, null, 2));
+    console.log(`  📝 Created ${MANIFEST_FILENAME} (for safe uninstall)`);
+    console.log("");
 }
 /**
  * Run the uninstaller for DevTools Plugin (removes files and imports)
@@ -743,54 +784,102 @@ function runDevToolsUninstaller() {
         }
     }
     // --- 3. Delete installed directories/files ---
-    // Detect project structure by checking where layout.tsx actually lives
-    const hasRootLayout = fs.existsSync(path.join(targetDir, "app/layout.tsx"));
-    const hasSrcLayout = fs.existsSync(path.join(targetDir, "src/app/layout.tsx"));
-    let useSrcDir;
-    if (hasRootLayout) {
-        // Root layout exists - use root structure (even if src/ also exists)
-        useSrcDir = false;
-    }
-    else if (hasSrcLayout) {
-        // Only src layout exists
-        useSrcDir = true;
+    // Check for manifest file first (safe uninstall)
+    const manifestPath = path.join(targetDir, MANIFEST_FILENAME);
+    if (fs.existsSync(manifestPath)) {
+        // Use manifest for safe, precise uninstall
+        console.log("  📋 Found installation manifest - using safe uninstall");
+        console.log("");
+        try {
+            const manifest = JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
+            // Delete files listed in manifest
+            for (const file of manifest.files) {
+                const fullPath = path.join(targetDir, file);
+                if (fs.existsSync(fullPath)) {
+                    try {
+                        fs.unlinkSync(fullPath);
+                        removedItems.push(`Deleted ${file}`);
+                    }
+                    catch (err) {
+                        errors.push(`Could not delete ${file}`);
+                    }
+                }
+            }
+            // Delete directories listed in manifest (in reverse order to handle nested)
+            const sortedDirs = [...manifest.directories].sort((a, b) => b.length - a.length);
+            for (const dir of sortedDirs) {
+                const fullPath = path.join(targetDir, dir);
+                if (fs.existsSync(fullPath)) {
+                    try {
+                        fs.rmSync(fullPath, { recursive: true, force: true });
+                        removedItems.push(`Deleted ${dir}/`);
+                    }
+                    catch (err) {
+                        errors.push(`Could not delete ${dir}`);
+                    }
+                }
+            }
+            // Delete the manifest file itself
+            fs.unlinkSync(manifestPath);
+            removedItems.push(`Deleted ${MANIFEST_FILENAME}`);
+        }
+        catch (err) {
+            errors.push("Could not parse manifest file - falling back to legacy uninstall");
+        }
     }
     else {
-        // No layout found - fall back to directory detection
-        useSrcDir = fs.existsSync(path.join(targetDir, "src/app")) ||
-            fs.existsSync(path.join(targetDir, "src/components"));
-    }
-    const baseDir = useSrcDir ? "src" : "";
-    const pathPrefix = baseDir ? `${baseDir}/` : "";
-    const itemsToDelete = [
-        `${pathPrefix}components/dev-tools`,
-        `${pathPrefix}styles/brand-overrides.css`,
-        `${pathPrefix}theme`,
-        `${pathPrefix}app/api/sonance-theme`,
-        `${pathPrefix}app/api/sonance-components`,
-        `${pathPrefix}app/api/sonance-save-logo`,
-        `${pathPrefix}app/api/sonance-assets`,
-        `${pathPrefix}app/api/sonance-inject-id`,
-        `${pathPrefix}app/api/sonance-analyze`,
-        `${pathPrefix}lib/brand-system.ts`,
-        `${pathPrefix}lib/brand-context.tsx`,
-        `${pathPrefix}lib/utils.ts`
-    ];
-    for (const item of itemsToDelete) {
-        const fullPath = path.join(targetDir, item);
-        if (fs.existsSync(fullPath)) {
-            try {
-                const stats = fs.statSync(fullPath);
-                if (stats.isDirectory()) {
-                    fs.rmSync(fullPath, { recursive: true, force: true });
+        // Legacy uninstall (no manifest) - warn user and use hardcoded list
+        console.log("  ⚠️  No installation manifest found - using legacy uninstall");
+        console.log("     (This may delete files that existed before installation)");
+        console.log("");
+        // Detect project structure by checking where layout.tsx actually lives
+        const hasRootLayout = fs.existsSync(path.join(targetDir, "app/layout.tsx"));
+        const hasSrcLayout = fs.existsSync(path.join(targetDir, "src/app/layout.tsx"));
+        let useSrcDir;
+        if (hasRootLayout) {
+            useSrcDir = false;
+        }
+        else if (hasSrcLayout) {
+            useSrcDir = true;
+        }
+        else {
+            useSrcDir = fs.existsSync(path.join(targetDir, "src/app")) ||
+                fs.existsSync(path.join(targetDir, "src/components"));
+        }
+        const baseDir = useSrcDir ? "src" : "";
+        const pathPrefix = baseDir ? `${baseDir}/` : "";
+        // Legacy list - NOTE: Excludes lib/utils.ts to prevent deleting user's pre-existing utils
+        const itemsToDelete = [
+            `${pathPrefix}components/dev-tools`,
+            `${pathPrefix}styles/brand-overrides.css`,
+            `${pathPrefix}theme`,
+            `${pathPrefix}app/api/sonance-theme`,
+            `${pathPrefix}app/api/sonance-components`,
+            `${pathPrefix}app/api/sonance-save-logo`,
+            `${pathPrefix}app/api/sonance-assets`,
+            `${pathPrefix}app/api/sonance-inject-id`,
+            `${pathPrefix}app/api/sonance-analyze`,
+            `${pathPrefix}lib/brand-system.ts`,
+            `${pathPrefix}lib/brand-context.tsx`
+            // NOTE: lib/utils.ts intentionally excluded from legacy uninstall
+            // to prevent deleting pre-existing user files
+        ];
+        for (const item of itemsToDelete) {
+            const fullPath = path.join(targetDir, item);
+            if (fs.existsSync(fullPath)) {
+                try {
+                    const stats = fs.statSync(fullPath);
+                    if (stats.isDirectory()) {
+                        fs.rmSync(fullPath, { recursive: true, force: true });
+                    }
+                    else {
+                        fs.unlinkSync(fullPath);
+                    }
+                    removedItems.push(`Deleted ${item}`);
                 }
-                else {
-                    fs.unlinkSync(fullPath);
+                catch (err) {
+                    errors.push(`Could not delete ${item}`);
                 }
-                removedItems.push(`Deleted ${item}`);
-            }
-            catch (err) {
-                errors.push(`Could not delete ${item}`);
             }
         }
     }

package/package.json

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