@mcp-b/chrome-devtools-mcp 1.5.4 → 1.5.6

package/build/src/McpContext.js

@@ -75,6 +75,12 @@ export class McpContext {
     #pageToDevToolsPage = new Map();
     /** Currently selected page for tool operations. */
     #selectedPage;
+    /**
+     * Whether the selected page has been explicitly set for this session.
+     * When true, createPagesSnapshot() won't auto-switch to pages[0].
+     * This prevents MCP sessions from interfering with each other in shared browsers.
+     */
+    #pageExplicitlySelected = false;
     /** Most recent accessibility snapshot of the selected page. */
     #textSnapshot = null;
     #networkCollector;
@@ -357,7 +363,8 @@ export class McpContext {
     async newPage() {
         const page = await this.browser.newPage();
         await this.createPagesSnapshot();
-        this.selectPage(page);
+        // Mark as explicitly selected so this session sticks to this page
+        this.selectPage(page, true);
         this.#networkCollector.addPage(page);
         this.#consoleCollector.addPage(page);
         // Set up WebMCP auto-detection for the new page
@@ -384,7 +391,8 @@ export class McpContext {
             throw new Error('Failed to get page from new window target');
         }
         await this.createPagesSnapshot();
-        this.selectPage(page);
+        // Mark as explicitly selected so this session sticks to this window
+        this.selectPage(page, true);
         this.#networkCollector.addPage(page);
         this.#consoleCollector.addPage(page);
         // Set up WebMCP auto-detection for the new page
@@ -473,12 +481,16 @@ export class McpContext {
     isPageSelected(page) {
         return this.#selectedPage === page;
     }
-    selectPage(newPage) {
+    selectPage(newPage, explicit = false) {
         const oldPage = this.#selectedPage;
         if (oldPage) {
             oldPage.off('dialog', this.#dialogHandler);
         }
         this.#selectedPage = newPage;
+        if (explicit) {
+            // Mark page as explicitly selected to prevent auto-switching
+            this.#pageExplicitlySelected = true;
+        }
         newPage.on('dialog', this.#dialogHandler);
         this.#updateSelectedPageTimeouts();
     }
@@ -532,7 +544,11 @@ export class McpContext {
             return (this.#options.experimentalDevToolsDebugging ||
                 !page.url().startsWith('devtools://'));
         });
-        if ((!this.#selectedPage || this.#pages.indexOf(this.#selectedPage) === -1) &&
+        // Only auto-select pages[0] if:
+        // 1. No page has been explicitly selected for this session AND
+        // 2. Either there's no selected page OR the selected page is no longer valid
+        if (!this.#pageExplicitlySelected &&
+            (!this.#selectedPage || this.#pages.indexOf(this.#selectedPage) === -1) &&
             this.#pages[0]) {
             this.selectPage(this.#pages[0]);
         }

package/build/src/main.js

@@ -22,7 +22,7 @@ import { WebMCPToolHub } from './tools/WebMCPToolHub.js';
  * @remarks If moved, update release-please config.
  */
 // x-release-please-start-version
-const VERSION = '1.5.4';
+const VERSION = '1.5.6';
 // x-release-please-end
 process.on('unhandledRejection', (reason, promise) => {
     logger('Unhandled promise rejection', promise, reason);

package/build/src/tools/pages.js

@@ -37,7 +37,8 @@ export const selectPage = defineTool({
     },
     handler: async (request, response, context) => {
         const page = context.getPageByIdx(request.params.pageIdx);
-        context.selectPage(page);
+        // Mark as explicitly selected so this session stays on this page
+        context.selectPage(page, true);
         if (request.params.bringToFront) {
             await page.bringToFront();
         }

package/build/src/tools/webmcp.js

@@ -117,22 +117,34 @@ export const listWebMCPTools = defineTool({
                 response.appendResponseLine('Navigate to a page with @mcp-b/global loaded to discover tools.');
                 return;
             }
-            response.appendResponseLine(`${tools.length} WebMCP tool(s) registered:`);
+            response.appendResponseLine(`Found ${tools.length} WebMCP tool(s):`);
             response.appendResponseLine('');
+            // Group tools by page
+            const toolsByPage = new Map();
             for (const tool of tools) {
-                response.appendResponseLine(`- ${tool.originalName}`);
-                if (tool.description) {
-                    response.appendResponseLine(`  Description: ${tool.description}`);
+                if (!toolsByPage.has(tool.pageIdx)) {
+                    toolsByPage.set(tool.pageIdx, []);
+                }
+                toolsByPage.get(tool.pageIdx).push(tool);
+            }
+            // Sort pages by index
+            const sortedPages = Array.from(toolsByPage.keys()).sort((a, b) => a - b);
+            for (const pageIdx of sortedPages) {
+                const pageTools = toolsByPage.get(pageIdx);
+                const domain = pageTools[0].domain;
+                response.appendResponseLine(`Page ${pageIdx}: ${domain}`);
+                for (const tool of pageTools) {
+                    response.appendResponseLine(`  • ${tool.originalName}`);
+                    if (tool.description) {
+                        response.appendResponseLine(`    ${tool.description}`);
+                    }
                 }
-                response.appendResponseLine(`  Domain: ${tool.domain} (page ${tool.pageIdx})`);
-                response.appendResponseLine(`  Full ID: ${tool.toolId}`);
                 response.appendResponseLine('');
             }
-            response.appendResponseLine('IMPORTANT: Use call_webmcp_tool with the ORIGINAL name (without webmcp_ prefix).');
+            response.appendResponseLine('To call a tool: call_webmcp_tool({ name: "tool_name", arguments: {...} })');
             if (tools.length > 0) {
                 response.appendResponseLine(`Example: call_webmcp_tool({ name: "${tools[0].originalName}" })`);
             }
-            response.appendResponseLine('NOT: call_webmcp_tool({ name: "webmcp_localhost_..." })');
             return;
         }
         // Subsequent calls: return diff
@@ -141,30 +153,61 @@ export const listWebMCPTools = defineTool({
         toolHub.setLastSeenToolIds(currentToolIds);
         if (added.length === 0 && removed.length === 0) {
             response.appendResponseLine('No changes since last poll.');
+            response.appendResponseLine('');
             if (tools.length > 0) {
-                const toolNames = tools.map(t => t.originalName).join(', ');
-                response.appendResponseLine(`${tools.length} tools available: ${toolNames}`);
+                // Group tools by page
+                const toolsByPage = new Map();
+                for (const tool of tools) {
+                    if (!toolsByPage.has(tool.pageIdx)) {
+                        toolsByPage.set(tool.pageIdx, []);
+                    }
+                    toolsByPage.get(tool.pageIdx).push(tool);
+                }
+                response.appendResponseLine(`${tools.length} tool(s) available:`);
+                const sortedPages = Array.from(toolsByPage.keys()).sort((a, b) => a - b);
+                for (const pageIdx of sortedPages) {
+                    const pageTools = toolsByPage.get(pageIdx);
+                    const toolNames = pageTools.map(t => t.originalName).join(', ');
+                    response.appendResponseLine(`  Page ${pageIdx}: ${toolNames}`);
+                }
             }
             return;
         }
         if (added.length > 0) {
-            response.appendResponseLine(`Added (${added.length}):`);
+            response.appendResponseLine(`Added ${added.length} new tool(s):`);
+            response.appendResponseLine('');
+            // Group by page
+            const addedByPage = new Map();
             for (const tool of added) {
-                response.appendResponseLine(`+ ${tool.originalName}`);
-                if (tool.description) {
-                    response.appendResponseLine(`  ${tool.description}`);
+                if (!addedByPage.has(tool.pageIdx)) {
+                    addedByPage.set(tool.pageIdx, []);
                 }
-                response.appendResponseLine(`  Full ID: ${tool.toolId}`);
+                addedByPage.get(tool.pageIdx).push(tool);
             }
-            response.appendResponseLine('');
-            response.appendResponseLine('NEW TOOLS AVAILABLE: Use call_webmcp_tool with the original name.');
-            response.appendResponseLine(`Example: call_webmcp_tool({ name: "${added[0].originalName}" })`);
+            const sortedPages = Array.from(addedByPage.keys()).sort((a, b) => a - b);
+            for (const pageIdx of sortedPages) {
+                const pageTools = addedByPage.get(pageIdx);
+                const domain = pageTools[0].domain;
+                response.appendResponseLine(`Page ${pageIdx}: ${domain}`);
+                for (const tool of pageTools) {
+                    response.appendResponseLine(`  + ${tool.originalName}`);
+                    if (tool.description) {
+                        response.appendResponseLine(`    ${tool.description}`);
+                    }
+                }
+                response.appendResponseLine('');
+            }
+            response.appendResponseLine(`Call with: call_webmcp_tool({ name: "${added[0].originalName}" })`);
             response.appendResponseLine('');
         }
         if (removed.length > 0) {
-            response.appendResponseLine(`Removed (${removed.length}):`);
+            response.appendResponseLine(`Removed ${removed.length} tool(s)`);
+            response.appendResponseLine('');
             for (const id of removed) {
-                response.appendResponseLine(`- ${id}`);
+                // Extract original name from toolId format: webmcp_{domain}_page{idx}_{name}
+                const parts = id.split('_');
+                const name = parts.slice(3).join('_'); // Everything after page index
+                response.appendResponseLine(`  - ${name || id}`);
             }
         }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcp-b/chrome-devtools-mcp",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "description": "MCP server for Chrome DevTools with WebMCP integration for connecting to website MCP tools",
   "keywords": [
     "mcp",