sonance-brand-mcp 1.3.10 → 1.3.12

package/dist/index.js

@@ -300,9 +300,26 @@ function runDevToolsInstaller() {
     console.log("  └─────────────────────────────────────────────────┘");
     console.log("");
     const targetDir = process.cwd();
-    // Detect project structure (src/ vs root)
-    const useSrcDir = fs.existsSync(path.join(targetDir, "src/app")) ||
-        fs.existsSync(path.join(targetDir, "src/components"));
+    // 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;
+        if (hasSrcLayout) {
+            console.log("  ⚠️  Found both app/ and src/app/ layouts - using root app/");
+        }
+    }
+    else if (hasSrcLayout) {
+        // Only src layout exists
+        useSrcDir = true;
+    }
+    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" : "";
     console.log(`  📁 Detected structure: ${useSrcDir ? "src/" : "root"}`);
     // Dynamic paths based on detected structure
@@ -541,8 +558,8 @@ function runDevToolsInstaller() {
         try {
             let cssContent = fs.readFileSync(globalsFullPath, "utf-8");
             // Calculate correct relative paths from globals.css to the target files
-            const stylesTarget = path.join(targetDir, "src/styles/brand-overrides.css");
-            const themeTarget = path.join(targetDir, "src/theme/sonance-theme.css");
+            const stylesTarget = path.join(targetDir, baseDir, "styles/brand-overrides.css");
+            const themeTarget = path.join(targetDir, baseDir, "theme/sonance-theme.css");
             const import1 = `@import "${getRelativeImportPath(globalsFullPath, stylesTarget)}";`;
             const import2 = `@import "${getRelativeImportPath(globalsFullPath, themeTarget)}";`;
             // Prepend imports if not already present
@@ -571,7 +588,7 @@ function runDevToolsInstaller() {
             let layoutContent = fs.readFileSync(layoutFullPath, "utf-8");
             let modified = false;
             // Calculate relative import path from layout to dev-tools
-            const devToolsTarget = path.join(targetDir, "src/components/dev-tools");
+            const devToolsTarget = path.join(targetDir, baseDir, "components/dev-tools");
             let devToolsImportPath = getRelativeImportPath(layoutFullPath, devToolsTarget);
             // Remove trailing slash for JS/TS imports
             devToolsImportPath = devToolsImportPath.replace(/\/$/, '');
@@ -726,9 +743,23 @@ function runDevToolsUninstaller() {
         }
     }
     // --- 3. Delete installed directories/files ---
-    // Detect project structure (src/ vs root)
-    const useSrcDir = fs.existsSync(path.join(targetDir, "src/app")) ||
-        fs.existsSync(path.join(targetDir, "src/components"));
+    // 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;
+    }
+    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 = [

package/package.json

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