Fix redundant conditional logic in browser_evaluate error test

Co-authored-by: pavelfeldman <883973+pavelfeldman@users.noreply.github.com>
Restore webkit-specific expectations for browser_evaluate error test
2025-07-18 22:16:55 +00:00 · 2025-07-18 21:01:38 +00:00 · 2025-07-18 20:21:49 +00:00 · 2025-07-18 20:14:39 +00:00 · 2025-07-18 19:52:18 +00:00 · 2025-07-18 18:49:06 +00:00
43 changed files with 1045 additions and 1350 deletions
--- a/README.md
+++ b/README.md
@@ -19,7 +19,9 @@ node utils/generate-links.js

 ### Getting started

-First, install the Playwright MCP server with your client. A typical configuration looks like this:
+First, install the Playwright MCP server with your client.
+
+**Standard config** works in most of the tools:

 ```js
 {
@@ -37,83 +39,8 @@ First, install the Playwright MCP server with your client. A typical configurati
 [<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)


-<details><summary><b>Install in VS Code</b></summary>
-
-You can also install the Playwright MCP server using the VS Code CLI:
-
-```bash
-# For VS Code
-code --add-mcp '{"name":"playwright","command":"npx","args":["@playwright/mcp@latest"]}'
-```
-
-After installation, the Playwright MCP server will be available for use with your GitHub Copilot agent in VS Code.
-</details>
-
 <details>
-<summary><b>Install in Cursor</b></summary>
-
-#### Click the button to install:
-
-[![Install MCP Server](https://cursor.com/deeplink/mcp-install-dark.svg)](https://cursor.com/install-mcp?name=playwright&config=eyJjb21tYW5kIjoibnB4IEBwbGF5d3JpZ2h0L21jcEBsYXRlc3QifQ%3D%3D)
-
-#### Or install manually:
-
-Go to `Cursor Settings` -> `MCP` -> `Add new MCP Server`. Name to your liking, use `command` type with the command `npx @playwright/mcp`. You can also verify config or add command like arguments via clicking `Edit`.
-
-```js
-{
-  "mcpServers": {
-    "playwright": {
-      "command": "npx",
-      "args": [
-        "@playwright/mcp@latest"
-      ]
-    }
-  }
-}
-```
-</details>
-
-<details>
-<summary><b>Install in Windsurf</b></summary>
-
-Follow Windsurf MCP [documentation](https://docs.windsurf.com/windsurf/cascade/mcp). Use following configuration:
-
-```js
-{
-  "mcpServers": {
-    "playwright": {
-      "command": "npx",
-      "args": [
-        "@playwright/mcp@latest"
-      ]
-    }
-  }
-}
-```
-</details>
-
-<details>
-<summary><b>Install in Claude Desktop</b></summary>
-
-Follow the MCP install [guide](https://modelcontextprotocol.io/quickstart/user), use following configuration:
-
-```js
-{
-  "mcpServers": {
-    "playwright": {
-      "command": "npx",
-      "args": [
-        "@playwright/mcp@latest"
-      ]
-    }
-  }
-}
-```
-</details>
-
-<details>
-<summary><b>Install in Claude Code</b></summary>
+<summary>Claude Code</summary>

 Use the Claude Code CLI to add the Playwright MCP server:

@@ -123,7 +50,34 @@ claude mcp add playwright npx @playwright/mcp@latest
 </details>

 <details>
-<summary><b>Install in Goose</b></summary>
+<summary>Claude Desktop</summary>
+
+Follow the MCP install [guide](https://modelcontextprotocol.io/quickstart/user), use the standard config above.
+
+</details>
+
+<details>
+<summary>Cursor</summary>
+
+#### Click the button to install:
+
+[![Install MCP Server](https://cursor.com/deeplink/mcp-install-dark.svg)](https://cursor.com/install-mcp?name=playwright&config=eyJjb21tYW5kIjoibnB4IEBwbGF5d3JpZ2h0L21jcEBsYXRlc3QifQ%3D%3D)
+
+#### Or install manually:
+
+Go to `Cursor Settings` -> `MCP` -> `Add new MCP Server`. Name to your liking, use `command` type with the command `npx @playwright/mcp`. You can also verify config or add command like arguments via clicking `Edit`.
+
+</details>
+
+<details>
+<summary>Gemini CLI</summary>
+
+Follow the MCP install [guide](https://github.com/google-gemini/gemini-cli/blob/main/docs/tools/mcp-server.md#configure-the-mcp-server-in-settingsjson), use the standard config above.
+
+</details>
+
+<details>
+<summary>Goose</summary>

 #### Click the button to install:

@@ -135,43 +89,37 @@ Go to `Advanced settings` -> `Extensions` -> `Add custom extension`. Name to you
 </details>

 <details>
-<summary><b>Install in Qodo Gen</b></summary>
+<summary>Qodo Gen</summary>

-Open [Qodo Gen](https://docs.qodo.ai/qodo-documentation/qodo-gen) chat panel in VSCode or IntelliJ → Connect more tools → + Add new MCP → Paste the following configuration:
-
-```js
-{
-  "mcpServers": {
-    "playwright": {
-      "command": "npx",
-      "args": [
-        "@playwright/mcp@latest"
-      ]
-    }
-  }
-}
-```
+Open [Qodo Gen](https://docs.qodo.ai/qodo-documentation/qodo-gen) chat panel in VSCode or IntelliJ → Connect more tools → + Add new MCP → Paste the standard config above.

 Click <code>Save</code>.
 </details>

 <details>
-<summary><b>Install in Gemini CLI</b></summary>
+<summary>VS Code</summary>

-Follow the MCP install [guide](https://github.com/google-gemini/gemini-cli/blob/main/docs/tools/mcp-server.md#configure-the-mcp-server-in-settingsjson), use following configuration:
+#### Click the button to install:

-```js
-{
-  "mcpServers": {
-    "playwright": {
-      "command": "npx",
-      "args": [
-        "@playwright/mcp@latest"
-      ]
-    }
-  }
-}
+[<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)
+
+#### Or install manually:
+
+Follow the MCP install [guide](https://code.visualstudio.com/docs/copilot/chat/mcp-servers#_add-an-mcp-server), use the standard config above. You can also install the Playwright MCP server using the VS Code CLI:
+
+```bash
+# For VS Code
+code --add-mcp '{"name":"playwright","command":"npx","args":["@playwright/mcp@latest"]}'
 ```
+
+After installation, the Playwright MCP server will be available for use with your GitHub Copilot agent in VS Code.
+</details>
+
+<details>
+<summary>Windsurf</summary>
+
+Follow Windsurf MCP [documentation](https://docs.windsurf.com/windsurf/cascade/mcp). Use the standard config above.
+
 </details>

 ### Configuration
@@ -192,10 +140,8 @@ Playwright MCP server supports following arguments. They can be provided in the
  --block-service-workers      block service workers
  --browser <browser>          browser or chrome channel to use, possible
                               values: chrome, firefox, webkit, msedge.
-  --browser-agent <endpoint>   Use browser agent (experimental).
-  --caps <caps>                comma-separated list of capabilities to enable,
-                               possible values: tabs, pdf, history, wait, files,
-                               install. Default is all.
+  --caps <caps>                comma-separated list of additional capabilities
+                               to enable, possible values: vision, pdf.
  --cdp-endpoint <endpoint>    CDP endpoint to connect to.
  --config <path>              path to the configuration file.
  --device <device>            device to emulate, for example: "iPhone 15"
@@ -207,9 +153,7 @@ Playwright MCP server supports following arguments. They can be provided in the
  --isolated                   keep the browser profile in memory, do not save
                               it to disk.
  --image-responses <mode>     whether to send image responses to the client.
-                               Can be "allow", "omit", or "auto". Defaults to
-                               "auto", which sends images if the client can
-                               display them.
+                               Can be "allow" or "omit", Defaults to "allow".
  --no-sandbox                 disable the sandbox for all process types that
                               are normally sandboxed.
  --output-dir <path>          path to the directory for output files.
@@ -227,8 +171,6 @@ Playwright MCP server supports following arguments. They can be provided in the
                               specified, a temporary directory will be created.
  --viewport-size <size>       specify browser viewport size in pixels, for
                               example "1280, 720"
-  --vision                     Run server that uses screenshots (Aria snapshots
-                               are used by default)
 ```

 <!--- End of options generated section -->
@@ -329,21 +271,14 @@ npx @playwright/mcp@latest --config path/to/config.json
    host?: string;  // Host to bind to (default: localhost)
  },

-  // List of enabled capabilities
+  // List of additional capabilities
  capabilities?: Array<
-    'core' |    // Core browser automation
    'tabs' |    // Tab management
-    'pdf' |     // PDF generation
-    'history' | // Browser history
-    'wait' |    // Wait utilities
-    'files' |   // File handling
    'install' | // Browser installation
-    'testing'   // Testing
+    'pdf' |     // PDF generation
+    'vision' |  // Coordinate-based interactions
  >;

-  // Enable vision mode (screenshots instead of accessibility snapshots)
-  vision?: boolean;
-
  // Directory for output files
  outputDir?: string;

@@ -357,10 +292,10 @@ npx @playwright/mcp@latest --config path/to/config.json
  };
 
  /**
-   * Whether to send image responses to the client. Can be "allow", "omit", or "auto". 
-   * Defaults to "auto", images are omitted for Cursor clients and sent for all other clients.
+   * Whether to send image responses to the client. Can be "allow" or "omit". 
+   * Defaults to "allow".
   */
-  imageResponses?: 'allow' | 'omit' | 'auto';
+  imageResponses?: 'allow' | 'omit';
 }
 ```
 </details>
@@ -433,42 +368,10 @@ http.createServer(async (req, res) => {

 ### Tools

-The tools are available in two modes:
-
-1. **Snapshot Mode** (default): Uses accessibility snapshots for better performance and reliability
-2. **Vision Mode**: Uses screenshots for visual-based interactions
-
-To use Vision Mode, add the `--vision` flag when starting the server:
-
-```js
-{
-  "mcpServers": {
-    "playwright": {
-      "command": "npx",
-      "args": [
-        "@playwright/mcp@latest",
-        "--vision"
-      ]
-    }
-  }
-}
-```
-
-Vision Mode works best with the computer use models that are able to interact with elements using
-X Y coordinate space, based on the provided screenshot.
-
 <!--- Tools generated by update-readme.js -->

 <details>
-<summary><b>Interactions</b></summary>
-
-<!-- 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**
+<summary><b>Core automation</b></summary>

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

@@ -479,10 +382,27 @@ X Y coordinate space, based on the provided screenshot.
    - `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
    - `doubleClick` (boolean, optional): Whether to perform a double click instead of a single click
+    - `button` (string, optional): Button to click, defaults to left
  - Read-only: **false**

 <!-- 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_console_messages**
+  - Title: Get console messages
+  - Description: Returns all console messages
+  - Parameters: None
+  - Read-only: **true**
+
+<!-- NOTE: This has been generated via update-readme.js -->
+
 - **browser_drag**
  - Title: Drag mouse
  - Description: Perform drag and drop between two elements
@@ -495,60 +415,17 @@ X Y coordinate space, based on the provided screenshot.

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

- **browser_hover**
-  - Title: Hover mouse
-  - Description: Hover over element on page
+- **browser_evaluate**
+  - Title: Evaluate JavaScript
+  - Description: Evaluate JavaScript expression on page or element
  - 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
-    - `ref` (string): Exact target element reference from the page snapshot
-    - `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.
+    - `function` (string): () => { /* code */ } or (element) => { /* code */ } when element is provided
+    - `element` (string, optional): Human-readable element description used to obtain permission to interact with the element
+    - `ref` (string, optional): Exact target element reference from the page snapshot
  - 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_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**
-
-<!-- NOTE: This has been generated via update-readme.js -->
-
- **browser_wait_for**
-  - Title: Wait for
-  - Description: Wait for text to appear or disappear or a specified time to pass
-  - Parameters:
-    - `time` (number, optional): The time to wait in seconds
-    - `text` (string, optional): The text to wait for
-    - `textGone` (string, optional): The text to wait for to disappear
-  - Read-only: **true**
-
-<!-- NOTE: This has been generated via update-readme.js -->
-
 - **browser_file_upload**
  - Title: Upload files
  - Description: Upload one or multiple files
@@ -566,10 +443,15 @@ X Y coordinate space, based on the provided screenshot.
    - `promptText` (string, optional): The text of the prompt in case of a prompt dialog.
  - Read-only: **false**

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

-<details>
-<summary><b>Navigation</b></summary>
+- **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 -->

@@ -596,10 +478,51 @@ X Y coordinate space, based on the provided screenshot.
  - Parameters: None
  - Read-only: **true**

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

-<details>
-<summary><b>Resources</b></summary>
+- **browser_network_requests**
+  - Title: List network requests
+  - Description: Returns all network requests since loading the page
+  - Parameters: None
+  - Read-only: **true**
+
+<!-- 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**
+
+<!-- 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_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_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 -->

@@ -615,64 +538,41 @@ X Y coordinate space, based on the provided screenshot.

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

- **browser_pdf_save**
-  - Title: Save as PDF
-  - Description: Save page as PDF
+- **browser_type**
+  - Title: Type text
+  - Description: Type text into editable element
  - Parameters:
-    - `filename` (string, optional): File name to save the pdf to. Defaults to `page-{timestamp}.pdf` if not specified.
-  - Read-only: **true**
-
-<!-- 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**
-
-<!-- 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**
-
-</details>
-
-<details>
-<summary><b>Utilities</b></summary>
-
-<!-- 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
+    - `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
+    - `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_close**
-  - Title: Close browser
-  - Description: Close the page
-  - Parameters: None
-  - Read-only: **true**
-
-<!-- NOTE: This has been generated via update-readme.js -->
-
- **browser_resize**
-  - Title: Resize browser window
-  - Description: Resize the browser window
+- **browser_wait_for**
+  - Title: Wait for
+  - Description: Wait for text to appear or disappear or a specified time to pass
  - Parameters:
-    - `width` (number): Width of the browser window
-    - `height` (number): Height of the browser window
+    - `time` (number, optional): The time to wait in seconds
+    - `text` (string, optional): The text to wait for
+    - `textGone` (string, optional): The text to wait for to disappear
  - Read-only: **true**

 </details>

 <details>
-<summary><b>Tabs</b></summary>
+<summary><b>Tab management</b></summary>
+
+<!-- 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**

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

@@ -700,60 +600,29 @@ X Y coordinate space, based on the provided screenshot.
    - `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**
-
 </details>

 <details>
-<summary><b>Testing</b></summary>
+<summary><b>Browser installation</b></summary>

 <!-- 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**
-
-</details>
-
-<details>
-<summary><b>Vision mode</b></summary>
-
-<!-- NOTE: This has been generated via update-readme.js -->
-
- **browser_screen_capture**
-  - Title: Take a screenshot
-  - Description: Take a screenshot of the current page
+- **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: **true**
+  - Read-only: **false**
+
+</details>
+
+<details>
+<summary><b>Coordinate-based (opt-in via --caps=vision)</b></summary>

 <!-- 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**
+- **browser_mouse_click_xy**
  - Title: Click
-  - Description: Click left mouse button
+  - Description: Click left mouse button at a given position
  - Parameters:
    - `element` (string): Human-readable element description used to obtain permission to interact with the element
    - `x` (number): X coordinate
@@ -762,9 +631,9 @@ X Y coordinate space, based on the provided screenshot.

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

- **browser_screen_drag**
+- **browser_mouse_drag_xy**
  - Title: Drag mouse
-  - Description: Drag left mouse button
+  - Description: Drag left mouse button to a given position
  - Parameters:
    - `element` (string): Human-readable element description used to obtain permission to interact with the element
    - `startX` (number): Start X coordinate
@@ -775,52 +644,28 @@ X Y coordinate space, based on the provided screenshot.

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

- **browser_screen_type**
-  - Title: Type text
-  - Description: Type text
+- **browser_mouse_move_xy**
+  - Title: Move mouse
+  - Description: Move mouse to a given position
  - Parameters:
-    - `text` (string): Text to type into the element
-    - `submit` (boolean, optional): Whether to submit entered text (press Enter after)
-  - Read-only: **false**
-
-<!-- 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**
-
-<!-- NOTE: This has been generated via update-readme.js -->
-
- **browser_wait_for**
-  - Title: Wait for
-  - Description: Wait for text to appear or disappear or a specified time to pass
-  - Parameters:
-    - `time` (number, optional): The time to wait in seconds
-    - `text` (string, optional): The text to wait for
-    - `textGone` (string, optional): The text to wait for to disappear
+    - `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 -->
+</details>

- **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**
+<details>
+<summary><b>PDF generation (opt-in via --caps=pdf)</b></summary>

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

- **browser_handle_dialog**
-  - Title: Handle a dialog
-  - Description: Handle a dialog
+- **browser_pdf_save**
+  - Title: Save as PDF
+  - Description: Save page as PDF
  - 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**
+    - `filename` (string, optional): File name to save the pdf to. Defaults to `page-{timestamp}.pdf` if not specified.
+  - Read-only: **true**

 </details>

--- a/config.d.ts
+++ b/config.d.ts
@@ -16,18 +16,13 @@

 import type * as playwright from 'playwright';

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

 export type Config = {
  /**
   * The browser to use.
   */
  browser?: {
-    /**
-     * Use browser agent (experimental).
-     */
-    browserAgent?: string;
-
    /**
     * The type of browser to use.
     */
@@ -85,20 +80,11 @@ export type Config = {
  /**
   * List of enabled tool capabilities. Possible values:
   *   - 'core': Core browser automation features.
-   *   - 'tabs': Tab management features.
   *   - 'pdf': PDF generation and manipulation.
-   *   - 'history': Browser history access.
-   *   - 'wait': Wait and timing utilities.
-   *   - 'files': File upload/download support.
-   *   - 'install': Browser installation utilities.
+   *   - 'vision': Coordinate-based interactions.
   */
  capabilities?: ToolCapability[];

-  /**
-   * Run server that uses screenshots (Aria snapshots are used by default).
-   */
-  vision?: boolean;
-
  /**
   * Whether to save the Playwright trace of the session into the output directory.
   */
@@ -124,5 +110,5 @@ export type Config = {
  /**
   * Whether to send image responses to the client. Can be "allow", "omit", or "auto". Defaults to "auto", which sends images if the client can display them.
   */
-  imageResponses?: 'allow' | 'omit' | 'auto';
+  imageResponses?: 'allow' | 'omit';
 };
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,19 +1,20 @@
 {
  "name": "@playwright/mcp",
-  "version": "0.0.30",
+  "version": "0.0.31",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@playwright/mcp",
-      "version": "0.0.30",
+      "version": "0.0.31",
      "license": "Apache-2.0",
      "dependencies": {
        "@modelcontextprotocol/sdk": "^1.11.0",
        "commander": "^13.1.0",
        "debug": "^4.4.1",
        "mime": "^4.0.7",
-        "playwright": "1.54.1",
+        "playwright": "1.55.0-alpha-1752701791000",
+        "playwright-core": "1.55.0-alpha-1752701791000",
        "ws": "^8.18.1",
        "zod-to-json-schema": "^3.24.4"
      },
@@ -23,7 +24,7 @@
      "devDependencies": {
        "@eslint/eslintrc": "^3.2.0",
        "@eslint/js": "^9.19.0",
-        "@playwright/test": "1.54.1",
+        "@playwright/test": "1.55.0-alpha-1752701791000",
        "@stylistic/eslint-plugin": "^3.0.1",
        "@types/chrome": "^0.0.315",
        "@types/debug": "^4.1.12",
@@ -292,13 +293,13 @@
      }
    },
    "node_modules/@playwright/test": {
-      "version": "1.54.1",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.54.1.tgz",
-      "integrity": "sha512-FS8hQ12acieG2dYSksmLOF7BNxnVf2afRJdCuM1eMSxj6QTSE6G4InGF7oApGgDb65MX7AwMVlIkpru0yZA4Xw==",
+      "version": "1.55.0-alpha-1752701791000",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.55.0-alpha-1752701791000.tgz",
+      "integrity": "sha512-mnitdsjXKPyKTjQQDJ78Or1xZSGcaoDzZVD/0BWFCvygn3nyNmGmiias/Mlfvzvgz9UWBbPeZYxU/bd2Lu+OrQ==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
-        "playwright": "1.54.1"
+        "playwright": "1.55.0-alpha-1752701791000"
      },
      "bin": {
        "playwright": "cli.js"
@@ -3300,12 +3301,12 @@
      }
    },
    "node_modules/playwright": {
-      "version": "1.54.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.54.1.tgz",
-      "integrity": "sha512-peWpSwIBmSLi6aW2auvrUtf2DqY16YYcCMO8rTVx486jKmDTJg7UAhyrraP98GB8BoPURZP8+nxO7TSd4cPr5g==",
+      "version": "1.55.0-alpha-1752701791000",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.55.0-alpha-1752701791000.tgz",
+      "integrity": "sha512-PA3TvDz7uQ+Pde0uaii5/WpU5vntRJsYFsaSPoBzywIqzYFO1ugk1ZZ0q6z4/xHq0ha1UClvsv3P77B+u1fi+w==",
      "license": "Apache-2.0",
      "dependencies": {
-        "playwright-core": "1.54.1"
+        "playwright-core": "1.55.0-alpha-1752701791000"
      },
      "bin": {
        "playwright": "cli.js"
@@ -3318,9 +3319,9 @@
      }
    },
    "node_modules/playwright-core": {
-      "version": "1.54.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.54.1.tgz",
-      "integrity": "sha512-Nbjs2zjj0htNhzgiy5wu+3w09YetDx5pkrpI/kZotDlDUaYk0HVA5xrBVPdow4SAUIlhgKcJeJg4GRKW6xHusA==",
+      "version": "1.55.0-alpha-1752701791000",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.55.0-alpha-1752701791000.tgz",
+      "integrity": "sha512-mQhzhjJMiqnGNnYZv7M4yk1OcNTt1E72jrTLO7EqZuoeat4+qpcU0/mbK+RcTEass5a9YheoVFh6OIhruFMGVg==",
      "license": "Apache-2.0",
      "bin": {
        "playwright-core": "cli.js"
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@playwright/mcp",
-  "version": "0.0.30",
+  "version": "0.0.31",
  "description": "Playwright Tools for MCP",
  "type": "module",
  "repository": {
@@ -40,14 +40,15 @@
    "commander": "^13.1.0",
    "debug": "^4.4.1",
    "mime": "^4.0.7",
-    "playwright": "1.54.1",
+    "playwright": "1.55.0-alpha-1752701791000",
+    "playwright-core": "1.55.0-alpha-1752701791000",
    "ws": "^8.18.1",
    "zod-to-json-schema": "^3.24.4"
  },
  "devDependencies": {
    "@eslint/eslintrc": "^3.2.0",
    "@eslint/js": "^9.19.0",
-    "@playwright/test": "1.54.1",
+    "@playwright/test": "1.55.0-alpha-1752701791000",
    "@stylistic/eslint-plugin": "^3.0.1",
    "@types/chrome": "^0.0.315",
    "@types/debug": "^4.1.12",
--- a/src/browserContextFactory.ts
+++ b/src/browserContextFactory.ts
@@ -19,14 +19,11 @@ import net from 'node:net';
 import path from 'node:path';
 import os from 'node:os';

-import debug from 'debug';
 import * as playwright from 'playwright';
-import { userDataDir } from './fileUtils.js';
+
+import { logUnhandledError, testDebug } from './log.js';

 import type { FullConfig } from './config.js';
-import type { BrowserInfo, LaunchBrowserRequest } from './browserServer.js';
-
-const testDebug = debug('pw:mcp:test');

 export function contextFactory(browserConfig: FullConfig['browser']): BrowserContextFactory {
  if (browserConfig.remoteEndpoint)
@@ -35,8 +32,6 @@ export function contextFactory(browserConfig: FullConfig['browser']): BrowserCon
    return new CdpContextFactory(browserConfig);
  if (browserConfig.isolated)
    return new IsolatedContextFactory(browserConfig);
-  if (browserConfig.browserAgent)
-    return new BrowserServerContextFactory(browserConfig);
  return new PersistentContextFactory(browserConfig);
 }

@@ -88,10 +83,10 @@ class BaseContextFactory implements BrowserContextFactory {
    testDebug(`close browser context (${this.name})`);
    if (browser.contexts().length === 1)
      this._browserPromise = undefined;
-    await browserContext.close().catch(() => {});
+    await browserContext.close().catch(logUnhandledError);
    if (browser.contexts().length === 0) {
      testDebug(`close browser (${this.name})`);
-      await browser.close().catch(() => {});
+      await browser.close().catch(logUnhandledError);
    }
  }
 }
@@ -217,38 +212,6 @@ class PersistentContextFactory implements BrowserContextFactory {
  }
 }

-export class BrowserServerContextFactory extends BaseContextFactory {
-  constructor(browserConfig: FullConfig['browser']) {
-    super('persistent', browserConfig);
-  }
-
-  protected override async _doObtainBrowser(): Promise<playwright.Browser> {
-    const response = await fetch(new URL(`/json/launch`, this.browserConfig.browserAgent), {
-      method: 'POST',
-      body: JSON.stringify({
-        browserType: this.browserConfig.browserName,
-        userDataDir: this.browserConfig.userDataDir ?? await this._createUserDataDir(),
-        launchOptions: this.browserConfig.launchOptions,
-        contextOptions: this.browserConfig.contextOptions,
-      } as LaunchBrowserRequest),
-    });
-    const info = await response.json() as BrowserInfo;
-    if (info.error)
-      throw new Error(info.error);
-    return await playwright.chromium.connectOverCDP(`http://localhost:${info.cdpPort}/`);
-  }
-
-  protected override async _doCreateContext(browser: playwright.Browser): Promise<playwright.BrowserContext> {
-    return this.browserConfig.isolated ? await browser.newContext() : browser.contexts()[0];
-  }
-
-  private async _createUserDataDir() {
-    const dir = await userDataDir(this.browserConfig);
-    await fs.promises.mkdir(dir, { recursive: true });
-    return dir;
-  }
-}
-
 async function injectCdpPort(browserConfig: FullConfig['browser']) {
  if (browserConfig.browserName === 'chromium')
    (browserConfig.launchOptions as any).cdpPort = await findFreePort();
--- a/src/browserServer.ts
+++ b/src/browserServer.ts
@@ -1,197 +0,0 @@
-/**
- * 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.
- */
-
-/* eslint-disable no-console */
-
-import net from 'net';
-
-import { program } from 'commander';
-import playwright from 'playwright';
-
-import { HttpServer } from './httpServer.js';
-import { packageJSON } from './package.js';
-
-import type http from 'http';
-
-export type LaunchBrowserRequest = {
-  browserType: string;
-  userDataDir: string;
-  launchOptions: playwright.LaunchOptions;
-  contextOptions: playwright.BrowserContextOptions;
-};
-
-export type BrowserInfo = {
-  browserType: string;
-  userDataDir: string;
-  cdpPort: number;
-  launchOptions: playwright.LaunchOptions;
-  contextOptions: playwright.BrowserContextOptions;
-  error?: string;
-};
-
-type BrowserEntry = {
-  browser?: playwright.Browser;
-  info: BrowserInfo;
-};
-
-class BrowserServer {
-  private _server = new HttpServer();
-  private _entries: BrowserEntry[] = [];
-
-  constructor() {
-    this._setupExitHandler();
-  }
-
-  async start(port: number) {
-    await this._server.start({ port });
-    this._server.routePath('/json/list', (req, res) => {
-      this._handleJsonList(res);
-    });
-    this._server.routePath('/json/launch', async (req, res) => {
-      void this._handleLaunchBrowser(req, res).catch(e => console.error(e));
-    });
-    this._setEntries([]);
-  }
-
-  private _handleJsonList(res: http.ServerResponse) {
-    const list = this._entries.map(browser => browser.info);
-    res.end(JSON.stringify(list));
-  }
-
-  private async _handleLaunchBrowser(req: http.IncomingMessage, res: http.ServerResponse) {
-    const request = await readBody<LaunchBrowserRequest>(req);
-    let info = this._entries.map(entry => entry.info).find(info => info.userDataDir === request.userDataDir);
-    if (!info || info.error)
-      info = await this._newBrowser(request);
-    res.end(JSON.stringify(info));
-  }
-
-  private async _newBrowser(request: LaunchBrowserRequest): Promise<BrowserInfo> {
-    const cdpPort = await findFreePort();
-    (request.launchOptions as any).cdpPort = cdpPort;
-    const info: BrowserInfo = {
-      browserType: request.browserType,
-      userDataDir: request.userDataDir,
-      cdpPort,
-      launchOptions: request.launchOptions,
-      contextOptions: request.contextOptions,
-    };
-
-    const browserType = playwright[request.browserType as 'chromium' | 'firefox' | 'webkit'];
-    const { browser, error } = await browserType.launchPersistentContext(request.userDataDir, {
-      ...request.launchOptions,
-      ...request.contextOptions,
-      handleSIGINT: false,
-      handleSIGTERM: false,
-    }).then(context => {
-      return { browser: context.browser()!, error: undefined };
-    }).catch(error => {
-      return { browser: undefined, error: error.message };
-    });
-    this._setEntries([...this._entries, {
-      browser,
-      info: {
-        browserType: request.browserType,
-        userDataDir: request.userDataDir,
-        cdpPort,
-        launchOptions: request.launchOptions,
-        contextOptions: request.contextOptions,
-        error,
-      },
-    }]);
-    browser?.on('disconnected', () => {
-      this._setEntries(this._entries.filter(entry => entry.browser !== browser));
-    });
-    return info;
-  }
-
-  private _updateReport() {
-    // Clear the current line and move cursor to top of screen
-    process.stdout.write('\x1b[2J\x1b[H');
-    process.stdout.write(`Playwright Browser Server v${packageJSON.version}\n`);
-    process.stdout.write(`Listening on ${this._server.urlPrefix('human-readable')}\n\n`);
-
-    if (this._entries.length === 0) {
-      process.stdout.write('No browsers currently running\n');
-      return;
-    }
-
-    process.stdout.write('Running browsers:\n');
-    for (const entry of this._entries) {
-      const status = entry.browser ? 'running' : 'error';
-      const statusColor = entry.browser ? '\x1b[32m' : '\x1b[31m'; // green for running, red for error
-      process.stdout.write(`${statusColor}${entry.info.browserType}\x1b[0m (${entry.info.userDataDir}) - ${statusColor}${status}\x1b[0m\n`);
-      if (entry.info.error)
-        process.stdout.write(`  Error: ${entry.info.error}\n`);
-    }
-
-  }
-
-  private _setEntries(entries: BrowserEntry[]) {
-    this._entries = entries;
-    this._updateReport();
-  }
-
-  private _setupExitHandler() {
-    let isExiting = false;
-    const handleExit = async () => {
-      if (isExiting)
-        return;
-      isExiting = true;
-      setTimeout(() => process.exit(0), 15000);
-      for (const entry of this._entries)
-        await entry.browser?.close().catch(() => {});
-      process.exit(0);
-    };
-
-    process.stdin.on('close', handleExit);
-    process.on('SIGINT', handleExit);
-    process.on('SIGTERM', handleExit);
-  }
-}
-
-program
-    .name('browser-agent')
-    .option('-p, --port <port>', 'Port to listen on', '9224')
-    .action(async options => {
-      await main(options);
-    });
-
-void program.parseAsync(process.argv);
-
-async function main(options: { port: string }) {
-  const server = new BrowserServer();
-  await server.start(+options.port);
-}
-
-function readBody<T>(req: http.IncomingMessage): Promise<T> {
-  return new Promise((resolve, reject) => {
-    const chunks: Buffer[] = [];
-    req.on('data', (chunk: Buffer) => chunks.push(chunk));
-    req.on('end', () => resolve(JSON.parse(Buffer.concat(chunks).toString())));
-  });
-}
-
-async function findFreePort(): Promise<number> {
-  return new Promise((resolve, reject) => {
-    const server = net.createServer();
-    server.listen(0, () => {
-      const { port } = server.address() as net.AddressInfo;
-      server.close(() => resolve(port));
-    });
-    server.on('error', reject);
-  });
-}
--- a/src/config.ts
+++ b/src/config.ts
@@ -28,8 +28,7 @@ export type CLIOptions = {
  blockedOrigins?: string[];
  blockServiceWorkers?: boolean;
  browser?: string;
-  browserAgent?: string;
-  caps?: string;
+  caps?: string[];
  cdpEndpoint?: string;
  config?: string;
  device?: string;
@@ -38,8 +37,8 @@ export type CLIOptions = {
  host?: string;
  ignoreHttpsErrors?: boolean;
  isolated?: boolean;
-  imageResponses?: 'allow' | 'omit' | 'auto';
-  sandbox: boolean;
+  imageResponses?: 'allow' | 'omit';
+  sandbox?: boolean;
  outputDir?: string;
  port?: number;
  proxyBypass?: string;
@@ -49,7 +48,6 @@ export type CLIOptions = {
  userAgent?: string;
  userDataDir?: string;
  viewportSize?: string;
-  vision?: boolean;
 };

 const defaultConfig: FullConfig = {
@@ -91,15 +89,19 @@ export async function resolveConfig(config: Config): Promise<FullConfig> {

 export async function resolveCLIConfig(cliOptions: CLIOptions): Promise<FullConfig> {
  const configInFile = await loadConfig(cliOptions.config);
-  const cliOverrides = await configFromCLIOptions(cliOptions);
-  const result = mergeConfig(mergeConfig(defaultConfig, configInFile), cliOverrides);
+  const envOverrides = configFromEnv();
+  const cliOverrides = configFromCLIOptions(cliOptions);
+  let result = defaultConfig;
+  result = mergeConfig(result, configInFile);
+  result = mergeConfig(result, envOverrides);
+  result = mergeConfig(result, cliOverrides);
  // Derive artifact output directory from config.outputDir
  if (result.saveTrace)
    result.browser.launchOptions.tracesDir = path.join(result.outputDir, 'traces');
  return result;
 }

-export async function configFromCLIOptions(cliOptions: CLIOptions): Promise<Config> {
+export function configFromCLIOptions(cliOptions: CLIOptions): Config {
  let browserName: 'chromium' | 'firefox' | 'webkit' | undefined;
  let channel: string | undefined;
  switch (cliOptions.browser) {
@@ -172,7 +174,6 @@ export async function configFromCLIOptions(cliOptions: CLIOptions): Promise<Conf

  const result: Config = {
    browser: {
-      browserAgent: cliOptions.browserAgent ?? process.env.PW_BROWSER_AGENT,
      browserName,
      isolated: cliOptions.isolated,
      userDataDir: cliOptions.userDataDir,
@@ -184,8 +185,7 @@ export async function configFromCLIOptions(cliOptions: CLIOptions): Promise<Conf
      port: cliOptions.port,
      host: cliOptions.host,
    },
-    capabilities: cliOptions.caps?.split(',').map((c: string) => c.trim() as ToolCapability),
-    vision: !!cliOptions.vision,
+    capabilities: cliOptions.caps as ToolCapability[],
    network: {
      allowedOrigins: cliOptions.allowedOrigins,
      blockedOrigins: cliOptions.blockedOrigins,
@@ -198,6 +198,36 @@ export async function configFromCLIOptions(cliOptions: CLIOptions): Promise<Conf
  return result;
 }

+function configFromEnv(): Config {
+  const options: CLIOptions = {};
+  options.allowedOrigins = semicolonSeparatedList(process.env.PLAYWRIGHT_MCP_ALLOWED_ORIGINS);
+  options.blockedOrigins = semicolonSeparatedList(process.env.PLAYWRIGHT_MCP_BLOCKED_ORIGINS);
+  options.blockServiceWorkers = envToBoolean(process.env.PLAYWRIGHT_MCP_BLOCK_SERVICE_WORKERS);
+  options.browser = envToString(process.env.PLAYWRIGHT_MCP_BROWSER);
+  options.caps = commaSeparatedList(process.env.PLAYWRIGHT_MCP_CAPS);
+  options.cdpEndpoint = envToString(process.env.PLAYWRIGHT_MCP_CDP_ENDPOINT);
+  options.config = envToString(process.env.PLAYWRIGHT_MCP_CONFIG);
+  options.device = envToString(process.env.PLAYWRIGHT_MCP_DEVICE);
+  options.executablePath = envToString(process.env.PLAYWRIGHT_MCP_EXECUTABLE_PATH);
+  options.headless = envToBoolean(process.env.PLAYWRIGHT_MCP_HEADLESS);
+  options.host = envToString(process.env.PLAYWRIGHT_MCP_HOST);
+  options.ignoreHttpsErrors = envToBoolean(process.env.PLAYWRIGHT_MCP_IGNORE_HTTPS_ERRORS);
+  options.isolated = envToBoolean(process.env.PLAYWRIGHT_MCP_ISOLATED);
+  if (process.env.PLAYWRIGHT_MCP_IMAGE_RESPONSES === 'omit')
+    options.imageResponses = 'omit';
+  options.sandbox = envToBoolean(process.env.PLAYWRIGHT_MCP_SANDBOX);
+  options.outputDir = envToString(process.env.PLAYWRIGHT_MCP_OUTPUT_DIR);
+  options.port = envToNumber(process.env.PLAYWRIGHT_MCP_PORT);
+  options.proxyBypass = envToString(process.env.PLAYWRIGHT_MCP_PROXY_BYPASS);
+  options.proxyServer = envToString(process.env.PLAYWRIGHT_MCP_PROXY_SERVER);
+  options.saveTrace = envToBoolean(process.env.PLAYWRIGHT_MCP_SAVE_TRACE);
+  options.storageState = envToString(process.env.PLAYWRIGHT_MCP_STORAGE_STATE);
+  options.userAgent = envToString(process.env.PLAYWRIGHT_MCP_USER_AGENT);
+  options.userDataDir = envToString(process.env.PLAYWRIGHT_MCP_USER_DATA_DIR);
+  options.viewportSize = envToString(process.env.PLAYWRIGHT_MCP_VIEWPORT_SIZE);
+  return configFromCLIOptions(options);
+}
+
 async function loadConfig(configFile: string | undefined): Promise<Config> {
  if (!configFile)
    return {};
@@ -255,3 +285,33 @@ function mergeConfig(base: FullConfig, overrides: Config): FullConfig {
    },
  } as FullConfig;
 }
+
+export function semicolonSeparatedList(value: string | undefined): string[] | undefined {
+  if (!value)
+    return undefined;
+  return value.split(';').map(v => v.trim());
+}
+
+export function commaSeparatedList(value: string | undefined): string[] | undefined {
+  if (!value)
+    return undefined;
+  return value.split(',').map(v => v.trim());
+}
+
+function envToNumber(value: string | undefined): number | undefined {
+  if (!value)
+    return undefined;
+  return +value;
+}
+
+function envToBoolean(value: string | undefined): boolean | undefined {
+  if (value === 'true' || value === '1')
+    return true;
+  if (value === 'false' || value === '0')
+    return false;
+  return undefined;
+}
+
+function envToString(value: string | undefined): string | undefined {
+  return value ? value.trim() : undefined;
+}
--- a/src/connection.ts
+++ b/src/connection.ts
@@ -19,7 +19,7 @@ import { CallToolRequestSchema, ListToolsRequestSchema, Tool as McpTool } from '
 import { zodToJsonSchema } from 'zod-to-json-schema';

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

 import { FullConfig } from './config.js';
@@ -27,8 +27,7 @@ import { FullConfig } from './config.js';
 import type { BrowserContextFactory } from './browserContextFactory.js';

 export function createConnection(config: FullConfig, browserContextFactory: BrowserContextFactory): Connection {
-  const allTools = config.vision ? visionTools : snapshotTools;
-  const tools = allTools.filter(tool => !config.capabilities || tool.capability === 'core' || config.capabilities.includes(tool.capability));
+  const tools = allTools.filter(tool => tool.capability.startsWith('core') || config.capabilities?.includes(tool.capability));
  const context = new Context(tools, config, browserContextFactory);
  const server = new McpServer({ name: 'Playwright', version: packageJSON.version }, {
    capabilities: {
--- a/src/context.ts
+++ b/src/context.ts
@@ -22,7 +22,6 @@ import { ManualPromise } from './manualPromise.js';
 import { Tab } from './tab.js';
 import { outputFile } from './config.js';

-import type { ImageContent, TextContent } from '@modelcontextprotocol/sdk/types.js';
 import type { ModalState, Tool, ToolActionResult } from './tools/tool.js';
 import type { FullConfig } from './config.js';
 import type { BrowserContextFactory } from './browserContextFactory.js';
@@ -53,11 +52,9 @@ export class Context {
  }

  clientSupportsImages(): boolean {
-    if (this.config.imageResponses === 'allow')
-      return true;
    if (this.config.imageResponses === 'omit')
      return false;
-    return !this.clientVersion?.name.includes('cursor');
+    return true;
  }

  modalStates(): ModalState[] {
@@ -101,7 +98,7 @@ export class Context {
  }

  async selectTab(index: number) {
-    this._currentTab = this._tabs[index - 1];
+    this._currentTab = this._tabs[index];
    await this._currentTab.page.bringToFront();
  }

@@ -121,13 +118,13 @@ export class Context {
      const title = await tab.title();
      const url = tab.page.url();
      const current = tab === this._currentTab ? ' (current)' : '';
-      lines.push(`- ${i + 1}:${current} [${title}] (${url})`);
+      lines.push(`- ${i}:${current} [${title}] (${url})`);
    }
    return lines.join('\n');
  }

  async closeTab(index: number | undefined) {
-    const tab = index === undefined ? this._currentTab : this._tabs[index - 1];
+    const tab = index === undefined ? this._currentTab : this._tabs[index];
    await tab?.page.close();
    return await this.listTabsMarkdown();
  }
@@ -136,7 +133,6 @@ export class Context {
    // Tab management is done outside of the action() call.
    const toolResult = await tool.handle(this, tool.schema.inputSchema.parse(params || {}));
    const { code, action, waitForNetwork, captureSnapshot, resultOverride } = toolResult;
-    const racingAction = action ? () => this._raceAgainstModalDialogs(action) : undefined;

    if (resultOverride)
      return resultOverride;
@@ -152,26 +148,26 @@ export class Context {

    const tab = this.currentTabOrDie();
    // TODO: race against modal dialogs to resolve clicks.
-    let actionResult: { content?: (ImageContent | TextContent)[] } | undefined;
-    try {
-      if (waitForNetwork)
-        actionResult = await waitForCompletion(this, tab, async () => racingAction?.()) ?? undefined;
-      else
-        actionResult = await racingAction?.() ?? undefined;
-    } finally {
-      if (captureSnapshot && !this._javaScriptBlocked())
-        await tab.captureSnapshot();
-    }
+    const actionResult = await this._raceAgainstModalDialogs(async () => {
+      try {
+        if (waitForNetwork)
+          return await waitForCompletion(this, tab, async () => action?.()) ?? undefined;
+        else
+          return await action?.() ?? undefined;
+      } finally {
+        if (captureSnapshot && !this._javaScriptBlocked())
+          await tab.captureSnapshot();
+      }
+    });

    const result: string[] = [];
-    result.push(`- Ran Playwright code:
+    result.push(`### Ran Playwright code
 \`\`\`js
 ${code.join('\n')}
-\`\`\`
-`);
+\`\`\``);

    if (this.modalStates().length) {
-      result.push(...this.modalStatesMarkdown());
+      result.push('', ...this.modalStatesMarkdown());
      return {
        content: [{
          type: 'text',
@@ -180,6 +176,13 @@ ${code.join('\n')}
      };
    }

+    const messages = tab.takeRecentConsoleMessages();
+    if (messages.length) {
+      result.push('', `### New console messages`);
+      for (const message of messages)
+        result.push(`- ${trim(message.toString(), 100)}`);
+    }
+
    if (this._downloads.length) {
      result.push('', '### Downloads');
      for (const entry of this._downloads) {
@@ -188,22 +191,23 @@ ${code.join('\n')}
        else
          result.push(`- Downloading file ${entry.download.suggestedFilename()} ...`);
      }
-      result.push('');
    }

-    if (this.tabs().length > 1)
-      result.push(await this.listTabsMarkdown(), '');
+    if (captureSnapshot && tab.hasSnapshot()) {
+      if (this.tabs().length > 1)
+        result.push('', await this.listTabsMarkdown());

-    if (this.tabs().length > 1)
-      result.push('### Current tab');
+      if (this.tabs().length > 1)
+        result.push('', '### Current tab');
+      else
+        result.push('', '### Page state');

-    result.push(
-        `- Page URL: ${tab.page.url()}`,
-        `- Page Title: ${await tab.title()}`
-    );
-
-    if (captureSnapshot && tab.hasSnapshot())
+      result.push(
+          `- Page URL: ${tab.page.url()}`,
+          `- Page Title: ${await tab.title()}`
+      );
      result.push(tab.snapshotOrDie().text());
+    }

    const content = actionResult?.content ?? [];

@@ -349,3 +353,9 @@ ${code.join('\n')}
    return result;
  }
 }
+
+function trim(text: string, maxLength: number) {
+  if (text.length <= maxLength)
+    return text;
+  return text.slice(0, maxLength) + '...';
+}
--- a/src/log.ts
+++ b/src/log.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 debug from 'debug';
+
+const errorsDebug = debug('pw:mcp:errors');
+
+export function logUnhandledError(error: unknown) {
+  errorsDebug(error);
+}
+
+export const testDebug = debug('pw:mcp:test');
--- a/src/pageSnapshot.ts
+++ b/src/pageSnapshot.ts
@@ -42,7 +42,7 @@ export class PageSnapshot {
  private async _build() {
    const snapshot = await callOnPageNoTrace(this._page, page => (page as PageEx)._snapshotForAI());
    this._text = [
-      `- Page Snapshot`,
+      `- Page Snapshot:`,
      '```yaml',
      snapshot,
      '```',
--- a/src/program.ts
+++ b/src/program.ts
@@ -14,12 +14,12 @@
 * limitations under the License.
 */

-import { program } from 'commander';
+import { program, Option } from 'commander';
 // @ts-ignore
 import { startTraceViewerServer } from 'playwright-core/lib/server';

 import { startHttpServer, startHttpTransport, startStdioTransport } from './transport.js';
-import { resolveCLIConfig } from './config.js';
+import { commaSeparatedList, resolveCLIConfig, semicolonSeparatedList } from './config.js';
 import { Server } from './server.js';
 import { packageJSON } from './package.js';

@@ -30,8 +30,7 @@ program
    .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('--block-service-workers', 'block service workers')
    .option('--browser <browser>', 'browser or chrome channel to use, possible values: chrome, firefox, webkit, msedge.')
-    .option('--browser-agent <endpoint>', 'Use browser agent (experimental).')
-    .option('--caps <caps>', 'comma-separated list of capabilities to enable, possible values: tabs, pdf, history, wait, files, install. Default is all.')
+    .option('--caps <caps>', 'comma-separated list of additional capabilities to enable, possible values: vision, pdf.', commaSeparatedList)
    .option('--cdp-endpoint <endpoint>', 'CDP endpoint to connect to.')
    .option('--config <path>', 'path to the configuration file.')
    .option('--device <device>', 'device to emulate, for example: "iPhone 15"')
@@ -40,7 +39,7 @@ program
    .option('--host <host>', 'host to bind server to. Default is localhost. Use 0.0.0.0 to bind to all interfaces.')
    .option('--ignore-https-errors', 'ignore https errors')
    .option('--isolated', 'keep the browser profile in memory, do not save it to disk.')
-    .option('--image-responses <mode>', 'whether to send image responses to the client. Can be "allow", "omit", or "auto". Defaults to "auto", which sends images if the client can display them.')
+    .option('--image-responses <mode>', 'whether to send image responses to the client. Can be "allow" or "omit", Defaults to "allow".')
    .option('--no-sandbox', 'disable the sandbox for all process types that are normally sandboxed.')
    .option('--output-dir <path>', 'path to the directory for output files.')
    .option('--port <port>', 'port to listen on for SSE transport.')
@@ -51,8 +50,13 @@ program
    .option('--user-agent <ua string>', 'specify user agent string')
    .option('--user-data-dir <path>', 'path to the user data directory. If not specified, a temporary directory will be created.')
    .option('--viewport-size <size>', 'specify browser viewport size in pixels, for example "1280, 720"')
-    .option('--vision', 'Run server that uses screenshots (Aria snapshots are used by default)')
+    .addOption(new Option('--vision', 'Legacy option, use --caps=vision instead').hideHelp())
    .action(async options => {
+      if (options.vision) {
+        // eslint-disable-next-line no-console
+        console.error('The --vision option is deprecated, use --caps=vision instead');
+        options.caps = 'vision';
+      }
      const config = await resolveCLIConfig(options);
      const httpServer = config.server.port !== undefined ? await startHttpServer(config.server) : undefined;

@@ -73,8 +77,4 @@ program
      }
    });

-function semicolonSeparatedList(value: string): string[] {
-  return value.split(';').map(v => v.trim());
-}
-
 void program.parseAsync(process.argv);
--- a/src/tab.ts
+++ b/src/tab.ts
@@ -17,14 +17,16 @@
 import * as playwright from 'playwright';

 import { PageSnapshot } from './pageSnapshot.js';
+import { callOnPageNoTrace } from './tools/utils.js';
+import { logUnhandledError } from './log.js';

 import type { Context } from './context.js';
-import { callOnPageNoTrace } from './tools/utils.js';

 export class Tab {
  readonly context: Context;
  readonly page: playwright.Page;
-  private _consoleMessages: playwright.ConsoleMessage[] = [];
+  private _consoleMessages: ConsoleMessage[] = [];
+  private _recentConsoleMessages: ConsoleMessage[] = [];
  private _requests: Map<playwright.Request, playwright.Response | null> = new Map();
  private _snapshot: PageSnapshot | undefined;
  private _onPageClose: (tab: Tab) => void;
@@ -33,7 +35,8 @@ export class Tab {
    this.context = context;
    this.page = page;
    this._onPageClose = onPageClose;
-    page.on('console', event => this._consoleMessages.push(event));
+    page.on('console', event => this._handleConsoleMessage(messageToConsoleMessage(event)));
+    page.on('pageerror', error => this._handleConsoleMessage(pageErrorToConsoleMessage(error)));
    page.on('request', request => this._requests.set(request, null));
    page.on('response', response => this._requests.set(response.request(), response));
    page.on('close', () => this._onClose());
@@ -54,9 +57,15 @@ export class Tab {

  private _clearCollectedArtifacts() {
    this._consoleMessages.length = 0;
+    this._recentConsoleMessages.length = 0;
    this._requests.clear();
  }

+  private _handleConsoleMessage(message: ConsoleMessage) {
+    this._consoleMessages.push(message);
+    this._recentConsoleMessages.push(message);
+  }
+
  private _onClose() {
    this._clearCollectedArtifacts();
    this._onPageClose(this);
@@ -67,13 +76,13 @@ export class Tab {
  }

  async waitForLoadState(state: 'load', options?: { timeout?: number }): Promise<void> {
-    await callOnPageNoTrace(this.page, page => page.waitForLoadState(state, options).catch(() => {}));
+    await callOnPageNoTrace(this.page, page => page.waitForLoadState(state, options).catch(logUnhandledError));
  }

  async navigate(url: string) {
    this._clearCollectedArtifacts();

-    const downloadEvent = callOnPageNoTrace(this.page, page => page.waitForEvent('download').catch(() => {}));
+    const downloadEvent = callOnPageNoTrace(this.page, page => page.waitForEvent('download').catch(logUnhandledError));
    try {
      await this.page.goto(url, { waitUntil: 'domcontentloaded' });
    } catch (_e: unknown) {
@@ -106,7 +115,7 @@ export class Tab {
    return this._snapshot;
  }

-  consoleMessages(): playwright.ConsoleMessage[] {
+  consoleMessages(): ConsoleMessage[] {
    return this._consoleMessages;
  }

@@ -117,4 +126,39 @@ export class Tab {
  async captureSnapshot() {
    this._snapshot = await PageSnapshot.create(this.page);
  }
+
+  takeRecentConsoleMessages(): ConsoleMessage[] {
+    const result = this._recentConsoleMessages.slice();
+    this._recentConsoleMessages.length = 0;
+    return result;
+  }
+}
+
+export type ConsoleMessage = {
+  type: ReturnType<playwright.ConsoleMessage['type']> | undefined;
+  text: string;
+  toString(): string;
+};
+
+function messageToConsoleMessage(message: playwright.ConsoleMessage): ConsoleMessage {
+  return {
+    type: message.type(),
+    text: message.text(),
+    toString: () => `[${message.type().toUpperCase()}] ${message.text()} @ ${message.location().url}:${message.location().lineNumber}`,
+  };
+}
+
+function pageErrorToConsoleMessage(errorOrValue: Error | any): ConsoleMessage {
+  if (errorOrValue instanceof Error) {
+    return {
+      type: undefined,
+      text: errorOrValue.message,
+      toString: () => errorOrValue.stack || errorOrValue.message,
+    };
+  }
+  return {
+    type: undefined,
+    text: String(errorOrValue),
+    toString: () => String(errorOrValue),
+  };
 }
--- a/src/tools.ts
+++ b/src/tools.ts
@@ -17,6 +17,7 @@
 import common from './tools/common.js';
 import console from './tools/console.js';
 import dialogs from './tools/dialogs.js';
+import evaluate from './tools/evaluate.js';
 import files from './tools/files.js';
 import install from './tools/install.js';
 import keyboard from './tools/keyboard.js';
@@ -26,41 +27,25 @@ import pdf from './tools/pdf.js';
 import snapshot from './tools/snapshot.js';
 import tabs from './tools/tabs.js';
 import screenshot from './tools/screenshot.js';
-import testing from './tools/testing.js';
-import vision from './tools/vision.js';
 import wait from './tools/wait.js';
+import mouse from './tools/mouse.js';

 import type { Tool } from './tools/tool.js';

-export const snapshotTools: Tool<any>[] = [
-  ...common(true),
+export const allTools: Tool<any>[] = [
+  ...common,
  ...console,
-  ...dialogs(true),
-  ...files(true),
+  ...dialogs,
+  ...evaluate,
+  ...files,
  ...install,
-  ...keyboard(true),
-  ...navigate(true),
+  ...keyboard,
+  ...navigate,
  ...network,
+  ...mouse,
  ...pdf,
  ...screenshot,
  ...snapshot,
-  ...tabs(true),
-  ...testing,
-  ...wait(true),
-];
-
-export const visionTools: Tool<any>[] = [
-  ...common(false),
-  ...console,
-  ...dialogs(false),
-  ...files(false),
-  ...install,
-  ...keyboard(false),
-  ...navigate(false),
-  ...network,
-  ...pdf,
-  ...tabs(false),
-  ...testing,
-  ...vision,
-  ...wait(false),
+  ...tabs,
+  ...wait,
 ];
--- a/src/tools/common.ts
+++ b/src/tools/common.ts
@@ -15,7 +15,7 @@
 */

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

 const close = defineTool({
  capability: 'core',
@@ -38,7 +38,7 @@ const close = defineTool({
  },
 });

-const resize: ToolFactory = captureSnapshot => defineTool({
+const resize = defineTool({
  capability: 'core',
  schema: {
    name: 'browser_resize',
@@ -66,13 +66,13 @@ const resize: ToolFactory = captureSnapshot => defineTool({
    return {
      code,
      action,
-      captureSnapshot,
+      captureSnapshot: true,
      waitForNetwork: true
    };
  },
 });

-export default (captureSnapshot: boolean) => [
+export default [
  close,
-  resize(captureSnapshot)
+  resize
 ];
--- a/src/tools/console.ts
+++ b/src/tools/console.ts
@@ -28,7 +28,7 @@ const console = defineTool({
  },
  handle: async context => {
    const messages = context.currentTabOrDie().consoleMessages();
-    const log = messages.map(message => `[${message.type().toUpperCase()}] ${message.text()}`).join('\n');
+    const log = messages.map(message => message.toString()).join('\n');
    return {
      code: [`// <internal code to get console messages>`],
      action: async () => {
--- a/src/tools/dialogs.ts
+++ b/src/tools/dialogs.ts
@@ -15,9 +15,9 @@
 */

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

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

  schema: {
@@ -49,7 +49,7 @@ const handleDialog: ToolFactory = captureSnapshot => defineTool({

    return {
      code,
-      captureSnapshot,
+      captureSnapshot: true,
      waitForNetwork: false,
    };
  },
@@ -57,6 +57,6 @@ const handleDialog: ToolFactory = captureSnapshot => defineTool({
  clearsModalState: 'dialog',
 });

-export default (captureSnapshot: boolean) => [
-  handleDialog(captureSnapshot),
+export default [
+  handleDialog,
 ];
--- a/src/tools/evaluate.ts
+++ b/src/tools/evaluate.ts
@@ -0,0 +1,71 @@
+/**
+ * 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';
+import * as javascript from '../javascript.js';
+import { generateLocator } from './utils.js';
+
+import type * as playwright from 'playwright';
+
+const evaluateSchema = z.object({
+  function: z.string().describe('() => { /* code */ } or (element) => { /* code */ } when element is provided'),
+  element: z.string().optional().describe('Human-readable element description used to obtain permission to interact with the element'),
+  ref: z.string().optional().describe('Exact target element reference from the page snapshot'),
+});
+
+const evaluate = defineTool({
+  capability: 'core',
+  schema: {
+    name: 'browser_evaluate',
+    title: 'Evaluate JavaScript',
+    description: 'Evaluate JavaScript expression on page or element',
+    inputSchema: evaluateSchema,
+    type: 'destructive',
+  },
+
+  handle: async (context, params) => {
+    const tab = context.currentTabOrDie();
+    const code: string[] = [];
+
+    let locator: playwright.Locator | undefined;
+    if (params.ref && params.element) {
+      const snapshot = tab.snapshotOrDie();
+      locator = snapshot.refLocator({ ref: params.ref, element: params.element });
+      code.push(`await page.${await generateLocator(locator)}.evaluate(${javascript.quote(params.function)});`);
+    } else {
+      code.push(`await page.evaluate(${javascript.quote(params.function)});`);
+    }
+
+    return {
+      code,
+      action: async () => {
+        const receiver = locator ?? tab.page as any;
+        const result = await receiver._evaluateFunction(params.function);
+        return {
+          content: [{ type: 'text', text: '- Result: ' + (JSON.stringify(result, null, 2) || 'undefined') }],
+        };
+      },
+      captureSnapshot: false,
+      waitForNetwork: false,
+    };
+  },
+});
+
+export default [
+  evaluate,
+];
--- a/src/tools/files.ts
+++ b/src/tools/files.ts
@@ -15,10 +15,10 @@
 */

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

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

  schema: {
    name: 'browser_file_upload',
@@ -47,13 +47,13 @@ const uploadFile: ToolFactory = captureSnapshot => defineTool({
    return {
      code,
      action,
-      captureSnapshot,
+      captureSnapshot: true,
      waitForNetwork: true,
    };
  },
  clearsModalState: 'fileChooser',
 });

-export default (captureSnapshot: boolean) => [
-  uploadFile(captureSnapshot),
+export default [
+  uploadFile,
 ];
--- a/src/tools/install.ts
+++ b/src/tools/install.ts
@@ -23,7 +23,7 @@ import { defineTool } from './tool.js';
 import { fileURLToPath } from 'node:url';

 const install = defineTool({
-  capability: 'install',
+  capability: 'core-install',
  schema: {
    name: 'browser_install',
    title: 'Install the browser specified in the config',
--- a/src/tools/keyboard.ts
+++ b/src/tools/keyboard.ts
@@ -15,9 +15,13 @@
 */

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

-const pressKey: ToolFactory = captureSnapshot => defineTool({
+import { defineTool } from './tool.js';
+import { elementSchema } from './snapshot.js';
+import { generateLocator } from './utils.js';
+import * as javascript from '../javascript.js';
+
+const pressKey = defineTool({
  capability: 'core',

  schema: {
@@ -43,12 +47,61 @@ const pressKey: ToolFactory = captureSnapshot => defineTool({
    return {
      code,
      action,
-      captureSnapshot,
+      captureSnapshot: true,
      waitForNetwork: true
    };
  },
 });

-export default (captureSnapshot: boolean) => [
-  pressKey(captureSnapshot),
+const typeSchema = elementSchema.extend({
+  text: z.string().describe('Text to type into the element'),
+  submit: z.boolean().optional().describe('Whether to submit entered text (press Enter after)'),
+  slowly: z.boolean().optional().describe('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.'),
+});
+
+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) => {
+    const snapshot = context.currentTabOrDie().snapshotOrDie();
+    const locator = snapshot.refLocator(params);
+
+    const code: string[] = [];
+    const steps: (() => Promise<void>)[] = [];
+
+    if (params.slowly) {
+      code.push(`// Press "${params.text}" sequentially into "${params.element}"`);
+      code.push(`await page.${await generateLocator(locator)}.pressSequentially(${javascript.quote(params.text)});`);
+      steps.push(() => locator.pressSequentially(params.text));
+    } else {
+      code.push(`// Fill "${params.text}" into "${params.element}"`);
+      code.push(`await page.${await generateLocator(locator)}.fill(${javascript.quote(params.text)});`);
+      steps.push(() => locator.fill(params.text));
+    }
+
+    if (params.submit) {
+      code.push(`// Submit text`);
+      code.push(`await page.${await generateLocator(locator)}.press('Enter');`);
+      steps.push(() => locator.press('Enter'));
+    }
+
+    return {
+      code,
+      action: () => steps.reduce((acc, step) => acc.then(step), Promise.resolve()),
+      captureSnapshot: true,
+      waitForNetwork: true,
+    };
+  },
+});
+
+export default [
+  pressKey,
+  type,
 ];
--- a/src/tools/vision.ts
+++ b/src/tools/vision.ts
@@ -17,50 +17,14 @@
 import { z } from 'zod';
 import { defineTool } from './tool.js';

-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'),
 });

-const screenshot = defineTool({
-  capability: 'core',
+const mouseMove = defineTool({
+  capability: 'vision',
  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 => {
-    const tab = await context.ensureTab();
-    const options = { type: 'jpeg' as 'jpeg', quality: 50, scale: 'css' as 'css' };
-
-    const code = [
-      `// Take a screenshot of the current page`,
-      `await page.screenshot(${javascript.formatObject(options)});`,
-    ];
-
-    const action = () => tab.page.screenshot(options).then(buffer => {
-      return {
-        content: [{ type: 'image' as 'image', data: buffer.toString('base64'), mimeType: 'image/jpeg' }],
-      };
-    });
-
-    return {
-      code,
-      action,
-      captureSnapshot: false,
-      waitForNetwork: false
-    };
-  },
-});
-
-const moveMouse = defineTool({
-  capability: 'core',
-  schema: {
-    name: 'browser_screen_move_mouse',
+    name: 'browser_mouse_move_xy',
    title: 'Move mouse',
    description: 'Move mouse to a given position',
    inputSchema: elementSchema.extend({
@@ -86,12 +50,12 @@ const moveMouse = defineTool({
  },
 });

-const click = defineTool({
-  capability: 'core',
+const mouseClick = defineTool({
+  capability: 'vision',
  schema: {
-    name: 'browser_screen_click',
+    name: 'browser_mouse_click_xy',
    title: 'Click',
-    description: 'Click left mouse button',
+    description: 'Click left mouse button at a given position',
    inputSchema: elementSchema.extend({
      x: z.number().describe('X coordinate'),
      y: z.number().describe('Y coordinate'),
@@ -121,12 +85,12 @@ const click = defineTool({
  },
 });

-const drag = defineTool({
-  capability: 'core',
+const mouseDrag = defineTool({
+  capability: 'vision',
  schema: {
-    name: 'browser_screen_drag',
+    name: 'browser_mouse_drag_xy',
    title: 'Drag mouse',
-    description: 'Drag left mouse button',
+    description: 'Drag left mouse button to a given position',
    inputSchema: elementSchema.extend({
      startX: z.number().describe('Start X coordinate'),
      startY: z.number().describe('Start Y coordinate'),
@@ -163,51 +127,8 @@ 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) => {
-    const tab = context.currentTabOrDie();
-
-    const code = [
-      `// Type ${params.text}`,
-      `await page.keyboard.type('${params.text}');`,
-    ];
-
-    const action = async () => {
-      await tab.page.keyboard.type(params.text);
-      if (params.submit)
-        await tab.page.keyboard.press('Enter');
-    };
-
-    if (params.submit) {
-      code.push(`// Submit text`);
-      code.push(`await page.keyboard.press('Enter');`);
-    }
-
-    return {
-      code,
-      action,
-      captureSnapshot: false,
-      waitForNetwork: true,
-    };
-  },
-});
-
 export default [
-  screenshot,
-  moveMouse,
-  click,
-  drag,
-  type,
+  mouseMove,
+  mouseClick,
+  mouseDrag,
 ];
--- a/src/tools/navigate.ts
+++ b/src/tools/navigate.ts
@@ -15,9 +15,9 @@
 */

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

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

  schema: {
@@ -41,14 +41,14 @@ const navigate: ToolFactory = captureSnapshot => defineTool({

    return {
      code,
-      captureSnapshot,
+      captureSnapshot: true,
      waitForNetwork: false,
    };
  },
 });

-const goBack: ToolFactory = captureSnapshot => defineTool({
-  capability: 'history',
+const goBack = defineTool({
+  capability: 'core',
  schema: {
    name: 'browser_navigate_back',
    title: 'Go back',
@@ -67,14 +67,14 @@ const goBack: ToolFactory = captureSnapshot => defineTool({

    return {
      code,
-      captureSnapshot,
+      captureSnapshot: true,
      waitForNetwork: false,
    };
  },
 });

-const goForward: ToolFactory = captureSnapshot => defineTool({
-  capability: 'history',
+const goForward = defineTool({
+  capability: 'core',
  schema: {
    name: 'browser_navigate_forward',
    title: 'Go forward',
@@ -91,14 +91,14 @@ const goForward: ToolFactory = captureSnapshot => defineTool({
    ];
    return {
      code,
-      captureSnapshot,
+      captureSnapshot: true,
      waitForNetwork: false,
    };
  },
 });

-export default (captureSnapshot: boolean) => [
-  navigate(captureSnapshot),
-  goBack(captureSnapshot),
-  goForward(captureSnapshot),
+export default [
+  navigate,
+  goBack,
+  goForward,
 ];
--- a/src/tools/screenshot.ts
+++ b/src/tools/screenshot.ts
@@ -79,7 +79,7 @@ const screenshot = defineTool({
    return {
      code,
      action,
-      captureSnapshot: true,
+      captureSnapshot: false,
      waitForNetwork: false,
    };
  }
--- a/src/tools/snapshot.ts
+++ b/src/tools/snapshot.ts
@@ -41,13 +41,14 @@ const snapshot = defineTool({
  },
 });

-const elementSchema = z.object({
+export const elementSchema = z.object({
  element: z.string().describe('Human-readable element description used to obtain permission to interact with the element'),
  ref: z.string().describe('Exact target element reference from the page snapshot'),
 });

 const clickSchema = elementSchema.extend({
  doubleClick: z.boolean().optional().describe('Whether to perform a double click instead of a single click'),
+  button: z.enum(['left', 'right', 'middle']).optional().describe('Button to click, defaults to left'),
 });

 const click = defineTool({
@@ -63,19 +64,21 @@ const click = defineTool({
  handle: async (context, params) => {
    const tab = context.currentTabOrDie();
    const locator = tab.snapshotOrDie().refLocator(params);
+    const button = params.button;
+    const buttonAttr = button ? `{ button: '${button}' }` : '';

    const code: string[] = [];
    if (params.doubleClick) {
      code.push(`// Double click ${params.element}`);
-      code.push(`await page.${await generateLocator(locator)}.dblclick();`);
+      code.push(`await page.${await generateLocator(locator)}.dblclick(${buttonAttr});`);
    } else {
      code.push(`// Click ${params.element}`);
-      code.push(`await page.${await generateLocator(locator)}.click();`);
+      code.push(`await page.${await generateLocator(locator)}.click(${buttonAttr});`);
    }

    return {
      code,
-      action: () => params.doubleClick ? locator.dblclick() : locator.click(),
+      action: () => params.doubleClick ? locator.dblclick({ button }) : locator.click({ button }),
      captureSnapshot: true,
      waitForNetwork: true,
    };
@@ -144,54 +147,6 @@ const hover = defineTool({
  },
 });

-const typeSchema = elementSchema.extend({
-  text: z.string().describe('Text to type into the element'),
-  submit: z.boolean().optional().describe('Whether to submit entered text (press Enter after)'),
-  slowly: z.boolean().optional().describe('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.'),
-});
-
-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) => {
-    const snapshot = context.currentTabOrDie().snapshotOrDie();
-    const locator = snapshot.refLocator(params);
-
-    const code: string[] = [];
-    const steps: (() => Promise<void>)[] = [];
-
-    if (params.slowly) {
-      code.push(`// Press "${params.text}" sequentially into "${params.element}"`);
-      code.push(`await page.${await generateLocator(locator)}.pressSequentially(${javascript.quote(params.text)});`);
-      steps.push(() => locator.pressSequentially(params.text));
-    } else {
-      code.push(`// Fill "${params.text}" into "${params.element}"`);
-      code.push(`await page.${await generateLocator(locator)}.fill(${javascript.quote(params.text)});`);
-      steps.push(() => locator.fill(params.text));
-    }
-
-    if (params.submit) {
-      code.push(`// Submit text`);
-      code.push(`await page.${await generateLocator(locator)}.press('Enter');`);
-      steps.push(() => locator.press('Enter'));
-    }
-
-    return {
-      code,
-      action: () => steps.reduce((acc, step) => acc.then(step), Promise.resolve()),
-      captureSnapshot: true,
-      waitForNetwork: true,
-    };
-  },
-});
-
 const selectOptionSchema = elementSchema.extend({
  values: z.array(z.string()).describe('Array of values to select in the dropdown. This can be a single value or multiple values.'),
 });
@@ -229,6 +184,5 @@ export default [
  click,
  drag,
  hover,
-  type,
  selectOption,
 ];
--- a/src/tools/tabs.ts
+++ b/src/tools/tabs.ts
@@ -15,10 +15,10 @@
 */

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

 const listTabs = defineTool({
-  capability: 'tabs',
+  capability: 'core-tabs',

  schema: {
    name: 'browser_tab_list',
@@ -44,8 +44,8 @@ const listTabs = defineTool({
  },
 });

-const selectTab: ToolFactory = captureSnapshot => defineTool({
-  capability: 'tabs',
+const selectTab = defineTool({
+  capability: 'core-tabs',

  schema: {
    name: 'browser_tab_select',
@@ -65,14 +65,14 @@ const selectTab: ToolFactory = captureSnapshot => defineTool({

    return {
      code,
-      captureSnapshot,
+      captureSnapshot: true,
      waitForNetwork: false
    };
  },
 });

-const newTab: ToolFactory = captureSnapshot => defineTool({
-  capability: 'tabs',
+const newTab = defineTool({
+  capability: 'core-tabs',

  schema: {
    name: 'browser_tab_new',
@@ -94,14 +94,14 @@ const newTab: ToolFactory = captureSnapshot => defineTool({
    ];
    return {
      code,
-      captureSnapshot,
+      captureSnapshot: true,
      waitForNetwork: false
    };
  },
 });

-const closeTab: ToolFactory = captureSnapshot => defineTool({
-  capability: 'tabs',
+const closeTab = defineTool({
+  capability: 'core-tabs',

  schema: {
    name: 'browser_tab_close',
@@ -120,15 +120,15 @@ const closeTab: ToolFactory = captureSnapshot => defineTool({
    ];
    return {
      code,
-      captureSnapshot,
+      captureSnapshot: true,
      waitForNetwork: false
    };
  },
 });

-export default (captureSnapshot: boolean) => [
+export default [
  listTabs,
-  newTab(captureSnapshot),
-  selectTab(captureSnapshot),
-  closeTab(captureSnapshot),
+  newTab,
+  selectTab,
+  closeTab,
 ];
--- a/src/tools/testing.ts
+++ b/src/tools/testing.ts
@@ -1,67 +0,0 @@
-/**
- * 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
@@ -61,8 +61,6 @@ export type Tool<Input extends InputType = InputType> = {
  handle: (context: Context, params: z.output<Input>) => Promise<ToolResult>;
 };

-export type ToolFactory = (snapshot: boolean) => Tool<any>;
-
 export function defineTool<Input extends InputType>(tool: Tool<Input>): Tool<Input> {
  return tool;
 }
--- a/src/tools/utils.ts
+++ b/src/tools/utils.ts
@@ -14,6 +14,9 @@
 * limitations under the License.
 */

+// @ts-ignore
+import { asLocator } from 'playwright-core/lib/utils';
+
 import type * as playwright from 'playwright';
 import type { Context } from '../context.js';
 import type { Tab } from '../tab.js';
@@ -79,11 +82,10 @@ export function sanitizeForFilePath(s: string) {

 export async function generateLocator(locator: playwright.Locator): Promise<string> {
  try {
-    return await (locator as any)._generateLocatorString();
+    const { resolvedSelector } = await (locator as any)._resolveSelector();
+    return asLocator('javascript', resolvedSelector);
  } catch (e) {
-    if (e instanceof Error && /locator._generateLocatorString: No element matching locator/.test(e.message))
-      throw new Error('Ref not found, likely because element was removed. Use browser_snapshot to see what elements are currently on the page.');
-    throw e;
+    throw new Error('Ref not found, likely because element was removed. Use browser_snapshot to see what elements are currently on the page.');
  }
 }

--- a/src/tools/wait.ts
+++ b/src/tools/wait.ts
@@ -15,10 +15,10 @@
 */

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

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

  schema: {
    name: 'browser_wait_for',
@@ -40,7 +40,7 @@ const wait: ToolFactory = captureSnapshot => defineTool({

    if (params.time) {
      code.push(`await new Promise(f => setTimeout(f, ${params.time!} * 1000));`);
-      await new Promise(f => setTimeout(f, Math.min(10000, params.time! * 1000)));
+      await new Promise(f => setTimeout(f, Math.min(30000, params.time! * 1000)));
    }

    const tab = context.currentTabOrDie();
@@ -59,12 +59,12 @@ const wait: ToolFactory = captureSnapshot => defineTool({

    return {
      code,
-      captureSnapshot,
+      captureSnapshot: true,
      waitForNetwork: false,
    };
  },
 });

-export default (captureSnapshot: boolean) => [
-  wait(captureSnapshot),
+export default [
+  wait,
 ];
--- a/tests/browser-server.spec.ts
+++ b/tests/browser-server.spec.ts
@@ -1,77 +0,0 @@
-/**
- * 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 path from 'path';
-import url from 'node:url';
-
-import { spawn } from 'child_process';
-import { test as baseTest, expect } from './fixtures.js';
-
-import type { ChildProcess } from 'child_process';
-
-const __filename = url.fileURLToPath(import.meta.url);
-
-const test = baseTest.extend<{ agentEndpoint: (options?: { args?: string[] }) => Promise<{ url: URL, stdout: () => string }> }>({
-  agentEndpoint: async ({}, use) => {
-    let cp: ChildProcess | undefined;
-    await use(async (options?: { args?: string[] }) => {
-      if (cp)
-        throw new Error('Process already running');
-
-      cp = spawn('node', [
-        path.join(path.dirname(__filename), '../lib/browserServer.js'),
-        ...(options?.args || []),
-      ], {
-        stdio: 'pipe',
-        env: {
-          ...process.env,
-          DEBUG: 'pw:mcp:test',
-          DEBUG_COLORS: '0',
-          DEBUG_HIDE_DATE: '1',
-        },
-      });
-      let stdout = '';
-      const url = await new Promise<string>(resolve => cp!.stdout?.on('data', data => {
-        stdout += data.toString();
-        const match = stdout.match(/Listening on (http:\/\/.*)/);
-        if (match)
-          resolve(match[1]);
-      }));
-
-      return { url: new URL(url), stdout: () => stdout };
-    });
-    cp?.kill('SIGTERM');
-  },
-});
-
-test.skip(({ mcpBrowser }) => mcpBrowser !== 'chrome', 'Agent is CDP-only for now');
-
-test('browser lifecycle', async ({ agentEndpoint, startClient, server }) => {
-  const { url: agentUrl } = await agentEndpoint();
-  const { client: client1 } = await startClient({ args: ['--browser-agent', agentUrl.toString()] });
-  expect(await client1.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.HELLO_WORLD },
-  })).toContainTextContent('Hello, world!');
-
-  const { client: client2 } = await startClient({ args: ['--browser-agent', agentUrl.toString()] });
-  expect(await client2.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.HELLO_WORLD },
-  })).toContainTextContent('Hello, world!');
-
-  await client1.close();
-  await client2.close();
-});
--- a/tests/capabilities.spec.ts
+++ b/tests/capabilities.spec.ts
@@ -22,8 +22,8 @@ test('test snapshot tool list', async ({ client }) => {
    'browser_click',
    'browser_console_messages',
    'browser_drag',
+    'browser_evaluate',
    'browser_file_upload',
-    'browser_generate_playwright_test',
    'browser_handle_dialog',
    'browser_hover',
    'browser_select_option',
@@ -34,7 +34,6 @@ test('test snapshot tool list', async ({ client }) => {
    'browser_navigate_forward',
    'browser_navigate',
    'browser_network_requests',
-    'browser_pdf_save',
    'browser_press_key',
    'browser_resize',
    'browser_snapshot',
@@ -47,46 +46,33 @@ test('test snapshot tool list', async ({ client }) => {
  ]));
 });

-test('test vision tool list', async ({ visionClient }) => {
-  const { tools: visionTools } = await visionClient.listTools();
-  expect(new Set(visionTools.map(t => t.name))).toEqual(new Set([
-    'browser_close',
-    'browser_console_messages',
-    'browser_file_upload',
-    'browser_generate_playwright_test',
-    'browser_handle_dialog',
-    'browser_install',
-    'browser_navigate_back',
-    'browser_navigate_forward',
-    'browser_navigate',
-    'browser_network_requests',
-    'browser_pdf_save',
-    'browser_press_key',
-    'browser_resize',
-    'browser_screen_capture',
-    'browser_screen_click',
-    'browser_screen_drag',
-    'browser_screen_move_mouse',
-    'browser_screen_type',
-    'browser_tab_close',
-    'browser_tab_list',
-    'browser_tab_new',
-    'browser_tab_select',
-    'browser_wait_for',
-  ]));
-});
-
-test('test capabilities', async ({ startClient }) => {
+test('test capabilities (pdf)', async ({ startClient }) => {
  const { client } = await startClient({
-    args: ['--caps="core"'],
+    args: ['--caps=pdf'],
  });
  const { tools } = await client.listTools();
  const toolNames = tools.map(t => t.name);
-  expect(toolNames).not.toContain('browser_file_upload');
-  expect(toolNames).not.toContain('browser_pdf_save');
-  expect(toolNames).not.toContain('browser_screen_capture');
-  expect(toolNames).not.toContain('browser_screen_click');
-  expect(toolNames).not.toContain('browser_screen_drag');
-  expect(toolNames).not.toContain('browser_screen_move_mouse');
-  expect(toolNames).not.toContain('browser_screen_type');
+  expect(toolNames).toContain('browser_pdf_save');
+});
+
+test('test capabilities (vision)', async ({ startClient }) => {
+  const { client } = await startClient({
+    args: ['--caps=vision'],
+  });
+  const { tools } = await client.listTools();
+  const toolNames = tools.map(t => t.name);
+  expect(toolNames).toContain('browser_mouse_move_xy');
+  expect(toolNames).toContain('browser_mouse_click_xy');
+  expect(toolNames).toContain('browser_mouse_drag_xy');
+});
+
+test('support for legacy --vision option', async ({ startClient }) => {
+  const { client } = await startClient({
+    args: ['--vision'],
+  });
+  const { tools } = await client.listTools();
+  const toolNames = tools.map(t => t.name);
+  expect(toolNames).toContain('browser_mouse_move_xy');
+  expect(toolNames).toContain('browser_mouse_click_xy');
+  expect(toolNames).toContain('browser_mouse_drag_xy');
 });
--- a/tests/cdp.spec.ts
+++ b/tests/cdp.spec.ts
@@ -46,14 +46,15 @@ test('cdp server reuse tab', async ({ cdpServer, startClient, server }) => {
  expect(await client.callTool({
    name: 'browser_snapshot',
  })).toHaveTextContent(`
- Ran Playwright code:
+### Ran Playwright code
 \`\`\`js
 // <internal code to capture accessibility snapshot>
 \`\`\`

+### Page state
 - Page URL: ${server.HELLO_WORLD}
 - Page Title: Title
- Page Snapshot
+- Page Snapshot:
 \`\`\`yaml
 - generic [active] [ref=e1]: Hello, world!
 \`\`\`
--- a/tests/click.spec.ts
+++ b/tests/click.spec.ts
@@ -0,0 +1,119 @@
+/**
+ * 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_click', async ({ client, server, mcpBrowser }) => {
+  server.setContent('/', `
+    <title>Title</title>
+    <button>Submit</button>
+  `, 'text/html');
+
+  await client.callTool({
+    name: 'browser_navigate',
+    arguments: { url: server.PREFIX },
+  });
+
+  expect(await client.callTool({
+    name: 'browser_click',
+    arguments: {
+      element: 'Submit button',
+      ref: 'e2',
+    },
+  })).toHaveTextContent(`
+### Ran Playwright code
+\`\`\`js
+// Click Submit button
+await page.getByRole('button', { name: 'Submit' }).click();
+\`\`\`
+
+### Page state
+- Page URL: ${server.PREFIX}
+- Page Title: Title
+- Page Snapshot:
+\`\`\`yaml
+- button "Submit" ${mcpBrowser !== 'webkit' || process.platform === 'linux' ? '[active] ' : ''}[ref=e2]
+\`\`\`
+`);
+});
+
+test('browser_click (double)', async ({ client, server }) => {
+  server.setContent('/', `
+    <title>Title</title>
+    <script>
+      function handle() {
+        document.querySelector('h1').textContent = 'Double clicked';
+      }
+    </script>
+    <h1 ondblclick="handle()">Click me</h1>
+  `, 'text/html');
+
+  await client.callTool({
+    name: 'browser_navigate',
+    arguments: { url: server.PREFIX },
+  });
+
+  expect(await client.callTool({
+    name: 'browser_click',
+    arguments: {
+      element: 'Click me',
+      ref: 'e2',
+      doubleClick: true,
+    },
+  })).toHaveTextContent(`
+### Ran Playwright code
+\`\`\`js
+// Double click Click me
+await page.getByRole('heading', { name: 'Click me' }).dblclick();
+\`\`\`
+
+### Page state
+- Page URL: ${server.PREFIX}
+- Page Title: Title
+- Page Snapshot:
+\`\`\`yaml
+- heading "Double clicked" [level=1] [ref=e3]
+\`\`\`
+`);
+});
+
+test('browser_click (right)', async ({ client, server }) => {
+  server.setContent('/', `
+    <button oncontextmenu="handle">Menu</button>
+    <script>
+      document.addEventListener('contextmenu', event => {
+        event.preventDefault();
+        document.querySelector('button').textContent = 'Right clicked';
+      });
+    </script>
+  `, 'text/html');
+
+  await client.callTool({
+    name: 'browser_navigate',
+    arguments: { url: server.PREFIX },
+  });
+
+  const result = await client.callTool({
+    name: 'browser_click',
+    arguments: {
+      element: 'Menu',
+      ref: 'e2',
+      button: 'right',
+    },
+  });
+  expect(result).toContainTextContent(`await page.getByRole('button', { name: 'Menu' }).click({ button: 'right' });`);
+  expect(result).toContainTextContent(`- button "Right clicked"`);
+});
--- a/tests/console.spec.ts
+++ b/tests/console.spec.ts
@@ -38,7 +38,59 @@ test('browser_console_messages', async ({ client, server }) => {
    name: 'browser_console_messages',
  });
  expect(resource).toHaveTextContent([
-    '[LOG] Hello, world!',
-    '[ERROR] Error',
+    `[LOG] Hello, world! @ ${server.PREFIX}:4`,
+    `[ERROR] Error @ ${server.PREFIX}:5`,
  ].join('\n'));
 });
+
+test('browser_console_messages (page error)', async ({ client, server }) => {
+  server.setContent('/', `
+    <!DOCTYPE html>
+    <html>
+      <script>
+        throw new Error("Error in script");
+      </script>
+    </html>
+  `, 'text/html');
+
+  await client.callTool({
+    name: 'browser_navigate',
+    arguments: {
+      url: server.PREFIX,
+    },
+  });
+
+  const resource = await client.callTool({
+    name: 'browser_console_messages',
+  });
+  expect(resource).toHaveTextContent(/Error: Error in script/);
+  expect(resource).toHaveTextContent(new RegExp(server.PREFIX));
+});
+
+test('recent console messages', async ({ client, server }) => {
+  server.setContent('/', `
+    <!DOCTYPE html>
+    <html>
+      <button onclick="console.log('Hello, world!');">Click me</button>
+    </html>
+  `, 'text/html');
+
+  await client.callTool({
+    name: 'browser_navigate',
+    arguments: {
+      url: server.PREFIX,
+    },
+  });
+
+  const response = await client.callTool({
+    name: 'browser_click',
+    arguments: {
+      element: 'Click me',
+      ref: 'e2',
+    },
+  });
+
+  expect(response).toContainTextContent(`
+### New console messages
+- [LOG] Hello, world! @`);
+});
--- a/tests/core.spec.ts
+++ b/tests/core.spec.ts
@@ -21,15 +21,16 @@ test('browser_navigate', async ({ client, server }) => {
    name: 'browser_navigate',
    arguments: { url: server.HELLO_WORLD },
  })).toHaveTextContent(`
- Ran Playwright code:
+### Ran Playwright code
 \`\`\`js
 // Navigate to ${server.HELLO_WORLD}
 await page.goto('${server.HELLO_WORLD}');
 \`\`\`

+### Page state
 - Page URL: ${server.HELLO_WORLD}
 - Page Title: Title
- Page Snapshot
+- Page Snapshot:
 \`\`\`yaml
 - generic [active] [ref=e1]: Hello, world!
 \`\`\`
@@ -37,78 +38,6 @@ await page.goto('${server.HELLO_WORLD}');
  );
 });

-test('browser_click', async ({ client, server, mcpBrowser }) => {
-  server.setContent('/', `
-    <title>Title</title>
-    <button>Submit</button>
-  `, 'text/html');
-
-  await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.PREFIX },
-  });
-
-  expect(await client.callTool({
-    name: 'browser_click',
-    arguments: {
-      element: 'Submit button',
-      ref: 'e2',
-    },
-  })).toHaveTextContent(`
- Ran Playwright code:
-\`\`\`js
-// Click Submit button
-await page.getByRole('button', { name: 'Submit' }).click();
-\`\`\`
-
- Page URL: ${server.PREFIX}
- Page Title: Title
- Page Snapshot
-\`\`\`yaml
- button "Submit" ${mcpBrowser !== 'webkit' || process.platform === 'linux' ? '[active] ' : ''}[ref=e2]
-\`\`\`
-`);
-});
-
-test('browser_click (double)', async ({ client, server }) => {
-  server.setContent('/', `
-    <title>Title</title>
-    <script>
-      function handle() {
-        document.querySelector('h1').textContent = 'Double clicked';
-      }
-    </script>
-    <h1 ondblclick="handle()">Click me</h1>
-  `, 'text/html');
-
-  await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.PREFIX },
-  });
-
-  expect(await client.callTool({
-    name: 'browser_click',
-    arguments: {
-      element: 'Click me',
-      ref: 'e2',
-      doubleClick: true,
-    },
-  })).toHaveTextContent(`
- Ran Playwright code:
-\`\`\`js
-// Double click Click me
-await page.getByRole('heading', { name: 'Click me' }).dblclick();
-\`\`\`
-
- Page URL: ${server.PREFIX}
- Page Title: Title
- Page Snapshot
-\`\`\`yaml
- heading "Double clicked" [level=1] [ref=e3]
-\`\`\`
-`);
-});
-
 test('browser_select_option', async ({ client, server }) => {
  server.setContent('/', `
    <title>Title</title>
@@ -131,15 +60,16 @@ test('browser_select_option', async ({ client, server }) => {
      values: ['bar'],
    },
  })).toHaveTextContent(`
- Ran Playwright code:
+### Ran Playwright code
 \`\`\`js
 // Select options [bar] in Select
 await page.getByRole('combobox').selectOption(['bar']);
 \`\`\`

+### Page state
 - Page URL: ${server.PREFIX}
 - Page Title: Title
- Page Snapshot
+- Page Snapshot:
 \`\`\`yaml
 - combobox [ref=e2]:
  - option "Foo"
@@ -171,15 +101,16 @@ test('browser_select_option (multiple)', async ({ client, server }) => {
      values: ['bar', 'baz'],
    },
  })).toHaveTextContent(`
- Ran Playwright code:
+### Ran Playwright code
 \`\`\`js
 // Select options [bar, baz] in Select
 await page.getByRole('listbox').selectOption(['bar', 'baz']);
 \`\`\`

+### Page state
 - Page URL: ${server.PREFIX}
 - Page Title: Title
- Page Snapshot
+- Page Snapshot:
 \`\`\`yaml
 - listbox [ref=e2]:
  - option "Foo" [ref=e3]
@@ -214,7 +145,7 @@ test('browser_type', async ({ client, server }) => {
  });
  expect(await client.callTool({
    name: 'browser_console_messages',
-  })).toHaveTextContent('[LOG] Key pressed: Enter , Text: Hi!');
+  })).toHaveTextContent(/\[LOG\] Key pressed: Enter , Text: Hi!/);
 });

 test('browser_type (slowly)', async ({ client, server }) => {
@@ -238,14 +169,13 @@ test('browser_type (slowly)', async ({ client, server }) => {
      slowly: true,
    },
  });
-  expect(await client.callTool({
+  const response = await client.callTool({
    name: 'browser_console_messages',
-  })).toHaveTextContent([
-    '[LOG] Key pressed: H Text: ',
-    '[LOG] Key pressed: i Text: H',
-    '[LOG] Key pressed: ! Text: Hi',
-    '[LOG] Key pressed: Enter Text: Hi!',
-  ].join('\n'));
+  });
+  expect(response).toHaveTextContent(/\[LOG\] Key pressed: H Text: /);
+  expect(response).toHaveTextContent(/\[LOG\] Key pressed: i Text: H/);
+  expect(response).toHaveTextContent(/\[LOG\] Key pressed: ! Text: Hi/);
+  expect(response).toHaveTextContent(/\[LOG\] Key pressed: Enter Text: Hi!/);
 });

 test('browser_resize', async ({ client, server }) => {
@@ -269,7 +199,7 @@ test('browser_resize', async ({ client, server }) => {
      height: 780,
    },
  });
-  expect(response).toContainTextContent(`- Ran Playwright code:
+  expect(response).toContainTextContent(`### Ran Playwright code
 \`\`\`js
 // Resize browser window to 390x780
 await page.setViewportSize({ width: 390, height: 780 });
--- a/tests/dialogs.spec.ts
+++ b/tests/dialogs.spec.ts
@@ -16,9 +16,6 @@

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

-// https://github.com/microsoft/playwright/issues/35663
-test.skip(({ mcpBrowser, mcpHeadless }) => mcpBrowser === 'webkit' && mcpHeadless);
-
 test('alert dialog', async ({ client, server }) => {
  server.setContent('/', `<button onclick="alert('Alert')">Button</button>`, 'text/html');
  expect(await client.callTool({
@@ -32,7 +29,7 @@ test('alert dialog', async ({ client, server }) => {
      element: 'Button',
      ref: 'e2',
    },
-  })).toHaveTextContent(`- Ran Playwright code:
+  })).toHaveTextContent(`### Ran Playwright code
 \`\`\`js
 // Click Button
 await page.getByRole('button', { name: 'Button' }).click();
@@ -49,23 +46,20 @@ await page.getByRole('button', { name: 'Button' }).click();
  });

  expect(result).not.toContainTextContent('### Modal state');
-  expect(result).toHaveTextContent(`- Ran Playwright code:
+  expect(result).toContainTextContent(`### Ran Playwright code
 \`\`\`js
 // <internal code to handle "alert" dialog>
 \`\`\`

+### Page state
 - Page URL: ${server.PREFIX}
 - Page Title: 
- Page Snapshot
+- Page Snapshot:
 \`\`\`yaml
- button "Button" [active] [ref=e2]
-\`\`\`
-`);
+- button "Button"`);
 });

 test('two alert dialogs', async ({ client, server }) => {
-  test.fixme(true, 'Race between the dialog and ariaSnapshot');
-
  server.setContent('/', `
    <title>Title</title>
    <body>
@@ -84,7 +78,7 @@ test('two alert dialogs', async ({ client, server }) => {
      element: 'Button',
      ref: 'e2',
    },
-  })).toHaveTextContent(`- Ran Playwright code:
+  })).toHaveTextContent(`### Ran Playwright code
 \`\`\`js
 // Click Button
 await page.getByRole('button', { name: 'Button' }).click();
@@ -100,7 +94,18 @@ await page.getByRole('button', { name: 'Button' }).click();
    },
  });

-  expect(result).not.toContainTextContent('### Modal state');
+  expect(result).toContainTextContent(`
+### Modal state
+- ["alert" dialog with message "Alert 2"]: can be handled by the "browser_handle_dialog" tool`);
+
+  const result2 = await client.callTool({
+    name: 'browser_handle_dialog',
+    arguments: {
+      accept: true,
+    },
+  });
+
+  expect(result2).not.toContainTextContent('### Modal state');
 });

 test('confirm dialog (true)', async ({ client, server }) => {
@@ -134,7 +139,7 @@ test('confirm dialog (true)', async ({ client, server }) => {

  expect(result).not.toContainTextContent('### Modal state');
  expect(result).toContainTextContent('// <internal code to handle "confirm" dialog>');
-  expect(result).toContainTextContent(`- Page Snapshot
+  expect(result).toContainTextContent(`- Page Snapshot:
 \`\`\`yaml
 - generic [active] [ref=e1]: "true"
 \`\`\``);
@@ -169,7 +174,7 @@ test('confirm dialog (false)', async ({ client, server }) => {
    },
  });

-  expect(result).toContainTextContent(`- Page Snapshot
+  expect(result).toContainTextContent(`- Page Snapshot:
 \`\`\`yaml
 - generic [active] [ref=e1]: "false"
 \`\`\``);
@@ -205,8 +210,51 @@ test('prompt dialog', async ({ client, server }) => {
    },
  });

-  expect(result).toContainTextContent(`- Page Snapshot
+  expect(result).toContainTextContent(`- Page Snapshot:
 \`\`\`yaml
 - generic [active] [ref=e1]: Answer
 \`\`\``);
 });
+
+test('alert dialog w/ race', async ({ client, server }) => {
+  server.setContent('/', `<button onclick="setTimeout(() => alert('Alert'), 100)">Button</button>`, 'text/html');
+  expect(await client.callTool({
+    name: 'browser_navigate',
+    arguments: { url: server.PREFIX },
+  })).toContainTextContent('- button "Button" [ref=e2]');
+
+  expect(await client.callTool({
+    name: 'browser_click',
+    arguments: {
+      element: 'Button',
+      ref: 'e2',
+    },
+  })).toHaveTextContent(`### Ran Playwright code
+\`\`\`js
+// Click Button
+await page.getByRole('button', { name: 'Button' }).click();
+\`\`\`
+
+### Modal state
+- ["alert" dialog with message "Alert"]: can be handled by the "browser_handle_dialog" tool`);
+
+  const result = await client.callTool({
+    name: 'browser_handle_dialog',
+    arguments: {
+      accept: true,
+    },
+  });
+
+  expect(result).not.toContainTextContent('### Modal state');
+  expect(result).toContainTextContent(`### Ran Playwright code
+\`\`\`js
+// <internal code to handle "alert" dialog>
+\`\`\`
+
+### Page state
+- Page URL: ${server.PREFIX}
+- Page Title: 
+- Page Snapshot:
+\`\`\`yaml
+- button "Button"`);
+});
--- a/tests/evaluate.spec.ts
+++ b/tests/evaluate.spec.ts
@@ -0,0 +1,72 @@
+/**
+ * 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_evaluate', async ({ client, server }) => {
+  expect(await client.callTool({
+    name: 'browser_navigate',
+    arguments: { url: server.HELLO_WORLD },
+  })).toContainTextContent(`- Page Title: Title`);
+
+  const result = await client.callTool({
+    name: 'browser_evaluate',
+    arguments: {
+      function: '() => document.title',
+    },
+  });
+  expect(result).toContainTextContent(`"Title"`);
+});
+
+test('browser_evaluate (element)', async ({ client, server }) => {
+  server.setContent('/', `
+    <body style="background-color: red">Hello, world!</body>
+  `, 'text/html');
+  await client.callTool({
+    name: 'browser_navigate',
+    arguments: { url: server.PREFIX },
+  });
+
+  expect(await client.callTool({
+    name: 'browser_evaluate',
+    arguments: {
+      function: 'element => element.style.backgroundColor',
+      element: 'body',
+      ref: 'e1',
+    },
+  })).toContainTextContent(`- Result: "red"`);
+});
+
+test('browser_evaluate (error)', async ({ client, server }) => {
+  expect(await client.callTool({
+    name: 'browser_navigate',
+    arguments: { url: server.HELLO_WORLD },
+  })).toContainTextContent(`- Page Title: Title`);
+
+  // Test with a bogus expression that will cause a JavaScript error
+  const result = await client.callTool({
+    name: 'browser_evaluate',
+    arguments: {
+      function: '() => { undefinedVariable.nonExistentMethod(); }',
+    },
+  });
+
+  // Check that error MCP response is returned
+  expect(result.isError).toBe(true);
+
+  // Check that JavaScript error details are contained in the response
+  expect(result.content?.[0].text).toContain('undefinedVariable is not defined');
+});
--- a/tests/fixtures.ts
+++ b/tests/fixtures.ts
@@ -41,7 +41,6 @@ type CDPServer = {

 type TestFixtures = {
  client: Client;
-  visionClient: Client;
  startClient: (options?: { clientName?: string, args?: string[], config?: Config }) => Promise<{ client: Client, stderr: () => string }>;
  wsEndpoint: string;
  cdpServer: CDPServer;
@@ -61,11 +60,6 @@ export const test = baseTest.extend<TestFixtures & TestOptions, WorkerFixtures>(
    await use(client);
  },

-  visionClient: async ({ startClient }, use) => {
-    const { client } = await startClient({ args: ['--vision'] });
-    await use(client);
-  },
-
  startClient: async ({ mcpHeadless, mcpBrowser, mcpMode }, use, testInfo) => {
    const userDataDir = mcpMode !== 'docker' ? testInfo.outputPath('user-data-dir') : undefined;
    const configDir = path.dirname(test.info().config.configFile!);
@@ -232,17 +226,14 @@ export const expect = baseExpect.extend({
    };
  },

-  toContainTextContent(response: Response, content: string | string[]) {
+  toContainTextContent(response: Response, content: string) {
    const isNot = this.isNot;
    try {
-      content = Array.isArray(content) ? content : [content];
-      const texts = (response.content as any).map(c => c.text);
-      for (let i = 0; i < texts.length; i++) {
-        if (isNot)
-          expect(texts[i]).not.toContain(content[i]);
-        else
-          expect(texts[i]).toContain(content[i]);
-      }
+      const texts = (response.content as any).map(c => c.text).join('\n');
+      if (isNot)
+        expect(texts).not.toContain(content);
+      else
+        expect(texts).toContain(content);
    } catch (e) {
      return {
        pass: isNot,
--- a/tests/pdf.spec.ts
+++ b/tests/pdf.spec.ts
@@ -19,7 +19,7 @@ import fs from 'fs';
 import { test, expect } from './fixtures.js';

 test('save as pdf unavailable', async ({ startClient, server }) => {
-  const { client } = await startClient({ args: ['--caps="no-pdf"'] });
+  const { client } = await startClient();
  await client.callTool({
    name: 'browser_navigate',
    arguments: { url: server.HELLO_WORLD },
@@ -32,7 +32,7 @@ test('save as pdf unavailable', async ({ startClient, server }) => {

 test('save as pdf', async ({ startClient, mcpBrowser, server }, testInfo) => {
  const { client } = await startClient({
-    config: { outputDir: testInfo.outputPath('output') },
+    config: { outputDir: testInfo.outputPath('output'), capabilities: ['pdf'] },
  });

  test.skip(!!mcpBrowser && !['chromium', 'chrome', 'msedge'].includes(mcpBrowser), 'Save as PDF is only supported in Chromium.');
@@ -52,7 +52,7 @@ test('save as pdf (filename: output.pdf)', async ({ startClient, mcpBrowser, ser
  const outputDir = testInfo.outputPath('output');
  test.skip(!!mcpBrowser && !['chromium', 'chrome', 'msedge'].includes(mcpBrowser), 'Save as PDF is only supported in Chromium.');
  const { client } = await startClient({
-    config: { outputDir },
+    config: { outputDir, capabilities: ['pdf'] },
  });

  expect(await client.callTool({
--- a/tests/screenshot.spec.ts
+++ b/tests/screenshot.spec.ts
@@ -201,32 +201,3 @@ test('browser_take_screenshot (imageResponses=omit)', async ({ startClient, serv
    ],
  });
 });
-
-test('browser_take_screenshot (cursor)', async ({ startClient, server }, testInfo) => {
-  const outputDir = testInfo.outputPath('output');
-
-  const { client } = await startClient({
-    clientName: 'cursor:vscode',
-    config: { outputDir },
-  });
-
-  expect(await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.HELLO_WORLD },
-  })).toContainTextContent(`Navigate to http://localhost`);
-
-  await client.callTool({
-    name: 'browser_take_screenshot',
-  });
-
-  expect(await client.callTool({
-    name: 'browser_take_screenshot',
-  })).toEqual({
-    content: [
-      {
-        text: expect.stringContaining(`Screenshot viewport and save it as`),
-        type: 'text',
-      },
-    ],
-  });
-});
--- a/tests/tabs.spec.ts
+++ b/tests/tabs.spec.ts
@@ -31,7 +31,7 @@ test('list initial tabs', async ({ client }) => {
  expect(await client.callTool({
    name: 'browser_tab_list',
  })).toHaveTextContent(`### Open tabs
- 1: (current) [] (about:blank)`);
+- 0: (current) [] (about:blank)`);
 });

 test('list first tab', async ({ client }) => {
@@ -39,44 +39,34 @@ test('list first tab', async ({ client }) => {
  expect(await client.callTool({
    name: 'browser_tab_list',
  })).toHaveTextContent(`### Open tabs
- 1: [] (about:blank)
- 2: (current) [Tab one] (data:text/html,<title>Tab one</title><body>Body one</body>)`);
+- 0: [] (about:blank)
+- 1: (current) [Tab one] (data:text/html,<title>Tab one</title><body>Body one</body>)`);
 });

 test('create new tab', async ({ client }) => {
-  expect(await createTab(client, 'Tab one', 'Body one')).toHaveTextContent(`
- Ran Playwright code:
-\`\`\`js
-// <internal code to open a new tab>
-\`\`\`
-
+  expect(await createTab(client, 'Tab one', 'Body one')).toContainTextContent(`
 ### Open tabs
- 1: [] (about:blank)
- 2: (current) [Tab one] (data:text/html,<title>Tab one</title><body>Body one</body>)
+- 0: [] (about:blank)
+- 1: (current) [Tab one] (data:text/html,<title>Tab one</title><body>Body one</body>)

 ### Current tab
 - Page URL: data:text/html,<title>Tab one</title><body>Body one</body>
 - Page Title: Tab one
- Page Snapshot
+- Page Snapshot:
 \`\`\`yaml
 - generic [active] [ref=e1]: Body one
 \`\`\``);

-  expect(await createTab(client, 'Tab two', 'Body two')).toHaveTextContent(`
- Ran Playwright code:
-\`\`\`js
-// <internal code to open a new tab>
-\`\`\`
-
+  expect(await createTab(client, 'Tab two', 'Body two')).toContainTextContent(`
 ### Open tabs
- 1: [] (about:blank)
- 2: [Tab one] (data:text/html,<title>Tab one</title><body>Body one</body>)
- 3: (current) [Tab two] (data:text/html,<title>Tab two</title><body>Body two</body>)
+- 0: [] (about:blank)
+- 1: [Tab one] (data:text/html,<title>Tab one</title><body>Body one</body>)
+- 2: (current) [Tab two] (data:text/html,<title>Tab two</title><body>Body two</body>)

 ### Current tab
 - Page URL: data:text/html,<title>Tab two</title><body>Body two</body>
 - Page Title: Tab two
- Page Snapshot
+- Page Snapshot:
 \`\`\`yaml
 - generic [active] [ref=e1]: Body two
 \`\`\``);
@@ -88,23 +78,23 @@ test('select tab', async ({ client }) => {
  expect(await client.callTool({
    name: 'browser_tab_select',
    arguments: {
-      index: 2,
+      index: 1,
    },
  })).toHaveTextContent(`
- Ran Playwright code:
+### Ran Playwright code
 \`\`\`js
-// <internal code to select tab 2>
+// <internal code to select tab 1>
 \`\`\`

 ### Open tabs
- 1: [] (about:blank)
- 2: (current) [Tab one] (data:text/html,<title>Tab one</title><body>Body one</body>)
- 3: [Tab two] (data:text/html,<title>Tab two</title><body>Body two</body>)
+- 0: [] (about:blank)
+- 1: (current) [Tab one] (data:text/html,<title>Tab one</title><body>Body one</body>)
+- 2: [Tab two] (data:text/html,<title>Tab two</title><body>Body two</body>)

 ### Current tab
 - Page URL: data:text/html,<title>Tab one</title><body>Body one</body>
 - Page Title: Tab one
- Page Snapshot
+- Page Snapshot:
 \`\`\`yaml
 - generic [active] [ref=e1]: Body one
 \`\`\``);
@@ -116,22 +106,22 @@ test('close tab', async ({ client }) => {
  expect(await client.callTool({
    name: 'browser_tab_close',
    arguments: {
-      index: 3,
+      index: 2,
    },
  })).toHaveTextContent(`
- Ran Playwright code:
+### Ran Playwright code
 \`\`\`js
-// <internal code to close tab 3>
+// <internal code to close tab 2>
 \`\`\`

 ### Open tabs
- 1: [] (about:blank)
- 2: (current) [Tab one] (data:text/html,<title>Tab one</title><body>Body one</body>)
+- 0: [] (about:blank)
+- 1: (current) [Tab one] (data:text/html,<title>Tab one</title><body>Body one</body>)

 ### Current tab
 - Page URL: data:text/html,<title>Tab one</title><body>Body one</body>
 - Page Title: Tab one
- Page Snapshot
+- Page Snapshot:
 \`\`\`yaml
 - generic [active] [ref=e1]: Body one
 \`\`\``);
--- a/utils/update-readme.js
+++ b/utils/update-readme.js
@@ -20,60 +20,20 @@ import fs from 'node:fs'
 import path from 'node:path'
 import url from 'node:url'
 import zodToJsonSchema from 'zod-to-json-schema'
-
-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 screenshotTools from '../lib/tools/screenshot.js';
-import testTools from '../lib/tools/testing.js';
-import visionTools from '../lib/tools/vision.js';
-import waitTools from '../lib/tools/wait.js';
 import { execSync } from 'node:child_process';

-const categories = {
-  'Interactions': [
-    ...snapshotTools,
-    ...keyboardTools(true),
-    ...waitTools(true),
-    ...filesTools(true),
-    ...dialogsTools(true),
-  ],
-  'Navigation': [
-    ...navigateTools(true),
-  ],
-  'Resources': [
-    ...screenshotTools,
-    ...pdfTools,
-    ...networkTools,
-    ...consoleTools,
-  ],
-  'Utilities': [
-    ...installTools,
-    ...commonTools(true),
-  ],
-  'Tabs': [
-    ...tabsTools(true),
-  ],
-  'Testing': [
-    ...testTools,
-  ],
-  'Vision mode': [
-    ...visionTools,
-    ...keyboardTools(),
-    ...waitTools(false),
-    ...filesTools(false),
-    ...dialogsTools(false),
-  ],
+import { allTools } from '../lib/tools.js';
+
+const capabilities = {
+  'core': 'Core automation',
+  'core-tabs': 'Tab management',
+  'core-install': 'Browser installation',
+  'vision': 'Coordinate-based (opt-in via --caps=vision)',
+  'pdf': 'PDF generation (opt-in via --caps=pdf)',
 };

+const toolsByCapability = Object.fromEntries(Object.entries(capabilities).map(([capability, title]) => [title, allTools.filter(tool => tool.capability === capability).sort((a, b) => a.schema.name.localeCompare(b.schema.name))]));
+
 // NOTE: Can be removed when we drop Node.js 18 support and changed to import.meta.filename.
 const __filename = url.fileURLToPath(import.meta.url);

@@ -139,14 +99,12 @@ async function updateSection(content, startMarker, endMarker, generatedLines) {
 async function updateTools(content) {
  console.log('Loading tool information from compiled modules...');

-  const totalTools = Object.values(categories).flat().length;
-  console.log(`Found ${totalTools} tools`);
-
  const generatedLines = /** @type {string[]} */ ([]);
-  for (const [category, categoryTools] of Object.entries(categories)) {
-    generatedLines.push(`<details>\n<summary><b>${category}</b></summary>`);
+  for (const [capability, tools] of Object.entries(toolsByCapability)) {
+    console.log('Updating tools for capability:', capability);
+    generatedLines.push(`<details>\n<summary><b>${capability}</b></summary>`);
    generatedLines.push('');
-    for (const tool of categoryTools)
+    for (const tool of tools)
      generatedLines.push(...formatToolForReadme(tool.schema));
    generatedLines.push(`</details>`);
    generatedLines.push('');
Author	SHA1	Message	Date
copilot-swe-agent[bot]	47a73de357	Fix redundant conditional logic in browser_evaluate error test Co-authored-by: pavelfeldman <883973+pavelfeldman@users.noreply.github.com>	2025-07-18 22:16:55 +00:00
copilot-swe-agent[bot]	d9d5e3f7ed	Restore webkit-specific expectations for browser_evaluate error test Co-authored-by: pavelfeldman <883973+pavelfeldman@users.noreply.github.com>	2025-07-18 21:01:38 +00:00
copilot-swe-agent[bot]	0c8a2c9c70	Remove all implementation detail checks from browser_evaluate error test Co-authored-by: yury-s <9798949+yury-s@users.noreply.github.com>	2025-07-18 20:21:49 +00:00
copilot-swe-agent[bot]	ce1652d7af	Remove implementation detail check for page._evaluateFunction Co-authored-by: pavelfeldman <883973+pavelfeldman@users.noreply.github.com>	2025-07-18 20:14:39 +00:00
copilot-swe-agent[bot]	269d8d8a4d	Add conditional webkit expectations for browser_evaluate error test Co-authored-by: pavelfeldman <883973+pavelfeldman@users.noreply.github.com>	2025-07-18 19:52:18 +00:00
copilot-swe-agent[bot]	2acdc66c27	Add browser_evaluate (error) test for JavaScript error handling Co-authored-by: pavelfeldman <883973+pavelfeldman@users.noreply.github.com>	2025-07-18 18:49:06 +00:00
copilot-swe-agent[bot]	723ad2a9a6	Initial plan	2025-07-18 18:37:16 +00:00
Adam Gastineau	9f8441daa5	chore(docs): make VSCode match other README sections (#706 )	2025-07-18 11:21:29 -07:00
Pavel Feldman	64f950ae42	chore: mark v0.0.31 (#691 )	2025-07-17 16:04:21 -07:00
Pavel Feldman	5bfff0a059	chore: include recent console logs in results (#689 )	2025-07-17 14:58:44 -07:00
Pavel Feldman	c97bc6e2ae	chore: allow right click (#687 ) Fixes https://github.com/microsoft/playwright-mcp/issues/467	2025-07-17 13:24:05 -07:00
Pavel Feldman	fe0c0ffffe	chore: mirror cli options w/ env vars (#685 ) Fixes https://github.com/microsoft/playwright-mcp/issues/639	2025-07-17 10:19:18 -07:00
Pavel Feldman	9526910864	chore: sort install sections (#682 )	2025-07-17 09:06:10 -07:00
Pavel Feldman	95454735bf	chore: remove image reply special case in cursor (#680 )	2025-07-16 18:32:07 -07:00
Pavel Feldman	e9f6433241	chore: remove server experiment (#681 )	2025-07-16 18:05:47 -07:00
Pavel Feldman	d61aa16fee	chore: turn vision into capability (#679 ) Fixes https://github.com/microsoft/playwright-mcp/issues/420	2025-07-16 16:40:00 -07:00
Pavel Feldman	012c906500	chore: introduce browser_evaluate (#678 ) Fixes https://github.com/microsoft/playwright-mcp/issues/424	2025-07-16 15:02:47 -07:00
Pavel Feldman	825a97d66e	chore: remove generate_test tool for now - it adds no value (#675 )	2025-07-16 13:33:05 -07:00
Pavel Feldman	3061d9aa56	chore: resolve dialog races (#673 ) Fixes https://github.com/microsoft/playwright-mcp/issues/595	2025-07-16 13:32:54 -07:00
Pavel Feldman	da818d113a	chore: make tab indexes 0-based (#674 ) Fixes https://github.com/microsoft/playwright-mcp/issues/570	2025-07-16 09:55:08 -07:00
Pavel Feldman	a5a57df105	chore: include page errors in console messages (#671 ) Fixes https://github.com/microsoft/playwright-mcp/issues/669	2025-07-15 15:46:09 -07:00
Pavel Feldman	be8adb1866	chore: migrate to locator._resolveSelector (#670 )	2025-07-15 14:50:33 -07:00