chrome-devtools-mcp-for-extension 0.15.0 → 0.15.1

package/build/src/browser.js

@@ -444,6 +444,7 @@ export async function launch(options) {
     console.error(`[profiles] Using: ${userDataDir}`);
     console.error(`           Reason: ${resolved.reason}`);
     console.error(`           Project: ${resolved.projectName} (${resolved.hash})`);
+    console.error(`           Client:  ${resolved.clientId}`);
     if (resolved.reason === 'AUTO') {
         console.error(`           Root: ${process.cwd()}`);
     }
@@ -546,15 +547,17 @@ export async function launch(options) {
     console.error(`  Headless: ${headless}`);
     console.error(`  Args: ${JSON.stringify(args, null, 2)}`);
     console.error(`  Ignored Default Args: ["--disable-extensions", "--enable-automation"]`);
+    // IMPORTANT: Chrome extensions (especially MV3 content scripts and service workers)
+    // DO NOT work in headless mode. Always use headless:false when loading extensions.
+    // Reference: https://groups.google.com/a/chromium.org/g/headless-dev/c/nEoeUkoNI0o/m/9KZ4Os46AQAJ
+    const effectiveHeadless = extensionPaths.length > 0 ? false : headless;
+    if (extensionPaths.length > 0 && headless) {
+        console.warn('⚠️  WARNING: Extensions require headful mode. Forcing headless:false');
+    }
+    let browser;
+    let finalUserDataDir = userDataDir;
     try {
-        // IMPORTANT: Chrome extensions (especially MV3 content scripts and service workers)
-        // DO NOT work in headless mode. Always use headless:false when loading extensions.
-        // Reference: https://groups.google.com/a/chromium.org/g/headless-dev/c/nEoeUkoNI0o/m/9KZ4Os46AQAJ
-        const effectiveHeadless = extensionPaths.length > 0 ? false : headless;
-        if (extensionPaths.length > 0 && headless) {
-            console.warn('⚠️  WARNING: Extensions require headful mode. Forcing headless:false');
-        }
-        const browser = await puppeteer.launch({
+        browser = await puppeteer.launch({
             ...connectOptions,
             channel: puppeterChannel,
             executablePath: effectiveExecutablePath,
@@ -565,6 +568,50 @@ export async function launch(options) {
             args,
             ignoreDefaultArgs: ['--disable-extensions', '--enable-automation'],
         });
+    }
+    catch (e) {
+        // Profile lock collision fallback (v0.15.1)
+        const errorMsg = String(e.message || '').toLowerCase();
+        const isProfileLocked = errorMsg.includes('in use') ||
+            errorMsg.includes('lock') ||
+            errorMsg.includes('another chrome') ||
+            errorMsg.includes('profile appears to be');
+        if (isProfileLocked) {
+            // Fallback to ephemeral session
+            const sessionId = `${process.pid}-${Date.now()}`;
+            const tempPath = path.join(os.homedir(), '.cache', 'chrome-devtools-mcp', 'sessions', sessionId, channel || 'stable');
+            await fs.promises.mkdir(tempPath, { recursive: true });
+            console.error(`⚠️  Profile locked: ${userDataDir}`);
+            console.error(`📁 Falling back to ephemeral session: ${tempPath}`);
+            console.error(`💡 To avoid this, set MCP_CLIENT_ID (e.g., "claude-code", "codex")`);
+            // Clean up on exit
+            process.on('exit', () => {
+                try {
+                    fs.rmSync(tempPath, { recursive: true, force: true });
+                }
+                catch {
+                    /* ignore */
+                }
+            });
+            finalUserDataDir = tempPath;
+            // Retry with ephemeral profile
+            browser = await puppeteer.launch({
+                ...connectOptions,
+                channel: puppeterChannel,
+                executablePath: effectiveExecutablePath,
+                defaultViewport: null,
+                userDataDir: tempPath,
+                pipe: true,
+                headless: effectiveHeadless,
+                args,
+                ignoreDefaultArgs: ['--disable-extensions', '--enable-automation'],
+            });
+        }
+        else {
+            throw e;
+        }
+    }
+    try {
         // Log actual spawn args for debugging
         const spawnArgs = browser.process()?.spawnargs;
         if (spawnArgs) {

package/build/src/profile-resolver.js

@@ -1,11 +1,12 @@
 // src/profile-resolver.ts
-// Phase 1 (v0.15.0)
+// Phase 1 (v0.15.0) + v0.15.1 (MCP_CLIENT_ID support)
 // - Hybrid priority (CLI > MCP_USER_DATA_DIR > MCP_PROJECT_ID > AUTO > DEFAULT)
 // - Auto-detection (git root -> nearest package.json -> cwd)
 // - Realpath normalization
 // - Tilde (~) expansion
 // - Short SHA-256 hash (8 chars)
 // - CI detection => ephemeral session profile (unless MCP_PERSIST_PROFILES)
+// - Client ID isolation (MCP_CLIENT_ID environment variable)
 // - Minimal console.error() logging of decision
 import fs from 'node:fs';
 import os from 'node:os';
@@ -16,6 +17,7 @@ const CACHE_ROOT = path.join(os.homedir(), '.cache', 'chrome-devtools-mcp');
 // --- Public API ---
 export function resolveUserDataDir(opts) {
     const channel = opts.channel || 'stable';
+    const clientId = sanitize(opts.env.MCP_CLIENT_ID || 'default');
     // 0) CI detection → ephemeral session directory (unless MCP_PERSIST_PROFILES)
     //    - This happens before other priorities to keep CI clean by default.
     if (isCI(opts.env) && !opts.env.MCP_PERSIST_PROFILES) {
@@ -33,13 +35,14 @@ export function resolveUserDataDir(opts) {
         const result = {
             path: tempPath,
             reason: 'AUTO', // keep enum as specified (no EPHEMERAL type in Phase 1)
-            projectKey: `session-${sessionId}`,
+            projectKey: `session-${sessionId}_${clientId}`,
             projectName: 'ci-session',
             hash: sessionId,
+            clientId,
             channel,
         };
         // concise decision log (resolver-side)
-        console.error(`[profiles] resolved(AUTO, ci-ephemeral): ${result.path} (session=${sessionId})`);
+        console.error(`[profiles] resolved(AUTO, ci-ephemeral): ${result.path} (session=${sessionId}, client=${clientId})`);
         return result;
     }
     // 1) CLI explicit userDataDir
@@ -48,12 +51,13 @@ export function resolveUserDataDir(opts) {
         const result = {
             path: p,
             reason: 'CLI',
-            projectKey: stripHomeForKey(p),
+            projectKey: `${stripHomeForKey(p)}_${clientId}`,
             projectName: 'cli',
             hash: shortHash(p),
+            clientId,
             channel,
         };
-        console.error(`[profiles] resolved(CLI): ${result.path}`);
+        console.error(`[profiles] resolved(CLI): ${result.path} (client=${clientId})`);
         return result;
     }
     // 2) ENV: MCP_USER_DATA_DIR (full path)
@@ -63,27 +67,30 @@ export function resolveUserDataDir(opts) {
         const result = {
             path: p,
             reason: 'MCP_USER_DATA_DIR',
-            projectKey: stripHomeForKey(p),
+            projectKey: `${stripHomeForKey(p)}_${clientId}`,
             projectName: 'env',
             hash: shortHash(p),
+            clientId,
             channel,
         };
-        console.error(`[profiles] resolved(MCP_USER_DATA_DIR): ${result.path}`);
+        console.error(`[profiles] resolved(MCP_USER_DATA_DIR): ${result.path} (client=${clientId})`);
         return result;
     }
     // 3) ENV: MCP_PROJECT_ID (project-scoped persistent profile)
     const projectId = sanitize(opts.env.MCP_PROJECT_ID || '');
     if (projectId) {
-        const p = projectProfilePath(projectId, channel);
+        const key = `${projectId}_${clientId}`;
+        const p = projectProfilePath(key, channel);
         const result = {
             path: p,
             reason: 'MCP_PROJECT_ID',
-            projectKey: projectId,
+            projectKey: key,
             projectName: projectId,
             hash: shortHash(projectId),
+            clientId,
             channel,
         };
-        console.error(`[profiles] resolved(MCP_PROJECT_ID): ${result.path} (projectId=${projectId})`);
+        console.error(`[profiles] resolved(MCP_PROJECT_ID): ${result.path} (projectId=${projectId}, client=${clientId})`);
         return result;
     }
     // 4) AUTO: detect by root -> name -> hash
@@ -92,7 +99,7 @@ export function resolveUserDataDir(opts) {
         const name = detectProjectName(root);
         const realRoot = realpathSafe(root);
         const hash = shortHash(realRoot);
-        const key = `${sanitize(name)}_${hash}`;
+        const key = `${sanitize(name)}_${hash}_${clientId}`;
         const p = projectProfilePath(key, channel);
         const result = {
             path: p,
@@ -100,24 +107,26 @@ export function resolveUserDataDir(opts) {
             projectKey: key,
             projectName: sanitize(name),
             hash,
+            clientId,
             channel,
         };
-        console.error(`[profiles] resolved(AUTO): ${result.path} (root=${root}, name=${name}, hash=${hash})`);
+        console.error(`[profiles] resolved(AUTO): ${result.path} (root=${root}, name=${name}, hash=${hash}, client=${clientId})`);
         return result;
     }
     catch (e) {
         // 5) DEFAULT fallback
-        const key = 'project-default';
+        const key = `project-default_${clientId}`;
         const p = projectProfilePath(key, channel);
         const result = {
             path: p,
             reason: 'DEFAULT',
             projectKey: key,
-            projectName: key,
+            projectName: 'project-default',
             hash: '00000000',
+            clientId,
             channel,
         };
-        console.error(`[profiles] resolved(DEFAULT): ${result.path} (reason=${e?.message || 'fallback'})`);
+        console.error(`[profiles] resolved(DEFAULT): ${result.path} (reason=${e?.message || 'fallback'}, client=${clientId})`);
         return result;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chrome-devtools-mcp-for-extension",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "MCP server for Chrome extension development with Web Store automation. Fork of chrome-devtools-mcp with extension-specific tools.",
   "type": "module",
   "bin": "./build/src/index.js",