chore: mark v0.0.21 (#364 )

chore: change import assert to readFile (#368 )
devops: publish Docker image to :latest as well (#365 )
2025-05-07 11:30:11 +02:00 · 2025-05-07 11:30:01 +02:00 · 2025-05-07 11:14:05 +02:00 · 2025-05-06 14:27:28 -07:00 · 2025-05-06 23:14:41 +02:00 · 2025-05-05 17:38:22 -07:00
63 changed files with 1141 additions and 473 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,7 +37,8 @@ jobs:
    - name: Use Node.js 18
      uses: actions/setup-node@v4
      with:
-        node-version: '18'
+        # https://github.com/microsoft/playwright-mcp/issues/344
+        node-version: '18.19'
        cache: 'npm'

    - name: Install dependencies
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -7,7 +7,7 @@ jobs:
    runs-on: ubuntu-latest
    permissions:
      contents: read
-      id-token: write
+      id-token: write # Needed for npm provenance
    steps:
      - uses: actions/checkout@v4
      - uses: actions/setup-node@v4
@@ -21,4 +21,35 @@ jobs:
      - run: npm run ctest
      - run: npm publish --provenance
        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+  publish-docker:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write # Needed for OIDC login to Azure
+    environment: allow-publishing-docker-to-acr
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up QEMU # Needed for multi-platform builds (e.g., arm64 on amd64 runner)
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx # Needed for multi-platform builds
+        uses: docker/setup-buildx-action@v3
+      - name: Azure Login via OIDC
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_DOCKER_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_DOCKER_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_DOCKER_SUBSCRIPTION_ID }}
+      - name: Login to ACR
+        run: az acr login --name playwright
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile # Adjust path if your Dockerfile is elsewhere
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            playwright.azurecr.io/public/playwright/mcp:${{ github.ref_name }}
+            playwright.azurecr.io/public/playwright/mcp:latest
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 lib/
 node_modules/
 test-results/
+playwright-report/
 .vscode/mcp.json

 .idea
--- a/65
+++ b/65
@@ -1,22 +1,69 @@
-FROM node:22-bookworm-slim
+ARG PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
+
+# ------------------------------
+# Base
+# ------------------------------
+# Base stage: Contains only the minimal dependencies required for runtime
+# (node_modules and Playwright system dependencies)
+FROM node:22-bookworm-slim AS base
+
+ARG PLAYWRIGHT_BROWSERS_PATH
+ENV PLAYWRIGHT_BROWSERS_PATH=${PLAYWRIGHT_BROWSERS_PATH}

 # Set the working directory
 WORKDIR /app

-# Copy package.json and package-lock.json at this stage to leverage the build cache
-COPY package*.json ./
+RUN --mount=type=cache,target=/root/.npm,sharing=locked,id=npm-cache \
+    --mount=type=bind,source=package.json,target=package.json \
+    --mount=type=bind,source=package-lock.json,target=package-lock.json \
+  npm ci --omit=dev && \
+  # Install system dependencies for playwright
+  npx -y playwright-core install-deps chromium

-# Install dependencies
-RUN npm ci
+# ------------------------------
+# Builder
+# ------------------------------
+FROM base AS builder

-# Install chromium and its dependencies, but only for headless mode
-RUN npx -y playwright install --with-deps --only-shell chromium
+RUN --mount=type=cache,target=/root/.npm,sharing=locked,id=npm-cache \
+    --mount=type=bind,source=package.json,target=package.json \
+    --mount=type=bind,source=package-lock.json,target=package-lock.json \
+  npm ci

 # Copy the rest of the app
-COPY . .
+COPY *.json *.js *.ts .
+COPY src src/

 # Build the app
 RUN npm run build

+# ------------------------------
+# Browser
+# ------------------------------
+# Cache optimization:
+# - Browser is downloaded only when node_modules or Playwright system dependencies change
+# - Cache is reused when only source code changes
+FROM base AS browser
+
+RUN npx -y playwright-core install --no-shell chromium
+
+# ------------------------------
+# Runtime
+# ------------------------------
+FROM base
+
+ARG PLAYWRIGHT_BROWSERS_PATH
+ARG USERNAME=node
+ENV NODE_ENV=production
+
+# Set the correct ownership for the runtime user on production `node_modules`
+RUN chown -R ${USERNAME}:${USERNAME} node_modules
+
+USER ${USERNAME}
+
+COPY --from=browser --chown=${USERNAME}:${USERNAME} ${PLAYWRIGHT_BROWSERS_PATH} ${PLAYWRIGHT_BROWSERS_PATH}
+COPY --chown=${USERNAME}:${USERNAME} cli.js package.json ./
+COPY --from=builder --chown=${USERNAME}:${USERNAME} /app/lib /app/lib
+
 # Run in headless and only with chromium (other browsers need more dependencies not included in this image)
-ENTRYPOINT ["node", "cli.js", "--headless", "--browser", "chromium"]
+ENTRYPOINT ["node", "cli.js", "--headless", "--browser", "chromium"]
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ A Model Context Protocol (MCP) server that provides browser automation capabilit

 <!--
 // Generate using:
-node utils/generate_links.js
+node utils/generate-links.js
 -->

 [<img src="https://img.shields.io/badge/VS_Code-VS_Code?style=flat-square&label=Install%20Server&color=0098FF" alt="Install in VS Code">](https://insiders.vscode.dev/redirect?url=vscode%3Amcp%2Finstall%3F%257B%2522name%2522%253A%2522playwright%2522%252C%2522command%2522%253A%2522npx%2522%252C%2522args%2522%253A%255B%2522%2540playwright%252Fmcp%2540latest%2522%255D%257D) [<img alt="Install in VS Code Insiders" src="https://img.shields.io/badge/VS_Code_Insiders-VS_Code_Insiders?style=flat-square&label=Install%20Server&color=24bfa5">](https://insiders.vscode.dev/redirect?url=vscode-insiders%3Amcp%2Finstall%3F%257B%2522name%2522%253A%2522playwright%2522%252C%2522command%2522%253A%2522npx%2522%252C%2522args%2522%253A%255B%2522%2540playwright%252Fmcp%2540latest%2522%255D%257D)
@@ -76,7 +76,10 @@ The Playwright MCP server supports the following command-line options:
 - `--user-data-dir <path>`: Path to the user data directory
 - `--port <port>`: Port to listen on for SSE transport
 - `--host <host>`: Host to bind server to. Default is localhost. Use 0.0.0.0 to bind to all interfaces.
+- `--allowed-origins <origins>`: Semicolon-separated list of origins to allow the browser to request. Default is to allow all. Origins matching both `--allowed-origins` and `--blocked-origins` will be blocked.
+- `--blocked-origins <origins>`: Semicolon-separated list of origins to block the browser to request. Origins matching both `--allowed-origins` and `--blocked-origins` will be blocked.
 - `--vision`: Run server that uses screenshots (Aria snapshots are used by default)
+- `--output-dir`: Directory for output files
 - `--config <path>`: Path to the configuration file

 ### User profile
@@ -142,7 +145,8 @@ The Playwright MCP server can be configured using a JSON configuration file. Her
    'history' | // Browser history
    'wait' |    // Wait utilities
    'files' |   // File handling
-    'install'   // Browser installation
+    'install' | // Browser installation
+    'testing'   // Testing
  >;

  // Enable vision mode (screenshots instead of accessibility snapshots)
@@ -151,13 +155,19 @@ The Playwright MCP server can be configured using a JSON configuration file. Her
  // Directory for output files
  outputDir?: string;

-  // Tool-specific configurations
-  tools?: {
-    browser_take_screenshot?: {
-      // Disable base64-encoded image responses
-      omitBase64?: boolean;
-    }
-  }
+  // Network configuration
+  network?: {
+    // List of origins to allow the browser to request. Default is to allow all. Origins matching both `allowedOrigins` and `blockedOrigins` will be blocked.
+    allowedOrigins?: string[];
+
+    // List of origins to block the browser to request. Origins matching both `allowedOrigins` and `blockedOrigins` will be blocked.
+    blockedOrigins?: string[];
+  };
+ 
+  /**
+   * Do not send image responses to the client.
+   */
+  noImageResponses?: boolean;
 }
 ```

@@ -221,9 +231,9 @@ http.createServer(async (req, res) => {
  // ...

  // Creates a headless Playwright MCP server with SSE transport
-  const mcpServer = await createServer({ headless: true });
+  const connection = await createConnection({ headless: true });
  const transport = new SSEServerTransport('/messages', res);
-  await mcpServer.connect(transport);
+  await connection.connect(transport);

  // ...
 });
@@ -263,38 +273,47 @@ X Y coordinate space, based on the provided screenshot.
 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_snapshot**
+  - Title: Page snapshot
  - Description: Capture accessibility snapshot of the current page, this is better than screenshot
  - Parameters: None
+  - Read-only: **true**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_click**
+  - Title: Click
  - Description: Perform click on a web page
  - Parameters:
    - `element` (string): Human-readable element description used to obtain permission to interact with the element
    - `ref` (string): Exact target element reference from the page snapshot
+  - Read-only: **false**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_drag**
+  - Title: Drag mouse
  - Description: Perform drag and drop between two elements
  - Parameters:
    - `startElement` (string): Human-readable source element description used to obtain the permission to interact with the element
    - `startRef` (string): Exact source element reference from the page snapshot
    - `endElement` (string): Human-readable target element description used to obtain the permission to interact with the element
    - `endRef` (string): Exact target element reference from the page snapshot
+  - Read-only: **false**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_hover**
+  - Title: Hover mouse
  - Description: Hover over element on page
  - Parameters:
    - `element` (string): Human-readable element description used to obtain permission to interact with the element
    - `ref` (string): Exact target element reference from the page snapshot
+  - Read-only: **true**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_type**
+  - Title: Type text
  - Description: Type text into editable element
  - Parameters:
    - `element` (string): Human-readable element description used to obtain permission to interact with the element
@@ -302,54 +321,66 @@ X Y coordinate space, based on the provided screenshot.
    - `text` (string): Text to type into the element
    - `submit` (boolean, optional): Whether to submit entered text (press Enter after)
    - `slowly` (boolean, optional): Whether to type one character at a time. Useful for triggering key handlers in the page. By default entire text is filled in at once.
+  - Read-only: **false**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_select_option**
+  - Title: Select option
  - Description: Select an option in a dropdown
  - Parameters:
    - `element` (string): Human-readable element description used to obtain permission to interact with the element
    - `ref` (string): Exact target element reference from the page snapshot
    - `values` (array): Array of values to select in the dropdown. This can be a single value or multiple values.
+  - Read-only: **false**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_take_screenshot**
+  - Title: Take a screenshot
  - Description: Take a screenshot of the current page. You can't perform actions based on the screenshot, use browser_snapshot for actions.
  - Parameters:
    - `raw` (boolean, optional): Whether to return without compression (in PNG format). Default is false, which returns a JPEG image.
    - `element` (string, optional): Human-readable element description used to obtain permission to screenshot the element. If not provided, the screenshot will be taken of viewport. If element is provided, ref must be provided too.
    - `ref` (string, optional): Exact target element reference from the page snapshot. If not provided, the screenshot will be taken of viewport. If ref is provided, element must be provided too.
+  - Read-only: **true**

 ### Vision-based Interactions

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_screen_capture**
+  - Title: Take a screenshot
  - Description: Take a screenshot of the current page
  - Parameters: None
+  - Read-only: **true**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_screen_move_mouse**
+  - Title: Move mouse
  - Description: Move mouse to a given position
  - Parameters:
    - `element` (string): Human-readable element description used to obtain permission to interact with the element
    - `x` (number): X coordinate
    - `y` (number): Y coordinate
+  - Read-only: **true**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_screen_click**
+  - Title: Click
  - Description: Click left mouse button
  - Parameters:
    - `element` (string): Human-readable element description used to obtain permission to interact with the element
    - `x` (number): X coordinate
    - `y` (number): Y coordinate
+  - Read-only: **false**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_screen_drag**
+  - Title: Drag mouse
  - Description: Drag left mouse button
  - Parameters:
    - `element` (string): Human-readable element description used to obtain permission to interact with the element
@@ -357,132 +388,188 @@ X Y coordinate space, based on the provided screenshot.
    - `startY` (number): Start Y coordinate
    - `endX` (number): End X coordinate
    - `endY` (number): End Y coordinate
+  - Read-only: **false**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_screen_type**
+  - Title: Type text
  - Description: Type text
  - Parameters:
    - `text` (string): Text to type into the element
    - `submit` (boolean, optional): Whether to submit entered text (press Enter after)
+  - Read-only: **false**

 ### Tab Management

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_tab_list**
+  - Title: List tabs
  - Description: List browser tabs
  - Parameters: None
+  - Read-only: **true**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_tab_new**
+  - Title: Open a new tab
  - Description: Open a new tab
  - Parameters:
    - `url` (string, optional): The URL to navigate to in the new tab. If not provided, the new tab will be blank.
+  - Read-only: **true**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_tab_select**
+  - Title: Select a tab
  - Description: Select a tab by index
  - Parameters:
    - `index` (number): The index of the tab to select
+  - Read-only: **true**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_tab_close**
+  - Title: Close a tab
  - Description: Close a tab
  - Parameters:
    - `index` (number, optional): The index of the tab to close. Closes current tab if not provided.
+  - Read-only: **false**

 ### Navigation

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_navigate**
+  - Title: Navigate to a URL
  - Description: Navigate to a URL
  - Parameters:
    - `url` (string): The URL to navigate to
+  - Read-only: **false**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_navigate_back**
+  - Title: Go back
  - Description: Go back to the previous page
  - Parameters: None
+  - Read-only: **true**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_navigate_forward**
+  - Title: Go forward
  - Description: Go forward to the next page
  - Parameters: None
+  - Read-only: **true**

 ### Keyboard

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_press_key**
+  - Title: Press a key
  - Description: Press a key on the keyboard
  - Parameters:
    - `key` (string): Name of the key to press or a character to generate, such as `ArrowLeft` or `a`
+  - Read-only: **false**

 ### Console

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_console_messages**
+  - Title: Get console messages
  - Description: Returns all console messages
  - Parameters: None
+  - Read-only: **true**

 ### Files and Media

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_file_upload**
+  - Title: Upload files
  - Description: Upload one or multiple files
  - Parameters:
    - `paths` (array): The absolute paths to the files to upload. Can be a single file or multiple files.
+  - Read-only: **false**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_pdf_save**
+  - Title: Save as PDF
  - Description: Save page as PDF
  - Parameters: None
+  - Read-only: **true**

 ### Utilities

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_close**
+  - Title: Close browser
  - Description: Close the page
  - Parameters: None
+  - Read-only: **true**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_wait**
+  - Title: Wait
  - Description: Wait for a specified time in seconds
  - Parameters:
    - `time` (number): The time to wait in seconds
+  - Read-only: **true**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_resize**
+  - Title: Resize browser window
  - Description: Resize the browser window
  - Parameters:
    - `width` (number): Width of the browser window
    - `height` (number): Height of the browser window
+  - Read-only: **true**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_install**
+  - Title: Install the browser specified in the config
  - Description: Install the browser specified in the config. Call this if you get an error about the browser not being installed.
  - Parameters: None
+  - Read-only: **false**

 <!-- NOTE: This has been generated via update-readme.js -->

 - **browser_handle_dialog**
+  - Title: Handle a dialog
  - Description: Handle a dialog
  - Parameters:
    - `accept` (boolean): Whether to accept the dialog.
    - `promptText` (string, optional): The text of the prompt in case of a prompt dialog.
+  - Read-only: **false**
+
+<!-- NOTE: This has been generated via update-readme.js -->
+
+- **browser_network_requests**
+  - Title: List network requests
+  - Description: Returns all network requests since loading the page
+  - Parameters: None
+  - Read-only: **true**
+
+### Testing
+
+<!-- NOTE: This has been generated via update-readme.js -->
+
+- **browser_generate_playwright_test**
+  - Title: Generate a Playwright test
+  - Description: Generate a Playwright test for given scenario
+  - Parameters:
+    - `name` (string): The name of the test
+    - `description` (string): The description of the test
+    - `steps` (array): The steps of the test
+  - Read-only: **true**

 <!--- End of generated section -->
--- a/cli.js
+++ b/cli.js
@@ -15,4 +15,4 @@
 * limitations under the License.
 */

-require('./lib/program');
+import './lib/program.js';
--- a/config.d.ts
+++ b/config.d.ts
@@ -16,7 +16,7 @@

 import type * as playwright from 'playwright';

-export type ToolCapability = 'core' | 'tabs' | 'pdf' | 'history' | 'wait' | 'files' | 'install';
+export type ToolCapability = 'core' | 'tabs' | 'pdf' | 'history' | 'wait' | 'files' | 'install' | 'testing';

 export type Config = {
  /**
@@ -94,20 +94,20 @@ export type Config = {
   */
  outputDir?: string;

-  /**
-   * Configuration for specific tools.
-   */
-  tools?: {
+  network?: {
    /**
-     * Configuration for the browser_take_screenshot tool.
+     * List of origins to allow the browser to request. Default is to allow all. Origins matching both `allowedOrigins` and `blockedOrigins` will be blocked.
     */
-    browser_take_screenshot?: {
+    allowedOrigins?: string[];

-      /**
-       * Whether to disable base64-encoded image responses to the clients that
-       * don't support binary data or prefer to save on tokens.
-      */
-      omitBase64?: boolean;
-    }
-  }
+    /**
+     * List of origins to block the browser to request. Origins matching both `allowedOrigins` and `blockedOrigins` will be blocked.
+     */
+    blockedOrigins?: string[];
+  };
+
+  /**
+   * Do not send image responses to the client.
+   */
+  noImageResponses?: boolean;
 };
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -33,6 +33,7 @@ const plugins = {
 };

 export const baseRules = {
+  "import/extensions": ["error", "ignorePackages", {ts: "always"}],
  "@typescript-eslint/no-floating-promises": "error",
  "@typescript-eslint/no-unused-vars": [
    2,
@@ -179,6 +180,7 @@ export const baseRules = {

  // react
  "react/react-in-jsx-scope": 0,
+  "no-console": 2,
 };

 const languageOptions = {
--- a/examples.md
+++ b/examples.md
@@ -1,47 +0,0 @@
-# Examples
-
-Below are some examples of prompts to use with Playwright MCP. Draw inspiration from them to create your own. If you come up with a new prompt that works well, feel free to let us know in an issue or pull request.
-
-## Write a regression test for a bug report
-
-We have received a user report about a bug on our website https://debs-obrien.github.io/playwright-movies-app. I'd like you to verify if this bug exists by trying to follow the steps. If you see different behaviour, explain how it's different. If you see the same behaviour, please write me a Playwright regression test that encapsulates the buggy user flow. While writing the test, draw inspiration from the Playwright code you ran. Here's the user report:
-
-Howdy. I love your movies site, but there's something fishy going on. I'm looking at The Garfield Movie - a spectacular film - but somehow it's showing the wrong length. The movie is 90mins long, I measured myself yesterday! But somehow your site is claiming 101mins. Am I looking at it wrong, or is there a bug?
-
-**Output:**
-
-```ts
-import { test, expect } from '@playwright/test';
-
-/**
- * Regression test for bug: The Garfield Movie showing incorrect runtime
- * User reported actual runtime is 90 minutes, but site shows 101 minutes
- */
-test('verify The Garfield Movie runtime bug', async ({ page }) => {
-  // Navigate to the movies app home page
-  await page.goto('https://debs-obrien.github.io/playwright-movies-app');
-  
-  // Wait for page to load completely
-  await expect(page.getByRole('heading', { name: 'Popular', level: 1 })).toBeVisible();
-  
-  // Look for The Garfield Movie and click on it
-  const garfieldMovieLink = page.getByRole('link', { name: /poster of The Garfield Movie/i });
-  await expect(garfieldMovieLink).toBeVisible();
-  await garfieldMovieLink.click();
-  
-  // Verify we're on the correct movie page
-  await expect(page.getByRole('heading', { name: 'The Garfield Movie', level: 1 })).toBeVisible();
-  
-  // Check the runtime information
-  // The bug: Expected runtime should be 90 min, but site shows 101 min
-  const movieInfoText = await page.locator('text=English / 101 min. / 2024').textContent();
-  
-  // This test will fail because of the bug (which is what we want to demonstrate)
-  // Once fixed, this assertion should be updated to the correct runtime (90 min)
-  expect(movieInfoText).toContain('90 min');
-  
-  // Alternative assertion that verifies the incorrect runtime is still present
-  // Uncomment this and comment the above assertion to verify the bug exists
-  // expect(movieInfoText).toContain('101 min');
-});
-```
--- a/examples/generate-test.md
+++ b/examples/generate-test.md
@@ -0,0 +1,10 @@
+Generate test for scenario:
+
+## GitHub PR Checks Navigation Checklist
+
+1. Open the [Microsoft Playwright GitHub repository](https://github.com/microsoft/playwright).
+2. Click on the **Pull requests** tab.
+3. Find and open the pull request titled **"chore: make noWaitAfter a default"**.
+4. Switch to the **Checks** tab for that pull request.
+5. Expand the **infra** check suite to view its jobs.
+6. Click on the **docs & lint** job to view its details.
--- a/index.d.ts
+++ b/index.d.ts
@@ -16,8 +16,14 @@
 */

 import type { Server } from '@modelcontextprotocol/sdk/server/index.js';
-
 import type { Config } from './config';
+import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';

-export declare function createServer(config?: Config): Promise<Server>;
+export type Connection = {
+  server: Server;
+  connect(transport: Transport): Promise<void>;
+  close(): Promise<void>;
+};
+
+export declare function createConnection(config?: Config): Promise<Connection>;
 export {};
--- a/index.js
+++ b/index.js
@@ -15,5 +15,5 @@
 * limitations under the License.
 */

-const { createServer } = require('./lib/index');
-module.exports = { createServer };
+import { createConnection } from './lib/index';
+export default { createConnection };
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,17 +1,17 @@
 {
  "name": "@playwright/mcp",
-  "version": "0.0.16",
+  "version": "0.0.21",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@playwright/mcp",
-      "version": "0.0.16",
+      "version": "0.0.21",
      "license": "Apache-2.0",
      "dependencies": {
-        "@modelcontextprotocol/sdk": "^1.10.1",
+        "@modelcontextprotocol/sdk": "^1.11.0",
        "commander": "^13.1.0",
-        "playwright": "1.53.0-alpha-2025-04-25",
+        "playwright": "1.53.0-alpha-1746218818000",
        "yaml": "^2.7.1",
        "zod-to-json-schema": "^3.24.4"
      },
@@ -21,7 +21,7 @@
      "devDependencies": {
        "@eslint/eslintrc": "^3.2.0",
        "@eslint/js": "^9.19.0",
-        "@playwright/test": "1.53.0-alpha-2025-04-25",
+        "@playwright/test": "1.53.0-alpha-1746218818000",
        "@stylistic/eslint-plugin": "^3.0.1",
        "@types/node": "^22.13.10",
        "@typescript-eslint/eslint-plugin": "^8.26.1",
@@ -228,9 +228,9 @@
      }
    },
    "node_modules/@modelcontextprotocol/sdk": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.10.1.tgz",
-      "integrity": "sha512-xNYdFdkJqEfIaTVP1gPKoEvluACHZsHZegIoICX8DM1o6Qf3G5u2BQJHmgd0n4YgRPqqK/u1ujQvrgAxxSJT9w==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.11.0.tgz",
+      "integrity": "sha512-k/1pb70eD638anoi0e8wUGAlbMJXyvdV4p62Ko+EZ7eBe1xMx8Uhak1R5DgfoofsK5IBBnRwsYGTaLZl+6/+RQ==",
      "license": "MIT",
      "dependencies": {
        "content-type": "^1.0.5",
@@ -287,13 +287,13 @@
      }
    },
    "node_modules/@playwright/test": {
-      "version": "1.53.0-alpha-2025-04-25",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.53.0-alpha-2025-04-25.tgz",
-      "integrity": "sha512-3y4C2ZjAc2oUpwavC2yG2JzH53TOKgcMZvWb5GmpxnOa6fhuSVXK0kIsiIaImKmdffIVM1agsqNHp8yldeBTHQ==",
+      "version": "1.53.0-alpha-1746218818000",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.53.0-alpha-1746218818000.tgz",
+      "integrity": "sha512-J05FD0oOCVbjbp4IjQi5tOPKywchi5EENS9jRjgkA5N9jd/+BaZ3jT8HlLMIgALdk/eLsprQa7vh9h45Q1FOPA==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
-        "playwright": "1.53.0-alpha-2025-04-25"
+        "playwright": "1.53.0-alpha-1746218818000"
      },
      "bin": {
        "playwright": "cli.js"
@@ -3299,12 +3299,12 @@
      }
    },
    "node_modules/playwright": {
-      "version": "1.53.0-alpha-2025-04-25",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.53.0-alpha-2025-04-25.tgz",
-      "integrity": "sha512-b5VT4lWgyhhy99zHeCoUBt/FQckPxeQVA5ksvxBv0HeqcEvzZzhuyqrrcZewJyflE+5U+bmvqI+yoU0ks8mE3Q==",
+      "version": "1.53.0-alpha-1746218818000",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.53.0-alpha-1746218818000.tgz",
+      "integrity": "sha512-mVIjtdqIawIqWVyvCaLmV6XTALCT4oWWrbMjoHyyWRln3jQjnm3RUO9LkaINz+Yh88O3FkuY6RfjGXPXeFeJ4Q==",
      "license": "Apache-2.0",
      "dependencies": {
-        "playwright-core": "1.53.0-alpha-2025-04-25"
+        "playwright-core": "1.53.0-alpha-1746218818000"
      },
      "bin": {
        "playwright": "cli.js"
@@ -3317,9 +3317,9 @@
      }
    },
    "node_modules/playwright-core": {
-      "version": "1.53.0-alpha-2025-04-25",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.53.0-alpha-2025-04-25.tgz",
-      "integrity": "sha512-gjV01l6A4q/zg+/pwEX50k9lhYWaE9NcDVypSDD331jB3EYrdk0LeDQxqz5XFDOzq/tC/8QTouDs9a/s/p95hA==",
+      "version": "1.53.0-alpha-1746218818000",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.53.0-alpha-1746218818000.tgz",
+      "integrity": "sha512-iaIZmhO/psGssWpxIprJkFrn2h4xFjgL0jZsKGtReAMZ/XhlqMUJxtSitwWM4BV+wxJIptsZD0s5Ml2KU62Z3w==",
      "license": "Apache-2.0",
      "bin": {
        "playwright-core": "cli.js"
--- a/package.json
+++ b/package.json
@@ -1,7 +1,8 @@
 {
  "name": "@playwright/mcp",
-  "version": "0.0.16",
+  "version": "0.0.21",
  "description": "Playwright Tools for MCP",
+  "type": "module",
  "repository": {
    "type": "git",
    "url": "git+https://github.com/microsoft/playwright-mcp.git"
@@ -16,7 +17,7 @@
  "license": "Apache-2.0",
  "scripts": {
    "build": "tsc",
-    "lint": "npm run update-readme && eslint .",
+    "lint": "npm run update-readme && eslint . && tsc --noEmit",
    "update-readme": "node utils/update-readme.js",
    "watch": "tsc --watch",
    "test": "playwright test",
@@ -34,16 +35,16 @@
    }
  },
  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.10.1",
+    "@modelcontextprotocol/sdk": "^1.11.0",
    "commander": "^13.1.0",
-    "playwright": "1.53.0-alpha-2025-04-25",
+    "playwright": "1.53.0-alpha-1746218818000",
    "yaml": "^2.7.1",
    "zod-to-json-schema": "^3.24.4"
  },
  "devDependencies": {
    "@eslint/eslintrc": "^3.2.0",
    "@eslint/js": "^9.19.0",
-    "@playwright/test": "1.53.0-alpha-2025-04-25",
+    "@playwright/test": "1.53.0-alpha-1746218818000",
    "@stylistic/eslint-plugin": "^3.0.1",
    "@types/node": "^22.13.10",
    "@typescript-eslint/eslint-plugin": "^8.26.1",
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -16,9 +16,9 @@

 import { defineConfig } from '@playwright/test';

-import type { Project } from '@playwright/test';
+import type { TestOptions } from './tests/fixtures.js';

-export default defineConfig({
+export default defineConfig<TestOptions>({
  testDir: './tests',
  fullyParallel: true,
  forbidOnly: !!process.env.CI,
@@ -31,5 +31,5 @@ export default defineConfig({
    { name: 'chromium', use: { mcpBrowser: 'chromium' } },
    { name: 'firefox', use: { mcpBrowser: 'firefox' } },
    { name: 'webkit', use: { mcpBrowser: 'webkit' } },
-  ].filter(Boolean) as Project[],
+  ],
 });
--- a/src/config.ts
+++ b/src/config.ts
@@ -20,10 +20,9 @@ import os from 'os';
 import path from 'path';
 import { devices } from 'playwright';

-import { sanitizeForFilePath } from './tools/utils';
-
-import type { Config, ToolCapability } from '../config';
+import type { Config, ToolCapability } from '../config.js';
 import type { BrowserContextOptions, LaunchOptions } from 'playwright';
+import { sanitizeForFilePath } from './tools/utils.js';

 export type CLIOptions = {
  browser?: string;
@@ -37,12 +36,15 @@ export type CLIOptions = {
  host?: string;
  vision?: boolean;
  config?: string;
+  allowedOrigins?: string[];
+  blockedOrigins?: string[];
+  outputDir?: string;
+  noImageResponses?: boolean;
 };

 const defaultConfig: Config = {
  browser: {
    browserName: 'chromium',
-    userDataDir: os.tmpdir(),
    launchOptions: {
      channel: 'chrome',
      headless: os.platform() === 'linux' && !process.env.DISPLAY,
@@ -51,6 +53,10 @@ const defaultConfig: Config = {
      viewport: null,
    },
  },
+  network: {
+    allowedOrigins: undefined,
+    blockedOrigins: undefined,
+  },
 };

 export async function resolveConfig(cliOptions: CLIOptions): Promise<Config> {
@@ -100,7 +106,7 @@ export async function configFromCLIOptions(cliOptions: CLIOptions): Promise<Conf
  return {
    browser: {
      browserName,
-      userDataDir: cliOptions.userDataDir ?? await createUserDataDir({ browserName, channel }),
+      userDataDir: cliOptions.userDataDir,
      launchOptions,
      contextOptions,
      cdpEndpoint: cliOptions.cdpEndpoint,
@@ -111,6 +117,11 @@ export async function configFromCLIOptions(cliOptions: CLIOptions): Promise<Conf
    },
    capabilities: cliOptions.caps?.split(',').map((c: string) => c.trim() as ToolCapability),
    vision: !!cliOptions.vision,
+    network: {
+      allowedOrigins: cliOptions.allowedOrigins,
+      blockedOrigins: cliOptions.blockedOrigins,
+    },
+    outputDir: cliOptions.outputDir,
  };
 }

@@ -136,21 +147,6 @@ async function loadConfig(configFile: string | undefined): Promise<Config> {
  }
 }

-async function createUserDataDir(options: { browserName: 'chromium' | 'firefox' | 'webkit', channel: string | undefined }) {
-  let cacheDirectory: string;
-  if (process.platform === 'linux')
-    cacheDirectory = process.env.XDG_CACHE_HOME || path.join(os.homedir(), '.cache');
-  else if (process.platform === 'darwin')
-    cacheDirectory = path.join(os.homedir(), 'Library', 'Caches');
-  else if (process.platform === 'win32')
-    cacheDirectory = process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local');
-  else
-    throw new Error('Unsupported platform: ' + process.platform);
-  const result = path.join(cacheDirectory, 'ms-playwright', `mcp-${options.channel ?? options.browserName}-profile`);
-  await fs.promises.mkdir(result, { recursive: true });
-  return result;
-}
-
 export async function outputFile(config: Config, name: string): Promise<string> {
  const result = config.outputDir ?? os.tmpdir();
  await fs.promises.mkdir(result, { recursive: true });
@@ -158,24 +154,37 @@ export async function outputFile(config: Config, name: string): Promise<string>
  return path.join(result, fileName);
 }

+function pickDefined<T extends object>(obj: T | undefined): Partial<T> {
+  return Object.fromEntries(
+      Object.entries(obj ?? {}).filter(([_, v]) => v !== undefined)
+  ) as Partial<T>;
+}
+
 function mergeConfig(base: Config, overrides: Config): Config {
  const browser: Config['browser'] = {
-    ...base.browser,
-    ...overrides.browser,
+    ...pickDefined(base.browser),
+    ...pickDefined(overrides.browser),
    launchOptions: {
-      ...base.browser?.launchOptions,
-      ...overrides.browser?.launchOptions,
+      ...pickDefined(base.browser?.launchOptions),
+      ...pickDefined(overrides.browser?.launchOptions),
      ...{ assistantMode: true },
    },
    contextOptions: {
-      ...base.browser?.contextOptions,
-      ...overrides.browser?.contextOptions,
+      ...pickDefined(base.browser?.contextOptions),
+      ...pickDefined(overrides.browser?.contextOptions),
    },
  };

+  if (browser.browserName !== 'chromium')
+    delete browser.launchOptions.channel;
+
  return {
-    ...base,
-    ...overrides,
+    ...pickDefined(base),
+    ...pickDefined(overrides),
    browser,
+    network: {
+      ...pickDefined(base.network),
+      ...pickDefined(overrides.network),
+    },
  };
 }
--- a/src/connection.ts
+++ b/src/connection.ts
@@ -15,24 +15,21 @@
 */

 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
-import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
+import { CallToolRequestSchema, ListToolsRequestSchema, Tool as McpTool } from '@modelcontextprotocol/sdk/types.js';
 import { zodToJsonSchema } from 'zod-to-json-schema';

-import { Context } from './context';
+import { Context, packageJSON } from './context.js';
+import { snapshotTools, screenshotTools } from './tools.js';

-import type { Tool } from './tools/tool';
-import type { Config } from '../config';
+import type { Config } from '../config.js';
+import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';

-type MCPServerOptions = {
-  name: string;
-  version: string;
-  tools: Tool[];
-};
+export async function createConnection(config: Config): Promise<Connection> {
+  const allTools = config.vision ? screenshotTools : snapshotTools;
+  const tools = allTools.filter(tool => !config.capabilities || tool.capability === 'core' || config.capabilities.includes(tool.capability));

-export function createServerWithTools(serverOptions: MCPServerOptions, config: Config): Server {
-  const { name, version, tools } = serverOptions;
  const context = new Context(tools, config);
-  const server = new Server({ name, version }, {
+  const server = new Server({ name: 'Playwright', version: packageJSON.version }, {
    capabilities: {
      tools: {},
    }
@@ -43,8 +40,14 @@ export function createServerWithTools(serverOptions: MCPServerOptions, config: C
      tools: tools.map(tool => ({
        name: tool.schema.name,
        description: tool.schema.description,
-        inputSchema: zodToJsonSchema(tool.schema.inputSchema)
-      })),
+        inputSchema: zodToJsonSchema(tool.schema.inputSchema),
+        annotations: {
+          title: tool.schema.title,
+          readOnlyHint: tool.schema.type === 'readOnly',
+          destructiveHint: tool.schema.type === 'destructive',
+          openWorldHint: true,
+        },
+      })) as McpTool[],
    };
  });

@@ -71,38 +74,30 @@ export function createServerWithTools(serverOptions: MCPServerOptions, config: C
    }
  });

-  const oldClose = server.close.bind(server);
-
-  server.close = async () => {
-    await oldClose();
-    await context.close();
-  };
-
-  return server;
+  const connection = new Connection(server, context);
+  return connection;
 }

-export class ServerList {
-  private _servers: Server[] = [];
-  private _serverFactory: () => Promise<Server>;
+export class Connection {
+  readonly server: Server;
+  readonly context: Context;

-  constructor(serverFactory: () => Promise<Server>) {
-    this._serverFactory = serverFactory;
+  constructor(server: Server, context: Context) {
+    this.server = server;
+    this.context = context;
  }

-  async create() {
-    const server = await this._serverFactory();
-    this._servers.push(server);
-    return server;
+  async connect(transport: Transport) {
+    await this.server.connect(transport);
+    await new Promise<void>(resolve => {
+      this.server.oninitialized = () => resolve();
+    });
+    if (this.server.getClientVersion()?.name.includes('cursor'))
+      this.context.config.noImageResponses = true;
  }

-  async close(server: Server) {
-    const index = this._servers.indexOf(server);
-    if (index !== -1)
-      this._servers.splice(index, 1);
-    await server.close();
-  }
-
-  async closeAll() {
-    await Promise.all(this._servers.map(server => server.close()));
+  async close() {
+    await this.server.close();
+    await this.context.close();
  }
 }
--- a/src/context.ts
+++ b/src/context.ts
@@ -14,15 +14,21 @@
 * limitations under the License.
 */

+import fs from 'node:fs';
+import url from 'node:url';
+import os from 'node:os';
+import path from 'node:path';
+
 import * as playwright from 'playwright';

-import { waitForCompletion } from './tools/utils';
-import { ManualPromise } from './manualPromise';
-import { Tab } from './tab';
+import { waitForCompletion } from './tools/utils.js';
+import { ManualPromise } from './manualPromise.js';
+import { Tab } from './tab.js';

-import type { ImageContent, TextContent } from '@modelcontextprotocol/sdk/types';
-import type { ModalState, Tool, ToolActionResult } from './tools/tool';
-import type { Config } from '../config';
+import type { ImageContent, TextContent } from '@modelcontextprotocol/sdk/types.js';
+import type { ModalState, Tool, ToolActionResult } from './tools/tool.js';
+import type { Config } from '../config.js';
+import { outputFile } from './config.js';

 type PendingAction = {
  dialogShown: ManualPromise<void>;
@@ -38,6 +44,7 @@ export class Context {
  private _currentTab: Tab | undefined;
  private _modalStates: (ModalState & { tab: Tab })[] = [];
  private _pendingAction: PendingAction | undefined;
+  private _downloads: { download: playwright.Download, finished: boolean, outputFile: string }[] = [];

  constructor(tools: Tool[], config: Config) {
    this.tools = tools;
@@ -164,6 +171,17 @@ ${code.join('\n')}
      };
    }

+    if (this._downloads.length) {
+      result.push('', '### Downloads');
+      for (const entry of this._downloads) {
+        if (entry.finished)
+          result.push(`- Downloaded file ${entry.download.suggestedFilename()} to ${entry.outputFile}`);
+        else
+          result.push(`- Downloading file ${entry.download.suggestedFilename()} ...`);
+      }
+      result.push('');
+    }
+
    if (this.tabs().length > 1)
      result.push(await this.listTabsMarkdown(), '');

@@ -228,6 +246,17 @@ ${code.join('\n')}
    this._pendingAction?.dialogShown.resolve();
  }

+  async downloadStarted(tab: Tab, download: playwright.Download) {
+    const entry = {
+      download,
+      finished: false,
+      outputFile: await outputFile(this.config, download.suggestedFilename())
+    };
+    this._downloads.push(entry);
+    await download.saveAs(entry.outputFile);
+    entry.finished = true;
+  }
+
  private _onPageCreated(page: playwright.Page) {
    const tab = new Tab(this, page, tab => this._onPageClosed(tab));
    this._tabs.push(tab);
@@ -262,11 +291,26 @@ ${code.join('\n')}
    }).catch(() => {});
  }

+  private async _setupRequestInterception(context: playwright.BrowserContext) {
+    if (this.config.network?.allowedOrigins?.length) {
+      await context.route('**', route => route.abort('blockedbyclient'));
+
+      for (const origin of this.config.network.allowedOrigins)
+        await context.route(`*://${origin}/**`, route => route.continue());
+    }
+
+    if (this.config.network?.blockedOrigins?.length) {
+      for (const origin of this.config.network.blockedOrigins)
+        await context.route(`*://${origin}/**`, route => route.abort('blockedbyclient'));
+    }
+  }
+
  private async _ensureBrowserContext() {
    if (!this._browserContext) {
      const context = await this._createBrowserContext();
      this._browser = context.browser;
      this._browserContext = context.browserContext;
+      await this._setupRequestInterception(this._browserContext);
      for (const page of this._browserContext.pages())
        this._onPageCreated(page);
      this._browserContext.on('page', page => this._onPageCreated(page));
@@ -275,8 +319,12 @@ ${code.join('\n')}
  }

  private async _createBrowserContext(): Promise<{ browser?: playwright.Browser, browserContext: playwright.BrowserContext }> {
-    if (!this._createBrowserContextPromise)
+    if (!this._createBrowserContextPromise) {
      this._createBrowserContextPromise = this._innerCreateBrowserContext();
+      void this._createBrowserContextPromise.catch(() => {
+        this._createBrowserContextPromise = undefined;
+      });
+    }
    return this._createBrowserContextPromise;
  }

@@ -305,8 +353,10 @@ ${code.join('\n')}

 async function launchPersistentContext(browserConfig: Config['browser']): Promise<playwright.BrowserContext> {
  try {
-    const browserType = browserConfig?.browserName ? playwright[browserConfig.browserName] : playwright.chromium;
-    return await browserType.launchPersistentContext(browserConfig?.userDataDir || '', { ...browserConfig?.launchOptions, ...browserConfig?.contextOptions });
+    const browserName = browserConfig?.browserName ?? 'chromium';
+    const userDataDir = browserConfig?.userDataDir ?? await createUserDataDir({ ...browserConfig, browserName });
+    const browserType = playwright[browserName];
+    return await browserType.launchPersistentContext(userDataDir, { ...browserConfig?.launchOptions, ...browserConfig?.contextOptions });
  } catch (error: any) {
    if (error.message.includes('Executable doesn\'t exist'))
      throw new Error(`Browser specified in your config is not installed. Either install it (likely) or change the config.`);
@@ -314,6 +364,24 @@ async function launchPersistentContext(browserConfig: Config['browser']): Promis
  }
 }

+async function createUserDataDir(browserConfig: Config['browser']) {
+  let cacheDirectory: string;
+  if (process.platform === 'linux')
+    cacheDirectory = process.env.XDG_CACHE_HOME || path.join(os.homedir(), '.cache');
+  else if (process.platform === 'darwin')
+    cacheDirectory = path.join(os.homedir(), 'Library', 'Caches');
+  else if (process.platform === 'win32')
+    cacheDirectory = process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local');
+  else
+    throw new Error('Unsupported platform: ' + process.platform);
+  const result = path.join(cacheDirectory, 'ms-playwright', `mcp-${browserConfig?.launchOptions.channel ?? browserConfig?.browserName}-profile`);
+  await fs.promises.mkdir(result, { recursive: true });
+  return result;
+}
+
 export async function generateLocator(locator: playwright.Locator): Promise<string> {
  return (locator as any)._generateLocatorString();
 }
+
+const __filename = url.fileURLToPath(import.meta.url);
+export const packageJSON = JSON.parse(fs.readFileSync(path.join(path.dirname(__filename), '..', 'package.json'), 'utf8'));
--- a/src/index.ts
+++ b/src/index.ts
@@ -14,60 +14,10 @@
 * limitations under the License.
 */

-import { createServerWithTools } from './server';
-import common from './tools/common';
-import console from './tools/console';
-import dialogs from './tools/dialogs';
-import files from './tools/files';
-import install from './tools/install';
-import keyboard from './tools/keyboard';
-import navigate from './tools/navigate';
-import network from './tools/network';
-import pdf from './tools/pdf';
-import snapshot from './tools/snapshot';
-import tabs from './tools/tabs';
-import screen from './tools/screen';
+import { Connection } from './connection.js';

-import type { Tool } from './tools/tool';
-import type { Config } from '../config';
-import type { Server } from '@modelcontextprotocol/sdk/server/index.js';
+import type { Config } from '../config.js';

-const snapshotTools: Tool<any>[] = [
-  ...common(true),
-  ...console,
-  ...dialogs(true),
-  ...files(true),
-  ...install,
-  ...keyboard(true),
-  ...navigate(true),
-  ...network,
-  ...pdf,
-  ...snapshot,
-  ...tabs(true),
-];
-
-const screenshotTools: Tool<any>[] = [
-  ...common(false),
-  ...console,
-  ...dialogs(false),
-  ...files(false),
-  ...install,
-  ...keyboard(false),
-  ...navigate(false),
-  ...network,
-  ...pdf,
-  ...screen,
-  ...tabs(false),
-];
-
-const packageJSON = require('../package.json');
-
-export async function createServer(config: Config = {}): Promise<Server> {
-  const allTools = config.vision ? screenshotTools : snapshotTools;
-  const tools = allTools.filter(tool => !config.capabilities || tool.capability === 'core' || config.capabilities.includes(tool.capability));
-  return createServerWithTools({
-    name: 'Playwright',
-    version: packageJSON.version,
-    tools,
-  }, config);
+export async function createConnection(config: Config = {}): Promise<Connection> {
+  return createConnection(config);
 }
--- a/src/program.ts
+++ b/src/program.ts
@@ -16,14 +16,11 @@

 import { program } from 'commander';

-import { createServer } from './index';
-import { ServerList } from './server';
+import { startHttpTransport, startStdioTransport } from './transport.js';
+import { resolveConfig } from './config.js';

-import { startHttpTransport, startStdioTransport } from './transport';
-
-import { resolveConfig } from './config';
-
-const packageJSON = require('../package.json');
+import type { Connection } from './connection.js';
+import { packageJSON } from './context.js';

 program
    .version('Version ' + packageJSON.version)
@@ -37,23 +34,28 @@ program
    .option('--user-data-dir <path>', 'Path to the user data directory')
    .option('--port <port>', 'Port to listen on for SSE transport.')
    .option('--host <host>', 'Host to bind server to. Default is localhost. Use 0.0.0.0 to bind to all interfaces.')
+    .option('--allowed-origins <origins>', 'Semicolon-separated list of origins to allow the browser to request. Default is to allow all.', semicolonSeparatedList)
+    .option('--blocked-origins <origins>', 'Semicolon-separated list of origins to block the browser from requesting. Blocklist is evaluated before allowlist. If used without the allowlist, requests not matching the blocklist are still allowed.', semicolonSeparatedList)
    .option('--vision', 'Run server that uses screenshots (Aria snapshots are used by default)')
+    .option('--no-image-responses', 'Do not send image responses to the client.')
+    .option('--output-dir <path>', 'Path to the directory for output files.')
    .option('--config <path>', 'Path to the configuration file.')
    .action(async options => {
      const config = await resolveConfig(options);
-      const serverList = new ServerList(() => createServer(config));
-      setupExitWatchdog(serverList);
+      const connectionList: Connection[] = [];
+      setupExitWatchdog(connectionList);

      if (options.port)
-        startHttpTransport(+options.port, options.host, serverList);
+        startHttpTransport(config, +options.port, options.host, connectionList);
      else
-        await startStdioTransport(serverList);
+        await startStdioTransport(config, connectionList);
    });

-function setupExitWatchdog(serverList: ServerList) {
+function setupExitWatchdog(connectionList: Connection[]) {
  const handleExit = async () => {
    setTimeout(() => process.exit(0), 15000);
-    await serverList.closeAll();
+    for (const connection of connectionList)
+      await connection.close();
    process.exit(0);
  };

@@ -62,4 +64,8 @@ function setupExitWatchdog(serverList: ServerList) {
  process.on('SIGTERM', handleExit);
 }

+function semicolonSeparatedList(value: string): string[] {
+  return value.split(';').map(v => v.trim());
+}
+
 program.parse(process.argv);
--- a/src/resources/resource.ts
+++ b/src/resources/resource.ts
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-import type { Context } from '../context';
+import type { Context } from '../context.js';

 export type ResourceSchema = {
  uri: string;
--- a/src/tab.ts
+++ b/src/tab.ts
@@ -16,9 +16,9 @@

 import * as playwright from 'playwright';

-import { PageSnapshot } from './pageSnapshot';
+import { PageSnapshot } from './pageSnapshot.js';

-import type { Context } from './context';
+import type { Context } from './context.js';

 export class Tab {
  readonly context: Context;
@@ -48,6 +48,9 @@ export class Tab {
      }, this);
    });
    page.on('dialog', dialog => this.context.dialogShown(this, dialog));
+    page.on('download', download => {
+      void this.context.downloadStarted(this, download);
+    });
    page.setDefaultNavigationTimeout(60000);
    page.setDefaultTimeout(5000);
  }
--- a/src/tools.ts
+++ b/src/tools.ts
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import common from './tools/common.js';
+import console from './tools/console.js';
+import dialogs from './tools/dialogs.js';
+import files from './tools/files.js';
+import install from './tools/install.js';
+import keyboard from './tools/keyboard.js';
+import navigate from './tools/navigate.js';
+import network from './tools/network.js';
+import pdf from './tools/pdf.js';
+import snapshot from './tools/snapshot.js';
+import tabs from './tools/tabs.js';
+import screen from './tools/screen.js';
+import testing from './tools/testing.js';
+
+import type { Tool } from './tools/tool.js';
+
+export const snapshotTools: Tool<any>[] = [
+  ...common(true),
+  ...console,
+  ...dialogs(true),
+  ...files(true),
+  ...install,
+  ...keyboard(true),
+  ...navigate(true),
+  ...network,
+  ...pdf,
+  ...snapshot,
+  ...tabs(true),
+  ...testing,
+];
+
+export const screenshotTools: Tool<any>[] = [
+  ...common(false),
+  ...console,
+  ...dialogs(false),
+  ...files(false),
+  ...install,
+  ...keyboard(false),
+  ...navigate(false),
+  ...network,
+  ...pdf,
+  ...screen,
+  ...tabs(false),
+  ...testing,
+];
--- a/src/tools/common.ts
+++ b/src/tools/common.ts
@@ -15,17 +15,19 @@
 */

 import { z } from 'zod';
-import { defineTool, type ToolFactory } from './tool';
+import { defineTool, type ToolFactory } from './tool.js';

 const wait: ToolFactory = captureSnapshot => defineTool({
  capability: 'wait',

  schema: {
    name: 'browser_wait',
+    title: 'Wait',
    description: 'Wait for a specified time in seconds',
    inputSchema: z.object({
      time: z.number().describe('The time to wait in seconds'),
    }),
+    type: 'readOnly',
  },

  handle: async (context, params) => {
@@ -43,8 +45,10 @@ const close = defineTool({

  schema: {
    name: 'browser_close',
+    title: 'Close browser',
    description: 'Close the page',
    inputSchema: z.object({}),
+    type: 'readOnly',
  },

  handle: async context => {
@@ -61,11 +65,13 @@ const resize: ToolFactory = captureSnapshot => defineTool({
  capability: 'core',
  schema: {
    name: 'browser_resize',
+    title: 'Resize browser window',
    description: 'Resize the browser window',
    inputSchema: z.object({
      width: z.number().describe('Width of the browser window'),
      height: z.number().describe('Height of the browser window'),
    }),
+    type: 'readOnly',
  },

  handle: async (context, params) => {
--- a/src/tools/console.ts
+++ b/src/tools/console.ts
@@ -15,14 +15,16 @@
 */

 import { z } from 'zod';
-import { defineTool } from './tool';
+import { defineTool } from './tool.js';

 const console = defineTool({
  capability: 'core',
  schema: {
    name: 'browser_console_messages',
+    title: 'Get console messages',
    description: 'Returns all console messages',
    inputSchema: z.object({}),
+    type: 'readOnly',
  },
  handle: async context => {
    const messages = context.currentTabOrDie().console();
--- a/src/tools/dialogs.ts
+++ b/src/tools/dialogs.ts
@@ -15,18 +15,20 @@
 */

 import { z } from 'zod';
-import { defineTool, type ToolFactory } from './tool';
+import { defineTool, type ToolFactory } from './tool.js';

 const handleDialog: ToolFactory = captureSnapshot => defineTool({
  capability: 'core',

  schema: {
    name: 'browser_handle_dialog',
+    title: 'Handle a dialog',
    description: 'Handle a dialog',
    inputSchema: z.object({
      accept: z.boolean().describe('Whether to accept the dialog.'),
      promptText: z.string().optional().describe('The text of the prompt in case of a prompt dialog.'),
    }),
+    type: 'destructive',
  },

  handle: async (context, params) => {
--- a/src/tools/files.ts
+++ b/src/tools/files.ts
@@ -15,17 +15,19 @@
 */

 import { z } from 'zod';
-import { defineTool, type ToolFactory } from './tool';
+import { defineTool, type ToolFactory } from './tool.js';

 const uploadFile: ToolFactory = captureSnapshot => defineTool({
  capability: 'files',

  schema: {
    name: 'browser_file_upload',
+    title: 'Upload files',
    description: 'Upload one or multiple files',
    inputSchema: z.object({
      paths: z.array(z.string()).describe('The absolute paths to the files to upload. Can be a single file or multiple files.'),
    }),
+    type: 'destructive',
  },

  handle: async (context, params) => {
--- a/src/tools/install.ts
+++ b/src/tools/install.ts
@@ -18,20 +18,25 @@ import { fork } from 'child_process';
 import path from 'path';

 import { z } from 'zod';
-import { defineTool } from './tool';
+import { defineTool } from './tool.js';
+
+import { fileURLToPath } from 'node:url';

 const install = defineTool({
  capability: 'install',
  schema: {
    name: 'browser_install',
+    title: 'Install the browser specified in the config',
    description: 'Install the browser specified in the config. Call this if you get an error about the browser not being installed.',
    inputSchema: z.object({}),
+    type: 'destructive',
  },

  handle: async context => {
    const channel = context.config.browser?.launchOptions?.channel ?? context.config.browser?.launchOptions.browserName ?? 'chrome';
-    const cli = path.join(require.resolve('playwright/package.json'), '..', 'cli.js');
-    const child = fork(cli, ['install', channel], {
+    const cliUrl = import.meta.resolve('playwright/package.json');
+    const cliPath = path.join(fileURLToPath(cliUrl), '..', 'cli.js');
+    const child = fork(cliPath, ['install', channel], {
      stdio: 'pipe',
    });
    const output: string[] = [];
--- a/src/tools/keyboard.ts
+++ b/src/tools/keyboard.ts
@@ -15,17 +15,19 @@
 */

 import { z } from 'zod';
-import { defineTool, type ToolFactory } from './tool';
+import { defineTool, type ToolFactory } from './tool.js';

 const pressKey: ToolFactory = captureSnapshot => defineTool({
  capability: 'core',

  schema: {
    name: 'browser_press_key',
+    title: 'Press a key',
    description: 'Press a key on the keyboard',
    inputSchema: z.object({
      key: z.string().describe('Name of the key to press or a character to generate, such as `ArrowLeft` or `a`'),
    }),
+    type: 'destructive',
  },

  handle: async (context, params) => {
--- a/src/tools/navigate.ts
+++ b/src/tools/navigate.ts
@@ -15,17 +15,19 @@
 */

 import { z } from 'zod';
-import { defineTool, type ToolFactory } from './tool';
+import { defineTool, type ToolFactory } from './tool.js';

 const navigate: ToolFactory = captureSnapshot => defineTool({
  capability: 'core',

  schema: {
    name: 'browser_navigate',
+    title: 'Navigate to a URL',
    description: 'Navigate to a URL',
    inputSchema: z.object({
      url: z.string().describe('The URL to navigate to'),
    }),
+    type: 'destructive',
  },

  handle: async (context, params) => {
@@ -49,8 +51,10 @@ const goBack: ToolFactory = captureSnapshot => defineTool({
  capability: 'history',
  schema: {
    name: 'browser_navigate_back',
+    title: 'Go back',
    description: 'Go back to the previous page',
    inputSchema: z.object({}),
+    type: 'readOnly',
  },

  handle: async context => {
@@ -73,8 +77,10 @@ const goForward: ToolFactory = captureSnapshot => defineTool({
  capability: 'history',
  schema: {
    name: 'browser_navigate_forward',
+    title: 'Go forward',
    description: 'Go forward to the next page',
    inputSchema: z.object({}),
+    type: 'readOnly',
  },
  handle: async context => {
    const tab = context.currentTabOrDie();
--- a/src/tools/network.ts
+++ b/src/tools/network.ts
@@ -15,7 +15,7 @@
 */

 import { z } from 'zod';
-import { defineTool } from './tool';
+import { defineTool } from './tool.js';

 import type * as playwright from 'playwright';

@@ -24,8 +24,10 @@ const requests = defineTool({

  schema: {
    name: 'browser_network_requests',
+    title: 'List network requests',
    description: 'Returns all network requests since loading the page',
    inputSchema: z.object({}),
+    type: 'readOnly',
  },

  handle: async context => {
--- a/src/tools/pdf.ts
+++ b/src/tools/pdf.ts
@@ -15,23 +15,25 @@
 */

 import { z } from 'zod';
-import { defineTool } from './tool';
+import { defineTool } from './tool.js';

-import * as javascript from '../javascript';
-import { outputFile } from '../config';
+import * as javascript from '../javascript.js';
+import { outputFile } from '../config.js';

 const pdf = defineTool({
  capability: 'pdf',

  schema: {
    name: 'browser_pdf_save',
+    title: 'Save as PDF',
    description: 'Save page as PDF',
    inputSchema: z.object({}),
+    type: 'readOnly',
  },

  handle: async context => {
    const tab = context.currentTabOrDie();
-    const fileName = await outputFile(context.config, `page-${new Date().toISOString()}'.pdf'`);
+    const fileName = await outputFile(context.config, `page-${new Date().toISOString()}.pdf`);

    const code = [
      `// Save page as ${fileName}`,
--- a/src/tools/screen.ts
+++ b/src/tools/screen.ts
@@ -15,9 +15,9 @@
 */

 import { z } from 'zod';
-import { defineTool } from './tool';
+import { defineTool } from './tool.js';

-import * as javascript from '../javascript';
+import * as javascript from '../javascript.js';

 const elementSchema = z.object({
  element: z.string().describe('Human-readable element description used to obtain permission to interact with the element'),
@@ -27,8 +27,10 @@ const screenshot = defineTool({
  capability: 'core',
  schema: {
    name: 'browser_screen_capture',
+    title: 'Take a screenshot',
    description: 'Take a screenshot of the current page',
    inputSchema: z.object({}),
+    type: 'readOnly',
  },

  handle: async context => {
@@ -59,11 +61,13 @@ const moveMouse = defineTool({
  capability: 'core',
  schema: {
    name: 'browser_screen_move_mouse',
+    title: 'Move mouse',
    description: 'Move mouse to a given position',
    inputSchema: elementSchema.extend({
      x: z.number().describe('X coordinate'),
      y: z.number().describe('Y coordinate'),
    }),
+    type: 'readOnly',
  },

  handle: async (context, params) => {
@@ -86,11 +90,13 @@ const click = defineTool({
  capability: 'core',
  schema: {
    name: 'browser_screen_click',
+    title: 'Click',
    description: 'Click left mouse button',
    inputSchema: elementSchema.extend({
      x: z.number().describe('X coordinate'),
      y: z.number().describe('Y coordinate'),
    }),
+    type: 'destructive',
  },

  handle: async (context, params) => {
@@ -117,9 +123,9 @@ const click = defineTool({

 const drag = defineTool({
  capability: 'core',
-
  schema: {
    name: 'browser_screen_drag',
+    title: 'Drag mouse',
    description: 'Drag left mouse button',
    inputSchema: elementSchema.extend({
      startX: z.number().describe('Start X coordinate'),
@@ -127,6 +133,7 @@ const drag = defineTool({
      endX: z.number().describe('End X coordinate'),
      endY: z.number().describe('End Y coordinate'),
    }),
+    type: 'destructive',
  },

  handle: async (context, params) => {
@@ -158,14 +165,15 @@ const drag = defineTool({

 const type = defineTool({
  capability: 'core',
-
  schema: {
    name: 'browser_screen_type',
+    title: 'Type text',
    description: 'Type text',
    inputSchema: z.object({
      text: z.string().describe('Text to type into the element'),
      submit: z.boolean().optional().describe('Whether to submit entered text (press Enter after)'),
    }),
+    type: 'destructive',
  },

  handle: async (context, params) => {
--- a/src/tools/snapshot.ts
+++ b/src/tools/snapshot.ts
@@ -16,9 +16,9 @@

 import { z } from 'zod';

-import { defineTool } from './tool';
-import * as javascript from '../javascript';
-import { outputFile } from '../config';
+import { defineTool } from './tool.js';
+import * as javascript from '../javascript.js';
+import { outputFile } from '../config.js';

 import type * as playwright from 'playwright';

@@ -26,8 +26,10 @@ const snapshot = defineTool({
  capability: 'core',
  schema: {
    name: 'browser_snapshot',
+    title: 'Page snapshot',
    description: 'Capture accessibility snapshot of the current page, this is better than screenshot',
    inputSchema: z.object({}),
+    type: 'readOnly',
  },

  handle: async context => {
@@ -50,8 +52,10 @@ const click = defineTool({
  capability: 'core',
  schema: {
    name: 'browser_click',
+    title: 'Click',
    description: 'Perform click on a web page',
    inputSchema: elementSchema,
+    type: 'destructive',
  },

  handle: async (context, params) => {
@@ -76,6 +80,7 @@ const drag = defineTool({
  capability: 'core',
  schema: {
    name: 'browser_drag',
+    title: 'Drag mouse',
    description: 'Perform drag and drop between two elements',
    inputSchema: z.object({
      startElement: z.string().describe('Human-readable source element description used to obtain the permission to interact with the element'),
@@ -83,6 +88,7 @@ const drag = defineTool({
      endElement: z.string().describe('Human-readable target element description used to obtain the permission to interact with the element'),
      endRef: z.string().describe('Exact target element reference from the page snapshot'),
    }),
+    type: 'destructive',
  },

  handle: async (context, params) => {
@@ -108,8 +114,10 @@ const hover = defineTool({
  capability: 'core',
  schema: {
    name: 'browser_hover',
+    title: 'Hover mouse',
    description: 'Hover over element on page',
    inputSchema: elementSchema,
+    type: 'readOnly',
  },

  handle: async (context, params) => {
@@ -140,8 +148,10 @@ const type = defineTool({
  capability: 'core',
  schema: {
    name: 'browser_type',
+    title: 'Type text',
    description: 'Type text into editable element',
    inputSchema: typeSchema,
+    type: 'destructive',
  },

  handle: async (context, params) => {
@@ -184,8 +194,10 @@ const selectOption = defineTool({
  capability: 'core',
  schema: {
    name: 'browser_select_option',
+    title: 'Select option',
    description: 'Select an option in a dropdown',
    inputSchema: selectOptionSchema,
+    type: 'destructive',
  },

  handle: async (context, params) => {
@@ -221,8 +233,10 @@ const screenshot = defineTool({
  capability: 'core',
  schema: {
    name: 'browser_take_screenshot',
+    title: 'Take a screenshot',
    description: `Take a screenshot of the current page. You can't perform actions based on the screenshot, use browser_snapshot for actions.`,
    inputSchema: screenshotSchema,
+    type: 'readOnly',
  },

  handle: async (context, params) => {
@@ -244,7 +258,7 @@ const screenshot = defineTool({
    else
      code.push(`await page.screenshot(${javascript.formatObject(options)});`);

-    const includeBase64 = !context.config.tools?.browser_take_screenshot?.omitBase64;
+    const includeBase64 = !context.config.noImageResponses;
    const action = async () => {
      const screenshot = locator ? await locator.screenshot(options) : await tab.page.screenshot(options);
      return {
--- a/src/tools/tabs.ts
+++ b/src/tools/tabs.ts
@@ -15,15 +15,17 @@
 */

 import { z } from 'zod';
-import { defineTool, type ToolFactory } from './tool';
+import { defineTool, type ToolFactory } from './tool.js';

 const listTabs = defineTool({
  capability: 'tabs',

  schema: {
    name: 'browser_tab_list',
+    title: 'List tabs',
    description: 'List browser tabs',
    inputSchema: z.object({}),
+    type: 'readOnly',
  },

  handle: async context => {
@@ -47,10 +49,12 @@ const selectTab: ToolFactory = captureSnapshot => defineTool({

  schema: {
    name: 'browser_tab_select',
+    title: 'Select a tab',
    description: 'Select a tab by index',
    inputSchema: z.object({
      index: z.number().describe('The index of the tab to select'),
    }),
+    type: 'readOnly',
  },

  handle: async (context, params) => {
@@ -72,10 +76,12 @@ const newTab: ToolFactory = captureSnapshot => defineTool({

  schema: {
    name: 'browser_tab_new',
+    title: 'Open a new tab',
    description: 'Open a new tab',
    inputSchema: z.object({
      url: z.string().optional().describe('The URL to navigate to in the new tab. If not provided, the new tab will be blank.'),
    }),
+    type: 'readOnly',
  },

  handle: async (context, params) => {
@@ -99,10 +105,12 @@ const closeTab: ToolFactory = captureSnapshot => defineTool({

  schema: {
    name: 'browser_tab_close',
+    title: 'Close a tab',
    description: 'Close a tab',
    inputSchema: z.object({
      index: z.number().optional().describe('The index of the tab to close. Closes current tab if not provided.'),
    }),
+    type: 'destructive',
  },

  handle: async (context, params) => {
--- a/src/tools/testing.ts
+++ b/src/tools/testing.ts
@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { z } from 'zod';
+import { defineTool } from './tool.js';
+
+const generateTestSchema = z.object({
+  name: z.string().describe('The name of the test'),
+  description: z.string().describe('The description of the test'),
+  steps: z.array(z.string()).describe('The steps of the test'),
+});
+
+const generateTest = defineTool({
+  capability: 'testing',
+
+  schema: {
+    name: 'browser_generate_playwright_test',
+    title: 'Generate a Playwright test',
+    description: 'Generate a Playwright test for given scenario',
+    inputSchema: generateTestSchema,
+    type: 'readOnly',
+  },
+
+  handle: async (context, params) => {
+    return {
+      resultOverride: {
+        content: [{
+          type: 'text',
+          text: instructions(params),
+        }],
+      },
+      code: [],
+      captureSnapshot: false,
+      waitForNetwork: false,
+    };
+  },
+});
+
+const instructions = (params: { name: string, description: string, steps: string[] }) => [
+  `## Instructions`,
+  `- You are a playwright test generator.`,
+  `- You are given a scenario and you need to generate a playwright test for it.`,
+  '- DO NOT generate test code based on the scenario alone. DO run steps one by one using the tools provided instead.',
+  '- Only after all steps are completed, emit a Playwright TypeScript test that uses @playwright/test based on message history',
+  '- Save generated test file in the tests directory',
+  `Test name: ${params.name}`,
+  `Description: ${params.description}`,
+  `Steps:`,
+  ...params.steps.map((step, index) => `- ${index + 1}. ${step}`),
+].join('\n');
+
+export default [
+  generateTest,
+];
--- a/src/tools/tool.ts
+++ b/src/tools/tool.ts
@@ -14,16 +14,18 @@
 * limitations under the License.
 */

-import type { ImageContent, TextContent } from '@modelcontextprotocol/sdk/types';
+import type { ImageContent, TextContent } from '@modelcontextprotocol/sdk/types.js';
 import type { z } from 'zod';
-import type { Context } from '../context';
+import type { Context } from '../context.js';
 import type * as playwright from 'playwright';
-import type { ToolCapability } from '../../config';
+import type { ToolCapability } from '../../config.js';

 export type ToolSchema<Input extends InputType> = {
  name: string;
+  title: string;
  description: string;
  inputSchema: Input;
+  type: 'readOnly' | 'destructive';
 };

 type InputType = z.Schema;
--- a/src/tools/utils.ts
+++ b/src/tools/utils.ts
@@ -15,7 +15,7 @@
 */

 import type * as playwright from 'playwright';
-import type { Context } from '../context';
+import type { Context } from '../context.js';

 export async function waitForCompletion<R>(context: Context, page: playwright.Page, callback: () => Promise<R>): Promise<R> {
  const requests = new Set<playwright.Request>();
@@ -71,5 +71,9 @@ export async function waitForCompletion<R>(context: Context, page: playwright.Pa
 }

 export function sanitizeForFilePath(s: string) {
-  return s.replace(/[\x00-\x2C\x2E-\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]+/g, '-');
+  const sanitize = (s: string) => s.replace(/[\x00-\x2C\x2E-\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]+/g, '-');
+  const separator = s.lastIndexOf('.');
+  if (separator === -1)
+    return sanitize(s);
+  return sanitize(s.substring(0, separator)) + '.' + sanitize(s.substring(separator + 1));
 }
--- a/src/transport.ts
+++ b/src/transport.ts
@@ -18,17 +18,22 @@ import http from 'node:http';
 import assert from 'node:assert';
 import crypto from 'node:crypto';

-import { ServerList } from './server';
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
+import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';

-export async function startStdioTransport(serverList: ServerList) {
-  const server = await serverList.create();
-  await server.connect(new StdioServerTransport());
+import { createConnection } from './connection.js';
+
+import type { Config } from '../config.js';
+import type { Connection } from './connection.js';
+
+export async function startStdioTransport(config: Config, connectionList: Connection[]) {
+  const connection = await createConnection(config);
+  await connection.connect(new StdioServerTransport());
+  connectionList.push(connection);
 }

-async function handleSSE(req: http.IncomingMessage, res: http.ServerResponse, url: URL, serverList: ServerList, sessions: Map<string, SSEServerTransport>) {
+async function handleSSE(config: Config, req: http.IncomingMessage, res: http.ServerResponse, url: URL, sessions: Map<string, SSEServerTransport>, connectionList: Connection[]) {
  if (req.method === 'POST') {
    const sessionId = url.searchParams.get('sessionId');
    if (!sessionId) {
@@ -46,19 +51,24 @@ async function handleSSE(req: http.IncomingMessage, res: http.ServerResponse, ur
  } else if (req.method === 'GET') {
    const transport = new SSEServerTransport('/sse', res);
    sessions.set(transport.sessionId, transport);
-    const server = await serverList.create();
+    const connection = await createConnection(config);
+    await connection.connect(transport);
+    connectionList.push(connection);
    res.on('close', () => {
      sessions.delete(transport.sessionId);
-      serverList.close(server).catch(e => console.error(e));
+      connection.close().catch(e => {
+        // eslint-disable-next-line no-console
+        console.error(e);
+      });
    });
-    return await server.connect(transport);
+    return;
  }

  res.statusCode = 405;
  res.end('Method not allowed');
 }

-async function handleStreamable(req: http.IncomingMessage, res: http.ServerResponse, serverList: ServerList, sessions: Map<string, StreamableHTTPServerTransport>) {
+async function handleStreamable(config: Config, req: http.IncomingMessage, res: http.ServerResponse, sessions: Map<string, StreamableHTTPServerTransport>, connectionList: Connection[]) {
  const sessionId = req.headers['mcp-session-id'] as string | undefined;
  if (sessionId) {
    const transport = sessions.get(sessionId);
@@ -81,24 +91,28 @@ async function handleStreamable(req: http.IncomingMessage, res: http.ServerRespo
      if (transport.sessionId)
        sessions.delete(transport.sessionId);
    };
-    const server = await serverList.create();
-    await server.connect(transport);
-    return await transport.handleRequest(req, res);
+    const connection = await createConnection(config);
+    connectionList.push(connection);
+    await Promise.all([
+      connection.connect(transport),
+      transport.handleRequest(req, res),
+    ]);
+    return;
  }

  res.statusCode = 400;
  res.end('Invalid request');
 }

-export function startHttpTransport(port: number, hostname: string | undefined, serverList: ServerList) {
+export function startHttpTransport(config: Config, port: number, hostname: string | undefined, connectionList: Connection[]) {
  const sseSessions = new Map<string, SSEServerTransport>();
  const streamableSessions = new Map<string, StreamableHTTPServerTransport>();
  const httpServer = http.createServer(async (req, res) => {
    const url = new URL(`http://localhost${req.url}`);
    if (url.pathname.startsWith('/mcp'))
-      await handleStreamable(req, res, serverList, streamableSessions);
+      await handleStreamable(config, req, res, streamableSessions, connectionList);
    else
-      await handleSSE(req, res, url, serverList, sseSessions);
+      await handleSSE(config, req, res, url, sseSessions, connectionList);
  });
  httpServer.listen(port, hostname, () => {
    const address = httpServer.address();
@@ -113,15 +127,19 @@ export function startHttpTransport(port: number, hostname: string | undefined, s
        resolvedHost = 'localhost';
      url = `http://${resolvedHost}:${resolvedPort}`;
    }
-    console.log(`Listening on ${url}`);
-    console.log('Put this in your client config:');
-    console.log(JSON.stringify({
-      'mcpServers': {
-        'playwright': {
-          'url': `${url}/sse`
+    const message = [
+      `Listening on ${url}`,
+      'Put this in your client config:',
+      JSON.stringify({
+        'mcpServers': {
+          'playwright': {
+            'url': `${url}/sse`
+          }
        }
-      }
-    }, undefined, 2));
-    console.log('If your client supports streamable HTTP, you can use the /mcp endpoint instead.');
+      }, undefined, 2),
+      'If your client supports streamable HTTP, you can use the /mcp endpoint instead.',
+    ].join('\n');
+    // eslint-disable-next-line no-console
+    console.log(message);
  });
 }
--- a/tests/capabilities.spec.ts
+++ b/tests/capabilities.spec.ts
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-import { test, expect } from './fixtures';
+import { test, expect } from './fixtures.js';

 test('test snapshot tool list', async ({ client }) => {
  const { tools } = await client.listTools();
@@ -23,6 +23,7 @@ test('test snapshot tool list', async ({ client }) => {
    'browser_console_messages',
    'browser_drag',
    'browser_file_upload',
+    'browser_generate_playwright_test',
    'browser_handle_dialog',
    'browser_hover',
    'browser_select_option',
@@ -52,6 +53,7 @@ test('test vision tool list', async ({ visionClient }) => {
    'browser_close',
    'browser_console_messages',
    'browser_file_upload',
+    'browser_generate_playwright_test',
    'browser_handle_dialog',
    'browser_install',
    'browser_navigate_back',
--- a/tests/cdp.spec.ts
+++ b/tests/cdp.spec.ts
@@ -14,20 +14,20 @@
 * limitations under the License.
 */

-import { test, expect } from './fixtures';
+import { test, expect } from './fixtures.js';

 test('cdp server', async ({ cdpEndpoint, startClient }) => {
-  const client = await startClient({ args: [`--cdp-endpoint=${cdpEndpoint}`] });
+  const client = await startClient({ args: [`--cdp-endpoint=${await cdpEndpoint()}`] });
  expect(await client.callTool({
    name: 'browser_navigate',
    arguments: {
      url: 'data:text/html,<html><title>Title</title><body>Hello, world!</body></html>',
    },
-  })).toContainTextContent(`- text: Hello, world!`);
+  })).toContainTextContent(`- generic [ref=s1e2]: Hello, world!`);
 });

 test('cdp server reuse tab', async ({ cdpEndpoint, startClient }) => {
-  const client = await startClient({ args: [`--cdp-endpoint=${cdpEndpoint}`] });
+  const client = await startClient({ args: [`--cdp-endpoint=${await cdpEndpoint()}`] });

  expect(await client.callTool({
    name: 'browser_click',
@@ -50,7 +50,25 @@ test('cdp server reuse tab', async ({ cdpEndpoint, startClient }) => {
 - Page Title: 
 - Page Snapshot
 \`\`\`yaml
- text: hello world
+- generic [ref=s1e2]: hello world
 \`\`\`
 `);
 });
+
+test('should throw connection error and allow re-connecting', async ({ cdpEndpoint, startClient }) => {
+  const port = 3200 + test.info().parallelIndex;
+  const client = await startClient({ args: [`--cdp-endpoint=http://localhost:${port}`] });
+  expect(await client.callTool({
+    name: 'browser_navigate',
+    arguments: {
+      url: 'data:text/html,<html><title>Title</title><body>Hello, world!</body></html>',
+    },
+  })).toContainTextContent(`Error: browserType.connectOverCDP: connect ECONNREFUSED`);
+  await cdpEndpoint(port);
+  expect(await client.callTool({
+    name: 'browser_navigate',
+    arguments: {
+      url: 'data:text/html,<html><title>Title</title><body>Hello, world!</body></html>',
+    },
+  })).toContainTextContent(`- generic [ref=s1e2]: Hello, world!`);
+});
--- a/tests/config.spec.ts
+++ b/tests/config.spec.ts
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import fs from 'node:fs';
+
+import { Config } from '../config.js';
+import { test, expect } from './fixtures.js';
+
+test('config user data dir', async ({ startClient, mcpBrowser }, testInfo) => {
+  const config: Config = {
+    browser: {
+      userDataDir: testInfo.outputPath('user-data-dir'),
+    },
+  };
+  const configPath = testInfo.outputPath('config.json');
+  await fs.promises.writeFile(configPath, JSON.stringify(config, null, 2));
+
+  const client = await startClient({ args: ['--config', configPath] });
+  expect(await client.callTool({
+    name: 'browser_navigate',
+    arguments: {
+      url: 'data:text/html,<html><body>Hello, world!</body></html>',
+    },
+  })).toContainTextContent(`Hello, world!`);
+
+  const files = await fs.promises.readdir(config.browser!.userDataDir!);
+  expect(files.length).toBeGreaterThan(0);
+});
--- a/tests/console.spec.ts
+++ b/tests/console.spec.ts
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-import { test, expect } from './fixtures';
+import { test, expect } from './fixtures.js';

 test('browser_console_messages', async ({ client }) => {
  await client.callTool({
--- a/tests/core.spec.ts
+++ b/tests/core.spec.ts
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-import { test, expect } from './fixtures';
+import { test, expect } from './fixtures.js';

 test('browser_navigate', async ({ client }) => {
  expect(await client.callTool({
@@ -33,7 +33,7 @@ await page.goto('data:text/html,<html><title>Title</title><body>Hello, world!</b
 - Page Title: Title
 - Page Snapshot
 \`\`\`yaml
- text: Hello, world!
+- generic [ref=s1e2]: Hello, world!
 \`\`\`
 `
  );
--- a/tests/device.spec.ts
+++ b/tests/device.spec.ts
@@ -14,9 +14,9 @@
 * limitations under the License.
 */

-import { test, expect } from './fixtures';
+import { test, expect } from './fixtures.js';

-test('browser_take_screenshot (viewport)', async ({ startClient, server }) => {
+test('--device should work', async ({ startClient, server }) => {
  const client = await startClient({
    args: ['--device', 'iPhone 15'],
  });
--- a/tests/dialogs.spec.ts
+++ b/tests/dialogs.spec.ts
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-import { test, expect } from './fixtures';
+import { test, expect } from './fixtures.js';

 // https://github.com/microsoft/playwright/issues/35663
 test.skip(({ mcpBrowser, mcpHeadless }) => mcpBrowser === 'webkit' && mcpHeadless);
@@ -126,7 +126,7 @@ test('confirm dialog (true)', async ({ client }) => {
  expect(result).toContainTextContent('// <internal code to handle "confirm" dialog>');
  expect(result).toContainTextContent(`- Page Snapshot
 \`\`\`yaml
- text: "true"
+- generic [ref=s2e2]: "true"
 \`\`\``);
 });

@@ -156,7 +156,7 @@ test('confirm dialog (false)', async ({ client }) => {

  expect(result).toContainTextContent(`- Page Snapshot
 \`\`\`yaml
- text: "false"
+- generic [ref=s2e2]: "false"
 \`\`\``);
 });

@@ -187,6 +187,6 @@ test('prompt dialog', async ({ client }) => {

  expect(result).toContainTextContent(`- Page Snapshot
 \`\`\`yaml
- text: Answer
+- generic [ref=s2e2]: Answer
 \`\`\``);
 });
--- a/tests/files.spec.ts
+++ b/tests/files.spec.ts
@@ -14,8 +14,9 @@
 * limitations under the License.
 */

-import { test, expect } from './fixtures';
+import { test, expect } from './fixtures.js';
 import fs from 'fs/promises';
+import path from 'path';

 test('browser_file_upload', async ({ client }) => {
  expect(await client.callTool({
@@ -25,9 +26,8 @@ test('browser_file_upload', async ({ client }) => {
    },
  })).toContainTextContent(`
 \`\`\`yaml
- generic [ref=s1e2]:
-  - button "Choose File" [ref=s1e3]
-  - button "Button" [ref=s1e4]
+- button "Choose File" [ref=s1e3]
+- button "Button" [ref=s1e4]
 \`\`\``);

  {
@@ -64,9 +64,8 @@ The tool "browser_file_upload" can only be used when there is related modal stat
    expect(response).not.toContainTextContent('### Modal state');
    expect(response).toContainTextContent(`
 \`\`\`yaml
- generic [ref=s3e2]:
-  - button "Choose File" [ref=s3e3]
-  - button "Button" [ref=s3e4]
+- button "Choose File" [ref=s3e3]
+- button "Button" [ref=s3e4]
 \`\`\``);
  }

@@ -96,3 +95,27 @@ The tool "browser_file_upload" can only be used when there is related modal stat
 - [File chooser]: can be handled by the "browser_file_upload" tool`);
  }
 });
+
+test('clicking on download link emits download', async ({ startClient }, testInfo) => {
+  const outputDir = testInfo.outputPath('output');
+  const client = await startClient({
+    config: { outputDir },
+  });
+
+  expect(await client.callTool({
+    name: 'browser_navigate',
+    arguments: {
+      url: 'data:text/html,<a href="data:text/plain,Hello world!" download="test.txt">Download</a>',
+    },
+  })).toContainTextContent('- link "Download" [ref=s1e3]');
+  await client.callTool({
+    name: 'browser_click',
+    arguments: {
+      element: 'Download link',
+      ref: 's1e3',
+    },
+  });
+  await expect.poll(() => client.callTool({ name: 'browser_snapshot', arguments: {} })).toContainTextContent(`
+### Downloads
+- Downloaded file test.txt to ${path.join(outputDir, 'test.txt')}`);
+});
--- a/tests/fixtures.ts
+++ b/tests/fixtures.ts
@@ -15,34 +15,38 @@
 */

 import fs from 'fs';
+import url from 'url';
 import path from 'path';
 import { chromium } from 'playwright';

 import { test as baseTest, expect as baseExpect } from '@playwright/test';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { spawn } from 'child_process';
-import { TestServer } from './testserver';
+import { ChildProcessWithoutNullStreams, spawn } from 'child_process';
+import { TestServer } from './testserver/index.ts';

 import type { Config } from '../config';

+export type TestOptions = {
+  mcpBrowser: string | undefined;
+};
+
 type TestFixtures = {
  client: Client;
  visionClient: Client;
-  startClient: (options?: { args?: string[], config?: Config }) => Promise<Client>;
+  startClient: (options?: { clientName?: string, args?: string[], config?: Config }) => Promise<Client>;
  wsEndpoint: string;
-  cdpEndpoint: string;
+  cdpEndpoint: (port?: number) => Promise<string>;
  server: TestServer;
  httpsServer: TestServer;
+  mcpHeadless: boolean;
 };

 type WorkerFixtures = {
-  mcpHeadless: boolean;
-  mcpBrowser: string | undefined;
  _workerServers: { server: TestServer, httpsServer: TestServer };
 };

-export const test = baseTest.extend<TestFixtures, WorkerFixtures>({
+export const test = baseTest.extend<TestFixtures & TestOptions, WorkerFixtures>({

  client: async ({ startClient }, use) => {
    await use(await startClient());
@@ -54,7 +58,7 @@ export const test = baseTest.extend<TestFixtures, WorkerFixtures>({

  startClient: async ({ mcpHeadless, mcpBrowser }, use, testInfo) => {
    const userDataDir = testInfo.outputPath('user-data-dir');
-    let client: StdioClientTransport | undefined;
+    let client: Client | undefined;

    await use(async options => {
      const args = ['--user-data-dir', userDataDir];
@@ -69,11 +73,13 @@ export const test = baseTest.extend<TestFixtures, WorkerFixtures>({
        await fs.promises.writeFile(configFile, JSON.stringify(options.config, null, 2));
        args.push(`--config=${configFile}`);
      }
+      // NOTE: Can be removed when we drop Node.js 18 support and changed to import.meta.filename.
+      const __filename = url.fileURLToPath(import.meta.url);
      const transport = new StdioClientTransport({
        command: 'node',
-        args: [path.join(__dirname, '../cli.js'), ...args],
+        args: [path.join(path.dirname(__filename), '../cli.js'), ...args],
      });
-      const client = new Client({ name: 'test', version: '1.0.0' });
+      client = new Client({ name: options?.clientName ?? 'test', version: '1.0.0' });
      await client.connect(transport);
      await client.ping();
      return client;
@@ -89,34 +95,40 @@ export const test = baseTest.extend<TestFixtures, WorkerFixtures>({
  },

  cdpEndpoint: async ({ }, use, testInfo) => {
-    const port = 3200 + (+process.env.TEST_PARALLEL_INDEX!);
-    const executablePath = chromium.executablePath();
-    const browserProcess = spawn(executablePath, [
-      `--user-data-dir=${testInfo.outputPath('user-data-dir')}`,
-      `--remote-debugging-port=${port}`,
-      `--no-first-run`,
-      `--no-sandbox`,
-      `--headless`,
-      '--use-mock-keychain',
-      `data:text/html,hello world`,
-    ], {
-      stdio: 'pipe',
-    });
-    await new Promise<void>(resolve => {
-      browserProcess.stderr.on('data', data => {
-        if (data.toString().includes('DevTools listening on '))
-          resolve();
+    let browserProcess: ChildProcessWithoutNullStreams | undefined;
+
+    await use(async port => {
+      if (!port)
+        port = 3200 + test.info().parallelIndex;
+      if (browserProcess)
+        return `http://localhost:${port}`;
+      browserProcess = spawn(chromium.executablePath(), [
+        `--user-data-dir=${testInfo.outputPath('user-data-dir')}`,
+        `--remote-debugging-port=${port}`,
+        `--no-first-run`,
+        `--no-sandbox`,
+        `--headless`,
+        '--use-mock-keychain',
+        `data:text/html,hello world`,
+      ], {
+        stdio: 'pipe',
      });
+      await new Promise<void>(resolve => {
+        browserProcess!.stderr.on('data', data => {
+          if (data.toString().includes('DevTools listening on '))
+            resolve();
+        });
+      });
+      return `http://localhost:${port}`;
    });
-    await use(`http://localhost:${port}`);
-    browserProcess.kill();
+    browserProcess?.kill();
  },

-  mcpHeadless: [async ({ headless }, use) => {
+  mcpHeadless: async ({ headless }, use) => {
    await use(headless);
-  }, { scope: 'worker' }],
+  },

-  mcpBrowser: ['chrome', { option: true, scope: 'worker' }],
+  mcpBrowser: ['chrome', { option: true }],

  _workerServers: [async ({}, use, workerInfo) => {
    const port = 8907 + workerInfo.workerIndex * 4;
--- a/tests/headed.spec.ts
+++ b/tests/headed.spec.ts
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { test, expect } from './fixtures.js';
+
+for (const mcpHeadless of [false, true]) {
+  test.describe(`mcpHeadless: ${mcpHeadless}`, () => {
+    test.use({ mcpHeadless });
+    test.skip(process.platform === 'linux', 'Auto-detection wont let this test run on linux');
+    test('browser', async ({ client, server, mcpBrowser }) => {
+      test.skip(!['chrome', 'msedge', 'chromium'].includes(mcpBrowser ?? ''), 'Only chrome is supported for this test');
+      server.route('/', (req, res) => {
+        res.writeHead(200, { 'Content-Type': 'text/html' });
+        res.end(`
+          <body></body>
+          <script>
+            document.body.textContent = navigator.userAgent;
+          </script>
+        `);
+      });
+
+      const response = await client.callTool({
+        name: 'browser_navigate',
+        arguments: {
+          url: server.PREFIX,
+        },
+      });
+
+      expect(response).toContainTextContent(`Mozilla/5.0`);
+      if (mcpHeadless)
+        expect(response).toContainTextContent(`HeadlessChrome`);
+      else
+        expect(response).not.toContainTextContent(`HeadlessChrome`);
+    });
+  });
+}
--- a/tests/iframes.spec.ts
+++ b/tests/iframes.spec.ts
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-import { test, expect } from './fixtures';
+import { test, expect } from './fixtures.js';

 test('stitched aria frames', async ({ client }) => {
  expect(await client.callTool({
@@ -24,14 +24,12 @@ test('stitched aria frames', async ({ client }) => {
    },
  })).toContainTextContent(`
 \`\`\`yaml
- generic [ref=s1e2]:
-  - heading "Hello" [level=1] [ref=s1e3]
-  - iframe [ref=s1e4]:
-    - generic [ref=f1s1e2]:
-      - button "World" [ref=f1s1e3]
-      - main [ref=f1s1e4]:
-        - iframe [ref=f1s1e5]:
-          - paragraph [ref=f2s1e3]: Nested
+- heading "Hello" [level=1] [ref=s1e3]
+- iframe [ref=s1e4]:
+  - button "World" [ref=f1s1e3]
+  - main [ref=f1s1e4]:
+    - iframe [ref=f1s1e5]:
+      - paragraph [ref=f2s1e3]: Nested
 \`\`\``);

  expect(await client.callTool({
--- a/tests/install.spec.ts
+++ b/tests/install.spec.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { test, expect } from './fixtures.js';
+
+test('browser_install', async ({ client, mcpBrowser }) => {
+  test.skip(mcpBrowser !== 'chromium', 'Test only chromium');
+  expect(await client.callTool({
+    name: 'browser_install',
+    arguments: {},
+  })).toContainTextContent(`No open pages available.`);
+});
--- a/tests/launch.spec.ts
+++ b/tests/launch.spec.ts
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-import { test, expect } from './fixtures';
+import { test, expect } from './fixtures.js';

 test('test reopen browser', async ({ client }) => {
  await client.callTool({
@@ -34,7 +34,7 @@ test('test reopen browser', async ({ client }) => {
    arguments: {
      url: 'data:text/html,<html><title>Title</title><body>Hello, world!</body></html>',
    },
-  })).toContainTextContent(`- text: Hello, world!`);
+  })).toContainTextContent(`- generic [ref=s1e2]: Hello, world!`);
 });

 test('executable path', async ({ startClient }) => {
--- a/tests/network.spec.ts
+++ b/tests/network.spec.ts
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-import { test, expect } from './fixtures';
+import { test, expect } from './fixtures.js';

 test('browser_network_requests', async ({ client, server }) => {
  server.route('/', (req, res) => {
--- a/tests/pdf.spec.ts
+++ b/tests/pdf.spec.ts
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-import { test, expect } from './fixtures';
+import { test, expect } from './fixtures.js';

 test('save as pdf unavailable', async ({ startClient }) => {
  const client = await startClient({ args: ['--caps="no-pdf"'] });
@@ -37,7 +37,7 @@ test('save as pdf', async ({ client, mcpBrowser }) => {
    arguments: {
      url: 'data:text/html,<html><title>Title</title><body>Hello, world!</body></html>',
    },
-  })).toContainTextContent(`- text: Hello, world!`);
+  })).toContainTextContent(`- generic [ref=s1e2]: Hello, world!`);

  const response = await client.callTool({
    name: 'browser_pdf_save',
--- a/tests/request-blocking.spec.ts
+++ b/tests/request-blocking.spec.ts
@@ -0,0 +1,91 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { test, expect } from './fixtures.ts';
+
+const BLOCK_MESSAGE = /Blocked by Web Inspector|NS_ERROR_FAILURE|net::ERR_BLOCKED_BY_CLIENT/g;
+
+const fetchPage = async (client: Client, url: string) => {
+  const result = await client.callTool({
+    name: 'browser_navigate',
+    arguments: {
+      url,
+    },
+  });
+
+  return JSON.stringify(result, null, 2);
+};
+
+test('default to allow all', async ({ server, client }) => {
+  server.route('/ppp', (_req, res) => {
+    res.writeHead(200, { 'Content-Type': 'text/html' });
+    res.end('content:PPP');
+  });
+  const result = await fetchPage(client, server.PREFIX + '/ppp');
+  expect(result).toContain('content:PPP');
+});
+
+test('blocked works', async ({ startClient }) => {
+  const client = await startClient({
+    args: ['--blocked-origins', 'microsoft.com;example.com;playwright.dev']
+  });
+  const result = await fetchPage(client, 'https://example.com/');
+  expect(result).toMatch(BLOCK_MESSAGE);
+});
+
+test('allowed works', async ({ server, startClient }) => {
+  server.route('/ppp', (_req, res) => {
+    res.writeHead(200, { 'Content-Type': 'text/html' });
+    res.end('content:PPP');
+  });
+  const client = await startClient({
+    args: ['--allowed-origins', `microsoft.com;${new URL(server.PREFIX).host};playwright.dev`]
+  });
+  const result = await fetchPage(client, server.PREFIX + '/ppp');
+  expect(result).toContain('content:PPP');
+});
+
+test('blocked takes precedence', async ({ startClient }) => {
+  const client = await startClient({
+    args: [
+      '--blocked-origins', 'example.com',
+      '--allowed-origins', 'example.com',
+    ],
+  });
+  const result = await fetchPage(client, 'https://example.com/');
+  expect(result).toMatch(BLOCK_MESSAGE);
+});
+
+test('allowed without blocked blocks all non-explicitly specified origins', async ({ startClient }) => {
+  const client = await startClient({
+    args: ['--allowed-origins', 'playwright.dev'],
+  });
+  const result = await fetchPage(client, 'https://example.com/');
+  expect(result).toMatch(BLOCK_MESSAGE);
+});
+
+test('blocked without allowed allows non-explicitly specified origins', async ({ server, startClient }) => {
+  server.route('/ppp', (_req, res) => {
+    res.writeHead(200, { 'Content-Type': 'text/html' });
+    res.end('content:PPP');
+  });
+  const client = await startClient({
+    args: ['--blocked-origins', 'example.com'],
+  });
+  const result = await fetchPage(client, server.PREFIX + '/ppp');
+  expect(result).toContain('content:PPP');
+});
--- a/tests/screenshot.spec.ts
+++ b/tests/screenshot.spec.ts
@@ -16,7 +16,7 @@

 import fs from 'fs';

-import { test, expect } from './fixtures';
+import { test, expect } from './fixtures.js';

 test('browser_take_screenshot (viewport)', async ({ client }) => {
  expect(await client.callTool({
@@ -73,6 +73,28 @@ test('browser_take_screenshot (element)', async ({ client }) => {
  });
 });

+test('--output-dir should work', async ({ startClient }, testInfo) => {
+  const outputDir = testInfo.outputPath('output');
+  const client = await startClient({
+    args: ['--output-dir', outputDir],
+  });
+  expect(await client.callTool({
+    name: 'browser_navigate',
+    arguments: {
+      url: 'data:text/html,<html><title>Title</title><body>Hello, world!</body></html>',
+    },
+  })).toContainTextContent(`Navigate to data:text/html`);
+
+  await client.callTool({
+    name: 'browser_take_screenshot',
+    arguments: {},
+  });
+
+  expect(fs.existsSync(outputDir)).toBeTruthy();
+  expect([...fs.readdirSync(outputDir)]).toHaveLength(1);
+});
+
+
 test('browser_take_screenshot (outputDir)', async ({ startClient }, testInfo) => {
  const outputDir = testInfo.outputPath('output');
  const client = await startClient({
@@ -94,14 +116,10 @@ test('browser_take_screenshot (outputDir)', async ({ startClient }, testInfo) =>
  expect([...fs.readdirSync(outputDir)]).toHaveLength(1);
 });

-test('browser_take_screenshot (omitBase64)', async ({ startClient }) => {
+test('browser_take_screenshot (noImageResponses)', async ({ startClient }) => {
  const client = await startClient({
    config: {
-      tools: {
-        browser_take_screenshot: {
-          omitBase64: true,
-        },
-      },
+      noImageResponses: true,
    },
  });

@@ -129,3 +147,31 @@ test('browser_take_screenshot (omitBase64)', async ({ startClient }) => {
    ],
  });
 });
+
+test('browser_take_screenshot (cursor)', async ({ startClient }) => {
+  const client = await startClient({ clientName: 'cursor:vscode' });
+
+  expect(await client.callTool({
+    name: 'browser_navigate',
+    arguments: {
+      url: 'data:text/html,<html><title>Title</title><body>Hello, world!</body></html>',
+    },
+  })).toContainTextContent(`Navigate to data:text/html`);
+
+  await client.callTool({
+    name: 'browser_take_screenshot',
+    arguments: {},
+  });
+
+  expect(await client.callTool({
+    name: 'browser_take_screenshot',
+    arguments: {},
+  })).toEqual({
+    content: [
+      {
+        text: expect.stringContaining(`Screenshot viewport and save it as`),
+        type: 'text',
+      },
+    ],
+  });
+});
--- a/tests/sse.spec.ts
+++ b/tests/sse.spec.ts
@@ -14,14 +14,18 @@
 * limitations under the License.
 */

+import url from 'node:url';
 import { spawn } from 'node:child_process';
 import path from 'node:path';
-import { test as baseTest } from './fixtures';
+import { test as baseTest } from './fixtures.js';
 import { expect } from 'playwright/test';

+// NOTE: Can be removed when we drop Node.js 18 support and changed to import.meta.filename.
+const __filename = url.fileURLToPath(import.meta.url);
+
 const test = baseTest.extend<{ serverEndpoint: string }>({
  serverEndpoint: async ({}, use) => {
-    const cp = spawn('node', [path.join(__dirname, '../cli.js'), '--port', '0'], { stdio: 'pipe' });
+    const cp = spawn('node', [path.join(path.dirname(__filename), '../cli.js'), '--port', '0'], { stdio: 'pipe' });
    try {
      let stdout = '';
      const url = await new Promise<string>(resolve => cp.stdout?.on('data', data => {
--- a/tests/tabs.spec.ts
+++ b/tests/tabs.spec.ts
@@ -16,7 +16,7 @@

 import { chromium } from 'playwright';

-import { test, expect } from './fixtures';
+import { test, expect } from './fixtures.js';

 import type { Client } from '@modelcontextprotocol/sdk/client/index.js';

@@ -63,7 +63,7 @@ test('create new tab', async ({ client }) => {
 - Page Title: Tab one
 - Page Snapshot
 \`\`\`yaml
- text: Body one
+- generic [ref=s1e2]: Body one
 \`\`\``);

  expect(await createTab(client, 'Tab two', 'Body two')).toHaveTextContent(`
@@ -82,7 +82,7 @@ test('create new tab', async ({ client }) => {
 - Page Title: Tab two
 - Page Snapshot
 \`\`\`yaml
- text: Body two
+- generic [ref=s1e2]: Body two
 \`\`\``);
 });

@@ -110,7 +110,7 @@ test('select tab', async ({ client }) => {
 - Page Title: Tab one
 - Page Snapshot
 \`\`\`yaml
- text: Body one
+- generic [ref=s2e2]: Body one
 \`\`\``);
 });

@@ -137,16 +137,16 @@ test('close tab', async ({ client }) => {
 - Page Title: Tab one
 - Page Snapshot
 \`\`\`yaml
- text: Body one
+- generic [ref=s2e2]: Body one
 \`\`\``);
 });

 test('reuse first tab when navigating', async ({ startClient, cdpEndpoint }) => {
-  const browser = await chromium.connectOverCDP(cdpEndpoint);
+  const browser = await chromium.connectOverCDP(await cdpEndpoint());
  const [context] = browser.contexts();
  const pages = context.pages();

-  const client = await startClient({ args: [`--cdp-endpoint=${cdpEndpoint}`] });
+  const client = await startClient({ args: [`--cdp-endpoint=${await cdpEndpoint()}`] });
  await client.callTool({
    name: 'browser_navigate',
    arguments: {
--- a/tests/testserver/index.ts
+++ b/tests/testserver/index.ts
@@ -16,13 +16,18 @@
 */

 import fs from 'fs';
+import url from 'node:url';
 import http from 'http';
 import https from 'https';
 import path from 'path';
+import debug from 'debug';

 const fulfillSymbol = Symbol('fulfil callback');
 const rejectSymbol = Symbol('reject callback');

+// NOTE: Can be removed when we drop Node.js 18 support and changed to import.meta.filename.
+const __filename = url.fileURLToPath(import.meta.url);
+
 export class TestServer {
  private _server: http.Server;
  readonly debugServer: any;
@@ -42,8 +47,8 @@ export class TestServer {

  static async createHTTPS(port: number): Promise<TestServer> {
    const server = new TestServer(port, {
-      key: await fs.promises.readFile(path.join(__dirname, 'key.pem')),
-      cert: await fs.promises.readFile(path.join(__dirname, 'cert.pem')),
+      key: await fs.promises.readFile(path.join(path.dirname(__filename), 'key.pem')),
+      cert: await fs.promises.readFile(path.join(path.dirname(__filename), 'cert.pem')),
      passphrase: 'aaaa',
    });
    await new Promise(x => server._server.once('listening', x));
@@ -56,7 +61,7 @@ export class TestServer {
    else
      this._server = http.createServer(this._onRequest.bind(this));
    this._server.listen(port);
-    this.debugServer = require('debug')('pw:testserver');
+    this.debugServer = debug('pw:testserver');

    const cross_origin = '127.0.0.1';
    const same_origin = 'localhost';
--- a/tests/webdriver.spec.ts
+++ b/tests/webdriver.spec.ts
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-import { test, expect } from './fixtures';
+import { test, expect } from './fixtures.js';

 test('do not falsely advertise user agent as a test driver', async ({ client, server, mcpBrowser }) => {
  test.skip(mcpBrowser === 'firefox');
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,10 +3,12 @@
    "target": "ESNext",
    "skipLibCheck": true,
    "esModuleInterop": true,
-    "moduleResolution": "node",
+    "moduleResolution": "nodenext",
    "strict": true,
-    "module": "CommonJS",
-    "outDir": "./lib"
+    "module": "NodeNext",
+    "rootDir": "src",
+    "outDir": "./lib",
+    "resolveJsonModule": true
  },
  "include": [
    "src",
--- a/utils/generate-links.js
+++ b/utils/generate-links.js
--- a/utils/update-readme.js
+++ b/utils/update-readme.js
@@ -16,21 +16,24 @@
 */
 // @ts-check

-const fs = require('node:fs');
-const path = require('node:path');
-const zodToJsonSchema = require('zod-to-json-schema').default;
+import fs from 'node:fs'
+import path from 'node:path'
+import url from 'node:url'
+import zodToJsonSchema from 'zod-to-json-schema'

-const commonTools = require('../lib/tools/common').default;
-const consoleTools = require('../lib/tools/console').default;
-const dialogsTools = require('../lib/tools/dialogs').default;
-const filesTools = require('../lib/tools/files').default;
-const installTools = require('../lib/tools/install').default;
-const keyboardTools = require('../lib/tools/keyboard').default;
-const navigateTools = require('../lib/tools/navigate').default;
-const pdfTools = require('../lib/tools/pdf').default;
-const snapshotTools = require('../lib/tools/snapshot').default;
-const tabsTools = require('../lib/tools/tabs').default;
-const screenTools = require('../lib/tools/screen').default;
+import commonTools from '../lib/tools/common.js';
+import consoleTools from '../lib/tools/console.js';
+import dialogsTools from '../lib/tools/dialogs.js';
+import filesTools from '../lib/tools/files.js';
+import installTools from '../lib/tools/install.js';
+import keyboardTools from '../lib/tools/keyboard.js';
+import navigateTools from '../lib/tools/navigate.js';
+import networkTools from '../lib/tools/network.js';
+import pdfTools from '../lib/tools/pdf.js';
+import snapshotTools from '../lib/tools/snapshot.js';
+import tabsTools from '../lib/tools/tabs.js';
+import screenTools from '../lib/tools/screen.js';
+import testTools from '../lib/tools/testing.js';

 // Category definitions for tools
 const categories = {
@@ -60,81 +63,51 @@ const categories = {
    ...commonTools(true),
    ...installTools,
    ...dialogsTools(true),
+    ...networkTools,
+  ],
+  'Testing': [
+    ...testTools,
  ],
 };

+// NOTE: Can be removed when we drop Node.js 18 support and changed to import.meta.filename.
+const __filename = url.fileURLToPath(import.meta.url);
+
 const kStartMarker = `<!--- Generated by ${path.basename(__filename)} -->`;
 const kEndMarker = `<!--- End of generated section -->`;

 /**
- * @param {ParsedToolSchema} tool 
+ * @param {import('../src/tools/tool.js').ToolSchema<any>} tool 
 * @returns {string}
 */
 function formatToolForReadme(tool) {
  const lines = /** @type {string[]} */ ([]);
  lines.push(`<!-- NOTE: This has been generated via ${path.basename(__filename)} -->\n\n`);
  lines.push(`- **${tool.name}**\n`);
+  lines.push(`  - Title: ${tool.title}\n`);
  lines.push(`  - Description: ${tool.description}\n`);

-  if (tool.parameters && tool.parameters.length > 0) {
+  const inputSchema = /** @type {any} */ (zodToJsonSchema(tool.inputSchema || {}));
+  const requiredParams = inputSchema.required || [];
+  if (inputSchema.properties && Object.keys(inputSchema.properties).length) {
    lines.push(`  - Parameters:\n`);
-    tool.parameters.forEach(param => {
+    Object.entries(inputSchema.properties).forEach(([name, param]) => {
+      const optional = !requiredParams.includes(name);
      const meta = /** @type {string[]} */ ([]);
      if (param.type)
        meta.push(param.type);
-      if (param.optional)
+      if (optional)
        meta.push('optional');
-      lines.push(`    - \`${param.name}\` ${meta.length ? `(${meta.join(', ')})` : ''}: ${param.description}\n`);
+      lines.push(`    - \`${name}\` ${meta.length ? `(${meta.join(', ')})` : ''}: ${param.description}\n`);
    });
  } else {
    lines.push(`  - Parameters: None\n`);
  }
-
+  lines.push(`  - Read-only: **${tool.type === 'readOnly'}**\n`);
  lines.push('\n');
  return lines.join('');
 }

-/**
- * @typedef {{
- *   name: any;
- *  description: any;
- *   parameters: {
- *       name: string;
- *     description: string;
- *     optional: boolean;
- *     type: string;
- *   }[];
- *}} ParsedToolSchema
- */
-
-/**
- * @param {import('../src/tools/tool').ToolSchema<any>} schema 
- * @returns {ParsedToolSchema}
- */
-function processToolSchema(schema) {
-  const inputSchema = /** @type {import('zod-to-json-schema').JsonSchema7ObjectType} */ (zodToJsonSchema(schema.inputSchema || {}));
-  if (inputSchema.type !== 'object')
-    throw new Error(`Tool ${schema.name} input schema is not an object`);
-
-  // In JSON Schema, properties are considered optional unless listed in the required array
-  const requiredParams = inputSchema?.required || [];
-
-  const parameters = Object.entries(inputSchema.properties).map(([name, prop]) => {
-    return {
-      name,
-      description: prop.description || '',
-      optional: !requiredParams.includes(name),
-      type: /** @type {any} */ (prop).type,
-    };
-  });
-
-  return {
-    name: schema.name,
-    description: schema.description,
-    parameters
-  };
-}
-
 async function updateReadme() {
  console.log('Loading tool information from compiled modules...');

@@ -146,13 +119,11 @@ async function updateReadme() {

  for (const [category, categoryTools] of Object.entries(categories)) {
    generatedLines.push(`### ${category}\n\n`);
-    for (const tool of categoryTools) {
-      const scheme = processToolSchema(tool.schema);
-      generatedLines.push(formatToolForReadme(scheme));
-    }
+    for (const tool of categoryTools)
+      generatedLines.push(formatToolForReadme(tool.schema));
  }

-  const readmePath = path.join(__dirname, '..', 'README.md');
+  const readmePath = path.join(path.dirname(__filename), '..', 'README.md');
  const readmeContent = await fs.promises.readFile(readmePath, 'utf-8');
  const startMarker = readmeContent.indexOf(kStartMarker);
  const endMarker = readmeContent.indexOf(kEndMarker);
Author	SHA1	Message	Date
Max Schmitt	cdeba454b5	chore: mark v0.0.21 (#364 )	2025-05-07 11:30:11 +02:00
Max Schmitt	91ae93c167	chore: change import assert to readFile (#368 )	2025-05-07 11:30:01 +02:00
Max Schmitt	35e6c49d7c	devops: publish Docker image to :latest as well (#365 ) We don't do that for normal Playwright because we expect the user to mount/add/copy their own Playwright folder and there the version has to match. In this case publishing to `:latest` seems fine since its a isolated product.	2025-05-07 11:14:05 +02:00
Pavel Feldman	e95b5b1dd6	chore: get rid of connection factory (#362 ) Drive-by User-Agent sniffing and disabling of image type in Cursor.	2025-05-06 14:27:28 -07:00
Max Schmitt	23a2e5fee7	devops: add Docker publishing (#356 )	2025-05-06 23:14:41 +02:00
Pavel Feldman	d01aa19ffa	chore: annotate tools (#351 ) Fixes https://github.com/microsoft/playwright-mcp/issues/215	2025-05-05 17:38:22 -07:00
kanchi	8cd7d5a753	chore(docker): optimize Dockerfile by excluding unnecessary files and using non-root user (#273 )	2025-05-05 14:38:02 -07:00
Ross Wollman	42faa3ccf8	feat: add --(allowed\|blocked)-origins (#319 ) Useful to limit the agent when using the playwright-mcp server with an agent in auto-invocation mode. Not intended to be a security feature.	2025-05-05 11:28:14 -07:00
Pavel Feldman	4694d60fc5	fix(config): allow specifying user data dir in config (#342 ) Fixes https://github.com/microsoft/playwright-mcp/issues/340	2025-05-05 08:23:24 -07:00
Max Schmitt	7dc689eee7	fix: installation tool on Windows (#345 )	2025-05-04 06:56:59 -07:00
おがどら	5df011ad4b	feat(cli): set `outputDir` via cli options (#338 )	2025-05-03 20:11:17 -07:00
Pavel Feldman	200cf737bb	chore: use import.meta.resolve to lookup Playwright (#337 )	2025-05-03 14:38:58 -07:00
Pavel Feldman	d8a59e0d0d	chore: mark v0.0.20 (#336 )	2025-05-02 21:31:06 -07:00
Pavel Feldman	21533d9000	chore: installation test added (#335 )	2025-05-02 21:30:55 -07:00
Ryosuke Iwanaga	49979641fa	fix: require is not defined (#334 ) Since it's moved to ESM, `require` isn't defined. This hotfix is just recreating `require` to workaround this issue.	2025-05-02 21:19:54 -07:00
Pavel Feldman	43aa4001b5	chore: mark v0.0.19 (#332 )	2025-05-02 18:38:20 -07:00
Pavel Feldman	7e087af6a6	chore: slightly adjust gen test prompt (#333 )	2025-05-02 18:38:06 -07:00
Pavel Feldman	927a1280f1	chore: allow generating tests for script (#331 )	2025-05-02 17:41:58 -07:00
Pavel Feldman	292e75d464	chore: roll Playwright to remove empty generic nodes (#330 )	2025-05-02 16:10:48 -07:00
Simon Knott	2c9376e50f	chore: don't sanitize file extension away (#327 )	2025-05-02 10:58:48 -07:00
Max Schmitt	062cdd0704	fix: sticky launch errors (#324 ) This fixes an issue that there were sticky launch errors. When the [following code path](`a15f0f301b/src/context.ts (L307-L339)`) was throwing, the Error was stored in the Promise and not cleared afterwards, this meant: - If a browser was not there and the user tried to install it via `browser_install` it was never working since the error was sticky. - If other errors like CDP is not available yet etc. error appear a re-connect would not work - the MCP server would require a restart. Test plan: Since we don't have any `browser_install` tests I added a CDP test for now to cover this bug.	2025-05-02 15:32:37 +02:00
Max Schmitt	a713300c5b	test: use TestOptions type in config (#326 )	2025-05-02 13:50:03 +02:00
Simon Knott	a15f0f301b	chore: save downloads to outputDir (#310 )	2025-05-02 10:57:31 +02:00
Pavel Feldman	23ce973377	lint: ban console output (#317 )	2025-04-30 14:15:32 -07:00
Max Schmitt	685dea9e19	chore: migrate to ESM (#303 ) - [Why do I need `.js` extension?](https://stackoverflow.com/a/77150985/6512681) - [Why setting `rootDir` in the `tsconfig.json`?](https://stackoverflow.com/a/58941798/6512681) - [How to ensure that we add the `.js` extension via ESLint](https://github.com/import-js/eslint-plugin-import/blob/main/docs/rules/extensions.md#importextensions) Fixes https://github.com/microsoft/playwright-mcp/issues/302	2025-04-30 23:06:56 +02:00
Pavel Feldman	878be97668	chore: mark v0.0.18 (#315 )	2025-04-30 13:07:55 -07:00
Pavel Feldman	6d6b1a384b	chore: fix merge config (#311 )	2025-04-30 08:41:19 -07:00
Pavel Feldman	fd22def4c5	chore: fix test harness, close the client (#312 )	2025-04-30 08:07:54 -07:00
Simon Knott	1b60870f50	chore: bump to 0.0.17 (#306 )	2025-04-30 12:30:03 +02:00
Simon Knott	1c760b3826	fix: default to headful (#305 ) See https://github.com/microsoft/playwright-mcp/issues/304 Regressed in `69703cc882`.	2025-04-30 12:23:30 +02:00