devops: fix publishing

See https://github.com/microsoft/playwright-vscode/pull/684 for the
other side.

.github/workflows/ci.yml

@@ -18,7 +18,6 @@ jobs:
         cache: 'npm'
     - name: Install dependencies
       run: npm ci
-    - run: npm run build
     - name: Run ESLint
       run: npm run lint
     - name: Ensure no changes
@@ -41,14 +40,8 @@ jobs:
       run: npm ci
     - name: Playwright install
       run: npx playwright install --with-deps
-    - name: Install MS Edge
-      # MS Edge is not preinstalled on macOS runners.
-      if: ${{ matrix.os == 'macos-latest' }}
-      run: npx playwright install msedge
-    - name: Build
-      run: npm run build
     - name: Run tests
-      run: npm test
+      run: npm run test
 
   test_docker:
     runs-on: ubuntu-latest
@@ -63,8 +56,6 @@ jobs:
       run: npm ci
     - name: Playwright install
       run: npx playwright install --with-deps chromium
-    - name: Build
-      run: npm run build
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
     - name: Build and push
@@ -84,8 +75,6 @@ jobs:
         MCP_IN_DOCKER: 1
 
   test_extension:
-    strategy:
-      fail-fast: false
     runs-on: macos-latest
     defaults:
       run:
@@ -107,11 +96,10 @@ jobs:
         name: extension
         path: ./extension/dist
         retention-days: 7
-    - name: Install and build MCP server
+    - name: Install MCP server
       run: |
         cd ..
         npm ci
-        npm run build
         npx playwright install chromium
     - name: Run tests
       run: |

.github/workflows/copilot-setup-steps.yml

@@ -1,44 +0,0 @@
-name: "Copilot Setup Steps"
-
-# Automatically run the setup steps when they are changed to allow for easy validation, and
-# allow manual testing through the repository's "Actions" tab
-on:
-  workflow_dispatch:
-  push:
-    paths:
-      - .github/workflows/copilot-setup-steps.yml
-  pull_request:
-    paths:
-      - .github/workflows/copilot-setup-steps.yml
-
-jobs:
-  # The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
-  copilot-setup-steps:
-    runs-on: ubuntu-latest
-
-    # Set the permissions to the lowest permissions possible needed for your steps.
-    # Copilot will be given its own token for its operations.
-    permissions:
-      # If you want to clone the repository as part of your setup steps, for example to install dependencies, you'll need the `contents: read` permission. If you don't clone the repository in your setup steps, Copilot will do this for you automatically after the steps complete.
-      contents: read
-
-    # You can define any steps you want, and they will run before the agent starts.
-    # If you do not check out your code, Copilot will do this for you.
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "18.19"
-          cache: "npm"
-
-      - name: Install JavaScript dependencies
-        run: npm ci
-
-      - name: Playwright install
-        run: npx playwright install --with-deps
-
-      - name: Build
-        run: npm run build

.github/workflows/publish-canary.yml

@@ -0,0 +1,47 @@
+name: Publish Canary
+on:
+  schedule:
+    - cron: '0 8 * * *'
+  workflow_dispatch:
+
+jobs:
+  publish-canary:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write # Needed for npm provenance
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          registry-url: https://registry.npmjs.org/
+
+      - name: Get current date
+        id: date
+        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+
+      - name: Get current version
+        id: version
+        run: echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT
+
+      - name: Set canary version
+        id: canary-version
+        run: echo "version=${{ steps.version.outputs.version }}-alpha-${{ steps.date.outputs.date }}" >> $GITHUB_OUTPUT
+
+      - name: Update package.json version
+        run: |
+          npm version ${{ steps.canary-version.outputs.version }} --no-git-tag-version
+
+      - run: npm ci
+      - run: npx playwright install --with-deps
+      - run: npm run lint
+      - run: npm run ctest
+
+      - name: Publish to npm with next tag
+        run: npm publish --tag next --provenance
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Reset package.json version
+        run: git checkout -- package.json

.github/workflows/publish.yml

@@ -16,7 +16,6 @@ jobs:
           registry-url: https://registry.npmjs.org/
       - run: npm ci
       - run: npx playwright install --with-deps
-      - run: npm run build
       - run: npm run lint
       - run: npm run ctest
       - run: npm publish --provenance
@@ -85,14 +84,18 @@ jobs:
       - name: Build extension
         working-directory: ./extension
         run: npm run build
+      - name: Get extension version
+        id: get-version
+        working-directory: ./extension
+        run: echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT
       - name: Package extension
         working-directory: ./extension
         run: |
           cd dist
-          zip -r ../playwright-mcp-extension-${{ github.event.release.tag_name }}.zip .
+          zip -r ../playwright-mcp-extension-${{ steps.get-version.outputs.version }}.zip .
           cd ..
       - name: Upload extension to release
         env:
            GITHUB_TOKEN: ${{ github.token }}
         run: |
-            gh release upload ${{github.event.release.tag_name}} ./extension/playwright-mcp-extension-${{ github.event.release.tag_name }}.zip
+            gh release upload ${{github.event.release.tag_name}} ./extension/playwright-mcp-extension-${{ steps.get-version.outputs.version }}.zip

.npmignore

@@ -1,7 +1,6 @@
 **/*
 README.md
 LICENSE
-!lib/**/*.js
 !cli.js
 !index.*
 !config.d.ts

CONTRIBUTING.md

@@ -0,0 +1,137 @@
+# Contributing
+
+## Choose an issue
+
+Playwright MCP **requires an issue** for every contribution, except for minor documentation updates.
+
+If you are passionate about a bug/feature, but cannot find an issue describing it, **file an issue first**. This will
+facilitate the discussion, and you might get some early feedback from project maintainers before spending your time on
+creating a pull request.
+
+## Make a change
+
+> [!WARNING]
+> The core of the Playwright MCP was moved to the [Playwright monorepo](https://github.com/microsoft/playwright).
+
+Clone the Playwright repository. If you plan to send a pull request, it might be better to [fork the repository](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo) first.
+
+
+```bash
+git clone https://github.com/microsoft/playwright
+cd playwright
+```
+
+Install dependencies and run the build in watch mode.
+```bash
+# install deps and run watch
+npm ci
+npm run watch
+npx playwright install
+```
+
+Source code for Playwright MCP is located at [packages/playwright/src/mcp](https://github.com/microsoft/playwright/blob/main/packages/playwright/src/mcp).
+
+```bash
+# list source files
+ls -la packages/playwright/src/mcp
+```
+
+Coding style is fully defined in [eslint.config.mjs](https://github.com/microsoft/playwright/blob/main/eslint.config.mjs). Before creating a pull request, or at any moment during development, run linter to check all kinds of things:
+```bash
+# lint the source base before sending PR
+npm run flint
+```
+
+Comments should have an explicit purpose and should improve readability rather than hinder it. If the code would not be understood without comments, consider re-writing the code to make it self-explanatory.
+
+## Add a test
+
+Playwright requires a test for the new or modified functionality. An exception would be a pure refactoring, but chances are you are doing more than that.
+
+There are multiple [test suites](https://github.com/microsoft/playwright/blob/main/tests) in Playwright that will be executed on the CI. Tests for Playwright MCP are located at [tests/mcp](https://github.com/microsoft/playwright/blob/main/tests/mcp).
+
+```bash
+# list test files
+ls -la tests/mcp
+```
+
+To run the mcp tests, use
+
+```bash
+# fast path runs all MCP tests in Chromium
+npm run mcp-ctest
+```
+
+```bash
+# slow path runs all tests in three browsers
+npm run mcp-test
+```
+
+Since Playwright tests are using Playwright under the hood, everything from our documentation applies, for example [this guide on running and debugging tests](https://playwright.dev/docs/running-tests#running-tests).
+
+Note that tests should be *hermetic*, and not depend on external services. Tests should work on all three platforms: macOS, Linux and Windows.
+
+## Write a commit message
+
+Commit messages should follow the [Semantic Commit Messages](https://www.conventionalcommits.org/en/v1.0.0/) format:
+
+```
+label(namespace): title
+
+description
+
+footer
+```
+
+1. *label* is one of the following:
+    - `fix` - bug fixes
+    - `feat` - new features
+    - `docs` - documentation-only changes
+    - `test` - test-only changes
+    - `devops` - changes to the CI or build
+    - `chore` - everything that doesn't fall under previous categories
+2. *namespace* is put in parentheses after label and is optional. Must be lowercase.
+3. *title* is a brief summary of changes.
+4. *description* is **optional**, new-line separated from title and is in present tense.
+5. *footer* is **optional**, new-line separated from *description* and contains "fixes" / "references" attribution to GitHub issues.
+
+Example:
+
+```
+feat(trace viewer): network panel filtering
+
+This patch adds a filtering toolbar to the network panel.
+<link to a screenshot>
+
+Fixes #123, references #234.
+```
+
+## Send a pull request
+
+All submissions, including submissions by project members, require review. We use GitHub pull requests for this purpose.
+Make sure to keep your PR (diff) small and readable. If necessary, split your contribution into multiple PRs.
+Consult [GitHub Help](https://help.github.com/articles/about-pull-requests/) for more information on using pull requests.
+
+After a successful code review, one of the maintainers will merge your pull request. Congratulations!
+
+## More details
+
+**No new dependencies**
+
+There is a very high bar for new dependencies, including updating to a new version of an existing dependency. We recommend to explicitly discuss this in an issue and get a green light from a maintainer, before creating a pull request that updates dependencies.
+
+## Contributor License Agreement
+
+This project welcomes contributions and suggestions.  Most contributions require you to agree to a
+Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
+the rights to use your contribution. For details, visit https://cla.opensource.microsoft.com.
+
+When you submit a pull request, a CLA bot will automatically determine whether you need to provide
+a CLA and decorate the PR appropriately (e.g., status check, comment). Simply follow the instructions
+provided by the bot. You will only need to do this once across all repos using our CLA.
+
+### Code of Conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
+contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.

Dockerfile

@@ -32,10 +32,6 @@ RUN --mount=type=cache,target=/root/.npm,sharing=locked,id=npm-cache \
 
 # Copy the rest of the app
 COPY *.json *.js *.ts .
-COPY src src/
-
-# Build the app
-RUN npm run build
 
 # ------------------------------
 # Browser
@@ -63,7 +59,6 @@ USER ${USERNAME}
 
 COPY --from=browser --chown=${USERNAME}:${USERNAME} ${PLAYWRIGHT_BROWSERS_PATH} ${PLAYWRIGHT_BROWSERS_PATH}
 COPY --chown=${USERNAME}:${USERNAME} cli.js package.json ./
-COPY --from=builder --chown=${USERNAME}:${USERNAME} /app/lib /app/lib
 
 # Run in headless and only with chromium (other browsers need more dependencies not included in this image)
 ENTRYPOINT ["node", "cli.js", "--headless", "--browser", "chromium", "--no-sandbox"]

README.md

@@ -56,16 +56,31 @@ Follow the MCP install [guide](https://modelcontextprotocol.io/quickstart/user),
 
 </details>
 
+<details>
+<summary>Codex</summary>
+
+Create or edit the configuration file `~/.codex/config.toml` and add:
+
+```toml
+[mcp_servers.playwright]
+command = "npx"
+args = ["@playwright/mcp@latest"]
+```
+
+For more information, see the [Codex MCP documentation](https://github.com/openai/codex/blob/main/codex-rs/config.md#mcp_servers).
+
+</details>
+
 <details>
 <summary>Cursor</summary>
 
 #### Click the button to install:
 
-[![Install MCP Server](https://cursor.com/deeplink/mcp-install-dark.svg)](cursor://anysphere.cursor-deeplink/mcp/install?name=Playwright&config=eyJjb21tYW5kIjoibnB4IEBwbGF5d3JpZ2h0L21jcEBsYXRlc3QifQ%3D%3D)
+[<img src="https://cursor.com/deeplink/mcp-install-dark.svg" alt="Install in Cursor">](cursor://anysphere.cursor-deeplink/mcp/install?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`.
+Go to `Cursor Settings` -> `MCP` -> `Add new MCP Server`. Name to your liking, use `command` type with the command `npx @playwright/mcp@latest`. You can also verify config or add command like arguments via clicking `Edit`.
 
 </details>
 
@@ -165,52 +180,65 @@ Playwright MCP server supports following arguments. They can be provided in the
 
 ```
 > npx @playwright/mcp@latest --help
-  --allowed-origins <origins>  semicolon-separated list of origins to allow the
-                               browser to request. Default is to allow all.
-  --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.
-  --block-service-workers      block service workers
-  --browser <browser>          browser or chrome channel to use, possible
-                               values: chrome, firefox, webkit, msedge.
-  --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"
-  --executable-path <path>     path to the browser executable.
-  --extension                  Connect to a running browser instance
-                               (Edge/Chrome only). Requires the "Playwright MCP
-                               Bridge" browser extension to be installed.
-  --headless                   run browser in headless mode, headed by default
-  --host <host>                host to bind server to. Default is localhost. Use
-                               0.0.0.0 to bind to all interfaces.
-  --ignore-https-errors        ignore https errors
-  --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" 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.
-  --port <port>                port to listen on for SSE transport.
-  --proxy-bypass <bypass>      comma-separated domains to bypass proxy, for
-                               example ".com,chromium.org,.domain.com"
-  --proxy-server <proxy>       specify proxy server, for example
-                               "http://myproxy:3128" or "socks5://myproxy:8080"
-  --save-session               Whether to save the Playwright MCP session into
-                               the output directory.
-  --save-trace                 Whether to save the Playwright Trace of the
-                               session into the output directory.
-  --storage-state <path>       path to the storage state file for isolated
-                               sessions.
-  --user-agent <ua string>     specify user agent string
-  --user-data-dir <path>       path to the user data directory. If not
-                               specified, a temporary directory will be created.
-  --viewport-size <size>       specify browser viewport size in pixels, for
-                               example "1280, 720"
+  --allowed-origins <origins>     semicolon-separated list of origins to allow
+                                  the browser to request. Default is to allow
+                                  all.
+  --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.
+  --block-service-workers         block service workers
+  --browser <browser>             browser or chrome channel to use, possible
+                                  values: chrome, firefox, webkit, msedge.
+  --caps <caps>                   comma-separated list of additional
+                                  capabilities to enable, possible values:
+                                  vision, pdf.
+  --cdp-endpoint <endpoint>       CDP endpoint to connect to.
+  --cdp-header <headers...>       CDP headers to send with the connect request,
+                                  multiple can be specified.
+  --config <path>                 path to the configuration file.
+  --device <device>               device to emulate, for example: "iPhone 15"
+  --executable-path <path>        path to the browser executable.
+  --extension                     Connect to a running browser instance
+                                  (Edge/Chrome only). Requires the "Playwright
+                                  MCP Bridge" browser extension to be installed.
+  --headless                      run browser in headless mode, headed by
+                                  default
+  --host <host>                   host to bind server to. Default is localhost.
+                                  Use 0.0.0.0 to bind to all interfaces.
+  --ignore-https-errors           ignore https errors
+  --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" 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.
+  --port <port>                   port to listen on for SSE transport.
+  --proxy-bypass <bypass>         comma-separated domains to bypass proxy, for
+                                  example ".com,chromium.org,.domain.com"
+  --proxy-server <proxy>          specify proxy server, for example
+                                  "http://myproxy:3128" or
+                                  "socks5://myproxy:8080"
+  --save-session                  Whether to save the Playwright MCP session
+                                  into the output directory.
+  --save-trace                    Whether to save the Playwright Trace of the
+                                  session into the output directory.
+  --secrets <path>                path to a file containing secrets in the
+                                  dotenv format
+  --storage-state <path>          path to the storage state file for isolated
+                                  sessions.
+  --timeout-action <timeout>      specify action timeout in milliseconds,
+                                  defaults to 5000ms
+  --timeout-navigation <timeout>  specify navigation timeout in milliseconds,
+                                  defaults to 60000ms
+  --user-agent <ua string>        specify user agent string
+  --user-data-dir <path>          path to the user data directory. If not
+                                  specified, a temporary directory will be
+                                  created.
+  --viewport-size <size>          specify browser viewport size in pixels, for
+                                  example "1280, 720"
 ```
 
 <!--- End of options generated section -->
@@ -427,6 +455,7 @@ http.createServer(async (req, res) => {
     - `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
+    - `modifiers` (array, optional): Modifier keys to press
   - Read-only: **false**
 
 <!-- NOTE: This has been generated via update-readme.js -->
@@ -479,6 +508,15 @@ http.createServer(async (req, res) => {
 
 <!-- NOTE: This has been generated via update-readme.js -->
 
+- **browser_fill_form**
+  - Title: Fill form
+  - Description: Fill multiple form fields
+  - Parameters:
+    - `fields` (array): Fields to fill in
+  - Read-only: **false**
+
+<!-- NOTE: This has been generated via update-readme.js -->
+
 - **browser_handle_dialog**
   - Title: Handle a dialog
   - Description: Handle a dialog
@@ -516,14 +554,6 @@ http.createServer(async (req, res) => {
 
 <!-- NOTE: This has been generated via update-readme.js -->
 
-- **browser_navigate_forward**
-  - Title: Go forward
-  - Description: Go forward to the next page
-  - Parameters: None
-  - Read-only: **true**
-
-<!-- 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
@@ -612,39 +642,14 @@ http.createServer(async (req, res) => {
 
 <!-- NOTE: This has been generated via update-readme.js -->
 
-- **browser_tab_close**
-  - Title: Close a tab
-  - Description: Close a tab
+- **browser_tabs**
+  - Title: Manage tabs
+  - Description: List, create, close, or select a browser tab.
   - Parameters:
-    - `index` (number, optional): The index of the tab to close. Closes current tab if not provided.
+    - `action` (string): Operation to perform
+    - `index` (number, optional): Tab index, used for close/select. If omitted for close, current tab is closed.
   - Read-only: **false**
 
-<!-- NOTE: This has been generated via update-readme.js -->
-
-- **browser_tab_list**
-  - Title: List tabs
-  - Description: List browser tabs
-  - Parameters: None
-  - Read-only: **true**
-
-<!-- NOTE: This has been generated via update-readme.js -->
-
-- **browser_tab_new**
-  - Title: Open a new tab
-  - Description: Open a new tab
-  - Parameters:
-    - `url` (string, optional): The URL to navigate to in the new tab. If not provided, the new tab will be blank.
-  - Read-only: **true**
-
-<!-- NOTE: This has been generated via update-readme.js -->
-
-- **browser_tab_select**
-  - Title: Select a tab
-  - Description: Select a tab by index
-  - Parameters:
-    - `index` (number): The index of the tab to select
-  - Read-only: **true**
-
 </details>
 
 <details>
@@ -714,5 +719,73 @@ http.createServer(async (req, res) => {
 
 </details>
 
+<details>
+<summary><b>Verify (opt-in via --caps=verify)</b></summary>
+
+<!-- NOTE: This has been generated via update-readme.js -->
+
+- **browser_verify_element_visible**
+  - Title: Verify element visible
+  - Description: Verify element is visible on the page
+  - Parameters:
+    - `role` (string): ROLE of the element. Can be found in the snapshot like this: `- {ROLE} "Accessible Name":`
+    - `accessibleName` (string): ACCESSIBLE_NAME of the element. Can be found in the snapshot like this: `- role "{ACCESSIBLE_NAME}"`
+  - Read-only: **true**
+
+<!-- NOTE: This has been generated via update-readme.js -->
+
+- **browser_verify_list_visible**
+  - Title: Verify list visible
+  - Description: Verify list is visible on the page
+  - Parameters:
+    - `element` (string): Human-readable list description
+    - `ref` (string): Exact target element reference that points to the list
+    - `items` (array): Items to verify
+  - Read-only: **true**
+
+<!-- NOTE: This has been generated via update-readme.js -->
+
+- **browser_verify_text_visible**
+  - Title: Verify text visible
+  - Description: Verify text is visible on the page. Prefer browser_verify_element_visible if possible.
+  - Parameters:
+    - `text` (string): TEXT to verify. Can be found in the snapshot like this: `- role "Accessible Name": {TEXT}` or like this: `- text: {TEXT}`
+  - Read-only: **true**
+
+<!-- NOTE: This has been generated via update-readme.js -->
+
+- **browser_verify_value**
+  - Title: Verify value
+  - Description: Verify element value
+  - Parameters:
+    - `type` (string): Type of the element
+    - `element` (string): Human-readable element description
+    - `ref` (string): Exact target element reference that points to the element
+    - `value` (string): Value to verify. For checkbox, use "true" or "false".
+  - Read-only: **true**
+
+</details>
+
+<details>
+<summary><b>Tracing (opt-in via --caps=tracing)</b></summary>
+
+<!-- NOTE: This has been generated via update-readme.js -->
+
+- **browser_start_tracing**
+  - Title: Start tracing
+  - Description: Start trace recording
+  - Parameters: None
+  - Read-only: **true**
+
+<!-- NOTE: This has been generated via update-readme.js -->
+
+- **browser_stop_tracing**
+  - Title: Stop tracing
+  - Description: Stop trace recording
+  - Parameters: None
+  - Read-only: **true**
+
+</details>
+
 
 <!--- End of tools generated section -->

cli.js

@@ -15,4 +15,10 @@
  * limitations under the License.
  */
 
-import './lib/program.js';
+const { program } = require('playwright-core/lib/utilsBundle');
+const { decorateCommand } = require('playwright/lib/mcp/program');
+
+const packageJSON = require('./package.json');
+const p = program.version('Version ' + packageJSON.version).name('Playwright MCP');
+decorateCommand(p, packageJSON.version)
+void program.parseAsync(process.argv);

config.d.ts

@@ -16,7 +16,7 @@
 
 import type * as playwright from 'playwright';
 
-export type ToolCapability = 'core' | 'core-tabs' | 'core-install' | 'vision' | 'pdf';
+export type ToolCapability = 'core' | 'core-tabs' | 'core-install' | 'vision' | 'pdf' | 'verify';
 
 export type Config = {
   /**
@@ -59,6 +59,11 @@ export type Config = {
      */
     cdpEndpoint?: string;
 
+    /**
+     * CDP headers to send with the connect request.
+     */
+    cdpHeaders?: Record<string, string>;
+
     /**
      * Remote endpoint to connect to an existing Playwright server.
      */
@@ -95,6 +100,13 @@ export type Config = {
    */
   saveTrace?: boolean;
 
+  /**
+   * Secrets are used to prevent LLM from getting sensitive data while
+   * automating scenarios such as authentication.
+   * Prefer the browser.contextOptions.storageState over secrets file as a more secure alternative.
+   */
+  secrets?: Record<string, string>;
+
   /**
    * The directory to save output files.
    */
@@ -112,6 +124,18 @@ export type Config = {
     blockedOrigins?: string[];
   };
 
+  timeouts?: {
+    /*
+     * Configures default action timeout: https://playwright.dev/docs/api/class-page#page-set-default-timeout. Defaults to 5000ms.
+     */
+    action?: number;
+
+    /*
+     * Configures default navigation timeout: https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout. Defaults to 60000ms.
+     */
+    navigation?: number;
+  };
+
   /**
    * 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.
    */

eslint.config.mjs

@@ -1,235 +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 typescriptEslint from "@typescript-eslint/eslint-plugin";
-import tsParser from "@typescript-eslint/parser";
-import notice from "eslint-plugin-notice";
-import path from "path";
-import { fileURLToPath } from "url";
-import stylistic from "@stylistic/eslint-plugin";
-import importRules from "eslint-plugin-import";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-const plugins = {
-  "@stylistic": stylistic,
-  "@typescript-eslint": typescriptEslint,
-  notice,
-  import: importRules,
-};
-
-export const baseRules = {
-  "import/extensions": ["error", "ignorePackages", {ts: "always"}],
-  "@typescript-eslint/no-floating-promises": "error",
-  "@typescript-eslint/no-unused-vars": [
-    2,
-    { args: "none", caughtErrors: "none" },
-  ],
-
-  /**
-   * Enforced rules
-   */
-  // syntax preferences
-  "object-curly-spacing": ["error", "always"],
-  quotes: [
-    2,
-    "single",
-    {
-      avoidEscape: true,
-      allowTemplateLiterals: true,
-    },
-  ],
-  "jsx-quotes": [2, "prefer-single"],
-  "no-extra-semi": 2,
-  "@stylistic/semi": [2],
-  "comma-style": [2, "last"],
-  "wrap-iife": [2, "inside"],
-  "spaced-comment": [
-    2,
-    "always",
-    {
-      markers: ["*"],
-    },
-  ],
-  eqeqeq: [2],
-  "accessor-pairs": [
-    2,
-    {
-      getWithoutSet: false,
-      setWithoutGet: false,
-    },
-  ],
-  "brace-style": [2, "1tbs", { allowSingleLine: true }],
-  curly: [2, "multi-or-nest", "consistent"],
-  "new-parens": 2,
-  "arrow-parens": [2, "as-needed"],
-  "prefer-const": 2,
-  "quote-props": [2, "consistent"],
-  "nonblock-statement-body-position": [2, "below"],
-
-  // anti-patterns
-  "no-var": 2,
-  "no-with": 2,
-  "no-multi-str": 2,
-  "no-caller": 2,
-  "no-implied-eval": 2,
-  "no-labels": 2,
-  "no-new-object": 2,
-  "no-octal-escape": 2,
-  "no-self-compare": 2,
-  "no-shadow-restricted-names": 2,
-  "no-cond-assign": 2,
-  "no-debugger": 2,
-  "no-dupe-keys": 2,
-  "no-duplicate-case": 2,
-  "no-empty-character-class": 2,
-  "no-unreachable": 2,
-  "no-unsafe-negation": 2,
-  radix: 2,
-  "valid-typeof": 2,
-  "no-implicit-globals": [2],
-  "no-unused-expressions": [
-    2,
-    { allowShortCircuit: true, allowTernary: true, allowTaggedTemplates: true },
-  ],
-  "no-proto": 2,
-
-  // es2015 features
-  "require-yield": 2,
-  "template-curly-spacing": [2, "never"],
-
-  // spacing details
-  "space-infix-ops": 2,
-  "space-in-parens": [2, "never"],
-  "array-bracket-spacing": [2, "never"],
-  "comma-spacing": [2, { before: false, after: true }],
-  "keyword-spacing": [2, "always"],
-  "space-before-function-paren": [
-    2,
-    {
-      anonymous: "never",
-      named: "never",
-      asyncArrow: "always",
-    },
-  ],
-  "no-whitespace-before-property": 2,
-  "keyword-spacing": [
-    2,
-    {
-      overrides: {
-        if: { after: true },
-        else: { after: true },
-        for: { after: true },
-        while: { after: true },
-        do: { after: true },
-        switch: { after: true },
-        return: { after: true },
-      },
-    },
-  ],
-  "arrow-spacing": [
-    2,
-    {
-      after: true,
-      before: true,
-    },
-  ],
-  "@stylistic/func-call-spacing": 2,
-  "@stylistic/type-annotation-spacing": 2,
-
-  // file whitespace
-  "no-multiple-empty-lines": [2, { max: 2, maxEOF: 0 }],
-  "no-mixed-spaces-and-tabs": 2,
-  "no-trailing-spaces": 2,
-  "linebreak-style": [process.platform === "win32" ? 0 : 2, "unix"],
-  indent: [
-    2,
-    2,
-    { SwitchCase: 1, CallExpression: { arguments: 2 }, MemberExpression: 2 },
-  ],
-  "key-spacing": [
-    2,
-    {
-      beforeColon: false,
-    },
-  ],
-  "eol-last": 2,
-
-  // copyright
-  "notice/notice": [
-    2,
-    {
-      mustMatch: "Copyright",
-      templateFile: path.join(__dirname, "utils", "copyright.js"),
-    },
-  ],
-
-  // react
-  "react/react-in-jsx-scope": 0,
-  "no-console": 2,
-};
-
-const languageOptions = {
-  parser: tsParser,
-  ecmaVersion: 9,
-  sourceType: "module",
-  parserOptions: {
-    project: path.join(fileURLToPath(import.meta.url), "..", "tsconfig.all.json"),
-  }
-};
-
-const importOrderRules = {
-  "import/order": [
-    2,
-    {
-      groups: [
-        "builtin",
-        "external",
-        "internal",
-        ["parent", "sibling"],
-        "index",
-        "type",
-      ],
-    },
-  ],
-  "import/consistent-type-specifier-style": [2, "prefer-top-level"],
-};
-
-const noFloatingPromisesRules = {
-  "@typescript-eslint/no-floating-promises": "error",
-};
-
-const noBooleanCompareRules = {
-  "@typescript-eslint/no-unnecessary-boolean-literal-compare": 2,
-};
-
-export default [
-  {
-    ignores: ["**/*.js"],
-  },
-  {
-    files: ["**/*.ts", "**/*.tsx"],
-    plugins,
-    languageOptions,
-    rules: {
-      ...baseRules,
-      ...importOrderRules,
-      ...noFloatingPromisesRules,
-      ...noBooleanCompareRules,
-    },
-  },
-];

examples/generate-test.md

@@ -1,10 +0,0 @@
-Use Playwright tools to generate test for scenario:
-
-## GitHub PR Checks Navigation Checklist
-
-1. Open the [Microsoft Playwright GitHub repository](https://github.com/microsoft/playwright).
-2. Click on the **Pull requests** tab.
-3. Find and open the pull request titled **"chore: make noWaitAfter a default"**.
-4. Switch to the **Checks** tab for that pull request.
-5. Expand the **infra** check suite to view its jobs.
-6. Click on the **docs & lint** job to view its details.

extension/manifest.json

@@ -1,26 +1,22 @@
 {
   "manifest_version": 3,
   "name": "Playwright MCP Bridge",
-  "version": "0.0.34",
+  "version": "0.0.37",
   "description": "Share browser tabs with Playwright MCP server",
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9nMS2b0WCohjVHPGb8D9qAdkbIngDqoAjTeSccHJijgcONejge+OJxOQOMLu7b0ovt1c9BiEJa5JcpM+EHFVGL1vluBxK71zmBy1m2f9vZF3HG0LSCp7YRkum9rAIEthDwbkxx6XTvpmAY5rjFa/NON6b9Hlbo+8peUSkoOK7HTwYnnI36asZ9eUTiveIf+DMPLojW2UX33vDWG2UKvMVDewzclb4+uLxAYshY7Mx8we/b44xu+Anb/EBLKjOPk9Yh541xJ5Ozc8EiP/5yxOp9c/lRiYUHaRW+4r0HKZyFt0eZ52ti2iM4Nfk7jRXR7an3JPsUIf5deC/1cVM/+1ZQIDAQAB",
-
   "permissions": [
     "debugger",
     "activeTab",
     "tabs",
     "storage"
   ],
-
   "host_permissions": [
     "<all_urls>"
   ],
-
   "background": {
-    "service_worker": "lib/background.js",
+    "service_worker": "lib/background.mjs",
     "type": "module"
   },
-
   "action": {
     "default_title": "Playwright MCP Bridge",
     "default_icon": {
@@ -30,7 +26,6 @@
       "128": "icons/icon-128.png"
     }
   },
-
   "icons": {
     "16": "icons/icon-16.png",
     "32": "icons/icon-32.png",

extension/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@playwright/mcp-extension",
-  "version": "0.0.34",
+  "version": "0.0.37",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@playwright/mcp-extension",
-      "version": "0.0.34",
+      "version": "0.0.37",
       "license": "Apache-2.0",
       "devDependencies": {
         "@types/chrome": "^0.0.315",

extension/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@playwright/mcp-extension",
-  "version": "0.0.34",
+  "version": "0.0.37",
   "description": "Playwright MCP Browser Extension",
-  "type": "module",
   "private": true,
   "repository": {
     "type": "git",
@@ -17,8 +16,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "build": "tsc --project . && tsc --project tsconfig.ui.json && vite build",
-    "watch": "tsc --watch --project . & tsc --watch --project tsconfig.ui.json & vite build --watch",
+    "build": "tsc --project . && tsc --project tsconfig.ui.json && vite build && vite build --config vite.sw.config.mts",
+    "watch": "tsc --watch --project . & tsc --watch --project tsconfig.ui.json & vite build --watch & vite build --watch --config vite.sw.config.mts",
     "test": "playwright test",
     "clean": "rm -rf dist"
   },

extension/playwright.config.ts

@@ -16,7 +16,7 @@
 
 import { defineConfig } from '@playwright/test';
 
-import type { TestOptions } from '../tests/fixtures.js';
+import type { TestOptions } from '../tests/fixtures';
 
 export default defineConfig<TestOptions>({
   testDir: './tests',

extension/src/background.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { RelayConnection, debugLog } from './relayConnection.js';
+import { RelayConnection, debugLog } from './relayConnection';
 
 type PageMessage = {
   type: 'connectToMCPRelay';
@@ -23,8 +23,8 @@ type PageMessage = {
   type: 'getTabs';
 } | {
   type: 'connectToTab';
-  tabId: number;
-  windowId: number;
+  tabId?: number;
+  windowId?: number;
   mcpRelayUrl: string;
 } | {
   type: 'getConnectionStatus';
@@ -59,7 +59,9 @@ class TabShareExtension {
             (error: any) => sendResponse({ success: false, error: error.message }));
         return true;
       case 'connectToTab':
-        this._connectTab(sender.tab!.id!, message.tabId, message.windowId, message.mcpRelayUrl!).then(
+        const tabId = message.tabId || sender.tab?.id!;
+        const windowId = message.windowId || sender.tab?.windowId!;
+        this._connectTab(sender.tab!.id!, tabId, windowId, message.mcpRelayUrl!).then(
             () => sendResponse({ success: true }),
             (error: any) => sendResponse({ success: false, error: error.message }));
         return true; // Return true to indicate that the response will be sent asynchronously

extension/src/ui/connect.css

@@ -193,3 +193,14 @@ body {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
+/* Link-style button */
+.link-button {
+  background: none;
+  border: none;
+  color: #0066cc;
+  text-decoration: underline;
+  cursor: pointer;
+  padding: 0;
+  font: inherit;
+}

extension/src/ui/connect.tsx

@@ -16,14 +16,16 @@
 
 import React, { useState, useEffect, useCallback } from 'react';
 import { createRoot } from 'react-dom/client';
-import { Button, TabItem  } from './tabItem.js';
-import type { TabInfo } from './tabItem.js';
+import { Button, TabItem  } from './tabItem';
+import type { TabInfo } from './tabItem';
 
 type Status =
   | { type: 'connecting'; message: string }
   | { type: 'connected'; message: string }
   | { type: 'error'; message: string }
-  | { type: 'error'; versionMismatch: { pwMcpVersion: string; extensionVersion: string } };
+  | { type: 'error'; versionMismatch: { extensionVersion: string; } };
+
+const SUPPORTED_PROTOCOL_VERSION = 1;
 
 const ConnectApp: React.FC = () => {
   const [tabs, setTabs] = useState<TabInfo[]>([]);
@@ -32,6 +34,7 @@ const ConnectApp: React.FC = () => {
   const [showTabList, setShowTabList] = useState(true);
   const [clientInfo, setClientInfo] = useState('unknown');
   const [mcpRelayUrl, setMcpRelayUrl] = useState('');
+  const [newTab, setNewTab] = useState<boolean>(false);
 
   useEffect(() => {
     const params = new URLSearchParams(window.location.search);
@@ -58,23 +61,30 @@ const ConnectApp: React.FC = () => {
       return;
     }
 
-    const pwMcpVersion = params.get('pwMcpVersion');
-    const extensionVersion = chrome.runtime.getManifest().version;
-    if (pwMcpVersion !== extensionVersion) {
+    const parsedVersion = parseInt(params.get('protocolVersion') ?? '', 10);
+    const requiredVersion = isNaN(parsedVersion) ? 1 : parsedVersion;
+    if (requiredVersion > SUPPORTED_PROTOCOL_VERSION) {
+      const extensionVersion = chrome.runtime.getManifest().version;
       setShowButtons(false);
       setShowTabList(false);
       setStatus({
         type: 'error',
         versionMismatch: {
-          pwMcpVersion: pwMcpVersion || 'unknown',
-          extensionVersion
+          extensionVersion,
         }
       });
       return;
     }
 
     void connectToMCPRelay(relayUrl);
-    void loadTabs();
+
+    // If this is a browser_navigate command, hide the tab list and show simple allow/reject
+    if (params.get('newTab') === 'true') {
+      setNewTab(true);
+      setShowTabList(false);
+    } else {
+      void loadTabs();
+    }
   }, []);
 
   const handleReject = useCallback((message: string) => {
@@ -98,7 +108,7 @@ const ConnectApp: React.FC = () => {
       setStatus({ type: 'error', message: 'Failed to load tabs: ' + response.error });
   }, []);
 
-  const handleConnectToTab = useCallback(async (tab: TabInfo) => {
+  const handleConnectToTab = useCallback(async (tab?: TabInfo) => {
     setShowButtons(false);
     setShowTabList(false);
 
@@ -106,8 +116,8 @@ const ConnectApp: React.FC = () => {
       const response = await chrome.runtime.sendMessage({
         type: 'connectToTab',
         mcpRelayUrl,
-        tabId: tab.id,
-        windowId: tab.windowId,
+        tabId: tab?.id,
+        windowId: tab?.windowId,
       });
 
       if (response?.success) {
@@ -144,9 +154,22 @@ const ConnectApp: React.FC = () => {
           <div className='status-container'>
             <StatusBanner status={status} />
             {showButtons && (
-              <Button variant='reject' onClick={() => handleReject('Connection rejected. This tab can be closed.')}>
-                Reject
-              </Button>
+              <div className='button-container'>
+                {newTab ? (
+                  <>
+                    <Button variant='primary' onClick={() => handleConnectToTab()}>
+                      Allow
+                    </Button>
+                    <Button variant='reject' onClick={() => handleReject('Connection rejected. This tab can be closed.')}>
+                      Reject
+                    </Button>
+                  </>
+                ) : (
+                  <Button variant='reject' onClick={() => handleReject('Connection rejected. This tab can be closed.')}>
+                    Reject
+                  </Button>
+                )}
+              </div>
             )}
           </div>
         )}
@@ -176,13 +199,14 @@ const ConnectApp: React.FC = () => {
   );
 };
 
-const VersionMismatchError: React.FC<{ pwMcpVersion: string; extensionVersion: string }> = ({ pwMcpVersion, extensionVersion }) => {
+const VersionMismatchError: React.FC<{ extensionVersion: string }> = ({ extensionVersion }) => {
   const readmeUrl = 'https://github.com/microsoft/playwright-mcp/blob/main/extension/README.md';
+  const latestReleaseUrl = 'https://github.com/microsoft/playwright-mcp/releases/latest';
   return (
     <div>
-      Incompatible Playwright MCP version: {pwMcpVersion} (extension version: {extensionVersion}).
-      Please install the latest version of the extension.{' '}
-      See <a href={readmeUrl} target='_blank' rel='noopener noreferrer'>installation instructions</a>.
+      Playwright MCP version trying to connect requires newer extension version (current version: {extensionVersion}).{' '}
+      <a href={latestReleaseUrl}>Click here</a> to download latest version of the extension, then drag and drop it into the Chrome Extensions page.{' '}
+      See <a href={readmeUrl} target='_blank' rel='noopener noreferrer'>installation instructions</a> for more details.
     </div>
   );
 };
@@ -191,7 +215,9 @@ const StatusBanner: React.FC<{ status: Status }> = ({ status }) => {
   return (
     <div className={`status-banner ${status.type}`}>
       {'versionMismatch' in status ? (
-        <VersionMismatchError pwMcpVersion={status.versionMismatch.pwMcpVersion} extensionVersion={status.versionMismatch.extensionVersion} />
+        <VersionMismatchError
+          extensionVersion={status.versionMismatch.extensionVersion}
+        />
       ) : (
         status.message
       )}

extension/src/ui/status.tsx

@@ -16,9 +16,9 @@
 
 import React, { useState, useEffect } from 'react';
 import { createRoot } from 'react-dom/client';
-import { Button, TabItem  } from './tabItem.js';
+import { Button, TabItem  } from './tabItem';
 
-import type { TabInfo } from './tabItem.js';
+import type { TabInfo } from './tabItem';
 
 interface ConnectionStatus {
   isConnected: boolean;

extension/tests/extension.spec.ts

@@ -16,14 +16,12 @@
 
 import fs from 'fs';
 import path from 'path';
-import { fileURLToPath } from 'url';
 import { chromium } from 'playwright';
-import packageJSON from '../../package.json' assert { type: 'json' };
-import { test as base, expect } from '../../tests/fixtures.js';
+import { test as base, expect } from '../../tests/fixtures';
 
 import type { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import type { BrowserContext } from 'playwright';
-import type { StartClient } from '../../tests/fixtures.js';
+import type { StartClient } from '../../tests/fixtures';
 
 type BrowserWithExtension = {
   userDataDir: string;
@@ -34,11 +32,12 @@ type TestFixtures = {
   browserWithExtension: BrowserWithExtension,
   pathToExtension: string,
   useShortConnectionTimeout: (timeoutMs: number) => void
+  overrideProtocolVersion: (version: number) => void
 };
 
 const test = base.extend<TestFixtures>({
   pathToExtension: async ({}, use) => {
-    await use(fileURLToPath(new URL('../dist', import.meta.url)));
+    await use(path.resolve(__dirname, '../dist'));
   },
 
   browserWithExtension: async ({ mcpBrowser, pathToExtension }, use, testInfo) => {
@@ -81,6 +80,12 @@ const test = base.extend<TestFixtures>({
     process.env.PWMCP_TEST_CONNECTION_TIMEOUT = undefined;
   },
 
+  overrideProtocolVersion: async ({}, use) => {
+    await use((version: number) => {
+      process.env.PWMCP_TEST_PROTOCOL_VERSION = version.toString();
+    });
+    process.env.PWMCP_TEST_PROTOCOL_VERSION = undefined;
+  }
 });
 
 async function startAndCallConnectTool(browserWithExtension: BrowserWithExtension, startClient: StartClient): Promise<Client> {
@@ -117,10 +122,10 @@ async function startWithExtensionFlag(browserWithExtension: BrowserWithExtension
   return client;
 }
 
-const testWithOldVersion = test.extend({
+const testWithOldExtensionVersion = test.extend({
   pathToExtension: async ({}, use, testInfo) => {
     const extensionDir = testInfo.outputPath('extension');
-    const oldPath = fileURLToPath(new URL('../dist', import.meta.url));
+    const oldPath = path.resolve(__dirname, '../dist');
 
     await fs.promises.cp(oldPath, extensionDir, { recursive: true });
     const manifestPath = path.join(extensionDir, 'manifest.json');
@@ -152,7 +157,8 @@ for (const [mode, startClientMethod] of [
     });
 
     const selectorPage = await confirmationPagePromise;
-    await selectorPage.locator('.tab-item', { hasText: 'Playwright MCP Extension' }).getByRole('button', { name: 'Connect' }).click();
+    // For browser_navigate command, the UI shows Allow/Reject buttons instead of tab selector
+    await selectorPage.getByRole('button', { name: 'Allow' }).click();
 
     expect(await navigateResponse).toHaveResponse({
       pageState: expect.stringContaining(`- generic [active] [ref=e1]: Hello, world!`),
@@ -215,7 +221,7 @@ for (const [mode, startClientMethod] of [
     await confirmationPagePromise;
   });
 
-  testWithOldVersion(`extension version mismatch (${mode})`, async ({ browserWithExtension, startClient, server, useShortConnectionTimeout }) => {
+  testWithOldExtensionVersion(`works with old extension version (${mode})`, async ({ browserWithExtension, startClient, server, useShortConnectionTimeout }) => {
     useShortConnectionTimeout(500);
 
     // Prelaunch the browser, so that it is properly closed after the test.
@@ -232,8 +238,35 @@ for (const [mode, startClientMethod] of [
       arguments: { url: server.HELLO_WORLD },
     });
 
+    const selectorPage = await confirmationPagePromise;
+    // For browser_navigate command, the UI shows Allow/Reject buttons instead of tab selector
+    await selectorPage.getByRole('button', { name: 'Allow' }).click();
+
+    expect(await navigateResponse).toHaveResponse({
+      pageState: expect.stringContaining(`- generic [active] [ref=e1]: Hello, world!`),
+    });
+  });
+
+  test(`extension needs update (${mode})`, async ({ browserWithExtension, startClient, server, useShortConnectionTimeout, overrideProtocolVersion }) => {
+    useShortConnectionTimeout(500);
+    overrideProtocolVersion(1000);
+
+    // Prelaunch the browser, so that it is properly closed after the test.
+    const browserContext = await browserWithExtension.launch();
+
+    const client = await startClientMethod(browserWithExtension, startClient);
+
+    const confirmationPagePromise = browserContext.waitForEvent('page', page => {
+      return page.url().startsWith('chrome-extension://jakfalbnbhgkpmoaakfflhflbfpkailf/connect.html');
+    });
+
+    const navigateResponse = client.callTool({
+      name: 'browser_navigate',
+      arguments: { url: server.HELLO_WORLD },
+    });
+
     const confirmationPage = await confirmationPagePromise;
-    await expect(confirmationPage.locator('.status-banner')).toHaveText(`Incompatible Playwright MCP version: ${packageJSON.version} (extension version: 0.0.1). Please install the latest version of the extension. See installation instructions.`);
+    await expect(confirmationPage.locator('.status-banner')).toContainText(`Playwright MCP version trying to connect requires newer extension version`);
 
     expect(await navigateResponse).toHaveResponse({
       result: expect.stringContaining('Extension connection timeout.'),
@@ -242,3 +275,32 @@ for (const [mode, startClientMethod] of [
   });
 
 }
+
+test(`custom executablePath`, async ({ startClient, server, useShortConnectionTimeout }) => {
+  useShortConnectionTimeout(1000);
+
+  const executablePath = test.info().outputPath('echo.sh');
+  await fs.promises.writeFile(executablePath, '#!/bin/bash\necho "Custom exec args: $@" > "$(dirname "$0")/output.txt"', { mode: 0o755 });
+
+  const { client } = await startClient({
+    args: [`--extension`],
+    config: {
+      browser: {
+        launchOptions: {
+          executablePath,
+        },
+      }
+    },
+  });
+
+  const navigateResponse = await client.callTool({
+    name: 'browser_navigate',
+    arguments: { url: server.HELLO_WORLD },
+    timeout: 1000,
+  });
+  expect(await navigateResponse).toHaveResponse({
+    result: expect.stringContaining('Extension connection timeout.'),
+    isError: true,
+  });
+  expect(await fs.promises.readFile(test.info().outputPath('output.txt'), 'utf8')).toContain('Custom exec args: chrome-extension://jakfalbnbhgkpmoaakfflhflbfpkailf/connect.html?');
+});

extension/tsconfig.json

@@ -10,7 +10,8 @@
     "resolveJsonModule": true,
     "types": ["chrome"],
     "jsx": "react-jsx",
-    "jsxImportSource": "react"
+    "jsxImportSource": "react",
+    "noEmit": true
   },
   "include": [
     "src",

extension/vite.sw.config.mts

@@ -14,13 +14,18 @@
  * limitations under the License.
  */
 
-import { test, expect } from './fixtures.js';
+import { resolve } from 'path';
+import { defineConfig } from 'vite';
 
-test('browser_install', async ({ client, mcpBrowser }) => {
-  test.skip(mcpBrowser !== 'chromium', 'Test only chromium');
-  expect(await client.callTool({
-    name: 'browser_install',
-  })).toHaveResponse({
-    tabs: expect.stringContaining(`No open tabs`),
-  });
+export default defineConfig({
+  build: {
+    lib: {
+      entry: resolve(__dirname, 'src/background.ts'),
+      fileName: 'lib/background',
+      formats: ['es']
+    },
+    outDir: 'dist',
+    emptyOutDir: false,
+    minify: false
+  }
 });

index.d.ts

@@ -16,7 +16,7 @@
  */
 
 import type { Server } from '@modelcontextprotocol/sdk/server/index.js';
-import type { Config } from './config.js';
+import type { Config } from './config';
 import type { BrowserContext } from 'playwright';
 
 export declare function createConnection(config?: Config, contextGetter?: () => Promise<BrowserContext>): Promise<Server>;

index.js

@@ -15,5 +15,5 @@
  * limitations under the License.
  */
 
-import { createConnection } from './lib/index.js';
-export { createConnection };
+const { createConnection } = require('playwright/lib/mcp/index');
+module.exports = { createConnection };

package.json

@@ -1,8 +1,7 @@
 {
   "name": "@playwright/mcp",
-  "version": "0.0.34",
+  "version": "0.0.37",
   "description": "Playwright Tools for MCP",
-  "type": "module",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/microsoft/playwright-mcp.git"
@@ -16,19 +15,14 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "build": "tsc",
-    "lint": "npm run update-readme && npm run check-deps && eslint . && tsc --noEmit",
-    "lint-fix": "eslint . --fix",
-    "check-deps": "node utils/check-deps.js",
-    "update-readme": "node utils/update-readme.js",
-    "watch": "tsc --watch",
+    "lint": "npm run update-readme",
+    "update-readme": "node update-readme.js",
+    "docker-build": "docker build --no-cache -t playwright-mcp-dev:latest .",
     "test": "playwright test",
     "ctest": "playwright test --project=chrome",
     "ftest": "playwright test --project=firefox",
     "wtest": "playwright test --project=webkit",
-    "run-server": "node lib/browserServer.js",
-    "clean": "rm -rf lib",
-    "npm-publish": "npm run clean && npm run build && npm run test && npm publish"
+    "dtest": "MCP_IN_DOCKER=1 playwright test --project=chromium-docker"
   },
   "exports": {
     "./package.json": "./package.json",
@@ -38,37 +32,16 @@
     }
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.16.0",
-    "commander": "^13.1.0",
-    "debug": "^4.4.1",
-    "dotenv": "^17.2.0",
-    "mime": "^4.0.7",
-    "playwright": "1.55.0-alpha-2025-08-12",
-    "playwright-core": "1.55.0-alpha-2025-08-12",
-    "ws": "^8.18.1",
-    "zod": "^3.24.1",
-    "zod-to-json-schema": "^3.24.4"
-  },
-  "devDependencies": {
-    "@anthropic-ai/sdk": "^0.57.0",
-    "@eslint/eslintrc": "^3.2.0",
-    "@eslint/js": "^9.19.0",
-    "@playwright/test": "1.55.0-alpha-2025-08-12",
-    "@stylistic/eslint-plugin": "^3.0.1",
-    "@types/debug": "^4.1.12",
-    "@types/node": "^22.13.10",
-    "@types/ws": "^8.18.1",
-    "@typescript-eslint/eslint-plugin": "^8.26.1",
-    "@typescript-eslint/parser": "^8.26.1",
-    "@typescript-eslint/utils": "^8.26.1",
-    "esbuild": "^0.20.1",
-    "eslint": "^9.19.0",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-notice": "^1.0.0",
-    "openai": "^5.10.2",
-    "typescript": "^5.8.2"
+    "playwright": "1.56.0-alpha-2025-09-06",
+    "playwright-core": "1.56.0-alpha-2025-09-06"
   },
   "bin": {
     "mcp-server-playwright": "cli.js"
+  },
+  "devDependencies": {
+    "@modelcontextprotocol/sdk": "^1.17.5",
+    "@playwright/test": "1.56.0-alpha-2025-09-06",
+    "@types/node": "^24.3.0",
+    "zod-to-json-schema": "^3.24.6"
   }
 }

playwright.config.ts

@@ -16,7 +16,7 @@
 
 import { defineConfig } from '@playwright/test';
 
-import type { TestOptions } from './tests/fixtures.js';
+import type { TestOptions } from './tests/fixtures';
 
 export default defineConfig<TestOptions>({
   testDir: './tests',
@@ -26,7 +26,6 @@ export default defineConfig<TestOptions>({
   reporter: 'list',
   projects: [
     { name: 'chrome' },
-    { name: 'chromium', use: { mcpBrowser: 'chromium' } },
     ...process.env.MCP_IN_DOCKER ? [{
       name: 'chromium-docker',
       grep: /browser_navigate|browser_click/,
@@ -35,8 +34,5 @@ export default defineConfig<TestOptions>({
         mcpMode: 'docker' as const
       }
     }] : [],
-    { name: 'firefox', use: { mcpBrowser: 'firefox' } },
-    { name: 'webkit', use: { mcpBrowser: 'webkit' } },
-    ... process.platform === 'win32' ? [{ name: 'msedge', use: { mcpBrowser: 'msedge' } }] : [],
   ],
 });

src/DEPS.list

@@ -1,7 +0,0 @@
-[*]
-./tools/
-./mcp/
-./utils/
-
-[program.ts]
-***

src/README.md

@@ -0,0 +1,3 @@
+# Where is the source?
+
+Playwright MCP source code is located in the Playwright monorepo. Please refer to the contributor's guide in [CONTRIBUTING.md](../CONTRIBUTING.md) for more details.

src/actions.d.ts

@@ -1,172 +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.
- */
-
-type Point = { x: number, y: number };
-
-export type ActionName =
-  'check' |
-  'click' |
-  'closePage' |
-  'fill' |
-  'navigate' |
-  'openPage' |
-  'press' |
-  'select' |
-  'uncheck' |
-  'setInputFiles' |
-  'assertText' |
-  'assertValue' |
-  'assertChecked' |
-  'assertVisible' |
-  'assertSnapshot';
-
-export type ActionBase = {
-  name: ActionName,
-  signals: Signal[],
-  ariaSnapshot?: string,
-};
-
-export type ActionWithSelector = ActionBase & {
-  selector: string,
-  ref?: string,
-};
-
-export type ClickAction = ActionWithSelector & {
-  name: 'click',
-  button: 'left' | 'middle' | 'right',
-  modifiers: number,
-  clickCount: number,
-  position?: Point,
-};
-
-export type CheckAction = ActionWithSelector & {
-  name: 'check',
-};
-
-export type UncheckAction = ActionWithSelector & {
-  name: 'uncheck',
-};
-
-export type FillAction = ActionWithSelector & {
-  name: 'fill',
-  text: string,
-};
-
-export type NavigateAction = ActionBase & {
-  name: 'navigate',
-  url: string,
-};
-
-export type OpenPageAction = ActionBase & {
-  name: 'openPage',
-  url: string,
-};
-
-export type ClosesPageAction = ActionBase & {
-  name: 'closePage',
-};
-
-export type PressAction = ActionWithSelector & {
-  name: 'press',
-  key: string,
-  modifiers: number,
-};
-
-export type SelectAction = ActionWithSelector & {
-  name: 'select',
-  options: string[],
-};
-
-export type SetInputFilesAction = ActionWithSelector & {
-  name: 'setInputFiles',
-  files: string[],
-};
-
-export type AssertTextAction = ActionWithSelector & {
-  name: 'assertText',
-  text: string,
-  substring: boolean,
-};
-
-export type AssertValueAction = ActionWithSelector & {
-  name: 'assertValue',
-  value: string,
-};
-
-export type AssertCheckedAction = ActionWithSelector & {
-  name: 'assertChecked',
-  checked: boolean,
-};
-
-export type AssertVisibleAction = ActionWithSelector & {
-  name: 'assertVisible',
-};
-
-export type AssertSnapshotAction = ActionWithSelector & {
-  name: 'assertSnapshot',
-  ariaSnapshot: string,
-};
-
-export type Action = ClickAction | CheckAction | ClosesPageAction | OpenPageAction | UncheckAction | FillAction | NavigateAction | PressAction | SelectAction | SetInputFilesAction | AssertTextAction | AssertValueAction | AssertCheckedAction | AssertVisibleAction | AssertSnapshotAction;
-export type AssertAction = AssertCheckedAction | AssertValueAction | AssertTextAction | AssertVisibleAction | AssertSnapshotAction;
-export type PerformOnRecordAction = ClickAction | CheckAction | UncheckAction | PressAction | SelectAction;
-
-// Signals.
-
-export type BaseSignal = {
-};
-
-export type NavigationSignal = BaseSignal & {
-  name: 'navigation',
-  url: string,
-};
-
-export type PopupSignal = BaseSignal & {
-  name: 'popup',
-  popupAlias: string,
-};
-
-export type DownloadSignal = BaseSignal & {
-  name: 'download',
-  downloadAlias: string,
-};
-
-export type DialogSignal = BaseSignal & {
-  name: 'dialog',
-  dialogAlias: string,
-};
-
-export type Signal = NavigationSignal | PopupSignal | DownloadSignal | DialogSignal;
-
-export type FrameDescription = {
-  pageGuid: string;
-  pageAlias: string;
-  framePath: string[];
-};
-
-export type ActionInContext = {
-  frame: FrameDescription;
-  description?: string;
-  action: Action;
-  startTime: number;
-  endTime?: number;
-};
-
-export type SignalInContext = {
-  frame: FrameDescription;
-  signal: Signal;
-  timestamp: number;
-};

src/browserContextFactory.ts

@@ -1,249 +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 fs from 'fs';
-import net from 'net';
-import path from 'path';
-
-import * as playwright from 'playwright';
-// @ts-ignore
-import { registryDirectory } from 'playwright-core/lib/server/registry/index';
-// @ts-ignore
-import { startTraceViewerServer } from 'playwright-core/lib/server';
-import { logUnhandledError, testDebug } from './utils/log.js';
-import { createHash } from './utils/guid.js';
-import { outputFile  } from './config.js';
-
-import type { FullConfig } from './config.js';
-
-export function contextFactory(config: FullConfig): BrowserContextFactory {
-  if (config.browser.remoteEndpoint)
-    return new RemoteContextFactory(config);
-  if (config.browser.cdpEndpoint)
-    return new CdpContextFactory(config);
-  if (config.browser.isolated)
-    return new IsolatedContextFactory(config);
-  return new PersistentContextFactory(config);
-}
-
-export type ClientInfo = { name?: string, version?: string, rootPath?: string };
-
-export interface BrowserContextFactory {
-  createContext(clientInfo: ClientInfo, abortSignal: AbortSignal): Promise<{ browserContext: playwright.BrowserContext, close: () => Promise<void> }>;
-}
-
-class BaseContextFactory implements BrowserContextFactory {
-  readonly config: FullConfig;
-  private _logName: string;
-  protected _browserPromise: Promise<playwright.Browser> | undefined;
-
-  constructor(name: string, config: FullConfig) {
-    this._logName = name;
-    this.config = config;
-  }
-
-  protected async _obtainBrowser(clientInfo: ClientInfo): Promise<playwright.Browser> {
-    if (this._browserPromise)
-      return this._browserPromise;
-    testDebug(`obtain browser (${this._logName})`);
-    this._browserPromise = this._doObtainBrowser(clientInfo);
-    void this._browserPromise.then(browser => {
-      browser.on('disconnected', () => {
-        this._browserPromise = undefined;
-      });
-    }).catch(() => {
-      this._browserPromise = undefined;
-    });
-    return this._browserPromise;
-  }
-
-  protected async _doObtainBrowser(clientInfo: ClientInfo): Promise<playwright.Browser> {
-    throw new Error('Not implemented');
-  }
-
-  async createContext(clientInfo: ClientInfo): Promise<{ browserContext: playwright.BrowserContext, close: () => Promise<void> }> {
-    testDebug(`create browser context (${this._logName})`);
-    const browser = await this._obtainBrowser(clientInfo);
-    const browserContext = await this._doCreateContext(browser);
-    return { browserContext, close: () => this._closeBrowserContext(browserContext, browser) };
-  }
-
-  protected async _doCreateContext(browser: playwright.Browser): Promise<playwright.BrowserContext> {
-    throw new Error('Not implemented');
-  }
-
-  private async _closeBrowserContext(browserContext: playwright.BrowserContext, browser: playwright.Browser) {
-    testDebug(`close browser context (${this._logName})`);
-    if (browser.contexts().length === 1)
-      this._browserPromise = undefined;
-    await browserContext.close().catch(logUnhandledError);
-    if (browser.contexts().length === 0) {
-      testDebug(`close browser (${this._logName})`);
-      await browser.close().catch(logUnhandledError);
-    }
-  }
-}
-
-class IsolatedContextFactory extends BaseContextFactory {
-  constructor(config: FullConfig) {
-    super('isolated', config);
-  }
-
-  protected override async _doObtainBrowser(clientInfo: ClientInfo): Promise<playwright.Browser> {
-    await injectCdpPort(this.config.browser);
-    const browserType = playwright[this.config.browser.browserName];
-    return browserType.launch({
-      tracesDir: await startTraceServer(this.config, clientInfo.rootPath),
-      ...this.config.browser.launchOptions,
-      handleSIGINT: false,
-      handleSIGTERM: false,
-    }).catch(error => {
-      if (error.message.includes('Executable doesn\'t exist'))
-        throw new Error(`Browser specified in your config is not installed. Either install it (likely) or change the config.`);
-      throw error;
-    });
-  }
-
-  protected override async _doCreateContext(browser: playwright.Browser): Promise<playwright.BrowserContext> {
-    return browser.newContext(this.config.browser.contextOptions);
-  }
-}
-
-class CdpContextFactory extends BaseContextFactory {
-  constructor(config: FullConfig) {
-    super('cdp', config);
-  }
-
-  protected override async _doObtainBrowser(): Promise<playwright.Browser> {
-    return playwright.chromium.connectOverCDP(this.config.browser.cdpEndpoint!);
-  }
-
-  protected override async _doCreateContext(browser: playwright.Browser): Promise<playwright.BrowserContext> {
-    return this.config.browser.isolated ? await browser.newContext() : browser.contexts()[0];
-  }
-}
-
-class RemoteContextFactory extends BaseContextFactory {
-  constructor(config: FullConfig) {
-    super('remote', config);
-  }
-
-  protected override async _doObtainBrowser(): Promise<playwright.Browser> {
-    const url = new URL(this.config.browser.remoteEndpoint!);
-    url.searchParams.set('browser', this.config.browser.browserName);
-    if (this.config.browser.launchOptions)
-      url.searchParams.set('launch-options', JSON.stringify(this.config.browser.launchOptions));
-    return playwright[this.config.browser.browserName].connect(String(url));
-  }
-
-  protected override async _doCreateContext(browser: playwright.Browser): Promise<playwright.BrowserContext> {
-    return browser.newContext();
-  }
-}
-
-class PersistentContextFactory implements BrowserContextFactory {
-  readonly config: FullConfig;
-  readonly name = 'persistent';
-  readonly description = 'Create a new persistent browser context';
-
-  private _userDataDirs = new Set<string>();
-
-  constructor(config: FullConfig) {
-    this.config = config;
-  }
-
-  async createContext(clientInfo: ClientInfo): Promise<{ browserContext: playwright.BrowserContext, close: () => Promise<void> }> {
-    await injectCdpPort(this.config.browser);
-    testDebug('create browser context (persistent)');
-    const userDataDir = this.config.browser.userDataDir ?? await this._createUserDataDir(clientInfo.rootPath);
-    const tracesDir = await startTraceServer(this.config, clientInfo.rootPath);
-
-    this._userDataDirs.add(userDataDir);
-    testDebug('lock user data dir', userDataDir);
-
-    const browserType = playwright[this.config.browser.browserName];
-    for (let i = 0; i < 5; i++) {
-      try {
-        const browserContext = await browserType.launchPersistentContext(userDataDir, {
-          tracesDir,
-          ...this.config.browser.launchOptions,
-          ...this.config.browser.contextOptions,
-          handleSIGINT: false,
-          handleSIGTERM: false,
-        });
-        const close = () => this._closeBrowserContext(browserContext, userDataDir);
-        return { browserContext, close };
-      } catch (error: any) {
-        if (error.message.includes('Executable doesn\'t exist'))
-          throw new Error(`Browser specified in your config is not installed. Either install it (likely) or change the config.`);
-        if (error.message.includes('ProcessSingleton') || error.message.includes('Invalid URL')) {
-          // User data directory is already in use, try again.
-          await new Promise(resolve => setTimeout(resolve, 1000));
-          continue;
-        }
-        throw error;
-      }
-    }
-    throw new Error(`Browser is already in use for ${userDataDir}, use --isolated to run multiple instances of the same browser`);
-  }
-
-  private async _closeBrowserContext(browserContext: playwright.BrowserContext, userDataDir: string) {
-    testDebug('close browser context (persistent)');
-    testDebug('release user data dir', userDataDir);
-    await browserContext.close().catch(() => {});
-    this._userDataDirs.delete(userDataDir);
-    testDebug('close browser context complete (persistent)');
-  }
-
-  private async _createUserDataDir(rootPath: string | undefined) {
-    const dir = process.env.PWMCP_PROFILES_DIR_FOR_TEST ?? registryDirectory;
-    const browserToken = this.config.browser.launchOptions?.channel ?? this.config.browser?.browserName;
-    // Hesitant putting hundreds of files into the user's workspace, so using it for hashing instead.
-    const rootPathToken = rootPath ? `-${createHash(rootPath)}` : '';
-    const result = path.join(dir, `mcp-${browserToken}${rootPathToken}`);
-    await fs.promises.mkdir(result, { recursive: true });
-    return result;
-  }
-}
-
-async function injectCdpPort(browserConfig: FullConfig['browser']) {
-  if (browserConfig.browserName === 'chromium')
-    (browserConfig.launchOptions as any).cdpPort = await findFreePort();
-}
-
-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);
-  });
-}
-
-async function startTraceServer(config: FullConfig, rootPath: string | undefined): Promise<string | undefined> {
-  if (!config.saveTrace)
-    return undefined;
-
-  const tracesDir = await outputFile(config, rootPath, `traces-${Date.now()}`);
-  const server = await startTraceViewerServer();
-  const urlPrefix = server.urlPrefix('human-readable');
-  const url = urlPrefix + '/trace/index.html?trace=' + tracesDir + '/trace.json';
-  // eslint-disable-next-line no-console
-  console.error('\nTrace viewer listening on ' + url);
-  return tracesDir;
-}

src/browserServerBackend.ts

@@ -1,88 +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 { fileURLToPath } from 'url';
-import { FullConfig } from './config.js';
-import { Context } from './context.js';
-import { logUnhandledError } from './utils/log.js';
-import { Response } from './response.js';
-import { SessionLog } from './sessionLog.js';
-import { filteredTools } from './tools.js';
-import { toMcpTool } from './mcp/tool.js';
-
-import type { Tool } from './tools/tool.js';
-import type { BrowserContextFactory } from './browserContextFactory.js';
-import type * as mcpServer from './mcp/server.js';
-import type { ServerBackend } from './mcp/server.js';
-
-export class BrowserServerBackend implements ServerBackend {
-  private _tools: Tool[];
-  private _context: Context | undefined;
-  private _sessionLog: SessionLog | undefined;
-  private _config: FullConfig;
-  private _browserContextFactory: BrowserContextFactory;
-
-  constructor(config: FullConfig, factory: BrowserContextFactory) {
-    this._config = config;
-    this._browserContextFactory = factory;
-    this._tools = filteredTools(config);
-  }
-
-  async initialize(clientVersion: mcpServer.ClientVersion, roots: mcpServer.Root[]): Promise<void> {
-    let rootPath: string | undefined;
-    if (roots.length > 0) {
-      const firstRootUri = roots[0]?.uri;
-      const url = firstRootUri ? new URL(firstRootUri) : undefined;
-      rootPath = url ? fileURLToPath(url) : undefined;
-    }
-    this._sessionLog = this._config.saveSession ? await SessionLog.create(this._config, rootPath) : undefined;
-    this._context = new Context({
-      tools: this._tools,
-      config: this._config,
-      browserContextFactory: this._browserContextFactory,
-      sessionLog: this._sessionLog,
-      clientInfo: { ...clientVersion, rootPath },
-    });
-  }
-
-  async listTools(): Promise<mcpServer.Tool[]> {
-    return this._tools.map(tool => toMcpTool(tool.schema));
-  }
-
-  async callTool(name: string, rawArguments: mcpServer.CallToolRequest['params']['arguments']) {
-    const tool = this._tools.find(tool => tool.schema.name === name)!;
-    if (!tool)
-      throw new Error(`Tool "${name}" not found`);
-    const parsedArguments = tool.schema.inputSchema.parse(rawArguments || {});
-    const context = this._context!;
-    const response = new Response(context, name, parsedArguments);
-    context.setRunningTool(true);
-    try {
-      await tool.handle(context, parsedArguments, response);
-      await response.finish();
-      this._sessionLog?.logResponse(response);
-    } catch (error: any) {
-      response.addError(String(error));
-    } finally {
-      context.setRunningTool(false);
-    }
-    return response.serialize();
-  }
-
-  serverClosed() {
-    void this._context?.dispose().catch(logUnhandledError);
-  }
-}

src/config.ts

@@ -1,320 +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 fs from 'fs';
-import os from 'os';
-import path from 'path';
-import { devices } from 'playwright';
-import { sanitizeForFilePath } from './utils/fileUtils.js';
-
-import type { Config, ToolCapability } from '../config.js';
-import type { BrowserContextOptions, LaunchOptions } from 'playwright';
-
-export type CLIOptions = {
-  allowedOrigins?: string[];
-  blockedOrigins?: string[];
-  blockServiceWorkers?: boolean;
-  browser?: string;
-  caps?: string[];
-  cdpEndpoint?: string;
-  config?: string;
-  device?: string;
-  executablePath?: string;
-  headless?: boolean;
-  host?: string;
-  ignoreHttpsErrors?: boolean;
-  isolated?: boolean;
-  imageResponses?: 'allow' | 'omit';
-  sandbox?: boolean;
-  outputDir?: string;
-  port?: number;
-  proxyBypass?: string;
-  proxyServer?: string;
-  saveSession?: boolean;
-  saveTrace?: boolean;
-  storageState?: string;
-  userAgent?: string;
-  userDataDir?: string;
-  viewportSize?: string;
-};
-
-const defaultConfig: FullConfig = {
-  browser: {
-    browserName: 'chromium',
-    launchOptions: {
-      channel: 'chrome',
-      headless: os.platform() === 'linux' && !process.env.DISPLAY,
-      chromiumSandbox: true,
-    },
-    contextOptions: {
-      viewport: null,
-    },
-  },
-  network: {
-    allowedOrigins: undefined,
-    blockedOrigins: undefined,
-  },
-  server: {},
-  saveTrace: false,
-};
-
-type BrowserUserConfig = NonNullable<Config['browser']>;
-
-export type FullConfig = Config & {
-  browser: Omit<BrowserUserConfig, 'browserName'> & {
-    browserName: 'chromium' | 'firefox' | 'webkit';
-    launchOptions: NonNullable<BrowserUserConfig['launchOptions']>;
-    contextOptions: NonNullable<BrowserUserConfig['contextOptions']>;
-  },
-  network: NonNullable<Config['network']>,
-  saveTrace: boolean;
-  server: NonNullable<Config['server']>,
-};
-
-export async function resolveConfig(config: Config): Promise<FullConfig> {
-  return mergeConfig(defaultConfig, config);
-}
-
-export async function resolveCLIConfig(cliOptions: CLIOptions): Promise<FullConfig> {
-  const configInFile = await loadConfig(cliOptions.config);
-  const envOverrides = configFromEnv();
-  const cliOverrides = configFromCLIOptions(cliOptions);
-  let result = defaultConfig;
-  result = mergeConfig(result, configInFile);
-  result = mergeConfig(result, envOverrides);
-  result = mergeConfig(result, cliOverrides);
-  return result;
-}
-
-export function configFromCLIOptions(cliOptions: CLIOptions): Config {
-  let browserName: 'chromium' | 'firefox' | 'webkit' | undefined;
-  let channel: string | undefined;
-  switch (cliOptions.browser) {
-    case 'chrome':
-    case 'chrome-beta':
-    case 'chrome-canary':
-    case 'chrome-dev':
-    case 'chromium':
-    case 'msedge':
-    case 'msedge-beta':
-    case 'msedge-canary':
-    case 'msedge-dev':
-      browserName = 'chromium';
-      channel = cliOptions.browser;
-      break;
-    case 'firefox':
-      browserName = 'firefox';
-      break;
-    case 'webkit':
-      browserName = 'webkit';
-      break;
-  }
-
-  // Launch options
-  const launchOptions: LaunchOptions = {
-    channel,
-    executablePath: cliOptions.executablePath,
-    headless: cliOptions.headless,
-  };
-
-  // --no-sandbox was passed, disable the sandbox
-  if (cliOptions.sandbox === false)
-    launchOptions.chromiumSandbox = false;
-
-  if (cliOptions.proxyServer) {
-    launchOptions.proxy = {
-      server: cliOptions.proxyServer
-    };
-    if (cliOptions.proxyBypass)
-      launchOptions.proxy.bypass = cliOptions.proxyBypass;
-  }
-
-  if (cliOptions.device && cliOptions.cdpEndpoint)
-    throw new Error('Device emulation is not supported with cdpEndpoint.');
-
-  // Context options
-  const contextOptions: BrowserContextOptions = cliOptions.device ? devices[cliOptions.device] : {};
-  if (cliOptions.storageState)
-    contextOptions.storageState = cliOptions.storageState;
-
-  if (cliOptions.userAgent)
-    contextOptions.userAgent = cliOptions.userAgent;
-
-  if (cliOptions.viewportSize) {
-    try {
-      const [width, height] = cliOptions.viewportSize.split(',').map(n => +n);
-      if (isNaN(width) || isNaN(height))
-        throw new Error('bad values');
-      contextOptions.viewport = { width, height };
-    } catch (e) {
-      throw new Error('Invalid viewport size format: use "width,height", for example --viewport-size="800,600"');
-    }
-  }
-
-  if (cliOptions.ignoreHttpsErrors)
-    contextOptions.ignoreHTTPSErrors = true;
-
-  if (cliOptions.blockServiceWorkers)
-    contextOptions.serviceWorkers = 'block';
-
-  const result: Config = {
-    browser: {
-      browserName,
-      isolated: cliOptions.isolated,
-      userDataDir: cliOptions.userDataDir,
-      launchOptions,
-      contextOptions,
-      cdpEndpoint: cliOptions.cdpEndpoint,
-    },
-    server: {
-      port: cliOptions.port,
-      host: cliOptions.host,
-    },
-    capabilities: cliOptions.caps as ToolCapability[],
-    network: {
-      allowedOrigins: cliOptions.allowedOrigins,
-      blockedOrigins: cliOptions.blockedOrigins,
-    },
-    saveSession: cliOptions.saveSession,
-    saveTrace: cliOptions.saveTrace,
-    outputDir: cliOptions.outputDir,
-    imageResponses: cliOptions.imageResponses,
-  };
-
-  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 {};
-
-  try {
-    return JSON.parse(await fs.promises.readFile(configFile, 'utf8'));
-  } catch (error) {
-    throw new Error(`Failed to load config file: ${configFile}, ${error}`);
-  }
-}
-
-export async function outputFile(config: FullConfig, rootPath: string | undefined, name: string): Promise<string> {
-  const outputDir = config.outputDir
-    ?? (rootPath ? path.join(rootPath, '.playwright-mcp') : undefined)
-    ?? path.join(os.tmpdir(), 'playwright-mcp-output', sanitizeForFilePath(new Date().toISOString()));
-
-  await fs.promises.mkdir(outputDir, { recursive: true });
-  const fileName = sanitizeForFilePath(name);
-  return path.join(outputDir, fileName);
-}
-
-function pickDefined<T extends object>(obj: T | undefined): Partial<T> {
-  return Object.fromEntries(
-      Object.entries(obj ?? {}).filter(([_, v]) => v !== undefined)
-  ) as Partial<T>;
-}
-
-function mergeConfig(base: FullConfig, overrides: Config): FullConfig {
-  const browser: FullConfig['browser'] = {
-    ...pickDefined(base.browser),
-    ...pickDefined(overrides.browser),
-    browserName: overrides.browser?.browserName ?? base.browser?.browserName ?? 'chromium',
-    isolated: overrides.browser?.isolated ?? base.browser?.isolated ?? false,
-    launchOptions: {
-      ...pickDefined(base.browser?.launchOptions),
-      ...pickDefined(overrides.browser?.launchOptions),
-      ...{ assistantMode: true },
-    },
-    contextOptions: {
-      ...pickDefined(base.browser?.contextOptions),
-      ...pickDefined(overrides.browser?.contextOptions),
-    },
-  };
-
-  if (browser.browserName !== 'chromium' && browser.launchOptions)
-    delete browser.launchOptions.channel;
-
-  return {
-    ...pickDefined(base),
-    ...pickDefined(overrides),
-    browser,
-    network: {
-      ...pickDefined(base.network),
-      ...pickDefined(overrides.network),
-    },
-    server: {
-      ...pickDefined(base.server),
-      ...pickDefined(overrides.server),
-    },
-  } 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;
-}

src/context.ts

@@ -1,276 +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 debug from 'debug';
-import * as playwright from 'playwright';
-
-import { logUnhandledError } from './utils/log.js';
-import { Tab } from './tab.js';
-import { outputFile  } from './config.js';
-
-import type { FullConfig } from './config.js';
-import type { Tool } from './tools/tool.js';
-import type { BrowserContextFactory, ClientInfo } from './browserContextFactory.js';
-import type * as actions from './actions.js';
-import type { SessionLog } from './sessionLog.js';
-
-const testDebug = debug('pw:mcp:test');
-
-type ContextOptions = {
-  tools: Tool[];
-  config: FullConfig;
-  browserContextFactory: BrowserContextFactory;
-  sessionLog: SessionLog | undefined;
-  clientInfo: ClientInfo;
-};
-
-export class Context {
-  readonly tools: Tool[];
-  readonly config: FullConfig;
-  readonly sessionLog: SessionLog | undefined;
-  readonly options: ContextOptions;
-  private _browserContextPromise: Promise<{ browserContext: playwright.BrowserContext, close: () => Promise<void> }> | undefined;
-  private _browserContextFactory: BrowserContextFactory;
-  private _tabs: Tab[] = [];
-  private _currentTab: Tab | undefined;
-  private _clientInfo: ClientInfo;
-
-  private static _allContexts: Set<Context> = new Set();
-  private _closeBrowserContextPromise: Promise<void> | undefined;
-  private _isRunningTool: boolean = false;
-  private _abortController = new AbortController();
-
-  constructor(options: ContextOptions) {
-    this.tools = options.tools;
-    this.config = options.config;
-    this.sessionLog = options.sessionLog;
-    this.options = options;
-    this._browserContextFactory = options.browserContextFactory;
-    this._clientInfo = options.clientInfo;
-    testDebug('create context');
-    Context._allContexts.add(this);
-  }
-
-  static async disposeAll() {
-    await Promise.all([...Context._allContexts].map(context => context.dispose()));
-  }
-
-  tabs(): Tab[] {
-    return this._tabs;
-  }
-
-  currentTab(): Tab | undefined {
-    return this._currentTab;
-  }
-
-  currentTabOrDie(): Tab {
-    if (!this._currentTab)
-      throw new Error('No open pages available. Use the "browser_navigate" tool to navigate to a page first.');
-    return this._currentTab;
-  }
-
-  async newTab(): Promise<Tab> {
-    const { browserContext } = await this._ensureBrowserContext();
-    const page = await browserContext.newPage();
-    this._currentTab = this._tabs.find(t => t.page === page)!;
-    return this._currentTab;
-  }
-
-  async selectTab(index: number) {
-    const tab = this._tabs[index];
-    if (!tab)
-      throw new Error(`Tab ${index} not found`);
-    await tab.page.bringToFront();
-    this._currentTab = tab;
-    return tab;
-  }
-
-  async ensureTab(): Promise<Tab> {
-    const { browserContext } = await this._ensureBrowserContext();
-    if (!this._currentTab)
-      await browserContext.newPage();
-    return this._currentTab!;
-  }
-
-  async closeTab(index: number | undefined): Promise<string> {
-    const tab = index === undefined ? this._currentTab : this._tabs[index];
-    if (!tab)
-      throw new Error(`Tab ${index} not found`);
-    const url = tab.page.url();
-    await tab.page.close();
-    return url;
-  }
-
-  async outputFile(name: string): Promise<string> {
-    return outputFile(this.config, this._clientInfo.rootPath, name);
-  }
-
-  private _onPageCreated(page: playwright.Page) {
-    const tab = new Tab(this, page, tab => this._onPageClosed(tab));
-    this._tabs.push(tab);
-    if (!this._currentTab)
-      this._currentTab = tab;
-  }
-
-  private _onPageClosed(tab: Tab) {
-    const index = this._tabs.indexOf(tab);
-    if (index === -1)
-      return;
-    this._tabs.splice(index, 1);
-
-    if (this._currentTab === tab)
-      this._currentTab = this._tabs[Math.min(index, this._tabs.length - 1)];
-    if (!this._tabs.length)
-      void this.closeBrowserContext();
-  }
-
-  async closeBrowserContext() {
-    if (!this._closeBrowserContextPromise)
-      this._closeBrowserContextPromise = this._closeBrowserContextImpl().catch(logUnhandledError);
-    await this._closeBrowserContextPromise;
-    this._closeBrowserContextPromise = undefined;
-  }
-
-  isRunningTool() {
-    return this._isRunningTool;
-  }
-
-  setRunningTool(isRunningTool: boolean) {
-    this._isRunningTool = isRunningTool;
-  }
-
-  private async _closeBrowserContextImpl() {
-    if (!this._browserContextPromise)
-      return;
-
-    testDebug('close context');
-
-    const promise = this._browserContextPromise;
-    this._browserContextPromise = undefined;
-
-    await promise.then(async ({ browserContext, close }) => {
-      if (this.config.saveTrace)
-        await browserContext.tracing.stop();
-      await close();
-    });
-  }
-
-  async dispose() {
-    this._abortController.abort('MCP context disposed');
-    await this.closeBrowserContext();
-    Context._allContexts.delete(this);
-  }
-
-  private async _setupRequestInterception(context: playwright.BrowserContext) {
-    if (this.config.network?.allowedOrigins?.length) {
-      await context.route('**', route => route.abort('blockedbyclient'));
-
-      for (const origin of this.config.network.allowedOrigins)
-        await context.route(`*://${origin}/**`, route => route.continue());
-    }
-
-    if (this.config.network?.blockedOrigins?.length) {
-      for (const origin of this.config.network.blockedOrigins)
-        await context.route(`*://${origin}/**`, route => route.abort('blockedbyclient'));
-    }
-  }
-
-  private _ensureBrowserContext() {
-    if (!this._browserContextPromise) {
-      this._browserContextPromise = this._setupBrowserContext();
-      this._browserContextPromise.catch(() => {
-        this._browserContextPromise = undefined;
-      });
-    }
-    return this._browserContextPromise;
-  }
-
-  private async _setupBrowserContext(): Promise<{ browserContext: playwright.BrowserContext, close: () => Promise<void> }> {
-    if (this._closeBrowserContextPromise)
-      throw new Error('Another browser context is being closed.');
-    // TODO: move to the browser context factory to make it based on isolation mode.
-    const result = await this._browserContextFactory.createContext(this._clientInfo, this._abortController.signal);
-    const { browserContext } = result;
-    await this._setupRequestInterception(browserContext);
-    if (this.sessionLog)
-      await InputRecorder.create(this, browserContext);
-    for (const page of browserContext.pages())
-      this._onPageCreated(page);
-    browserContext.on('page', page => this._onPageCreated(page));
-    if (this.config.saveTrace) {
-      await browserContext.tracing.start({
-        name: 'trace',
-        screenshots: false,
-        snapshots: true,
-        sources: false,
-      });
-    }
-    return result;
-  }
-}
-
-export class InputRecorder {
-  private _context: Context;
-  private _browserContext: playwright.BrowserContext;
-
-  private constructor(context: Context, browserContext: playwright.BrowserContext) {
-    this._context = context;
-    this._browserContext = browserContext;
-  }
-
-  static async create(context: Context, browserContext: playwright.BrowserContext) {
-    const recorder = new InputRecorder(context, browserContext);
-    await recorder._initialize();
-    return recorder;
-  }
-
-  private async _initialize() {
-    const sessionLog = this._context.sessionLog!;
-    await (this._browserContext as any)._enableRecorder({
-      mode: 'recording',
-      recorderMode: 'api',
-    }, {
-      actionAdded: (page: playwright.Page, data: actions.ActionInContext, code: string) => {
-        if (this._context.isRunningTool())
-          return;
-        const tab = Tab.forPage(page);
-        if (tab)
-          sessionLog.logUserAction(data.action, tab, code, false);
-      },
-      actionUpdated: (page: playwright.Page, data: actions.ActionInContext, code: string) => {
-        if (this._context.isRunningTool())
-          return;
-        const tab = Tab.forPage(page);
-        if (tab)
-          sessionLog.logUserAction(data.action, tab, code, true);
-      },
-      signalAdded: (page: playwright.Page, data: actions.SignalInContext) => {
-        if (this._context.isRunningTool())
-          return;
-        if (data.signal.name !== 'navigation')
-          return;
-        const tab = Tab.forPage(page);
-        const navigateAction: actions.Action = {
-          name: 'navigate',
-          url: data.signal.url,
-          signals: [],
-        };
-        if (tab)
-          sessionLog.logUserAction(navigateAction, tab, `await page.goto('${data.signal.url}');`, false);
-      },
-    });
-  }
-}

src/extension/DEPS.list

@@ -1,3 +0,0 @@
-[*]
-../mcp/
-../utils/

src/extension/cdpRelay.ts

@@ -1,415 +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.
- */
-
-/**
- * WebSocket server that bridges Playwright MCP and Chrome Extension
- *
- * Endpoints:
- * - /cdp/guid - Full CDP interface for Playwright MCP
- * - /extension/guid - Extension connection for chrome.debugger forwarding
- */
-
-import { spawn } from 'child_process';
-import http from 'http';
-import debug from 'debug';
-import { WebSocket, WebSocketServer } from 'ws';
-import { httpAddressToString } from '../mcp/http.js';
-import { logUnhandledError } from '../utils/log.js';
-import { ManualPromise } from '../utils/manualPromise.js';
-import { packageJSON } from '../utils/package.js';
-
-import type websocket from 'ws';
-import type { ClientInfo } from '../browserContextFactory.js';
-
-// @ts-ignore
-const { registry } = await import('playwright-core/lib/server/registry/index');
-
-const debugLogger = debug('pw:mcp:relay');
-
-type CDPCommand = {
-  id: number;
-  sessionId?: string;
-  method: string;
-  params?: any;
-};
-
-type CDPResponse = {
-  id?: number;
-  sessionId?: string;
-  method?: string;
-  params?: any;
-  result?: any;
-  error?: { code?: number; message: string };
-};
-
-export class CDPRelayServer {
-  private _wsHost: string;
-  private _browserChannel: string;
-  private _userDataDir?: string;
-  private _cdpPath: string;
-  private _extensionPath: string;
-  private _wss: WebSocketServer;
-  private _playwrightConnection: WebSocket | null = null;
-  private _extensionConnection: ExtensionConnection | null = null;
-  private _connectedTabInfo: {
-    targetInfo: any;
-    // Page sessionId that should be used by this connection.
-    sessionId: string;
-  } | undefined;
-  private _nextSessionId: number = 1;
-  private _extensionConnectionPromise!: ManualPromise<void>;
-
-  constructor(server: http.Server, browserChannel: string, userDataDir?: string) {
-    this._wsHost = httpAddressToString(server.address()).replace(/^http/, 'ws');
-    this._browserChannel = browserChannel;
-    this._userDataDir = userDataDir;
-
-    const uuid = crypto.randomUUID();
-    this._cdpPath = `/cdp/${uuid}`;
-    this._extensionPath = `/extension/${uuid}`;
-
-    this._resetExtensionConnection();
-    this._wss = new WebSocketServer({ server });
-    this._wss.on('connection', this._onConnection.bind(this));
-  }
-
-  cdpEndpoint() {
-    return `${this._wsHost}${this._cdpPath}`;
-  }
-
-  extensionEndpoint() {
-    return `${this._wsHost}${this._extensionPath}`;
-  }
-
-  async ensureExtensionConnectionForMCPContext(clientInfo: ClientInfo, abortSignal: AbortSignal) {
-    debugLogger('Ensuring extension connection for MCP context');
-    if (this._extensionConnection)
-      return;
-    this._connectBrowser(clientInfo);
-    debugLogger('Waiting for incoming extension connection');
-    await Promise.race([
-      this._extensionConnectionPromise,
-      new Promise((_, reject) => setTimeout(() => {
-        reject(new Error(`Extension connection timeout. Make sure the "Playwright MCP Bridge" extension is installed. See https://github.com/microsoft/playwright-mcp/blob/main/extension/README.md for installation instructions.`));
-      }, process.env.PWMCP_TEST_CONNECTION_TIMEOUT ? parseInt(process.env.PWMCP_TEST_CONNECTION_TIMEOUT, 10) : 5_000)),
-      new Promise((_, reject) => abortSignal.addEventListener('abort', reject))
-    ]);
-    debugLogger('Extension connection established');
-  }
-
-  private _connectBrowser(clientInfo: ClientInfo) {
-    const mcpRelayEndpoint = `${this._wsHost}${this._extensionPath}`;
-    // Need to specify "key" in the manifest.json to make the id stable when loading from file.
-    const url = new URL('chrome-extension://jakfalbnbhgkpmoaakfflhflbfpkailf/connect.html');
-    url.searchParams.set('mcpRelayUrl', mcpRelayEndpoint);
-    const client = {
-      name: clientInfo.name,
-      version: clientInfo.version,
-    };
-    url.searchParams.set('client', JSON.stringify(client));
-    url.searchParams.set('pwMcpVersion', packageJSON.version);
-    const href = url.toString();
-    const executableInfo = registry.findExecutable(this._browserChannel);
-    if (!executableInfo)
-      throw new Error(`Unsupported channel: "${this._browserChannel}"`);
-    const executablePath = executableInfo.executablePath();
-    if (!executablePath)
-      throw new Error(`"${this._browserChannel}" executable not found. Make sure it is installed at a standard location.`);
-
-    const args: string[] = [];
-    if (this._userDataDir)
-      args.push(`--user-data-dir=${this._userDataDir}`);
-    args.push(href);
-
-    spawn(executablePath, args, {
-      windowsHide: true,
-      detached: true,
-      shell: false,
-      stdio: 'ignore',
-    });
-  }
-
-  stop(): void {
-    this.closeConnections('Server stopped');
-    this._wss.close();
-  }
-
-  closeConnections(reason: string) {
-    this._closePlaywrightConnection(reason);
-    this._closeExtensionConnection(reason);
-  }
-
-  private _onConnection(ws: WebSocket, request: http.IncomingMessage): void {
-    const url = new URL(`http://localhost${request.url}`);
-    debugLogger(`New connection to ${url.pathname}`);
-    if (url.pathname === this._cdpPath) {
-      this._handlePlaywrightConnection(ws);
-    } else if (url.pathname === this._extensionPath) {
-      this._handleExtensionConnection(ws);
-    } else {
-      debugLogger(`Invalid path: ${url.pathname}`);
-      ws.close(4004, 'Invalid path');
-    }
-  }
-
-  private _handlePlaywrightConnection(ws: WebSocket): void {
-    if (this._playwrightConnection) {
-      debugLogger('Rejecting second Playwright connection');
-      ws.close(1000, 'Another CDP client already connected');
-      return;
-    }
-    this._playwrightConnection = ws;
-    ws.on('message', async data => {
-      try {
-        const message = JSON.parse(data.toString());
-        await this._handlePlaywrightMessage(message);
-      } catch (error: any) {
-        debugLogger(`Error while handling Playwright message\n${data.toString()}\n`, error);
-      }
-    });
-    ws.on('close', () => {
-      if (this._playwrightConnection !== ws)
-        return;
-      this._playwrightConnection = null;
-      this._closeExtensionConnection('Playwright client disconnected');
-      debugLogger('Playwright WebSocket closed');
-    });
-    ws.on('error', error => {
-      debugLogger('Playwright WebSocket error:', error);
-    });
-    debugLogger('Playwright MCP connected');
-  }
-
-  private _closeExtensionConnection(reason: string) {
-    this._extensionConnection?.close(reason);
-    this._extensionConnectionPromise.reject(new Error(reason));
-    this._resetExtensionConnection();
-  }
-
-  private _resetExtensionConnection() {
-    this._connectedTabInfo = undefined;
-    this._extensionConnection = null;
-    this._extensionConnectionPromise = new ManualPromise();
-    void this._extensionConnectionPromise.catch(logUnhandledError);
-  }
-
-  private _closePlaywrightConnection(reason: string) {
-    if (this._playwrightConnection?.readyState === WebSocket.OPEN)
-      this._playwrightConnection.close(1000, reason);
-    this._playwrightConnection = null;
-  }
-
-  private _handleExtensionConnection(ws: WebSocket): void {
-    if (this._extensionConnection) {
-      ws.close(1000, 'Another extension connection already established');
-      return;
-    }
-    this._extensionConnection = new ExtensionConnection(ws);
-    this._extensionConnection.onclose = (c, reason) => {
-      debugLogger('Extension WebSocket closed:', reason, c === this._extensionConnection);
-      if (this._extensionConnection !== c)
-        return;
-      this._resetExtensionConnection();
-      this._closePlaywrightConnection(`Extension disconnected: ${reason}`);
-    };
-    this._extensionConnection.onmessage = this._handleExtensionMessage.bind(this);
-    this._extensionConnectionPromise.resolve();
-  }
-
-  private _handleExtensionMessage(method: string, params: any) {
-    switch (method) {
-      case 'forwardCDPEvent':
-        const sessionId = params.sessionId || this._connectedTabInfo?.sessionId;
-        this._sendToPlaywright({
-          sessionId,
-          method: params.method,
-          params: params.params
-        });
-        break;
-      case 'detachedFromTab':
-        debugLogger('← Debugger detached from tab:', params);
-        this._connectedTabInfo = undefined;
-        break;
-    }
-  }
-
-  private async _handlePlaywrightMessage(message: CDPCommand): Promise<void> {
-    debugLogger('← Playwright:', `${message.method} (id=${message.id})`);
-    const { id, sessionId, method, params } = message;
-    try {
-      const result = await this._handleCDPCommand(method, params, sessionId);
-      this._sendToPlaywright({ id, sessionId, result });
-    } catch (e) {
-      debugLogger('Error in the extension:', e);
-      this._sendToPlaywright({
-        id,
-        sessionId,
-        error: { message: (e as Error).message }
-      });
-    }
-  }
-
-  private async _handleCDPCommand(method: string, params: any, sessionId: string | undefined): Promise<any> {
-    switch (method) {
-      case 'Browser.getVersion': {
-        return {
-          protocolVersion: '1.3',
-          product: 'Chrome/Extension-Bridge',
-          userAgent: 'CDP-Bridge-Server/1.0.0',
-        };
-      }
-      case 'Browser.setDownloadBehavior': {
-        return { };
-      }
-      case 'Target.setAutoAttach': {
-        // Forward child session handling.
-        if (sessionId)
-          break;
-        // Simulate auto-attach behavior with real target info
-        const { targetInfo } = await this._extensionConnection!.send('attachToTab');
-        this._connectedTabInfo = {
-          targetInfo,
-          sessionId: `pw-tab-${this._nextSessionId++}`,
-        };
-        debugLogger('Simulating auto-attach');
-        this._sendToPlaywright({
-          method: 'Target.attachedToTarget',
-          params: {
-            sessionId: this._connectedTabInfo.sessionId,
-            targetInfo: {
-              ...this._connectedTabInfo.targetInfo,
-              attached: true,
-            },
-            waitingForDebugger: false
-          }
-        });
-        return { };
-      }
-      case 'Target.getTargetInfo': {
-        return this._connectedTabInfo?.targetInfo;
-      }
-    }
-    return await this._forwardToExtension(method, params, sessionId);
-  }
-
-  private async _forwardToExtension(method: string, params: any, sessionId: string | undefined): Promise<any> {
-    if (!this._extensionConnection)
-      throw new Error('Extension not connected');
-    // Top level sessionId is only passed between the relay and the client.
-    if (this._connectedTabInfo?.sessionId === sessionId)
-      sessionId = undefined;
-    return await this._extensionConnection.send('forwardCDPCommand', { sessionId, method, params });
-  }
-
-  private _sendToPlaywright(message: CDPResponse): void {
-    debugLogger('→ Playwright:', `${message.method ?? `response(id=${message.id})`}`);
-    this._playwrightConnection?.send(JSON.stringify(message));
-  }
-}
-
-type ExtensionResponse = {
-  id?: number;
-  method?: string;
-  params?: any;
-  result?: any;
-  error?: string;
-};
-
-class ExtensionConnection {
-  private readonly _ws: WebSocket;
-  private readonly _callbacks = new Map<number, { resolve: (o: any) => void, reject: (e: Error) => void, error: Error }>();
-  private _lastId = 0;
-
-  onmessage?: (method: string, params: any) => void;
-  onclose?: (self: ExtensionConnection, reason: string) => void;
-
-  constructor(ws: WebSocket) {
-    this._ws = ws;
-    this._ws.on('message', this._onMessage.bind(this));
-    this._ws.on('close', this._onClose.bind(this));
-    this._ws.on('error', this._onError.bind(this));
-  }
-
-  async send(method: string, params?: any, sessionId?: string): Promise<any> {
-    if (this._ws.readyState !== WebSocket.OPEN)
-      throw new Error(`Unexpected WebSocket state: ${this._ws.readyState}`);
-    const id = ++this._lastId;
-    this._ws.send(JSON.stringify({ id, method, params, sessionId }));
-    const error = new Error(`Protocol error: ${method}`);
-    return new Promise((resolve, reject) => {
-      this._callbacks.set(id, { resolve, reject, error });
-    });
-  }
-
-  close(message: string) {
-    debugLogger('closing extension connection:', message);
-    if (this._ws.readyState === WebSocket.OPEN)
-      this._ws.close(1000, message);
-  }
-
-  private _onMessage(event: websocket.RawData) {
-    const eventData = event.toString();
-    let parsedJson;
-    try {
-      parsedJson = JSON.parse(eventData);
-    } catch (e: any) {
-      debugLogger(`<closing ws> Closing websocket due to malformed JSON. eventData=${eventData} e=${e?.message}`);
-      this._ws.close();
-      return;
-    }
-    try {
-      this._handleParsedMessage(parsedJson);
-    } catch (e: any) {
-      debugLogger(`<closing ws> Closing websocket due to failed onmessage callback. eventData=${eventData} e=${e?.message}`);
-      this._ws.close();
-    }
-  }
-
-  private _handleParsedMessage(object: ExtensionResponse) {
-    if (object.id && this._callbacks.has(object.id)) {
-      const callback = this._callbacks.get(object.id)!;
-      this._callbacks.delete(object.id);
-      if (object.error) {
-        const error = callback.error;
-        error.message = object.error;
-        callback.reject(error);
-      } else {
-        callback.resolve(object.result);
-      }
-    } else if (object.id) {
-      debugLogger('← Extension: unexpected response', object);
-    } else {
-      this.onmessage?.(object.method!, object.params);
-    }
-  }
-
-  private _onClose(event: websocket.CloseEvent) {
-    debugLogger(`<ws closed> code=${event.code} reason=${event.reason}`);
-    this._dispose();
-    this.onclose?.(this, event.reason);
-  }
-
-  private _onError(event: websocket.ErrorEvent) {
-    debugLogger(`<ws error> message=${event.message} type=${event.type} target=${event.target}`);
-    this._dispose();
-  }
-
-  private _dispose() {
-    for (const callback of this._callbacks.values())
-      callback.reject(new Error('WebSocket closed'));
-    this._callbacks.clear();
-  }
-}

src/extension/extensionContextFactory.ts

@@ -1,63 +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 debug from 'debug';
-import * as playwright from 'playwright';
-import { startHttpServer } from '../mcp/http.js';
-import { CDPRelayServer } from './cdpRelay.js';
-
-import type { BrowserContextFactory, ClientInfo } from '../browserContextFactory.js';
-
-const debugLogger = debug('pw:mcp:relay');
-
-export class ExtensionContextFactory implements BrowserContextFactory {
-  private _browserChannel: string;
-  private _userDataDir?: string;
-
-  constructor(browserChannel: string, userDataDir: string | undefined) {
-    this._browserChannel = browserChannel;
-    this._userDataDir = userDataDir;
-  }
-
-  async createContext(clientInfo: ClientInfo, abortSignal: AbortSignal): Promise<{ browserContext: playwright.BrowserContext, close: () => Promise<void> }> {
-    const browser = await this._obtainBrowser(clientInfo, abortSignal);
-    return {
-      browserContext: browser.contexts()[0],
-      close: async () => {
-        debugLogger('close() called for browser context');
-        await browser.close();
-      }
-    };
-  }
-
-  private async _obtainBrowser(clientInfo: ClientInfo, abortSignal: AbortSignal): Promise<playwright.Browser> {
-    const relay = await this._startRelay(abortSignal);
-    await relay.ensureExtensionConnectionForMCPContext(clientInfo, abortSignal);
-    return await playwright.chromium.connectOverCDP(relay.cdpEndpoint());
-  }
-
-  private async _startRelay(abortSignal: AbortSignal) {
-    const httpServer = await startHttpServer({});
-    if (abortSignal.aborted) {
-      httpServer.close();
-      throw new Error(abortSignal.reason);
-    }
-    const cdpRelayServer = new CDPRelayServer(httpServer, this._browserChannel, this._userDataDir);
-    abortSignal.addEventListener('abort', () => cdpRelayServer.stop());
-    debugLogger(`CDP relay server started, extension endpoint: ${cdpRelayServer.extensionEndpoint()}.`);
-    return cdpRelayServer;
-  }
-}

src/index.ts

@@ -1,51 +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 { BrowserServerBackend } from './browserServerBackend.js';
-import { resolveConfig } from './config.js';
-import { contextFactory } from './browserContextFactory.js';
-import * as mcpServer from './mcp/server.js';
-import { packageJSON } from './utils/package.js';
-
-import type { Config } from '../config.js';
-import type { BrowserContext } from 'playwright';
-import type { BrowserContextFactory } from './browserContextFactory.js';
-import type { Server } from '@modelcontextprotocol/sdk/server/index.js';
-
-export async function createConnection(userConfig: Config = {}, contextGetter?: () => Promise<BrowserContext>): Promise<Server> {
-  const config = await resolveConfig(userConfig);
-  const factory = contextGetter ? new SimpleBrowserContextFactory(contextGetter) : contextFactory(config);
-  return mcpServer.createServer('Playwright', packageJSON.version, new BrowserServerBackend(config, factory), false);
-}
-
-class SimpleBrowserContextFactory implements BrowserContextFactory {
-  name = 'custom';
-  description = 'Connect to a browser using a custom context getter';
-
-  private readonly _contextGetter: () => Promise<BrowserContext>;
-
-  constructor(contextGetter: () => Promise<BrowserContext>) {
-    this._contextGetter = contextGetter;
-  }
-
-  async createContext(): Promise<{ browserContext: BrowserContext, close: () => Promise<void> }> {
-    const browserContext = await this._contextGetter();
-    return {
-      browserContext,
-      close: () => browserContext.close()
-    };
-  }
-}

src/loop/loop.ts

@@ -1,108 +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 debug from 'debug';
-import type { Tool, ImageContent, TextContent } from '@modelcontextprotocol/sdk/types.js';
-import type { Client } from '@modelcontextprotocol/sdk/client/index.js';
-
-export type LLMToolCall = {
-  name: string;
-  arguments: any;
-  id: string;
-};
-
-export type LLMTool = {
-  name: string;
-  description: string;
-  inputSchema: any;
-};
-
-export type LLMMessage =
-  | { role: 'user'; content: string }
-  | { role: 'assistant'; content: string; toolCalls?: LLMToolCall[] }
-  | { role: 'tool'; toolCallId: string; content: string; isError?: boolean };
-
-export type LLMConversation = {
-  messages: LLMMessage[];
-  tools: LLMTool[];
-};
-
-export interface LLMDelegate {
-  createConversation(task: string, tools: Tool[], oneShot: boolean): LLMConversation;
-  makeApiCall(conversation: LLMConversation): Promise<LLMToolCall[]>;
-  addToolResults(conversation: LLMConversation, results: Array<{ toolCallId: string; content: string; isError?: boolean }>): void;
-  checkDoneToolCall(toolCall: LLMToolCall): string | null;
-}
-
-export async function runTask(delegate: LLMDelegate, client: Client, task: string, oneShot: boolean = false): Promise<LLMMessage[]> {
-  const { tools } = await client.listTools();
-  const taskContent = oneShot ? `Perform following task: ${task}.` : `Perform following task: ${task}. Once the task is complete, call the "done" tool.`;
-  const conversation = delegate.createConversation(taskContent, tools, oneShot);
-
-  for (let iteration = 0; iteration < 5; ++iteration) {
-    debug('history')('Making API call for iteration', iteration);
-    const toolCalls = await delegate.makeApiCall(conversation);
-    if (toolCalls.length === 0)
-      throw new Error('Call the "done" tool when the task is complete.');
-
-    const toolResults: Array<{ toolCallId: string; content: string; isError?: boolean }> = [];
-    for (const toolCall of toolCalls) {
-      const doneResult = delegate.checkDoneToolCall(toolCall);
-      if (doneResult !== null)
-        return conversation.messages;
-
-      const { name, arguments: args, id } = toolCall;
-      try {
-        debug('tool')(name, args);
-        const response = await client.callTool({
-          name,
-          arguments: args,
-        });
-        const responseContent = (response.content || []) as (TextContent | ImageContent)[];
-        debug('tool')(responseContent);
-        const text = responseContent.filter(part => part.type === 'text').map(part => part.text).join('\n');
-
-        toolResults.push({
-          toolCallId: id,
-          content: text,
-        });
-      } catch (error) {
-        debug('tool')(error);
-        toolResults.push({
-          toolCallId: id,
-          content: `Error while executing tool "${name}": ${error instanceof Error ? error.message : String(error)}\n\nPlease try to recover and complete the task.`,
-          isError: true,
-        });
-
-        // Skip remaining tool calls for this iteration
-        for (const remainingToolCall of toolCalls.slice(toolCalls.indexOf(toolCall) + 1)) {
-          toolResults.push({
-            toolCallId: remainingToolCall.id,
-            content: `This tool call is skipped due to previous error.`,
-            isError: true,
-          });
-        }
-        break;
-      }
-    }
-
-    delegate.addToolResults(conversation, toolResults);
-    if (oneShot)
-      return conversation.messages;
-  }
-
-  throw new Error('Failed to perform step, max attempts reached');
-}

src/loop/loopClaude.ts

@@ -1,177 +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 type Anthropic from '@anthropic-ai/sdk';
-import type { LLMDelegate, LLMConversation, LLMToolCall, LLMTool } from './loop.js';
-import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-
-const model = 'claude-sonnet-4-20250514';
-
-export class ClaudeDelegate implements LLMDelegate {
-  private _anthropic: Anthropic | undefined;
-
-  async anthropic(): Promise<Anthropic> {
-    if (!this._anthropic) {
-      const anthropic = await import('@anthropic-ai/sdk');
-      this._anthropic = new anthropic.Anthropic();
-    }
-    return this._anthropic;
-  }
-
-  createConversation(task: string, tools: Tool[], oneShot: boolean): LLMConversation {
-    const llmTools: LLMTool[] = tools.map(tool => ({
-      name: tool.name,
-      description: tool.description || '',
-      inputSchema: tool.inputSchema,
-    }));
-
-    if (!oneShot) {
-      llmTools.push({
-        name: 'done',
-        description: 'Call this tool when the task is complete.',
-        inputSchema: {
-          type: 'object',
-          properties: {},
-        },
-      });
-    }
-
-    return {
-      messages: [{
-        role: 'user',
-        content: task
-      }],
-      tools: llmTools,
-    };
-  }
-
-  async makeApiCall(conversation: LLMConversation): Promise<LLMToolCall[]> {
-    // Convert generic messages to Claude format
-    const claudeMessages: Anthropic.Messages.MessageParam[] = [];
-
-    for (const message of conversation.messages) {
-      if (message.role === 'user') {
-        claudeMessages.push({
-          role: 'user',
-          content: message.content
-        });
-      } else if (message.role === 'assistant') {
-        const content: Anthropic.Messages.ContentBlock[] = [];
-
-        // Add text content
-        if (message.content) {
-          content.push({
-            type: 'text',
-            text: message.content,
-            citations: []
-          });
-        }
-
-        // Add tool calls
-        if (message.toolCalls) {
-          for (const toolCall of message.toolCalls) {
-            content.push({
-              type: 'tool_use',
-              id: toolCall.id,
-              name: toolCall.name,
-              input: toolCall.arguments
-            });
-          }
-        }
-
-        claudeMessages.push({
-          role: 'assistant',
-          content
-        });
-      } else if (message.role === 'tool') {
-        // Tool results are added differently - we need to find if there's already a user message with tool results
-        const lastMessage = claudeMessages[claudeMessages.length - 1];
-        const toolResult: Anthropic.Messages.ToolResultBlockParam = {
-          type: 'tool_result',
-          tool_use_id: message.toolCallId,
-          content: message.content,
-          is_error: message.isError,
-        };
-
-        if (lastMessage && lastMessage.role === 'user' && Array.isArray(lastMessage.content)) {
-          // Add to existing tool results message
-          (lastMessage.content as Anthropic.Messages.ToolResultBlockParam[]).push(toolResult);
-        } else {
-          // Create new tool results message
-          claudeMessages.push({
-            role: 'user',
-            content: [toolResult]
-          });
-        }
-      }
-    }
-
-    // Convert generic tools to Claude format
-    const claudeTools: Anthropic.Messages.Tool[] = conversation.tools.map(tool => ({
-      name: tool.name,
-      description: tool.description,
-      input_schema: tool.inputSchema,
-    }));
-
-    const anthropic = await this.anthropic();
-    const response = await anthropic.messages.create({
-      model,
-      max_tokens: 10000,
-      messages: claudeMessages,
-      tools: claudeTools,
-    });
-
-    // Extract tool calls and add assistant message to generic conversation
-    const toolCalls = response.content.filter(block => block.type === 'tool_use') as Anthropic.Messages.ToolUseBlock[];
-    const textContent = response.content.filter(block => block.type === 'text').map(block => (block as Anthropic.Messages.TextBlock).text).join('');
-
-    const llmToolCalls: LLMToolCall[] = toolCalls.map(toolCall => ({
-      name: toolCall.name,
-      arguments: toolCall.input as any,
-      id: toolCall.id,
-    }));
-
-    // Add assistant message to generic conversation
-    conversation.messages.push({
-      role: 'assistant',
-      content: textContent,
-      toolCalls: llmToolCalls.length > 0 ? llmToolCalls : undefined
-    });
-
-    return llmToolCalls;
-  }
-
-  addToolResults(
-    conversation: LLMConversation,
-    results: Array<{ toolCallId: string; content: string; isError?: boolean }>
-  ): void {
-    for (const result of results) {
-      conversation.messages.push({
-        role: 'tool',
-        toolCallId: result.toolCallId,
-        content: result.content,
-        isError: result.isError,
-      });
-    }
-  }
-
-  checkDoneToolCall(toolCall: LLMToolCall): string | null {
-    if (toolCall.name === 'done')
-      return (toolCall.arguments as { result: string }).result;
-
-    return null;
-  }
-}

src/loop/loopOpenAI.ts

@@ -1,168 +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 type OpenAI from 'openai';
-import type { LLMDelegate, LLMConversation, LLMToolCall, LLMTool } from './loop.js';
-import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-
-const model = 'gpt-4.1';
-
-export class OpenAIDelegate implements LLMDelegate {
-  private _openai: OpenAI | undefined;
-
-  async openai(): Promise<OpenAI> {
-    if (!this._openai) {
-      const oai = await import('openai');
-      this._openai = new oai.OpenAI();
-    }
-    return this._openai;
-  }
-
-  createConversation(task: string, tools: Tool[], oneShot: boolean): LLMConversation {
-    const genericTools: LLMTool[] = tools.map(tool => ({
-      name: tool.name,
-      description: tool.description || '',
-      inputSchema: tool.inputSchema,
-    }));
-
-    if (!oneShot) {
-      genericTools.push({
-        name: 'done',
-        description: 'Call this tool when the task is complete.',
-        inputSchema: {
-          type: 'object',
-          properties: {},
-        },
-      });
-    }
-
-    return {
-      messages: [{
-        role: 'user',
-        content: task
-      }],
-      tools: genericTools,
-    };
-  }
-
-  async makeApiCall(conversation: LLMConversation): Promise<LLMToolCall[]> {
-    // Convert generic messages to OpenAI format
-    const openaiMessages: OpenAI.Chat.Completions.ChatCompletionMessageParam[] = [];
-
-    for (const message of conversation.messages) {
-      if (message.role === 'user') {
-        openaiMessages.push({
-          role: 'user',
-          content: message.content
-        });
-      } else if (message.role === 'assistant') {
-        const toolCalls: OpenAI.Chat.Completions.ChatCompletionMessageToolCall[] = [];
-
-        if (message.toolCalls) {
-          for (const toolCall of message.toolCalls) {
-            toolCalls.push({
-              id: toolCall.id,
-              type: 'function',
-              function: {
-                name: toolCall.name,
-                arguments: JSON.stringify(toolCall.arguments)
-              }
-            });
-          }
-        }
-
-        const assistantMessage: OpenAI.Chat.Completions.ChatCompletionAssistantMessageParam = {
-          role: 'assistant'
-        };
-
-        if (message.content)
-          assistantMessage.content = message.content;
-
-        if (toolCalls.length > 0)
-          assistantMessage.tool_calls = toolCalls;
-
-        openaiMessages.push(assistantMessage);
-      } else if (message.role === 'tool') {
-        openaiMessages.push({
-          role: 'tool',
-          tool_call_id: message.toolCallId,
-          content: message.content,
-        });
-      }
-    }
-
-    // Convert generic tools to OpenAI format
-    const openaiTools: OpenAI.Chat.Completions.ChatCompletionTool[] = conversation.tools.map(tool => ({
-      type: 'function',
-      function: {
-        name: tool.name,
-        description: tool.description,
-        parameters: tool.inputSchema,
-      },
-    }));
-
-    const openai = await this.openai();
-    const response = await openai.chat.completions.create({
-      model,
-      messages: openaiMessages,
-      tools: openaiTools,
-      tool_choice: 'auto'
-    });
-
-    const message = response.choices[0].message;
-
-    // Extract tool calls and add assistant message to generic conversation
-    const toolCalls = message.tool_calls || [];
-    const genericToolCalls: LLMToolCall[] = toolCalls.map(toolCall => {
-      const functionCall = toolCall.function;
-      return {
-        name: functionCall.name,
-        arguments: JSON.parse(functionCall.arguments),
-        id: toolCall.id,
-      };
-    });
-
-    // Add assistant message to generic conversation
-    conversation.messages.push({
-      role: 'assistant',
-      content: message.content || '',
-      toolCalls: genericToolCalls.length > 0 ? genericToolCalls : undefined
-    });
-
-    return genericToolCalls;
-  }
-
-  addToolResults(
-    conversation: LLMConversation,
-    results: Array<{ toolCallId: string; content: string; isError?: boolean }>
-  ): void {
-    for (const result of results) {
-      conversation.messages.push({
-        role: 'tool',
-        toolCallId: result.toolCallId,
-        content: result.content,
-        isError: result.isError,
-      });
-    }
-  }
-
-  checkDoneToolCall(toolCall: LLMToolCall): string | null {
-    if (toolCall.name === 'done')
-      return toolCall.arguments.result;
-
-    return null;
-  }
-}

src/loop/main.ts

@@ -1,72 +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 path from 'path';
-import url from 'url';
-import dotenv from 'dotenv';
-
-import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { program } from 'commander';
-import { OpenAIDelegate } from './loopOpenAI.js';
-import { ClaudeDelegate } from './loopClaude.js';
-import { runTask } from './loop.js';
-
-import type { LLMDelegate } from './loop.js';
-
-dotenv.config();
-
-const __filename = url.fileURLToPath(import.meta.url);
-
-async function run(delegate: LLMDelegate) {
-  const transport = new StdioClientTransport({
-    command: 'node',
-    args: [
-      path.resolve(__filename, '../../../cli.js'),
-      '--save-session',
-      '--output-dir', path.resolve(__filename, '../../../sessions')
-    ],
-    stderr: 'inherit',
-    env: process.env as Record<string, string>,
-  });
-
-  const client = new Client({ name: 'test', version: '1.0.0' });
-  await client.connect(transport);
-  await client.ping();
-
-  for (const task of tasks) {
-    const messages = await runTask(delegate, client, task);
-    for (const message of messages)
-      console.log(`${message.role}: ${message.content}`);
-  }
-  await client.close();
-}
-
-const tasks = [
-  'Open https://playwright.dev/',
-];
-
-program
-    .option('--model <model>', 'model to use')
-    .action(async options => {
-      if (options.model === 'claude')
-        await run(new ClaudeDelegate());
-      else
-        await run(new OpenAIDelegate());
-    });
-void program.parseAsync(process.argv);

src/loopTools/DEPS.list

@@ -1,5 +0,0 @@
-[*]
-../
-../loop/
-../mcp/
-../utils/

src/loopTools/context.ts

@@ -1,78 +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 { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { contextFactory } from '../browserContextFactory.js';
-import { BrowserServerBackend } from '../browserServerBackend.js';
-import { Context as BrowserContext } from '../context.js';
-import { runTask } from '../loop/loop.js';
-import { OpenAIDelegate } from '../loop/loopOpenAI.js';
-import { ClaudeDelegate } from '../loop/loopClaude.js';
-import { InProcessTransport } from '../mcp/inProcessTransport.js';
-import * as mcpServer from '../mcp/server.js';
-import { packageJSON } from '../utils/package.js';
-
-import type { LLMDelegate } from '../loop/loop.js';
-import type { FullConfig } from '../config.js';
-
-export class Context {
-  readonly config: FullConfig;
-  private _client: Client;
-  private _delegate: LLMDelegate;
-
-  constructor(config: FullConfig, client: Client) {
-    this.config = config;
-    this._client = client;
-    if (process.env.OPENAI_API_KEY)
-      this._delegate = new OpenAIDelegate();
-    else if (process.env.ANTHROPIC_API_KEY)
-      this._delegate = new ClaudeDelegate();
-    else
-      throw new Error('No LLM API key found. Please set OPENAI_API_KEY or ANTHROPIC_API_KEY environment variable.');
-  }
-
-  static async create(config: FullConfig) {
-    const client = new Client({ name: 'Playwright Proxy', version: packageJSON.version });
-    const browserContextFactory = contextFactory(config);
-    const server = mcpServer.createServer('Playwright Subagent', packageJSON.version, new BrowserServerBackend(config, browserContextFactory), false);
-    await client.connect(new InProcessTransport(server));
-    await client.ping();
-    return new Context(config, client);
-  }
-
-  async runTask(task: string, oneShot: boolean = false): Promise<mcpServer.CallToolResult> {
-    const messages = await runTask(this._delegate, this._client!, task, oneShot);
-    const lines: string[] = [];
-
-    // Skip the first message, which is the user's task.
-    for (const message of messages.slice(1)) {
-      // Trim out all page snapshots.
-      if (!message.content.trim())
-        continue;
-      const index = oneShot ? -1 : message.content.indexOf('### Page state');
-      const trimmedContent = index === -1 ? message.content : message.content.substring(0, index);
-      lines.push(`[${message.role}]:`, trimmedContent);
-    }
-
-    return {
-      content: [{ type: 'text', text: lines.join('\n') }],
-    };
-  }
-
-  async close() {
-    await BrowserContext.disposeAll();
-  }
-}

src/loopTools/main.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 dotenv from 'dotenv';
-
-import * as mcpServer from '../mcp/server.js';
-import { packageJSON } from '../utils/package.js';
-import { Context } from './context.js';
-import { perform } from './perform.js';
-import { snapshot } from './snapshot.js';
-import { toMcpTool } from '../mcp/tool.js';
-
-import type { FullConfig } from '../config.js';
-import type { ServerBackend } from '../mcp/server.js';
-import type { Tool } from './tool.js';
-
-export async function runLoopTools(config: FullConfig) {
-  dotenv.config();
-  const serverBackendFactory = {
-    name: 'Playwright',
-    nameInConfig: 'playwright-loop',
-    version: packageJSON.version,
-    create: () => new LoopToolsServerBackend(config)
-  };
-  await mcpServer.start(serverBackendFactory, config.server);
-}
-
-class LoopToolsServerBackend implements ServerBackend {
-  private _config: FullConfig;
-  private _context: Context | undefined;
-  private _tools: Tool<any>[] = [perform, snapshot];
-
-  constructor(config: FullConfig) {
-    this._config = config;
-  }
-
-  async initialize() {
-    this._context = await Context.create(this._config);
-  }
-
-  async listTools(): Promise<mcpServer.Tool[]> {
-    return this._tools.map(tool => toMcpTool(tool.schema));
-  }
-
-  async callTool(name: string, args: mcpServer.CallToolRequest['params']['arguments']): Promise<mcpServer.CallToolResult> {
-    const tool = this._tools.find(tool => tool.schema.name === name)!;
-    const parsedArguments = tool.schema.inputSchema.parse(args || {});
-    return await tool.handle(this._context!, parsedArguments);
-  }
-
-  serverClosed() {
-    void this._context!.close();
-  }
-}

src/loopTools/perform.ts

@@ -1,36 +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 performSchema = z.object({
-  task: z.string().describe('The task to perform with the browser'),
-});
-
-export const perform = defineTool({
-  schema: {
-    name: 'browser_perform',
-    title: 'Perform a task with the browser',
-    description: 'Perform a task with the browser. It can click, type, export, capture screenshot, drag, hover, select options, etc.',
-    inputSchema: performSchema,
-    type: 'destructive',
-  },
-
-  handle: async (context, params) => {
-    return await context.runTask(params.task);
-  },
-});

src/loopTools/snapshot.ts

@@ -1,32 +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';
-
-export const snapshot = defineTool({
-  schema: {
-    name: 'browser_snapshot',
-    title: 'Take a snapshot of the browser',
-    description: 'Take a snapshot of the browser to read what is on the page.',
-    inputSchema: z.object({}),
-    type: 'readOnly',
-  },
-
-  handle: async (context, params) => {
-    return await context.runTask('Capture browser snapshot', true);
-  },
-});

src/loopTools/tool.ts

@@ -1,30 +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 type { z } from 'zod';
-import type * as mcpServer from '../mcp/server.js';
-import type { Context } from './context.js';
-import type { ToolSchema } from '../mcp/tool.js';
-
-
-export type Tool<Input extends z.Schema = z.Schema> = {
-  schema: ToolSchema<Input>;
-  handle: (context: Context, params: z.output<Input>) => Promise<mcpServer.CallToolResult>;
-};
-
-export function defineTool<Input extends z.Schema>(tool: Tool<Input>): Tool<Input> {
-  return tool;
-}

src/mcp/DEPS.list

@@ -1 +0,0 @@
-[*]

src/mcp/README.md

@@ -1 +0,0 @@
-- Generic MCP utils, no dependencies on anything.

src/mcp/http.ts

@@ -1,138 +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 assert from 'assert';
-import net from 'net';
-import http from 'http';
-import crypto from 'crypto';
-
-import debug from 'debug';
-
-import { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js';
-import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
-import * as mcpServer from './server.js';
-
-import type { ServerBackendFactory } from './server.js';
-
-const testDebug = debug('pw:mcp:test');
-
-export async function startHttpServer(config: { host?: string, port?: number }, abortSignal?: AbortSignal): Promise<http.Server> {
-  const { host, port } = config;
-  const httpServer = http.createServer();
-  await new Promise<void>((resolve, reject) => {
-    httpServer.on('error', reject);
-    abortSignal?.addEventListener('abort', () => {
-      httpServer.close();
-      reject(new Error('Aborted'));
-    });
-    httpServer.listen(port, host, () => {
-      resolve();
-      httpServer.removeListener('error', reject);
-    });
-  });
-  return httpServer;
-}
-
-export function httpAddressToString(address: string | net.AddressInfo | null): string {
-  assert(address, 'Could not bind server socket');
-  if (typeof address === 'string')
-    return address;
-  const resolvedPort = address.port;
-  let resolvedHost = address.family === 'IPv4' ? address.address : `[${address.address}]`;
-  if (resolvedHost === '0.0.0.0' || resolvedHost === '[::]')
-    resolvedHost = 'localhost';
-  return `http://${resolvedHost}:${resolvedPort}`;
-}
-
-export async function installHttpTransport(httpServer: http.Server, serverBackendFactory: ServerBackendFactory) {
-  const sseSessions = new Map();
-  const streamableSessions = new Map();
-  httpServer.on('request', async (req, res) => {
-    const url = new URL(`http://localhost${req.url}`);
-    if (url.pathname.startsWith('/sse'))
-      await handleSSE(serverBackendFactory, req, res, url, sseSessions);
-    else
-      await handleStreamable(serverBackendFactory, req, res, streamableSessions);
-  });
-}
-
-async function handleSSE(serverBackendFactory: ServerBackendFactory, req: http.IncomingMessage, res: http.ServerResponse, url: URL, sessions: Map<string, SSEServerTransport>) {
-  if (req.method === 'POST') {
-    const sessionId = url.searchParams.get('sessionId');
-    if (!sessionId) {
-      res.statusCode = 400;
-      return res.end('Missing sessionId');
-    }
-
-    const transport = sessions.get(sessionId);
-    if (!transport) {
-      res.statusCode = 404;
-      return res.end('Session not found');
-    }
-
-    return await transport.handlePostMessage(req, res);
-  } else if (req.method === 'GET') {
-    const transport = new SSEServerTransport('/sse', res);
-    sessions.set(transport.sessionId, transport);
-    testDebug(`create SSE session: ${transport.sessionId}`);
-    await mcpServer.connect(serverBackendFactory, transport, false);
-    res.on('close', () => {
-      testDebug(`delete SSE session: ${transport.sessionId}`);
-      sessions.delete(transport.sessionId);
-    });
-    return;
-  }
-
-  res.statusCode = 405;
-  res.end('Method not allowed');
-}
-
-async function handleStreamable(serverBackendFactory: ServerBackendFactory, req: http.IncomingMessage, res: http.ServerResponse, sessions: Map<string, StreamableHTTPServerTransport>) {
-  const sessionId = req.headers['mcp-session-id'] as string | undefined;
-  if (sessionId) {
-    const transport = sessions.get(sessionId);
-    if (!transport) {
-      res.statusCode = 404;
-      res.end('Session not found');
-      return;
-    }
-    return await transport.handleRequest(req, res);
-  }
-
-  if (req.method === 'POST') {
-    const transport = new StreamableHTTPServerTransport({
-      sessionIdGenerator: () => crypto.randomUUID(),
-      onsessioninitialized: async sessionId => {
-        testDebug(`create http session: ${transport.sessionId}`);
-        await mcpServer.connect(serverBackendFactory, transport, true);
-        sessions.set(sessionId, transport);
-      }
-    });
-
-    transport.onclose = () => {
-      if (!transport.sessionId)
-        return;
-      sessions.delete(transport.sessionId);
-      testDebug(`delete http session: ${transport.sessionId}`);
-    };
-
-    await transport.handleRequest(req, res);
-    return;
-  }
-
-  res.statusCode = 400;
-  res.end('Invalid request');
-}

src/mcp/inProcessTransport.ts

@@ -1,92 +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 type { Server } from '@modelcontextprotocol/sdk/server/index.js';
-import type { Transport, TransportSendOptions } from '@modelcontextprotocol/sdk/shared/transport.js';
-import type { JSONRPCMessage, MessageExtraInfo } from '@modelcontextprotocol/sdk/types.js';
-
-export class InProcessTransport implements Transport {
-  private _server: Server;
-  private _serverTransport: InProcessServerTransport;
-  private _connected: boolean = false;
-
-  constructor(server: Server) {
-    this._server = server;
-    this._serverTransport = new InProcessServerTransport(this);
-  }
-
-  async start(): Promise<void> {
-    if (this._connected)
-      throw new Error('InprocessTransport already started!');
-
-    await this._server.connect(this._serverTransport);
-    this._connected = true;
-  }
-
-  async send(message: JSONRPCMessage, options?: TransportSendOptions): Promise<void> {
-    if (!this._connected)
-      throw new Error('Transport not connected');
-
-
-    this._serverTransport._receiveFromClient(message);
-  }
-
-  async close(): Promise<void> {
-    if (this._connected) {
-      this._connected = false;
-      this.onclose?.();
-      this._serverTransport.onclose?.();
-    }
-  }
-
-  onclose?: (() => void) | undefined;
-  onerror?: ((error: Error) => void) | undefined;
-  onmessage?: ((message: JSONRPCMessage, extra?: MessageExtraInfo) => void) | undefined;
-  sessionId?: string | undefined;
-  setProtocolVersion?: ((version: string) => void) | undefined;
-
-  _receiveFromServer(message: JSONRPCMessage, extra?: MessageExtraInfo): void {
-    this.onmessage?.(message, extra);
-  }
-}
-
-class InProcessServerTransport implements Transport {
-  private _clientTransport: InProcessTransport;
-
-  constructor(clientTransport: InProcessTransport) {
-    this._clientTransport = clientTransport;
-  }
-
-  async start(): Promise<void> {
-  }
-
-  async send(message: JSONRPCMessage, options?: TransportSendOptions): Promise<void> {
-    this._clientTransport._receiveFromServer(message);
-  }
-
-  async close(): Promise<void> {
-    this.onclose?.();
-  }
-
-  onclose?: (() => void) | undefined;
-  onerror?: ((error: Error) => void) | undefined;
-  onmessage?: ((message: JSONRPCMessage, extra?: MessageExtraInfo) => void) | undefined;
-  sessionId?: string | undefined;
-  setProtocolVersion?: ((version: string) => void) | undefined;
-  _receiveFromClient(message: JSONRPCMessage): void {
-    this.onmessage?.(message);
-  }
-}

src/mcp/proxyBackend.ts

@@ -1,128 +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 debug from 'debug';
-import { z } from 'zod';
-import { zodToJsonSchema } from 'zod-to-json-schema';
-
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { ListRootsRequestSchema, PingRequestSchema } from '@modelcontextprotocol/sdk/types.js';
-
-import type { ServerBackend, ClientVersion, Root } from './server.js';
-import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
-import type { Tool, CallToolResult, CallToolRequest } from '@modelcontextprotocol/sdk/types.js';
-
-export type MCPProvider = {
-  name: string;
-  description: string;
-  connect(): Promise<Transport>;
-};
-
-const errorsDebug = debug('pw:mcp:errors');
-
-export class ProxyBackend implements ServerBackend {
-  private _mcpProviders: MCPProvider[];
-  private _currentClient: Client | undefined;
-  private _contextSwitchTool: Tool;
-  private _roots: Root[] = [];
-
-  constructor(mcpProviders: MCPProvider[]) {
-    this._mcpProviders = mcpProviders;
-    this._contextSwitchTool = this._defineContextSwitchTool();
-  }
-
-  async initialize(clientVersion: ClientVersion, roots: Root[]): Promise<void> {
-    this._roots = roots;
-    await this._setCurrentClient(this._mcpProviders[0]);
-  }
-
-  async listTools(): Promise<Tool[]> {
-    const response = await this._currentClient!.listTools();
-    if (this._mcpProviders.length === 1)
-      return response.tools;
-    return [
-      ...response.tools,
-      this._contextSwitchTool,
-    ];
-  }
-
-  async callTool(name: string, args: CallToolRequest['params']['arguments']): Promise<CallToolResult> {
-    if (name === this._contextSwitchTool.name)
-      return this._callContextSwitchTool(args);
-    return await this._currentClient!.callTool({
-      name,
-      arguments: args,
-    }) as CallToolResult;
-  }
-
-  serverClosed?(): void {
-    void this._currentClient?.close().catch(errorsDebug);
-  }
-
-  private async _callContextSwitchTool(params: any): Promise<CallToolResult> {
-    try {
-      const factory = this._mcpProviders.find(factory => factory.name === params.name);
-      if (!factory)
-        throw new Error('Unknown connection method: ' + params.name);
-
-      await this._setCurrentClient(factory);
-      return {
-        content: [{ type: 'text', text: '### Result\nSuccessfully changed connection method.\n' }],
-      };
-    } catch (error) {
-      return {
-        content: [{ type: 'text', text: `### Result\nError: ${error}\n` }],
-        isError: true,
-      };
-    }
-  }
-
-  private _defineContextSwitchTool(): Tool {
-    return {
-      name: 'browser_connect',
-      description: [
-        'Connect to a browser using one of the available methods:',
-        ...this._mcpProviders.map(factory => `- "${factory.name}": ${factory.description}`),
-      ].join('\n'),
-      inputSchema: zodToJsonSchema(z.object({
-        name: z.enum(this._mcpProviders.map(factory => factory.name) as [string, ...string[]]).default(this._mcpProviders[0].name).describe('The method to use to connect to the browser'),
-      }), { strictUnions: true }) as Tool['inputSchema'],
-      annotations: {
-        title: 'Connect to a browser context',
-        readOnlyHint: true,
-        openWorldHint: false,
-      },
-    };
-  }
-
-  private async _setCurrentClient(factory: MCPProvider) {
-    await this._currentClient?.close();
-    this._currentClient = undefined;
-
-    const client = new Client({ name: 'Playwright MCP Proxy', version: '0.0.0' });
-    client.registerCapabilities({
-      roots: {
-        listRoots: true,
-      },
-    });
-    client.setRequestHandler(ListRootsRequestSchema, () => ({ roots: this._roots }));
-    client.setRequestHandler(PingRequestSchema, () => ({}));
-
-    const transport = await factory.connect();
-    await client.connect(transport);
-    this._currentClient = client;
-  }
-}

src/mcp/server.ts

@@ -1,157 +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 debug from 'debug';
-
-import { Server } from '@modelcontextprotocol/sdk/server/index.js';
-import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { httpAddressToString, installHttpTransport, startHttpServer } from './http.js';
-import { InProcessTransport } from './inProcessTransport.js';
-
-import type { Tool, CallToolResult, CallToolRequest, Root } from '@modelcontextprotocol/sdk/types.js';
-import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
-export type { Server } from '@modelcontextprotocol/sdk/server/index.js';
-export type { Tool, CallToolResult, CallToolRequest, Root } from '@modelcontextprotocol/sdk/types.js';
-
-const serverDebug = debug('pw:mcp:server');
-const errorsDebug = debug('pw:mcp:errors');
-
-export type ClientVersion = { name: string, version: string };
-export interface ServerBackend {
-  initialize?(clientVersion: ClientVersion, roots: Root[]): Promise<void>;
-  listTools(): Promise<Tool[]>;
-  callTool(name: string, args: CallToolRequest['params']['arguments']): Promise<CallToolResult>;
-  serverClosed?(): void;
-}
-
-export type ServerBackendFactory = {
-  name: string;
-  nameInConfig: string;
-  version: string;
-  create: () => ServerBackend;
-};
-
-export async function connect(factory: ServerBackendFactory, transport: Transport, runHeartbeat: boolean) {
-  const server = createServer(factory.name, factory.version, factory.create(), runHeartbeat);
-  await server.connect(transport);
-}
-
-export async function wrapInProcess(backend: ServerBackend): Promise<Transport> {
-  const server = createServer('Internal', '0.0.0', backend, false);
-  return new InProcessTransport(server);
-}
-
-export function createServer(name: string, version: string, backend: ServerBackend, runHeartbeat: boolean): Server {
-  let initializedPromiseResolve = () => {};
-  const initializedPromise = new Promise<void>(resolve => initializedPromiseResolve = resolve);
-  const server = new Server({ name, version }, {
-    capabilities: {
-      tools: {},
-    }
-  });
-
-  server.setRequestHandler(ListToolsRequestSchema, async () => {
-    serverDebug('listTools');
-    await initializedPromise;
-    const tools = await backend.listTools();
-    return { tools };
-  });
-
-  let heartbeatRunning = false;
-  server.setRequestHandler(CallToolRequestSchema, async request => {
-    serverDebug('callTool', request);
-    await initializedPromise;
-
-    if (runHeartbeat && !heartbeatRunning) {
-      heartbeatRunning = true;
-      startHeartbeat(server);
-    }
-
-    try {
-      return await backend.callTool(request.params.name, request.params.arguments || {});
-    } catch (error) {
-      return {
-        content: [{ type: 'text', text: '### Result\n' + String(error) }],
-        isError: true,
-      };
-    }
-  });
-  addServerListener(server, 'initialized', async () => {
-    try {
-      const capabilities = server.getClientCapabilities();
-      let clientRoots: Root[] = [];
-      if (capabilities?.roots) {
-        const { roots } = await server.listRoots(undefined, { timeout: 2_000 }).catch(() => ({ roots: [] }));
-        clientRoots = roots;
-      }
-      const clientVersion = server.getClientVersion() ?? { name: 'unknown', version: 'unknown' };
-      await backend.initialize?.(clientVersion, clientRoots);
-      initializedPromiseResolve();
-    } catch (e) {
-      errorsDebug(e);
-    }
-  });
-  addServerListener(server, 'close', () => backend.serverClosed?.());
-  return server;
-}
-
-const startHeartbeat = (server: Server) => {
-  const beat = () => {
-    Promise.race([
-      server.ping(),
-      new Promise((_, reject) => setTimeout(() => reject(new Error('ping timeout')), 5000)),
-    ]).then(() => {
-      setTimeout(beat, 3000);
-    }).catch(() => {
-      void server.close();
-    });
-  };
-
-  beat();
-};
-
-function addServerListener(server: Server, event: 'close' | 'initialized', listener: () => void) {
-  const oldListener = server[`on${event}`];
-  server[`on${event}`] = () => {
-    oldListener?.();
-    listener();
-  };
-}
-
-export async function start(serverBackendFactory: ServerBackendFactory, options: { host?: string; port?: number }) {
-  if (options.port === undefined) {
-    await connect(serverBackendFactory, new StdioServerTransport(), false);
-    return;
-  }
-
-  const httpServer = await startHttpServer(options);
-  await installHttpTransport(httpServer, serverBackendFactory);
-  const url = httpAddressToString(httpServer.address());
-
-  const mcpConfig: any = { mcpServers: { } };
-  mcpConfig.mcpServers[serverBackendFactory.nameInConfig] = {
-    url: `${url}/mcp`
-  };
-  const message = [
-    `Listening on ${url}`,
-    'Put this in your client config:',
-    JSON.stringify(mcpConfig, undefined, 2),
-    'For legacy SSE transport support, you can use the /sse endpoint instead.',
-  ].join('\n');
-    // eslint-disable-next-line no-console
-  console.error(message);
-}

src/mcp/tool.ts

@@ -1,42 +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 { zodToJsonSchema } from 'zod-to-json-schema';
-
-import type { z } from 'zod';
-import type * as mcpServer from './server.js';
-
-export type ToolSchema<Input extends z.Schema> = {
-  name: string;
-  title: string;
-  description: string;
-  inputSchema: Input;
-  type: 'readOnly' | 'destructive';
-};
-
-export function toMcpTool(tool: ToolSchema<any>): mcpServer.Tool {
-  return {
-    name: tool.name,
-    description: tool.description,
-    inputSchema: zodToJsonSchema(tool.inputSchema, { strictUnions: true }) as mcpServer.Tool['inputSchema'],
-    annotations: {
-      title: tool.title,
-      readOnlyHint: tool.type === 'readOnly',
-      destructiveHint: tool.type === 'destructive',
-      openWorldHint: true,
-    },
-  };
-}

src/program.ts

@@ -1,139 +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 { program, Option } from 'commander';
-import * as mcpServer from './mcp/server.js';
-import { commaSeparatedList, resolveCLIConfig, semicolonSeparatedList } from './config.js';
-import { packageJSON } from './utils/package.js';
-import { Context } from './context.js';
-import { contextFactory } from './browserContextFactory.js';
-import { runLoopTools } from './loopTools/main.js';
-import { ProxyBackend } from './mcp/proxyBackend.js';
-import { BrowserServerBackend } from './browserServerBackend.js';
-import { ExtensionContextFactory } from './extension/extensionContextFactory.js';
-
-import type { MCPProvider } from './mcp/proxyBackend.js';
-
-program
-    .version('Version ' + packageJSON.version)
-    .name(packageJSON.name)
-    .option('--allowed-origins <origins>', 'semicolon-separated list of origins to allow the browser to request. Default is to allow all.', semicolonSeparatedList)
-    .option('--blocked-origins <origins>', 'semicolon-separated list of origins to block the browser from requesting. Blocklist is evaluated before allowlist. If used without the allowlist, requests not matching the blocklist are still allowed.', semicolonSeparatedList)
-    .option('--block-service-workers', 'block service workers')
-    .option('--browser <browser>', 'browser or chrome channel to use, possible values: chrome, firefox, webkit, msedge.')
-    .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"')
-    .option('--executable-path <path>', 'path to the browser executable.')
-    .option('--extension', 'Connect to a running browser instance (Edge/Chrome only). Requires the "Playwright MCP Bridge" browser extension to be installed.')
-    .option('--headless', 'run browser in headless mode, headed by default')
-    .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" 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.')
-    .option('--proxy-bypass <bypass>', 'comma-separated domains to bypass proxy, for example ".com,chromium.org,.domain.com"')
-    .option('--proxy-server <proxy>', 'specify proxy server, for example "http://myproxy:3128" or "socks5://myproxy:8080"')
-    .option('--save-session', 'Whether to save the Playwright MCP session into the output directory.')
-    .option('--save-trace', 'Whether to save the Playwright Trace of the session into the output directory.')
-    .option('--storage-state <path>', 'path to the storage state file for isolated sessions.')
-    .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"')
-    .addOption(new Option('--connect-tool', 'Allow to switch between different browser connection methods.').hideHelp())
-    .addOption(new Option('--loop-tools', 'Run loop tools').hideHelp())
-    .addOption(new Option('--vision', 'Legacy option, use --caps=vision instead').hideHelp())
-    .action(async options => {
-      setupExitWatchdog();
-
-      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 browserContextFactory = contextFactory(config);
-      const extensionContextFactory = new ExtensionContextFactory(config.browser.launchOptions.channel || 'chrome', config.browser.userDataDir);
-
-      if (options.extension) {
-        const serverBackendFactory: mcpServer.ServerBackendFactory = {
-          name: 'Playwright w/ extension',
-          nameInConfig: 'playwright-extension',
-          version: packageJSON.version,
-          create: () => new BrowserServerBackend(config, extensionContextFactory)
-        };
-        await mcpServer.start(serverBackendFactory, config.server);
-        return;
-      }
-
-      if (options.loopTools) {
-        await runLoopTools(config);
-        return;
-      }
-
-      if (options.connectTool) {
-        const providers: MCPProvider[] = [
-          {
-            name: 'default',
-            description: 'Starts standalone browser',
-            connect: () => mcpServer.wrapInProcess(new BrowserServerBackend(config, browserContextFactory)),
-          },
-          {
-            name: 'extension',
-            description: 'Connect to a browser using the Playwright MCP extension',
-            connect: () => mcpServer.wrapInProcess(new BrowserServerBackend(config, extensionContextFactory)),
-          },
-        ];
-        const factory: mcpServer.ServerBackendFactory = {
-          name: 'Playwright w/ switch',
-          nameInConfig: 'playwright-switch',
-          version: packageJSON.version,
-          create: () => new ProxyBackend(providers),
-        };
-        await mcpServer.start(factory, config.server);
-        return;
-      }
-
-      const factory: mcpServer.ServerBackendFactory = {
-        name: 'Playwright',
-        nameInConfig: 'playwright',
-        version: packageJSON.version,
-        create: () => new BrowserServerBackend(config, browserContextFactory)
-      };
-      await mcpServer.start(factory, config.server);
-    });
-
-function setupExitWatchdog() {
-  let isExiting = false;
-  const handleExit = async () => {
-    if (isExiting)
-      return;
-    isExiting = true;
-    setTimeout(() => process.exit(0), 15000);
-    await Context.disposeAll();
-    process.exit(0);
-  };
-
-  process.stdin.on('close', handleExit);
-  process.on('SIGINT', handleExit);
-  process.on('SIGTERM', handleExit);
-}
-
-void program.parseAsync(process.argv);

src/response.ts

@@ -1,201 +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 { renderModalStates } from './tab.js';
-
-import type { Tab, TabSnapshot } from './tab.js';
-import type { ImageContent, TextContent } from '@modelcontextprotocol/sdk/types.js';
-import type { Context } from './context.js';
-
-export class Response {
-  private _result: string[] = [];
-  private _code: string[] = [];
-  private _images: { contentType: string, data: Buffer }[] = [];
-  private _context: Context;
-  private _includeSnapshot = false;
-  private _includeTabs = false;
-  private _tabSnapshot: TabSnapshot | undefined;
-
-  readonly toolName: string;
-  readonly toolArgs: Record<string, any>;
-  private _isError: boolean | undefined;
-
-  constructor(context: Context, toolName: string, toolArgs: Record<string, any>) {
-    this._context = context;
-    this.toolName = toolName;
-    this.toolArgs = toolArgs;
-  }
-
-  addResult(result: string) {
-    this._result.push(result);
-  }
-
-  addError(error: string) {
-    this._result.push(error);
-    this._isError = true;
-  }
-
-  isError() {
-    return this._isError;
-  }
-
-  result() {
-    return this._result.join('\n');
-  }
-
-  addCode(code: string) {
-    this._code.push(code);
-  }
-
-  code() {
-    return this._code.join('\n');
-  }
-
-  addImage(image: { contentType: string, data: Buffer }) {
-    this._images.push(image);
-  }
-
-  images() {
-    return this._images;
-  }
-
-  setIncludeSnapshot() {
-    this._includeSnapshot = true;
-  }
-
-  setIncludeTabs() {
-    this._includeTabs = true;
-  }
-
-  async finish() {
-    // All the async snapshotting post-action is happening here.
-    // Everything below should race against modal states.
-    if (this._includeSnapshot && this._context.currentTab())
-      this._tabSnapshot = await this._context.currentTabOrDie().captureSnapshot();
-    for (const tab of this._context.tabs())
-      await tab.updateTitle();
-  }
-
-  tabSnapshot(): TabSnapshot | undefined {
-    return this._tabSnapshot;
-  }
-
-  serialize(): { content: (TextContent | ImageContent)[], isError?: boolean } {
-    const response: string[] = [];
-
-    // Start with command result.
-    if (this._result.length) {
-      response.push('### Result');
-      response.push(this._result.join('\n'));
-      response.push('');
-    }
-
-    // Add code if it exists.
-    if (this._code.length) {
-      response.push(`### Ran Playwright code
-\`\`\`js
-${this._code.join('\n')}
-\`\`\``);
-      response.push('');
-    }
-
-    // List browser tabs.
-    if (this._includeSnapshot || this._includeTabs)
-      response.push(...renderTabsMarkdown(this._context.tabs(), this._includeTabs));
-
-    // Add snapshot if provided.
-    if (this._tabSnapshot?.modalStates.length) {
-      response.push(...renderModalStates(this._context, this._tabSnapshot.modalStates));
-      response.push('');
-    } else if (this._tabSnapshot) {
-      response.push(renderTabSnapshot(this._tabSnapshot));
-      response.push('');
-    }
-
-    // Main response part
-    const content: (TextContent | ImageContent)[] = [
-      { type: 'text', text: response.join('\n') },
-    ];
-
-    // Image attachments.
-    if (this._context.config.imageResponses !== 'omit') {
-      for (const image of this._images)
-        content.push({ type: 'image', data: image.data.toString('base64'), mimeType: image.contentType });
-    }
-
-    return { content, isError: this._isError };
-  }
-}
-
-function renderTabSnapshot(tabSnapshot: TabSnapshot): string {
-  const lines: string[] = [];
-
-  if (tabSnapshot.consoleMessages.length) {
-    lines.push(`### New console messages`);
-    for (const message of tabSnapshot.consoleMessages)
-      lines.push(`- ${trim(message.toString(), 100)}`);
-    lines.push('');
-  }
-
-  if (tabSnapshot.downloads.length) {
-    lines.push(`### Downloads`);
-    for (const entry of tabSnapshot.downloads) {
-      if (entry.finished)
-        lines.push(`- Downloaded file ${entry.download.suggestedFilename()} to ${entry.outputFile}`);
-      else
-        lines.push(`- Downloading file ${entry.download.suggestedFilename()} ...`);
-    }
-    lines.push('');
-  }
-
-  lines.push(`### Page state`);
-  lines.push(`- Page URL: ${tabSnapshot.url}`);
-  lines.push(`- Page Title: ${tabSnapshot.title}`);
-  lines.push(`- Page Snapshot:`);
-  lines.push('```yaml');
-  lines.push(tabSnapshot.ariaSnapshot);
-  lines.push('```');
-
-  return lines.join('\n');
-}
-
-function renderTabsMarkdown(tabs: Tab[], force: boolean = false): string[] {
-  if (tabs.length === 1 && !force)
-    return [];
-
-  if (!tabs.length) {
-    return [
-      '### Open tabs',
-      'No open tabs. Use the "browser_navigate" tool to navigate to a page first.',
-      '',
-    ];
-  }
-
-  const lines: string[] = ['### Open tabs'];
-  for (let i = 0; i < tabs.length; i++) {
-    const tab = tabs[i];
-    const current = tab.isCurrentTab() ? ' (current)' : '';
-    lines.push(`- ${i}:${current} [${tab.lastTitle()}] (${tab.page.url()})`);
-  }
-  lines.push('');
-  return lines;
-}
-
-function trim(text: string, maxLength: number) {
-  if (text.length <= maxLength)
-    return text;
-  return text.slice(0, maxLength) + '...';
-}

src/sessionLog.ts

@@ -1,176 +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 fs from 'fs';
-import path from 'path';
-
-import { Response } from './response.js';
-import { logUnhandledError } from './utils/log.js';
-import { outputFile  } from './config.js';
-
-import type { FullConfig } from './config.js';
-import type * as actions from './actions.js';
-import type { Tab, TabSnapshot } from './tab.js';
-
-type LogEntry = {
-  timestamp: number;
-  toolCall?: {
-    toolName: string;
-    toolArgs: Record<string, any>;
-    result: string;
-    isError?: boolean;
-  };
-  userAction?: actions.Action;
-  code: string;
-  tabSnapshot?: TabSnapshot;
-};
-
-export class SessionLog {
-  private _folder: string;
-  private _file: string;
-  private _ordinal = 0;
-  private _pendingEntries: LogEntry[] = [];
-  private _sessionFileQueue = Promise.resolve();
-  private _flushEntriesTimeout: NodeJS.Timeout | undefined;
-
-  constructor(sessionFolder: string) {
-    this._folder = sessionFolder;
-    this._file = path.join(this._folder, 'session.md');
-  }
-
-  static async create(config: FullConfig, rootPath: string | undefined): Promise<SessionLog> {
-    const sessionFolder = await outputFile(config, rootPath, `session-${Date.now()}`);
-    await fs.promises.mkdir(sessionFolder, { recursive: true });
-    // eslint-disable-next-line no-console
-    console.error(`Session: ${sessionFolder}`);
-    return new SessionLog(sessionFolder);
-  }
-
-  logResponse(response: Response) {
-    const entry: LogEntry = {
-      timestamp: performance.now(),
-      toolCall: {
-        toolName: response.toolName,
-        toolArgs: response.toolArgs,
-        result: response.result(),
-        isError: response.isError(),
-      },
-      code: response.code(),
-      tabSnapshot: response.tabSnapshot(),
-    };
-    this._appendEntry(entry);
-  }
-
-  logUserAction(action: actions.Action, tab: Tab, code: string, isUpdate: boolean) {
-    code = code.trim();
-    if (isUpdate) {
-      const lastEntry = this._pendingEntries[this._pendingEntries.length - 1];
-      if (lastEntry.userAction?.name === action.name) {
-        lastEntry.userAction = action;
-        lastEntry.code = code;
-        return;
-      }
-    }
-    if (action.name === 'navigate') {
-      // Already logged at this location.
-      const lastEntry = this._pendingEntries[this._pendingEntries.length - 1];
-      if (lastEntry?.tabSnapshot?.url === action.url)
-        return;
-    }
-    const entry: LogEntry = {
-      timestamp: performance.now(),
-      userAction: action,
-      code,
-      tabSnapshot: {
-        url: tab.page.url(),
-        title: '',
-        ariaSnapshot: action.ariaSnapshot || '',
-        modalStates: [],
-        consoleMessages: [],
-        downloads: [],
-      },
-    };
-    this._appendEntry(entry);
-  }
-
-  private _appendEntry(entry: LogEntry) {
-    this._pendingEntries.push(entry);
-    if (this._flushEntriesTimeout)
-      clearTimeout(this._flushEntriesTimeout);
-    this._flushEntriesTimeout = setTimeout(() => this._flushEntries(), 1000);
-  }
-
-  private async _flushEntries() {
-    clearTimeout(this._flushEntriesTimeout);
-    const entries = this._pendingEntries;
-    this._pendingEntries = [];
-    const lines: string[] = [''];
-
-    for (const entry of entries) {
-      const ordinal = (++this._ordinal).toString().padStart(3, '0');
-      if (entry.toolCall) {
-        lines.push(
-            `### Tool call: ${entry.toolCall.toolName}`,
-            `- Args`,
-            '```json',
-            JSON.stringify(entry.toolCall.toolArgs, null, 2),
-            '```',
-        );
-        if (entry.toolCall.result) {
-          lines.push(
-              entry.toolCall.isError ? `- Error` : `- Result`,
-              '```',
-              entry.toolCall.result,
-              '```',
-          );
-        }
-      }
-
-      if (entry.userAction) {
-        const actionData = { ...entry.userAction } as any;
-        delete actionData.ariaSnapshot;
-        delete actionData.selector;
-        delete actionData.signals;
-
-        lines.push(
-            `### User action: ${entry.userAction.name}`,
-            `- Args`,
-            '```json',
-            JSON.stringify(actionData, null, 2),
-            '```',
-        );
-      }
-
-      if (entry.code) {
-        lines.push(
-            `- Code`,
-            '```js',
-            entry.code,
-            '```');
-      }
-
-      if (entry.tabSnapshot) {
-        const fileName = `${ordinal}.snapshot.yml`;
-        fs.promises.writeFile(path.join(this._folder, fileName), entry.tabSnapshot.ariaSnapshot).catch(logUnhandledError);
-        lines.push(`- Snapshot: ${fileName}`);
-      }
-
-      lines.push('', '');
-    }
-
-    this._sessionFileQueue = this._sessionFileQueue.then(() => fs.promises.appendFile(this._file, lines.join('\n')));
-  }
-}

src/tab.ts

@@ -1,313 +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 { EventEmitter } from 'events';
-import * as playwright from 'playwright';
-import { callOnPageNoTrace, waitForCompletion } from './tools/utils.js';
-import { logUnhandledError } from './utils/log.js';
-import { ManualPromise } from './utils/manualPromise.js';
-import { ModalState } from './tools/tool.js';
-
-import type { Context } from './context.js';
-
-type PageEx = playwright.Page & {
-  _snapshotForAI: () => Promise<string>;
-};
-
-export const TabEvents = {
-  modalState: 'modalState'
-};
-
-export type TabEventsInterface = {
-  [TabEvents.modalState]: [modalState: ModalState];
-};
-
-export type TabSnapshot = {
-  url: string;
-  title: string;
-  ariaSnapshot: string;
-  modalStates: ModalState[];
-  consoleMessages: ConsoleMessage[];
-  downloads: { download: playwright.Download, finished: boolean, outputFile: string }[];
-};
-
-export class Tab extends EventEmitter<TabEventsInterface> {
-  readonly context: Context;
-  readonly page: playwright.Page;
-  private _lastTitle = 'about:blank';
-  private _consoleMessages: ConsoleMessage[] = [];
-  private _recentConsoleMessages: ConsoleMessage[] = [];
-  private _requests: Map<playwright.Request, playwright.Response | null> = new Map();
-  private _onPageClose: (tab: Tab) => void;
-  private _modalStates: ModalState[] = [];
-  private _downloads: { download: playwright.Download, finished: boolean, outputFile: string }[] = [];
-
-  constructor(context: Context, page: playwright.Page, onPageClose: (tab: Tab) => void) {
-    super();
-    this.context = context;
-    this.page = page;
-    this._onPageClose = onPageClose;
-    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());
-    page.on('filechooser', chooser => {
-      this.setModalState({
-        type: 'fileChooser',
-        description: 'File chooser',
-        fileChooser: chooser,
-      });
-    });
-    page.on('dialog', dialog => this._dialogShown(dialog));
-    page.on('download', download => {
-      void this._downloadStarted(download);
-    });
-    page.setDefaultNavigationTimeout(60000);
-    page.setDefaultTimeout(5000);
-    (page as any)[tabSymbol] = this;
-  }
-
-  static forPage(page: playwright.Page): Tab | undefined {
-    return (page as any)[tabSymbol];
-  }
-
-  modalStates(): ModalState[] {
-    return this._modalStates;
-  }
-
-  setModalState(modalState: ModalState) {
-    this._modalStates.push(modalState);
-    this.emit(TabEvents.modalState, modalState);
-  }
-
-  clearModalState(modalState: ModalState) {
-    this._modalStates = this._modalStates.filter(state => state !== modalState);
-  }
-
-  modalStatesMarkdown(): string[] {
-    return renderModalStates(this.context, this.modalStates());
-  }
-
-  private _dialogShown(dialog: playwright.Dialog) {
-    this.setModalState({
-      type: 'dialog',
-      description: `"${dialog.type()}" dialog with message "${dialog.message()}"`,
-      dialog,
-    });
-  }
-
-  private async _downloadStarted(download: playwright.Download) {
-    const entry = {
-      download,
-      finished: false,
-      outputFile: await this.context.outputFile(download.suggestedFilename())
-    };
-    this._downloads.push(entry);
-    await download.saveAs(entry.outputFile);
-    entry.finished = true;
-  }
-
-  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);
-  }
-
-  async updateTitle() {
-    await this._raceAgainstModalStates(async () => {
-      this._lastTitle = await callOnPageNoTrace(this.page, page => page.title());
-    });
-  }
-
-  lastTitle(): string {
-    return this._lastTitle;
-  }
-
-  isCurrentTab(): boolean {
-    return this === this.context.currentTab();
-  }
-
-  async waitForLoadState(state: 'load', options?: { timeout?: number }): Promise<void> {
-    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(logUnhandledError));
-    try {
-      await this.page.goto(url, { waitUntil: 'domcontentloaded' });
-    } catch (_e: unknown) {
-      const e = _e as Error;
-      const mightBeDownload =
-        e.message.includes('net::ERR_ABORTED') // chromium
-        || e.message.includes('Download is starting'); // firefox + webkit
-      if (!mightBeDownload)
-        throw e;
-      // on chromium, the download event is fired *after* page.goto rejects, so we wait a lil bit
-      const download = await Promise.race([
-        downloadEvent,
-        new Promise(resolve => setTimeout(resolve, 3000)),
-      ]);
-      if (!download)
-        throw e;
-      // Make sure other "download" listeners are notified first.
-      await new Promise(resolve => setTimeout(resolve, 500));
-      return;
-    }
-
-    // Cap load event to 5 seconds, the page is operational at this point.
-    await this.waitForLoadState('load', { timeout: 5000 });
-  }
-
-  consoleMessages(): ConsoleMessage[] {
-    return this._consoleMessages;
-  }
-
-  requests(): Map<playwright.Request, playwright.Response | null> {
-    return this._requests;
-  }
-
-  async captureSnapshot(): Promise<TabSnapshot> {
-    let tabSnapshot: TabSnapshot | undefined;
-    const modalStates = await this._raceAgainstModalStates(async () => {
-      const snapshot = await (this.page as PageEx)._snapshotForAI();
-      tabSnapshot = {
-        url: this.page.url(),
-        title: await this.page.title(),
-        ariaSnapshot: snapshot,
-        modalStates: [],
-        consoleMessages: [],
-        downloads: this._downloads,
-      };
-    });
-    if (tabSnapshot) {
-      // Assign console message late so that we did not lose any to modal state.
-      tabSnapshot.consoleMessages = this._recentConsoleMessages;
-      this._recentConsoleMessages = [];
-    }
-    return tabSnapshot ?? {
-      url: this.page.url(),
-      title: '',
-      ariaSnapshot: '',
-      modalStates,
-      consoleMessages: [],
-      downloads: [],
-    };
-  }
-
-  private _javaScriptBlocked(): boolean {
-    return this._modalStates.some(state => state.type === 'dialog');
-  }
-
-  private async _raceAgainstModalStates(action: () => Promise<void>): Promise<ModalState[]> {
-    if (this.modalStates().length)
-      return this.modalStates();
-
-    const promise = new ManualPromise<ModalState[]>();
-    const listener = (modalState: ModalState) => promise.resolve([modalState]);
-    this.once(TabEvents.modalState, listener);
-
-    return await Promise.race([
-      action().then(() => {
-        this.off(TabEvents.modalState, listener);
-        return [];
-      }),
-      promise,
-    ]);
-  }
-
-  async waitForCompletion(callback: () => Promise<void>) {
-    await this._raceAgainstModalStates(() => waitForCompletion(this, callback));
-  }
-
-  async refLocator(params: { element: string, ref: string }): Promise<playwright.Locator> {
-    return (await this.refLocators([params]))[0];
-  }
-
-  async refLocators(params: { element: string, ref: string }[]): Promise<playwright.Locator[]> {
-    const snapshot = await (this.page as PageEx)._snapshotForAI();
-    return params.map(param => {
-      if (!snapshot.includes(`[ref=${param.ref}]`))
-        throw new Error(`Ref ${param.ref} not found in the current page snapshot. Try capturing new snapshot.`);
-      return this.page.locator(`aria-ref=${param.ref}`).describe(param.element);
-    });
-  }
-
-  async waitForTimeout(time: number) {
-    if (this._javaScriptBlocked()) {
-      await new Promise(f => setTimeout(f, time));
-      return;
-    }
-
-    await callOnPageNoTrace(this.page, page => {
-      return page.evaluate(() => new Promise(f => setTimeout(f, 1000)));
-    });
-  }
-}
-
-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),
-  };
-}
-
-export function renderModalStates(context: Context, modalStates: ModalState[]): string[] {
-  const result: string[] = ['### Modal state'];
-  if (modalStates.length === 0)
-    result.push('- There is no modal state present');
-  for (const state of modalStates) {
-    const tool = context.tools.filter(tool => 'clearsModalState' in tool).find(tool => tool.clearsModalState === state.type);
-    result.push(`- [${state.description}]: can be handled by the "${tool?.schema.name}" tool`);
-  }
-  return result;
-}
-
-const tabSymbol = Symbol('tabSymbol');

src/tools.ts

@@ -1,56 +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 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';
-import navigate from './tools/navigate.js';
-import network from './tools/network.js';
-import pdf from './tools/pdf.js';
-import snapshot from './tools/snapshot.js';
-import tabs from './tools/tabs.js';
-import screenshot from './tools/screenshot.js';
-import wait from './tools/wait.js';
-import mouse from './tools/mouse.js';
-
-import type { Tool } from './tools/tool.js';
-import type { FullConfig } from './config.js';
-
-export const allTools: Tool<any>[] = [
-  ...common,
-  ...console,
-  ...dialogs,
-  ...evaluate,
-  ...files,
-  ...install,
-  ...keyboard,
-  ...navigate,
-  ...network,
-  ...mouse,
-  ...pdf,
-  ...screenshot,
-  ...snapshot,
-  ...tabs,
-  ...wait,
-];
-
-export function filteredTools(config: FullConfig) {
-  return allTools.filter(tool => tool.capability.startsWith('core') || config.capabilities?.includes(tool.capability));
-}

src/tools/DEPS.list

@@ -1,2 +0,0 @@
-[*]
-../utils/

src/tools/common.ts

@@ -1,63 +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 { defineTabTool, defineTool } from './tool.js';
-
-const close = defineTool({
-  capability: 'core',
-
-  schema: {
-    name: 'browser_close',
-    title: 'Close browser',
-    description: 'Close the page',
-    inputSchema: z.object({}),
-    type: 'readOnly',
-  },
-
-  handle: async (context, params, response) => {
-    await context.closeBrowserContext();
-    response.setIncludeTabs();
-    response.addCode(`await page.close()`);
-  },
-});
-
-const resize = defineTabTool({
-  capability: 'core',
-  schema: {
-    name: 'browser_resize',
-    title: 'Resize browser window',
-    description: 'Resize the browser window',
-    inputSchema: z.object({
-      width: z.number().describe('Width of the browser window'),
-      height: z.number().describe('Height of the browser window'),
-    }),
-    type: 'readOnly',
-  },
-
-  handle: async (tab, params, response) => {
-    response.addCode(`await page.setViewportSize({ width: ${params.width}, height: ${params.height} });`);
-
-    await tab.waitForCompletion(async () => {
-      await tab.page.setViewportSize({ width: params.width, height: params.height });
-    });
-  },
-});
-
-export default [
-  close,
-  resize
-];

src/tools/console.ts

@@ -1,36 +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 { defineTabTool } from './tool.js';
-
-const console = defineTabTool({
-  capability: 'core',
-  schema: {
-    name: 'browser_console_messages',
-    title: 'Get console messages',
-    description: 'Returns all console messages',
-    inputSchema: z.object({}),
-    type: 'readOnly',
-  },
-  handle: async (tab, params, response) => {
-    tab.consoleMessages().map(message => response.addResult(message.toString()));
-  },
-});
-
-export default [
-  console,
-];

src/tools/dialogs.ts

@@ -1,55 +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 { defineTabTool } from './tool.js';
-
-const handleDialog = defineTabTool({
-  capability: 'core',
-
-  schema: {
-    name: 'browser_handle_dialog',
-    title: 'Handle a dialog',
-    description: 'Handle a dialog',
-    inputSchema: z.object({
-      accept: z.boolean().describe('Whether to accept the dialog.'),
-      promptText: z.string().optional().describe('The text of the prompt in case of a prompt dialog.'),
-    }),
-    type: 'destructive',
-  },
-
-  handle: async (tab, params, response) => {
-    response.setIncludeSnapshot();
-
-    const dialogState = tab.modalStates().find(state => state.type === 'dialog');
-    if (!dialogState)
-      throw new Error('No dialog visible');
-
-    tab.clearModalState(dialogState);
-    await tab.waitForCompletion(async () => {
-      if (params.accept)
-        await dialogState.dialog.accept(params.promptText);
-      else
-        await dialogState.dialog.dismiss();
-    });
-  },
-
-  clearsModalState: 'dialog',
-});
-
-export default [
-  handleDialog,
-];

src/tools/evaluate.ts

@@ -1,62 +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 { defineTabTool } from './tool.js';
-import * as javascript from '../utils/codegen.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 = defineTabTool({
-  capability: 'core',
-  schema: {
-    name: 'browser_evaluate',
-    title: 'Evaluate JavaScript',
-    description: 'Evaluate JavaScript expression on page or element',
-    inputSchema: evaluateSchema,
-    type: 'destructive',
-  },
-
-  handle: async (tab, params, response) => {
-    response.setIncludeSnapshot();
-
-    let locator: playwright.Locator | undefined;
-    if (params.ref && params.element) {
-      locator = await tab.refLocator({ ref: params.ref, element: params.element });
-      response.addCode(`await page.${await generateLocator(locator)}.evaluate(${javascript.quote(params.function)});`);
-    } else {
-      response.addCode(`await page.evaluate(${javascript.quote(params.function)});`);
-    }
-
-    await tab.waitForCompletion(async () => {
-      const receiver = locator ?? tab.page as any;
-      const result = await receiver._evaluateFunction(params.function);
-      response.addResult(JSON.stringify(result, null, 2) || 'undefined');
-    });
-  },
-});
-
-export default [
-  evaluate,
-];

src/tools/files.ts

@@ -1,52 +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 { defineTabTool } from './tool.js';
-
-const uploadFile = defineTabTool({
-  capability: 'core',
-
-  schema: {
-    name: 'browser_file_upload',
-    title: 'Upload files',
-    description: 'Upload one or multiple files',
-    inputSchema: z.object({
-      paths: z.array(z.string()).describe('The absolute paths to the files to upload. Can be a single file or multiple files.'),
-    }),
-    type: 'destructive',
-  },
-
-  handle: async (tab, params, response) => {
-    response.setIncludeSnapshot();
-
-    const modalState = tab.modalStates().find(state => state.type === 'fileChooser');
-    if (!modalState)
-      throw new Error('No file chooser visible');
-
-    response.addCode(`await fileChooser.setFiles(${JSON.stringify(params.paths)})`);
-
-    tab.clearModalState(modalState);
-    await tab.waitForCompletion(async () => {
-      await modalState.fileChooser.setFiles(params.paths);
-    });
-  },
-  clearsModalState: 'fileChooser',
-});
-
-export default [
-  uploadFile,
-];

src/tools/install.ts

@@ -1,58 +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 { fork } from 'child_process';
-import path from 'path';
-import { fileURLToPath } from 'url';
-import { z } from 'zod';
-import { defineTool } from './tool.js';
-
-
-const install = defineTool({
-  capability: 'core-install',
-  schema: {
-    name: 'browser_install',
-    title: 'Install the browser specified in the config',
-    description: 'Install the browser specified in the config. Call this if you get an error about the browser not being installed.',
-    inputSchema: z.object({}),
-    type: 'destructive',
-  },
-
-  handle: async (context, params, response) => {
-    const channel = context.config.browser?.launchOptions?.channel ?? context.config.browser?.browserName ?? 'chrome';
-    const cliUrl = import.meta.resolve('playwright/package.json');
-    const cliPath = path.join(fileURLToPath(cliUrl), '..', 'cli.js');
-    const child = fork(cliPath, ['install', channel], {
-      stdio: 'pipe',
-    });
-    const output: string[] = [];
-    child.stdout?.on('data', data => output.push(data.toString()));
-    child.stderr?.on('data', data => output.push(data.toString()));
-    await new Promise<void>((resolve, reject) => {
-      child.on('close', code => {
-        if (code === 0)
-          resolve();
-        else
-          reject(new Error(`Failed to install browser: ${output.join('')}`));
-      });
-    });
-    response.setIncludeTabs();
-  },
-});
-
-export default [
-  install,
-];

src/tools/keyboard.ts

@@ -1,89 +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 { defineTabTool } from './tool.js';
-import { elementSchema } from './snapshot.js';
-import { generateLocator } from './utils.js';
-import * as javascript from '../utils/codegen.js';
-
-const pressKey = defineTabTool({
-  capability: 'core',
-
-  schema: {
-    name: 'browser_press_key',
-    title: 'Press a key',
-    description: 'Press a key on the keyboard',
-    inputSchema: z.object({
-      key: z.string().describe('Name of the key to press or a character to generate, such as `ArrowLeft` or `a`'),
-    }),
-    type: 'destructive',
-  },
-
-  handle: async (tab, params, response) => {
-    response.setIncludeSnapshot();
-    response.addCode(`// Press ${params.key}`);
-    response.addCode(`await page.keyboard.press('${params.key}');`);
-
-    await tab.waitForCompletion(async () => {
-      await tab.page.keyboard.press(params.key);
-    });
-  },
-});
-
-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 = defineTabTool({
-  capability: 'core',
-  schema: {
-    name: 'browser_type',
-    title: 'Type text',
-    description: 'Type text into editable element',
-    inputSchema: typeSchema,
-    type: 'destructive',
-  },
-
-  handle: async (tab, params, response) => {
-    const locator = await tab.refLocator(params);
-
-    await tab.waitForCompletion(async () => {
-      if (params.slowly) {
-        response.setIncludeSnapshot();
-        response.addCode(`await page.${await generateLocator(locator)}.pressSequentially(${javascript.quote(params.text)});`);
-        await locator.pressSequentially(params.text);
-      } else {
-        response.addCode(`await page.${await generateLocator(locator)}.fill(${javascript.quote(params.text)});`);
-        await locator.fill(params.text);
-      }
-
-      if (params.submit) {
-        response.setIncludeSnapshot();
-        response.addCode(`await page.${await generateLocator(locator)}.press('Enter');`);
-        await locator.press('Enter');
-      }
-    });
-  },
-});
-
-export default [
-  pressKey,
-  type,
-];

src/tools/mouse.ts

@@ -1,113 +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 { defineTabTool } from './tool.js';
-
-const elementSchema = z.object({
-  element: z.string().describe('Human-readable element description used to obtain permission to interact with the element'),
-});
-
-const mouseMove = defineTabTool({
-  capability: 'vision',
-  schema: {
-    name: 'browser_mouse_move_xy',
-    title: 'Move mouse',
-    description: 'Move mouse to a given position',
-    inputSchema: elementSchema.extend({
-      x: z.number().describe('X coordinate'),
-      y: z.number().describe('Y coordinate'),
-    }),
-    type: 'readOnly',
-  },
-
-  handle: async (tab, params, response) => {
-    response.addCode(`// Move mouse to (${params.x}, ${params.y})`);
-    response.addCode(`await page.mouse.move(${params.x}, ${params.y});`);
-
-    await tab.waitForCompletion(async () => {
-      await tab.page.mouse.move(params.x, params.y);
-    });
-  },
-});
-
-const mouseClick = defineTabTool({
-  capability: 'vision',
-  schema: {
-    name: 'browser_mouse_click_xy',
-    title: 'Click',
-    description: 'Click left mouse button at a given position',
-    inputSchema: elementSchema.extend({
-      x: z.number().describe('X coordinate'),
-      y: z.number().describe('Y coordinate'),
-    }),
-    type: 'destructive',
-  },
-
-  handle: async (tab, params, response) => {
-    response.setIncludeSnapshot();
-
-    response.addCode(`// Click mouse at coordinates (${params.x}, ${params.y})`);
-    response.addCode(`await page.mouse.move(${params.x}, ${params.y});`);
-    response.addCode(`await page.mouse.down();`);
-    response.addCode(`await page.mouse.up();`);
-
-    await tab.waitForCompletion(async () => {
-      await tab.page.mouse.move(params.x, params.y);
-      await tab.page.mouse.down();
-      await tab.page.mouse.up();
-    });
-  },
-});
-
-const mouseDrag = defineTabTool({
-  capability: 'vision',
-  schema: {
-    name: 'browser_mouse_drag_xy',
-    title: 'Drag mouse',
-    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'),
-      endX: z.number().describe('End X coordinate'),
-      endY: z.number().describe('End Y coordinate'),
-    }),
-    type: 'destructive',
-  },
-
-  handle: async (tab, params, response) => {
-    response.setIncludeSnapshot();
-
-    response.addCode(`// Drag mouse from (${params.startX}, ${params.startY}) to (${params.endX}, ${params.endY})`);
-    response.addCode(`await page.mouse.move(${params.startX}, ${params.startY});`);
-    response.addCode(`await page.mouse.down();`);
-    response.addCode(`await page.mouse.move(${params.endX}, ${params.endY});`);
-    response.addCode(`await page.mouse.up();`);
-
-    await tab.waitForCompletion(async () => {
-      await tab.page.mouse.move(params.startX, params.startY);
-      await tab.page.mouse.down();
-      await tab.page.mouse.move(params.endX, params.endY);
-      await tab.page.mouse.up();
-    });
-  },
-});
-
-export default [
-  mouseMove,
-  mouseClick,
-  mouseDrag,
-];

src/tools/navigate.ts

@@ -1,79 +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, defineTabTool } from './tool.js';
-
-const navigate = defineTool({
-  capability: 'core',
-
-  schema: {
-    name: 'browser_navigate',
-    title: 'Navigate to a URL',
-    description: 'Navigate to a URL',
-    inputSchema: z.object({
-      url: z.string().describe('The URL to navigate to'),
-    }),
-    type: 'destructive',
-  },
-
-  handle: async (context, params, response) => {
-    const tab = await context.ensureTab();
-    await tab.navigate(params.url);
-
-    response.setIncludeSnapshot();
-    response.addCode(`await page.goto('${params.url}');`);
-  },
-});
-
-const goBack = defineTabTool({
-  capability: 'core',
-  schema: {
-    name: 'browser_navigate_back',
-    title: 'Go back',
-    description: 'Go back to the previous page',
-    inputSchema: z.object({}),
-    type: 'readOnly',
-  },
-
-  handle: async (tab, params, response) => {
-    await tab.page.goBack();
-    response.setIncludeSnapshot();
-    response.addCode(`await page.goBack();`);
-  },
-});
-
-const goForward = defineTabTool({
-  capability: 'core',
-  schema: {
-    name: 'browser_navigate_forward',
-    title: 'Go forward',
-    description: 'Go forward to the next page',
-    inputSchema: z.object({}),
-    type: 'readOnly',
-  },
-  handle: async (tab, params, response) => {
-    await tab.page.goForward();
-    response.setIncludeSnapshot();
-    response.addCode(`await page.goForward();`);
-  },
-});
-
-export default [
-  navigate,
-  goBack,
-  goForward,
-];

src/tools/network.ts

@@ -1,49 +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 { defineTabTool } from './tool.js';
-
-import type * as playwright from 'playwright';
-
-const requests = defineTabTool({
-  capability: 'core',
-
-  schema: {
-    name: 'browser_network_requests',
-    title: 'List network requests',
-    description: 'Returns all network requests since loading the page',
-    inputSchema: z.object({}),
-    type: 'readOnly',
-  },
-
-  handle: async (tab, params, response) => {
-    const requests = tab.requests();
-    [...requests.entries()].forEach(([req, res]) => response.addResult(renderRequest(req, res)));
-  },
-});
-
-function renderRequest(request: playwright.Request, response: playwright.Response | null) {
-  const result: string[] = [];
-  result.push(`[${request.method().toUpperCase()}] ${request.url()}`);
-  if (response)
-    result.push(`=> [${response.status()}] ${response.statusText()}`);
-  return result.join(' ');
-}
-
-export default [
-  requests,
-];

src/tools/pdf.ts

@@ -1,47 +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 { defineTabTool } from './tool.js';
-
-import * as javascript from '../utils/codegen.js';
-
-const pdfSchema = z.object({
-  filename: z.string().optional().describe('File name to save the pdf to. Defaults to `page-{timestamp}.pdf` if not specified.'),
-});
-
-const pdf = defineTabTool({
-  capability: 'pdf',
-
-  schema: {
-    name: 'browser_pdf_save',
-    title: 'Save as PDF',
-    description: 'Save page as PDF',
-    inputSchema: pdfSchema,
-    type: 'readOnly',
-  },
-
-  handle: async (tab, params, response) => {
-    const fileName = await tab.context.outputFile(params.filename ?? `page-${new Date().toISOString()}.pdf`);
-    response.addCode(`await page.pdf(${javascript.formatObject({ path: fileName })});`);
-    response.addResult(`Saved page as ${fileName}`);
-    await tab.page.pdf({ path: fileName });
-  },
-});
-
-export default [
-  pdf,
-];

src/tools/screenshot.ts

@@ -1,92 +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 { defineTabTool } from './tool.js';
-import * as javascript from '../utils/codegen.js';
-import { generateLocator } from './utils.js';
-
-import type * as playwright from 'playwright';
-
-const screenshotSchema = z.object({
-  type: z.enum(['png', 'jpeg']).default('png').describe('Image format for the screenshot. Default is png.'),
-  filename: z.string().optional().describe('File name to save the screenshot to. Defaults to `page-{timestamp}.{png|jpeg}` if not specified.'),
-  element: z.string().optional().describe('Human-readable element description used to obtain permission to screenshot the element. If not provided, the screenshot will be taken of viewport. If element is provided, ref must be provided too.'),
-  ref: z.string().optional().describe('Exact target element reference from the page snapshot. If not provided, the screenshot will be taken of viewport. If ref is provided, element must be provided too.'),
-  fullPage: z.boolean().optional().describe('When true, takes a screenshot of the full scrollable page, instead of the currently visible viewport. Cannot be used with element screenshots.'),
-}).refine(data => {
-  return !!data.element === !!data.ref;
-}, {
-  message: 'Both element and ref must be provided or neither.',
-  path: ['ref', 'element']
-}).refine(data => {
-  return !(data.fullPage && (data.element || data.ref));
-}, {
-  message: 'fullPage cannot be used with element screenshots.',
-  path: ['fullPage']
-});
-
-const screenshot = defineTabTool({
-  capability: 'core',
-  schema: {
-    name: 'browser_take_screenshot',
-    title: 'Take a screenshot',
-    description: `Take a screenshot of the current page. You can't perform actions based on the screenshot, use browser_snapshot for actions.`,
-    inputSchema: screenshotSchema,
-    type: 'readOnly',
-  },
-
-  handle: async (tab, params, response) => {
-    const fileType = params.type || 'png';
-    const fileName = await tab.context.outputFile(params.filename ?? `page-${new Date().toISOString()}.${fileType}`);
-    const options: playwright.PageScreenshotOptions = {
-      type: fileType,
-      quality: fileType === 'png' ? undefined : 90,
-      scale: 'css',
-      path: fileName,
-      ...(params.fullPage !== undefined && { fullPage: params.fullPage })
-    };
-    const isElementScreenshot = params.element && params.ref;
-
-    const screenshotTarget = isElementScreenshot ? params.element : (params.fullPage ? 'full page' : 'viewport');
-    response.addCode(`// Screenshot ${screenshotTarget} and save it as ${fileName}`);
-
-    // Only get snapshot when element screenshot is needed
-    const locator = params.ref ? await tab.refLocator({ element: params.element || '', ref: params.ref }) : null;
-
-    if (locator)
-      response.addCode(`await page.${await generateLocator(locator)}.screenshot(${javascript.formatObject(options)});`);
-    else
-      response.addCode(`await page.screenshot(${javascript.formatObject(options)});`);
-
-    const buffer = locator ? await locator.screenshot(options) : await tab.page.screenshot(options);
-    response.addResult(`Took the ${screenshotTarget} screenshot and saved it as ${fileName}`);
-
-    // https://github.com/microsoft/playwright-mcp/issues/817
-    // Never return large images to LLM, saving them to the file system is enough.
-    if (!params.fullPage) {
-      response.addImage({
-        contentType: fileType === 'png' ? 'image/png' : 'image/jpeg',
-        data: buffer
-      });
-    }
-  }
-});
-
-export default [
-  screenshot,
-];

src/tools/snapshot.ts

@@ -1,166 +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 { defineTabTool, defineTool } from './tool.js';
-import * as javascript from '../utils/codegen.js';
-import { generateLocator } from './utils.js';
-
-const snapshot = defineTool({
-  capability: 'core',
-  schema: {
-    name: 'browser_snapshot',
-    title: 'Page snapshot',
-    description: 'Capture accessibility snapshot of the current page, this is better than screenshot',
-    inputSchema: z.object({}),
-    type: 'readOnly',
-  },
-
-  handle: async (context, params, response) => {
-    await context.ensureTab();
-    response.setIncludeSnapshot();
-  },
-});
-
-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 = defineTabTool({
-  capability: 'core',
-  schema: {
-    name: 'browser_click',
-    title: 'Click',
-    description: 'Perform click on a web page',
-    inputSchema: clickSchema,
-    type: 'destructive',
-  },
-
-  handle: async (tab, params, response) => {
-    response.setIncludeSnapshot();
-
-    const locator = await tab.refLocator(params);
-    const button = params.button;
-    const buttonAttr = button ? `{ button: '${button}' }` : '';
-
-    if (params.doubleClick)
-      response.addCode(`await page.${await generateLocator(locator)}.dblclick(${buttonAttr});`);
-    else
-      response.addCode(`await page.${await generateLocator(locator)}.click(${buttonAttr});`);
-
-
-    await tab.waitForCompletion(async () => {
-      if (params.doubleClick)
-        await locator.dblclick({ button });
-      else
-        await locator.click({ button });
-    });
-  },
-});
-
-const drag = defineTabTool({
-  capability: 'core',
-  schema: {
-    name: 'browser_drag',
-    title: 'Drag mouse',
-    description: 'Perform drag and drop between two elements',
-    inputSchema: z.object({
-      startElement: z.string().describe('Human-readable source element description used to obtain the permission to interact with the element'),
-      startRef: z.string().describe('Exact source element reference from the page snapshot'),
-      endElement: z.string().describe('Human-readable target element description used to obtain the permission to interact with the element'),
-      endRef: z.string().describe('Exact target element reference from the page snapshot'),
-    }),
-    type: 'destructive',
-  },
-
-  handle: async (tab, params, response) => {
-    response.setIncludeSnapshot();
-
-    const [startLocator, endLocator] = await tab.refLocators([
-      { ref: params.startRef, element: params.startElement },
-      { ref: params.endRef, element: params.endElement },
-    ]);
-
-    await tab.waitForCompletion(async () => {
-      await startLocator.dragTo(endLocator);
-    });
-
-    response.addCode(`await page.${await generateLocator(startLocator)}.dragTo(page.${await generateLocator(endLocator)});`);
-  },
-});
-
-const hover = defineTabTool({
-  capability: 'core',
-  schema: {
-    name: 'browser_hover',
-    title: 'Hover mouse',
-    description: 'Hover over element on page',
-    inputSchema: elementSchema,
-    type: 'readOnly',
-  },
-
-  handle: async (tab, params, response) => {
-    response.setIncludeSnapshot();
-
-    const locator = await tab.refLocator(params);
-    response.addCode(`await page.${await generateLocator(locator)}.hover();`);
-
-    await tab.waitForCompletion(async () => {
-      await locator.hover();
-    });
-  },
-});
-
-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.'),
-});
-
-const selectOption = defineTabTool({
-  capability: 'core',
-  schema: {
-    name: 'browser_select_option',
-    title: 'Select option',
-    description: 'Select an option in a dropdown',
-    inputSchema: selectOptionSchema,
-    type: 'destructive',
-  },
-
-  handle: async (tab, params, response) => {
-    response.setIncludeSnapshot();
-
-    const locator = await tab.refLocator(params);
-    response.addCode(`await page.${await generateLocator(locator)}.selectOption(${javascript.formatObject(params.values)});`);
-
-    await tab.waitForCompletion(async () => {
-      await locator.selectOption(params.values);
-    });
-  },
-});
-
-export default [
-  snapshot,
-  click,
-  drag,
-  hover,
-  selectOption,
-];

src/tools/tabs.ts

@@ -1,101 +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 listTabs = defineTool({
-  capability: 'core-tabs',
-
-  schema: {
-    name: 'browser_tab_list',
-    title: 'List tabs',
-    description: 'List browser tabs',
-    inputSchema: z.object({}),
-    type: 'readOnly',
-  },
-
-  handle: async (context, params, response) => {
-    await context.ensureTab();
-    response.setIncludeTabs();
-  },
-});
-
-const selectTab = defineTool({
-  capability: 'core-tabs',
-
-  schema: {
-    name: 'browser_tab_select',
-    title: 'Select a tab',
-    description: 'Select a tab by index',
-    inputSchema: z.object({
-      index: z.number().describe('The index of the tab to select'),
-    }),
-    type: 'readOnly',
-  },
-
-  handle: async (context, params, response) => {
-    await context.selectTab(params.index);
-    response.setIncludeSnapshot();
-  },
-});
-
-const newTab = defineTool({
-  capability: 'core-tabs',
-
-  schema: {
-    name: 'browser_tab_new',
-    title: 'Open a new tab',
-    description: 'Open a new tab',
-    inputSchema: z.object({
-      url: z.string().optional().describe('The URL to navigate to in the new tab. If not provided, the new tab will be blank.'),
-    }),
-    type: 'readOnly',
-  },
-
-  handle: async (context, params, response) => {
-    const tab = await context.newTab();
-    if (params.url)
-      await tab.navigate(params.url);
-    response.setIncludeSnapshot();
-  },
-});
-
-const closeTab = defineTool({
-  capability: 'core-tabs',
-
-  schema: {
-    name: 'browser_tab_close',
-    title: 'Close a tab',
-    description: 'Close a tab',
-    inputSchema: z.object({
-      index: z.number().optional().describe('The index of the tab to close. Closes current tab if not provided.'),
-    }),
-    type: 'destructive',
-  },
-
-  handle: async (context, params, response) => {
-    await context.closeTab(params.index);
-    response.setIncludeSnapshot();
-  },
-});
-
-export default [
-  listTabs,
-  newTab,
-  selectTab,
-  closeTab,
-];

src/tools/tool.ts

@@ -1,70 +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 type { z } from 'zod';
-import type { Context } from '../context.js';
-import type * as playwright from 'playwright';
-import type { ToolCapability } from '../../config.js';
-import type { Tab } from '../tab.js';
-import type { Response } from '../response.js';
-import type { ToolSchema } from '../mcp/tool.js';
-
-export type FileUploadModalState = {
-  type: 'fileChooser';
-  description: string;
-  fileChooser: playwright.FileChooser;
-};
-
-export type DialogModalState = {
-  type: 'dialog';
-  description: string;
-  dialog: playwright.Dialog;
-};
-
-export type ModalState = FileUploadModalState | DialogModalState;
-
-export type Tool<Input extends z.Schema = z.Schema> = {
-  capability: ToolCapability;
-  schema: ToolSchema<Input>;
-  handle: (context: Context, params: z.output<Input>, response: Response) => Promise<void>;
-};
-
-export function defineTool<Input extends z.Schema>(tool: Tool<Input>): Tool<Input> {
-  return tool;
-}
-
-export type TabTool<Input extends z.Schema = z.Schema> = {
-  capability: ToolCapability;
-  schema: ToolSchema<Input>;
-  clearsModalState?: ModalState['type'];
-  handle: (tab: Tab, params: z.output<Input>, response: Response) => Promise<void>;
-};
-
-export function defineTabTool<Input extends z.Schema>(tool: TabTool<Input>): Tool<Input> {
-  return {
-    ...tool,
-    handle: async (context, params, response) => {
-      const tab = context.currentTabOrDie();
-      const modalStates = tab.modalStates().map(state => state.type);
-      if (tool.clearsModalState && !modalStates.includes(tool.clearsModalState))
-        response.addError(`Error: The tool "${tool.schema.name}" can only be used when there is related modal state present.\n` + tab.modalStatesMarkdown().join('\n'));
-      else if (!tool.clearsModalState && modalStates.length)
-        response.addError(`Error: Tool "${tool.schema.name}" does not handle the modal state.\n` + tab.modalStatesMarkdown().join('\n'));
-      else
-        return tool.handle(tab, params, response);
-    },
-  };
-}

src/tools/utils.ts

@@ -1,85 +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.
- */
-
-// @ts-ignore
-import { asLocator } from 'playwright-core/lib/utils';
-
-import type * as playwright from 'playwright';
-import type { Tab } from '../tab.js';
-
-export async function waitForCompletion<R>(tab: Tab, callback: () => Promise<R>): Promise<R> {
-  const requests = new Set<playwright.Request>();
-  let frameNavigated = false;
-  let waitCallback: () => void = () => {};
-  const waitBarrier = new Promise<void>(f => { waitCallback = f; });
-
-  const requestListener = (request: playwright.Request) => requests.add(request);
-  const requestFinishedListener = (request: playwright.Request) => {
-    requests.delete(request);
-    if (!requests.size)
-      waitCallback();
-  };
-
-  const frameNavigateListener = (frame: playwright.Frame) => {
-    if (frame.parentFrame())
-      return;
-    frameNavigated = true;
-    dispose();
-    clearTimeout(timeout);
-    void tab.waitForLoadState('load').then(waitCallback);
-  };
-
-  const onTimeout = () => {
-    dispose();
-    waitCallback();
-  };
-
-  tab.page.on('request', requestListener);
-  tab.page.on('requestfinished', requestFinishedListener);
-  tab.page.on('framenavigated', frameNavigateListener);
-  const timeout = setTimeout(onTimeout, 10000);
-
-  const dispose = () => {
-    tab.page.off('request', requestListener);
-    tab.page.off('requestfinished', requestFinishedListener);
-    tab.page.off('framenavigated', frameNavigateListener);
-    clearTimeout(timeout);
-  };
-
-  try {
-    const result = await callback();
-    if (!requests.size && !frameNavigated)
-      waitCallback();
-    await waitBarrier;
-    await tab.waitForTimeout(1000);
-    return result;
-  } finally {
-    dispose();
-  }
-}
-
-export async function generateLocator(locator: playwright.Locator): Promise<string> {
-  try {
-    const { resolvedSelector } = await (locator as any)._resolveSelector();
-    return asLocator('javascript', resolvedSelector);
-  } catch (e) {
-    throw new Error('Ref not found, likely because element was removed. Use browser_snapshot to see what elements are currently on the page.');
-  }
-}
-
-export async function callOnPageNoTrace<T>(page: playwright.Page, callback: (page: playwright.Page) => Promise<T>): Promise<T> {
-  return await (page as any)._wrapApiCall(() => callback(page), { internal: true });
-}

src/tools/wait.ts

@@ -1,65 +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 wait = defineTool({
-  capability: 'core',
-
-  schema: {
-    name: 'browser_wait_for',
-    title: 'Wait for',
-    description: 'Wait for text to appear or disappear or a specified time to pass',
-    inputSchema: z.object({
-      time: z.number().optional().describe('The time to wait in seconds'),
-      text: z.string().optional().describe('The text to wait for'),
-      textGone: z.string().optional().describe('The text to wait for to disappear'),
-    }),
-    type: 'readOnly',
-  },
-
-  handle: async (context, params, response) => {
-    if (!params.text && !params.textGone && !params.time)
-      throw new Error('Either time, text or textGone must be provided');
-
-    if (params.time) {
-      response.addCode(`await new Promise(f => setTimeout(f, ${params.time!} * 1000));`);
-      await new Promise(f => setTimeout(f, Math.min(30000, params.time! * 1000)));
-    }
-
-    const tab = context.currentTabOrDie();
-    const locator = params.text ? tab.page.getByText(params.text).first() : undefined;
-    const goneLocator = params.textGone ? tab.page.getByText(params.textGone).first() : undefined;
-
-    if (goneLocator) {
-      response.addCode(`await page.getByText(${JSON.stringify(params.textGone)}).first().waitFor({ state: 'hidden' });`);
-      await goneLocator.waitFor({ state: 'hidden' });
-    }
-
-    if (locator) {
-      response.addCode(`await page.getByText(${JSON.stringify(params.text)}).first().waitFor({ state: 'visible' });`);
-      await locator.waitFor({ state: 'visible' });
-    }
-
-    response.addResult(`Waited for ${params.text || params.textGone || params.time}`);
-    response.setIncludeSnapshot();
-  },
-});
-
-export default [
-  wait,
-];

src/utils/codegen.ts

@@ -1,53 +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.
- */
-
-// adapted from:
-// - https://github.com/microsoft/playwright/blob/76ee48dc9d4034536e3ec5b2c7ce8be3b79418a8/packages/playwright-core/src/utils/isomorphic/stringUtils.ts
-// - https://github.com/microsoft/playwright/blob/76ee48dc9d4034536e3ec5b2c7ce8be3b79418a8/packages/playwright-core/src/server/codegen/javascript.ts
-
-// NOTE: this function should not be used to escape any selectors.
-export function escapeWithQuotes(text: string, char: string = '\'') {
-  const stringified = JSON.stringify(text);
-  const escapedText = stringified.substring(1, stringified.length - 1).replace(/\\"/g, '"');
-  if (char === '\'')
-    return char + escapedText.replace(/[']/g, '\\\'') + char;
-  if (char === '"')
-    return char + escapedText.replace(/["]/g, '\\"') + char;
-  if (char === '`')
-    return char + escapedText.replace(/[`]/g, '\\`') + char;
-  throw new Error('Invalid escape char');
-}
-
-export function quote(text: string) {
-  return escapeWithQuotes(text, '\'');
-}
-
-export function formatObject(value: any, indent = '  '): string {
-  if (typeof value === 'string')
-    return quote(value);
-  if (Array.isArray(value))
-    return `[${value.map(o => formatObject(o)).join(', ')}]`;
-  if (typeof value === 'object') {
-    const keys = Object.keys(value).filter(key => value[key] !== undefined).sort();
-    if (!keys.length)
-      return '{}';
-    const tokens: string[] = [];
-    for (const key of keys)
-      tokens.push(`${key}: ${formatObject(value[key])}`);
-    return `{\n${indent}${tokens.join(`,\n${indent}`)}\n}`;
-  }
-  return String(value);
-}

src/utils/fileUtils.ts

@@ -1,39 +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 os from 'node:os';
-import path from 'node:path';
-
-export function cacheDir() {
-  let cacheDirectory: string;
-  if (process.platform === 'linux')
-    cacheDirectory = process.env.XDG_CACHE_HOME || path.join(os.homedir(), '.cache');
-  else if (process.platform === 'darwin')
-    cacheDirectory = path.join(os.homedir(), 'Library', 'Caches');
-  else if (process.platform === 'win32')
-    cacheDirectory = process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local');
-  else
-    throw new Error('Unsupported platform: ' + process.platform);
-  return path.join(cacheDirectory, 'ms-playwright');
-}
-
-export function sanitizeForFilePath(s: string) {
-  const sanitize = (s: string) => s.replace(/[\x00-\x2C\x2E-\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]+/g, '-');
-  const separator = s.lastIndexOf('.');
-  if (separator === -1)
-    return sanitize(s);
-  return sanitize(s.substring(0, separator)) + '.' + sanitize(s.substring(separator + 1));
-}

src/utils/guid.ts

@@ -1,25 +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 crypto from 'crypto';
-
-export function createGuid(): string {
-  return crypto.randomBytes(16).toString('hex');
-}
-
-export function createHash(data: string): string {
-  return crypto.createHash('sha256').update(data).digest('hex').slice(0, 7);
-}

src/utils/log.ts

@@ -1,25 +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 debug from 'debug';
-
-const errorsDebug = debug('pw:mcp:errors');
-
-export function logUnhandledError(error: unknown) {
-  errorsDebug(error);
-}
-
-export const testDebug = debug('pw:mcp:test');

src/utils/manualPromise.ts

@@ -1,127 +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.
- */
-
-export class ManualPromise<T = void> extends Promise<T> {
-  private _resolve!: (t: T) => void;
-  private _reject!: (e: Error) => void;
-  private _isDone: boolean;
-
-  constructor() {
-    let resolve: (t: T) => void;
-    let reject: (e: Error) => void;
-    super((f, r) => {
-      resolve = f;
-      reject = r;
-    });
-    this._isDone = false;
-    this._resolve = resolve!;
-    this._reject = reject!;
-  }
-
-  isDone() {
-    return this._isDone;
-  }
-
-  resolve(t: T) {
-    this._isDone = true;
-    this._resolve(t);
-  }
-
-  reject(e: Error) {
-    this._isDone = true;
-    this._reject(e);
-  }
-
-  static override get [Symbol.species]() {
-    return Promise;
-  }
-
-  override get [Symbol.toStringTag]() {
-    return 'ManualPromise';
-  }
-}
-
-export class LongStandingScope {
-  private _terminateError: Error | undefined;
-  private _closeError: Error | undefined;
-  private _terminatePromises = new Map<ManualPromise<Error>, string[]>();
-  private _isClosed = false;
-
-  reject(error: Error) {
-    this._isClosed = true;
-    this._terminateError = error;
-    for (const p of this._terminatePromises.keys())
-      p.resolve(error);
-  }
-
-  close(error: Error) {
-    this._isClosed = true;
-    this._closeError = error;
-    for (const [p, frames] of this._terminatePromises)
-      p.resolve(cloneError(error, frames));
-  }
-
-  isClosed() {
-    return this._isClosed;
-  }
-
-  static async raceMultiple<T>(scopes: LongStandingScope[], promise: Promise<T>): Promise<T> {
-    return Promise.race(scopes.map(s => s.race(promise)));
-  }
-
-  async race<T>(promise: Promise<T> | Promise<T>[]): Promise<T> {
-    return this._race(Array.isArray(promise) ? promise : [promise], false) as Promise<T>;
-  }
-
-  async safeRace<T>(promise: Promise<T>, defaultValue?: T): Promise<T> {
-    return this._race([promise], true, defaultValue);
-  }
-
-  private async _race(promises: Promise<any>[], safe: boolean, defaultValue?: any): Promise<any> {
-    const terminatePromise = new ManualPromise<Error>();
-    const frames = captureRawStack();
-    if (this._terminateError)
-      terminatePromise.resolve(this._terminateError);
-    if (this._closeError)
-      terminatePromise.resolve(cloneError(this._closeError, frames));
-    this._terminatePromises.set(terminatePromise, frames);
-    try {
-      return await Promise.race([
-        terminatePromise.then(e => safe ? defaultValue : Promise.reject(e)),
-        ...promises
-      ]);
-    } finally {
-      this._terminatePromises.delete(terminatePromise);
-    }
-  }
-}
-
-function cloneError(error: Error, frames: string[]) {
-  const clone = new Error();
-  clone.name = error.name;
-  clone.message = error.message;
-  clone.stack = [error.name + ':' + error.message, ...frames].join('\n');
-  return clone;
-}
-
-function captureRawStack(): string[] {
-  const stackTraceLimit = Error.stackTraceLimit;
-  Error.stackTraceLimit = 50;
-  const error = new Error();
-  const stack = error.stack || '';
-  Error.stackTraceLimit = stackTraceLimit;
-  return stack.split('\n');
-}

src/utils/package.ts

@@ -1,22 +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 fs from 'fs';
-import path from 'path';
-import url from 'url';
-
-const __filename = url.fileURLToPath(import.meta.url);
-export const packageJSON = JSON.parse(fs.readFileSync(path.join(path.dirname(__filename), '..', '..', 'package.json'), 'utf8'));

tests/capabilities.spec.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { test, expect } from './fixtures.js';
+import { test, expect } from './fixtures';
 
 test('test snapshot tool list', async ({ client }) => {
   const { tools } = await client.listTools();
@@ -24,6 +24,7 @@ test('test snapshot tool list', async ({ client }) => {
     'browser_drag',
     'browser_evaluate',
     'browser_file_upload',
+    'browser_fill_form',
     'browser_handle_dialog',
     'browser_hover',
     'browser_select_option',
@@ -31,16 +32,12 @@ test('test snapshot tool list', async ({ client }) => {
     'browser_close',
     'browser_install',
     'browser_navigate_back',
-    'browser_navigate_forward',
     'browser_navigate',
     'browser_network_requests',
     'browser_press_key',
     'browser_resize',
     'browser_snapshot',
-    'browser_tab_close',
-    'browser_tab_list',
-    'browser_tab_new',
-    'browser_tab_select',
+    'browser_tabs',
     'browser_take_screenshot',
     'browser_wait_for',
   ]));
@@ -58,6 +55,7 @@ test('test tool list proxy mode', async ({ startClient }) => {
     'browser_drag',
     'browser_evaluate',
     'browser_file_upload',
+    'browser_fill_form',
     'browser_handle_dialog',
     'browser_hover',
     'browser_select_option',
@@ -65,16 +63,12 @@ test('test tool list proxy mode', async ({ startClient }) => {
     'browser_close',
     'browser_install',
     'browser_navigate_back',
-    'browser_navigate_forward',
     'browser_navigate',
     'browser_network_requests',
     'browser_press_key',
     'browser_resize',
     'browser_snapshot',
-    'browser_tab_close',
-    'browser_tab_list',
-    'browser_tab_new',
-    'browser_tab_select',
+    'browser_tabs',
     'browser_take_screenshot',
     'browser_wait_for',
   ]));

tests/cdp.spec.ts

@@ -1,97 +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 url from 'node:url';
-import path from 'node:path';
-import { spawnSync } from 'node:child_process';
-import { test, expect } from './fixtures.js';
-
-test('cdp server', async ({ cdpServer, startClient, server }) => {
-  await cdpServer.start();
-  const { client } = await startClient({ args: [`--cdp-endpoint=${cdpServer.endpoint}`] });
-  expect(await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.HELLO_WORLD },
-  })).toHaveResponse({
-    pageState: expect.stringContaining(`- generic [active] [ref=e1]: Hello, world!`),
-  });
-});
-
-test('cdp server reuse tab', async ({ cdpServer, startClient, server }) => {
-  const browserContext = await cdpServer.start();
-  const { client } = await startClient({ args: [`--cdp-endpoint=${cdpServer.endpoint}`] });
-
-  const [page] = browserContext.pages();
-  await page.goto(server.HELLO_WORLD);
-
-  expect(await client.callTool({
-    name: 'browser_click',
-    arguments: {
-      element: 'Hello, world!',
-      ref: 'f0',
-    },
-  })).toHaveResponse({
-    result: `Error: No open pages available. Use the "browser_navigate" tool to navigate to a page first.`,
-    isError: true,
-  });
-
-  expect(await client.callTool({
-    name: 'browser_snapshot',
-  })).toHaveResponse({
-    pageState: expect.stringContaining(`- Page URL: ${server.HELLO_WORLD}
-- Page Title: Title
-- Page Snapshot:
-\`\`\`yaml
-- generic [active] [ref=e1]: Hello, world!
-\`\`\``),
-  });
-});
-
-test('should throw connection error and allow re-connecting', async ({ cdpServer, startClient, server }) => {
-  const { client } = await startClient({ args: [`--cdp-endpoint=${cdpServer.endpoint}`] });
-
-  server.setContent('/', `
-    <title>Title</title>
-    <body>Hello, world!</body>
-  `, 'text/html');
-
-  expect(await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.PREFIX },
-  })).toHaveResponse({
-    result: expect.stringContaining(`Error: browserType.connectOverCDP: connect ECONNREFUSED`),
-    isError: true,
-  });
-  await cdpServer.start();
-  expect(await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.PREFIX },
-  })).toHaveResponse({
-    pageState: expect.stringContaining(`- generic [active] [ref=e1]: Hello, world!`),
-  });
-});
-
-// NOTE: Can be removed when we drop Node.js 18 support and changed to import.meta.filename.
-const __filename = url.fileURLToPath(import.meta.url);
-
-test('does not support --device', async () => {
-  const result = spawnSync('node', [
-    path.join(__filename, '../../cli.js'), '--device=Pixel 5', '--cdp-endpoint=http://localhost:1234',
-  ]);
-  expect(result.error).toBeUndefined();
-  expect(result.status).toBe(1);
-  expect(result.stderr.toString()).toContain('Device emulation is not supported with cdpEndpoint.');
-});

tests/click.spec.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { test, expect } from './fixtures.js';
+import { test, expect } from './fixtures';
 
 test('browser_click', async ({ client, server, mcpBrowser }) => {
   server.setContent('/', `
@@ -22,9 +22,12 @@ test('browser_click', async ({ client, server, mcpBrowser }) => {
     <button>Submit</button>
   `, 'text/html');
 
-  await client.callTool({
+  expect(await client.callTool({
     name: 'browser_navigate',
     arguments: { url: server.PREFIX },
+  })).toHaveResponse({
+    code: `await page.goto('${server.PREFIX}');`,
+    pageState: expect.stringContaining(`- button \"Submit\" [ref=e2]`),
   });
 
   expect(await client.callTool({
@@ -38,62 +41,3 @@ test('browser_click', async ({ client, server, mcpBrowser }) => {
     pageState: expect.stringContaining(`- 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,
-    },
-  })).toHaveResponse({
-    code: `await page.getByRole('heading', { name: 'Click me' }).dblclick();`,
-    pageState: expect.stringContaining(`- 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).toHaveResponse({
-    code: `await page.getByRole('button', { name: 'Menu' }).click({ button: 'right' });`,
-    pageState: expect.stringContaining(`- button "Right clicked"`),
-  });
-});

tests/config.spec.ts

@@ -1,84 +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 fs from 'node:fs';
-
-import { Config } from '../config.js';
-import { test, expect } from './fixtures.js';
-
-test('config user data dir', async ({ startClient, server, mcpMode }, testInfo) => {
-  server.setContent('/', `
-    <title>Title</title>
-    <body>Hello, world!</body>
-  `, 'text/html');
-
-  const config: Config = {
-    browser: {
-      userDataDir: testInfo.outputPath('user-data-dir'),
-    },
-  };
-  const configPath = testInfo.outputPath('config.json');
-  await fs.promises.writeFile(configPath, JSON.stringify(config, null, 2));
-
-  const { client } = await startClient({ args: ['--config', configPath] });
-  expect(await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.PREFIX },
-  })).toHaveResponse({
-    pageState: expect.stringContaining(`Hello, world!`),
-  });
-
-  const files = await fs.promises.readdir(config.browser!.userDataDir!);
-  expect(files.length).toBeGreaterThan(0);
-});
-
-test.describe(() => {
-  test.use({ mcpBrowser: '' });
-  test('browserName', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright-mcp/issues/458' } }, async ({ startClient, mcpMode }, testInfo) => {
-    const config: Config = {
-      browser: {
-        browserName: 'firefox',
-      },
-    };
-    const configPath = testInfo.outputPath('config.json');
-    await fs.promises.writeFile(configPath, JSON.stringify(config, null, 2));
-
-    const { client } = await startClient({ args: ['--config', configPath] });
-    expect(await client.callTool({
-      name: 'browser_navigate',
-      arguments: { url: 'data:text/html,<script>document.title = navigator.userAgent</script>' },
-    })).toHaveResponse({
-      pageState: expect.stringContaining(`Firefox`),
-    });
-  });
-});
-
-test.describe('sandbox configuration', () => {
-  test('should enable sandbox by default (no --no-sandbox flag)', async () => {
-    const { configFromCLIOptions } = await import('../lib/config.js');
-    const config = configFromCLIOptions({ sandbox: undefined });
-    // When --no-sandbox is not passed, chromiumSandbox should not be set to false
-    // This allows the default (true) to be used
-    expect(config.browser?.launchOptions?.chromiumSandbox).toBeUndefined();
-  });
-
-  test('should disable sandbox when --no-sandbox flag is passed', async () => {
-    const { configFromCLIOptions } = await import('../lib/config.js');
-    const config = configFromCLIOptions({ sandbox: false });
-    // When --no-sandbox is passed, chromiumSandbox should be explicitly set to false
-    expect(config.browser?.launchOptions?.chromiumSandbox).toBe(false);
-  });
-});

tests/console.spec.ts

@@ -1,100 +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 { test, expect } from './fixtures.js';
-
-test('browser_console_messages', async ({ client, server }) => {
-  server.setContent('/', `
-    <!DOCTYPE html>
-    <html>
-      <script>
-        console.log("Hello, world!");
-        console.error("Error");
-      </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).toHaveResponse({
-    result: `[LOG] Hello, world! @ ${server.PREFIX}:4
-[ERROR] Error @ ${server.PREFIX}:5`,
-  });
-});
-
-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).toHaveResponse({
-    result: expect.stringContaining(`Error: Error in script`),
-  });
-  expect(resource).toHaveResponse({
-    result: expect.stringContaining(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).toHaveResponse({
-    consoleMessages: expect.stringContaining(`- [LOG] Hello, world! @`),
-  });
-});

tests/core.spec.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { test, expect } from './fixtures.js';
+import { test, expect } from './fixtures';
 
 test('browser_navigate', async ({ client, server }) => {
   expect(await client.callTool({
@@ -30,161 +30,3 @@ test('browser_navigate', async ({ client, server }) => {
 \`\`\``,
   });
 });
-
-test('browser_select_option', async ({ client, server }) => {
-  server.setContent('/', `
-    <title>Title</title>
-    <select>
-      <option value="foo">Foo</option>
-      <option value="bar">Bar</option>
-    </select>
-  `, 'text/html');
-
-  await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.PREFIX },
-  });
-
-  expect(await client.callTool({
-    name: 'browser_select_option',
-    arguments: {
-      element: 'Select',
-      ref: 'e2',
-      values: ['bar'],
-    },
-  })).toHaveResponse({
-    code: `await page.getByRole('combobox').selectOption(['bar']);`,
-    pageState: `- Page URL: ${server.PREFIX}
-- Page Title: Title
-- Page Snapshot:
-\`\`\`yaml
-- combobox [ref=e2]:
-  - option "Foo"
-  - option "Bar" [selected]
-\`\`\``,
-  });
-});
-
-test('browser_select_option (multiple)', async ({ client, server }) => {
-  server.setContent('/', `
-    <title>Title</title>
-    <select multiple>
-      <option value="foo">Foo</option>
-      <option value="bar">Bar</option>
-      <option value="baz">Baz</option>
-    </select>
-  `, 'text/html');
-
-  await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.PREFIX },
-  });
-
-  expect(await client.callTool({
-    name: 'browser_select_option',
-    arguments: {
-      element: 'Select',
-      ref: 'e2',
-      values: ['bar', 'baz'],
-    },
-  })).toHaveResponse({
-    code: `await page.getByRole('listbox').selectOption(['bar', 'baz']);`,
-    pageState: expect.stringContaining(`
-- listbox [ref=e2]:
-  - option "Foo" [ref=e3]
-  - option "Bar" [selected] [ref=e4]
-  - option "Baz" [selected] [ref=e5]`),
-  });
-});
-
-test('browser_resize', async ({ client, server }) => {
-  server.setContent('/', `
-    <title>Resize Test</title>
-    <body>
-      <div id="size">Waiting for resize...</div>
-      <script>new ResizeObserver(() => { document.getElementById("size").textContent = \`Window size: \${window.innerWidth}x\${window.innerHeight}\`; }).observe(document.body);
-      </script>
-    </body>
-  `, 'text/html');
-  await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.PREFIX },
-  });
-
-  const response = await client.callTool({
-    name: 'browser_resize',
-    arguments: {
-      width: 390,
-      height: 780,
-    },
-  });
-  expect(response).toHaveResponse({
-    code: `await page.setViewportSize({ width: 390, height: 780 });`,
-  });
-  await expect.poll(() => client.callTool({ name: 'browser_snapshot' })).toHaveResponse({
-    pageState: expect.stringContaining(`Window size: 390x780`),
-  });
-});
-
-test('old locator error message', async ({ client, server }) => {
-  server.setContent('/', `
-    <button>Button 1</button>
-    <button>Button 2</button>
-    <script>
-      document.querySelector('button').addEventListener('click', () => {
-        document.querySelectorAll('button')[1].remove();
-      });
-    </script>
-  `, 'text/html');
-
-  expect(await client.callTool({
-    name: 'browser_navigate',
-    arguments: {
-      url: server.PREFIX,
-    },
-  })).toHaveResponse({
-    pageState: expect.stringContaining(`
-  - button "Button 1" [ref=e2]
-  - button "Button 2" [ref=e3]`),
-  });
-
-  await client.callTool({
-    name: 'browser_click',
-    arguments: {
-      element: 'Button 1',
-      ref: 'e2',
-    },
-  });
-
-  expect(await client.callTool({
-    name: 'browser_click',
-    arguments: {
-      element: 'Button 2',
-      ref: 'e3',
-    },
-  })).toHaveResponse({
-    result: expect.stringContaining(`Ref e3 not found in the current page snapshot. Try capturing new snapshot.`),
-    isError: true,
-  });
-});
-
-test('visibility: hidden > visible should be shown', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright-mcp/issues/535' } }, async ({ client, server }) => {
-  server.setContent('/', `
-    <div style="visibility: hidden;">
-      <div style="visibility: visible;">
-        <button>Button</button>
-      </div>
-    </div>
-  `, 'text/html');
-
-  await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.PREFIX },
-  });
-
-  expect(await client.callTool({
-    name: 'browser_snapshot'
-  })).toHaveResponse({
-    pageState: expect.stringContaining(`- button "Button"`),
-  });
-});

tests/device.spec.ts

@@ -1,45 +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 { test, expect } from './fixtures.js';
-
-test('--device should work', async ({ startClient, server, mcpMode }) => {
-  const { client } = await startClient({
-    args: ['--device', 'iPhone 15'],
-  });
-
-  server.route('/', (req, res) => {
-    res.writeHead(200, { 'Content-Type': 'text/html' });
-    res.end(`
-      <head>
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-      </head>
-      <body></body>
-      <script>
-        document.body.textContent = window.innerWidth + "x" + window.innerHeight;
-      </script>
-    `);
-  });
-
-  expect(await client.callTool({
-    name: 'browser_navigate',
-    arguments: {
-      url: server.PREFIX,
-    },
-  })).toHaveResponse({
-    pageState: expect.stringContaining(`393x659`),
-  });
-});

tests/dialogs.spec.ts

@@ -1,255 +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 { test, expect } from './fixtures.js';
-
-test('alert dialog', async ({ client, server }) => {
-  server.setContent('/', `<button onclick="alert('Alert')">Button</button>`, 'text/html');
-  expect(await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.PREFIX },
-  })).toHaveResponse({
-    pageState: expect.stringContaining(`- button "Button" [ref=e2]`),
-  });
-
-  expect(await client.callTool({
-    name: 'browser_click',
-    arguments: {
-      element: 'Button',
-      ref: 'e2',
-    },
-  })).toHaveResponse({
-    code: `await page.getByRole('button', { name: 'Button' }).click();`,
-    modalState: `- ["alert" dialog with message "Alert"]: can be handled by the "browser_handle_dialog" tool`,
-  });
-
-  expect(await client.callTool({
-    name: 'browser_click',
-    arguments: {
-      element: 'Button',
-      ref: 'e2',
-    },
-  })).toHaveResponse({
-    code: undefined,
-    modalState: `- ["alert" dialog with message "Alert"]: can be handled by the "browser_handle_dialog" tool`,
-  });
-
-  expect(await client.callTool({
-    name: 'browser_handle_dialog',
-    arguments: {
-      accept: true,
-    },
-  })).toHaveResponse({
-    modalState: undefined,
-    pageState: expect.stringContaining(`- button "Button"`),
-  });
-});
-
-test('two alert dialogs', async ({ client, server }) => {
-  server.setContent('/', `
-    <title>Title</title>
-    <body>
-      <button onclick="alert('Alert 1');alert('Alert 2');">Button</button>
-    </body>
-  `, 'text/html');
-
-  expect(await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.PREFIX },
-  })).toHaveResponse({
-    pageState: expect.stringContaining(`- button "Button" [ref=e2]`),
-  });
-
-  expect(await client.callTool({
-    name: 'browser_click',
-    arguments: {
-      element: 'Button',
-      ref: 'e2',
-    },
-  })).toHaveResponse({
-    code: `await page.getByRole('button', { name: 'Button' }).click();`,
-    modalState: expect.stringContaining(`- ["alert" dialog with message "Alert 1"]: can be handled by the "browser_handle_dialog" tool`),
-  });
-
-  const result = await client.callTool({
-    name: 'browser_handle_dialog',
-    arguments: {
-      accept: true,
-    },
-  });
-
-  expect(result).toHaveResponse({
-    modalState: expect.stringContaining(`- ["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.toHaveResponse({
-    modalState: expect.stringContaining(`- ["alert" dialog with message "Alert 2"]: can be handled by the "browser_handle_dialog" tool`),
-  });
-});
-
-test('confirm dialog (true)', async ({ client, server }) => {
-  server.setContent('/', `
-    <title>Title</title>
-    <body>
-      <button onclick="document.body.textContent = confirm('Confirm')">Button</button>
-    </body>
-  `, 'text/html');
-
-  expect(await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.PREFIX },
-  })).toHaveResponse({
-    pageState: expect.stringContaining(`- button "Button" [ref=e2]`),
-  });
-
-  expect(await client.callTool({
-    name: 'browser_click',
-    arguments: {
-      element: 'Button',
-      ref: 'e2',
-    },
-  })).toHaveResponse({
-    modalState: expect.stringContaining(`- ["confirm" dialog with message "Confirm"]: can be handled by the "browser_handle_dialog" tool`),
-  });
-
-  expect(await client.callTool({
-    name: 'browser_handle_dialog',
-    arguments: {
-      accept: true,
-    },
-  })).toHaveResponse({
-    modalState: undefined,
-    pageState: expect.stringContaining(`- generic [active] [ref=e1]: "true"`),
-  });
-});
-
-test('confirm dialog (false)', async ({ client, server }) => {
-  server.setContent('/', `
-    <title>Title</title>
-    <body>
-      <button onclick="document.body.textContent = confirm('Confirm')">Button</button>
-    </body>
-  `, 'text/html');
-
-  expect(await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.PREFIX },
-  })).toHaveResponse({
-    pageState: expect.stringContaining(`- button "Button" [ref=e2]`),
-  });
-
-  expect(await client.callTool({
-    name: 'browser_click',
-    arguments: {
-      element: 'Button',
-      ref: 'e2',
-    },
-  })).toHaveResponse({
-    modalState: expect.stringContaining(`- ["confirm" dialog with message "Confirm"]: can be handled by the "browser_handle_dialog" tool`),
-  });
-
-  expect(await client.callTool({
-    name: 'browser_handle_dialog',
-    arguments: {
-      accept: false,
-    },
-  })).toHaveResponse({
-    modalState: undefined,
-    pageState: expect.stringContaining(`- generic [active] [ref=e1]: "false"`),
-  });
-});
-
-test('prompt dialog', async ({ client, server }) => {
-  server.setContent('/', `
-    <title>Title</title>
-    <body>
-      <button onclick="document.body.textContent = prompt('Prompt')">Button</button>
-    </body>
-  `, 'text/html');
-
-  expect(await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.PREFIX },
-  })).toHaveResponse({
-    pageState: expect.stringContaining(`- button "Button" [ref=e2]`),
-  });
-
-  expect(await client.callTool({
-    name: 'browser_click',
-    arguments: {
-      element: 'Button',
-      ref: 'e2',
-    },
-  })).toHaveResponse({
-    modalState: expect.stringContaining(`- ["prompt" dialog with message "Prompt"]: can be handled by the "browser_handle_dialog" tool`),
-  });
-
-  const result = await client.callTool({
-    name: 'browser_handle_dialog',
-    arguments: {
-      accept: true,
-      promptText: 'Answer',
-    },
-  });
-
-  expect(result).toHaveResponse({
-    pageState: expect.stringContaining(`- 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 },
-  })).toHaveResponse({
-    pageState: expect.stringContaining(`- button "Button" [ref=e2]`),
-  });
-
-  expect(await client.callTool({
-    name: 'browser_click',
-    arguments: {
-      element: 'Button',
-      ref: 'e2',
-    },
-  })).toHaveResponse({
-    code: `await page.getByRole('button', { name: 'Button' }).click();`,
-    modalState: expect.stringContaining(`- ["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).toHaveResponse({
-    modalState: undefined,
-    pageState: expect.stringContaining(`- Page URL: ${server.PREFIX}
-- Page Title: 
-- Page Snapshot:
-\`\`\`yaml
-- button "Button"`),
-  });
-});

tests/evaluate.spec.ts

@@ -1,80 +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 { test, expect } from './fixtures.js';
-
-test('browser_evaluate', async ({ client, server }) => {
-  expect(await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.HELLO_WORLD },
-  })).toHaveResponse({
-    pageState: expect.stringContaining(`- Page Title: Title`),
-  });
-
-  expect(await client.callTool({
-    name: 'browser_evaluate',
-    arguments: {
-      function: '() => document.title',
-    },
-  })).toHaveResponse({
-    result: `"Title"`,
-    code: `await page.evaluate('() => document.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',
-    },
-  })).toHaveResponse({
-    result: `"red"`,
-    code: `await page.getByText('Hello, world!').evaluate('element => element.style.backgroundColor');`,
-  });
-});
-
-test('browser_evaluate (error)', async ({ client, server }) => {
-  expect(await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.HELLO_WORLD },
-  })).toHaveResponse({
-    pageState: expect.stringContaining(`- Page Title: Title`),
-  });
-
-  const result = await client.callTool({
-    name: 'browser_evaluate',
-    arguments: {
-      function: '() => nonExistentVariable',
-    },
-  });
-
-  expect(result.isError).toBe(true);
-  expect(result.content?.[0]?.text).toContain('nonExistentVariable');
-  // Check for common error patterns across browsers
-  const errorText = result.content?.[0]?.text || '';
-  expect(errorText).toMatch(/not defined|Can't find variable/);
-});

tests/files.spec.ts

@@ -1,151 +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 fs from 'fs/promises';
-import { test, expect } from './fixtures.js';
-
-test('browser_file_upload', async ({ client, server }, testInfo) => {
-  server.setContent('/', `
-    <input type="file" />
-    <button>Button</button>
-  `, 'text/html');
-
-  expect(await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.PREFIX },
-  })).toHaveResponse({
-    pageState: expect.stringContaining(`- generic [active] [ref=e1]:
-  - button "Choose File" [ref=e2]
-  - button "Button" [ref=e3]`),
-  });
-
-  {
-    expect(await client.callTool({
-      name: 'browser_file_upload',
-      arguments: { paths: [] },
-    })).toHaveResponse({
-      isError: true,
-      result: expect.stringContaining(`The tool "browser_file_upload" can only be used when there is related modal state present.`),
-      modalState: expect.stringContaining(`- There is no modal state present`),
-    });
-  }
-
-  expect(await client.callTool({
-    name: 'browser_click',
-    arguments: {
-      element: 'Textbox',
-      ref: 'e2',
-    },
-  })).toHaveResponse({
-    modalState: expect.stringContaining(`- [File chooser]: can be handled by the "browser_file_upload" tool`),
-  });
-
-  const filePath = testInfo.outputPath('test.txt');
-  await fs.writeFile(filePath, 'Hello, world!');
-
-  {
-    const response = await client.callTool({
-      name: 'browser_file_upload',
-      arguments: {
-        paths: [filePath],
-      },
-    });
-
-    expect(response).toHaveResponse({
-      code: expect.stringContaining(`await fileChooser.setFiles(`),
-      modalState: undefined,
-    });
-  }
-
-  {
-    const response = await client.callTool({
-      name: 'browser_click',
-      arguments: {
-        element: 'Textbox',
-        ref: 'e2',
-      },
-    });
-
-    expect(response).toHaveResponse({
-      modalState: `- [File chooser]: can be handled by the "browser_file_upload" tool`,
-    });
-  }
-
-  {
-    const response = await client.callTool({
-      name: 'browser_click',
-      arguments: {
-        element: 'Button',
-        ref: 'e3',
-      },
-    });
-
-    expect(response).toHaveResponse({
-      result: `Error: Tool "browser_click" does not handle the modal state.`,
-      modalState: expect.stringContaining(`- [File chooser]: can be handled by the "browser_file_upload" tool`),
-    });
-  }
-});
-
-test('clicking on download link emits download', async ({ startClient, server, mcpMode }, testInfo) => {
-  const { client } = await startClient({
-    config: { outputDir: testInfo.outputPath('output') },
-  });
-
-  server.setContent('/', `<a href="/download" download="test.txt">Download</a>`, 'text/html');
-  server.setContent('/download', 'Data', 'text/plain');
-
-  expect(await client.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.PREFIX },
-  })).toHaveResponse({
-    pageState: expect.stringContaining(`- link "Download" [ref=e2]`),
-  });
-  await client.callTool({
-    name: 'browser_click',
-    arguments: {
-      element: 'Download link',
-      ref: 'e2',
-    },
-  });
-  await expect.poll(() => client.callTool({ name: 'browser_snapshot' })).toHaveResponse({
-    downloads: `- Downloaded file test.txt to ${testInfo.outputPath('output', 'test.txt')}`,
-  });
-});
-
-test('navigating to download link emits download', async ({ startClient, server, mcpBrowser, mcpMode }, testInfo) => {
-  const { client } = await startClient({
-    config: { outputDir: testInfo.outputPath('output') },
-  });
-
-  test.skip(mcpBrowser !== 'chromium', 'This test is racy');
-  server.route('/download', (req, res) => {
-    res.writeHead(200, {
-      'Content-Type': 'text/plain',
-      'Content-Disposition': 'attachment; filename=test.txt',
-    });
-    res.end('Hello world!');
-  });
-
-  expect(await client.callTool({
-    name: 'browser_navigate',
-    arguments: {
-      url: server.PREFIX + 'download',
-    },
-  })).toHaveResponse({
-    downloads: expect.stringContaining(`- Downloaded file test.txt to`),
-  });
-});

tests/fixtures.ts

@@ -15,7 +15,6 @@
  */
 
 import fs from 'fs';
-import url from 'url';
 import path from 'path';
 import { chromium } from 'playwright';
 
@@ -23,7 +22,7 @@ import { test as baseTest, expect as baseExpect } from '@playwright/test';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { ListRootsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
-import { TestServer } from './testserver/index.ts';
+import { TestServer } from './testserver/index';
 
 import type { Config } from '../config';
 import type { BrowserContext } from 'playwright';
@@ -31,6 +30,7 @@ import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
 import type { Stream } from 'stream';
 
 export type TestOptions = {
+  mcpArgs: string[] | undefined;
   mcpBrowser: string | undefined;
   mcpMode: 'docker' | undefined;
 };
@@ -65,17 +65,19 @@ type WorkerFixtures = {
 
 export const test = baseTest.extend<TestFixtures & TestOptions, WorkerFixtures>({
 
+  mcpArgs: [undefined, { option: true }],
+
   client: async ({ startClient }, use) => {
     const { client } = await startClient();
     await use(client);
   },
 
-  startClient: async ({ mcpHeadless, mcpBrowser, mcpMode }, use, testInfo) => {
+  startClient: async ({ mcpHeadless, mcpBrowser, mcpMode, mcpArgs }, use, testInfo) => {
     const configDir = path.dirname(test.info().config.configFile!);
     const clients: Client[] = [];
 
     await use(async options => {
-      const args: string[] = [];
+      const args: string[] = mcpArgs ?? [];
       if (process.env.CI && process.platform === 'linux')
         args.push('--no-sandbox');
       if (mcpHeadless)
@@ -183,8 +185,6 @@ async function createTransport(args: string[], mcpMode: TestOptions['mcpMode'],
   transport: Transport,
   stderr: Stream | null,
 }> {
-  // NOTE: Can be removed when we drop Node.js 18 support and changed to import.meta.filename.
-  const __filename = url.fileURLToPath(import.meta.url);
   if (mcpMode === 'docker') {
     const dockerArgs = ['run', '--rm', '-i', '--network=host', '-v', `${test.info().project.outputDir}:/app/test-results`];
     const transport = new StdioClientTransport({
@@ -199,7 +199,7 @@ async function createTransport(args: string[], mcpMode: TestOptions['mcpMode'],
 
   const transport = new StdioClientTransport({
     command: 'node',
-    args: [path.join(path.dirname(__filename), '../cli.js'), ...args],
+    args: [path.join(__dirname, '../cli.js'), ...args],
     cwd: path.dirname(test.info().config.configFile!),
     stderr: 'pipe',
     env: {

tests/headed.spec.ts

@@ -1,49 +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 { test, expect } from './fixtures.js';
-
-for (const mcpHeadless of [false, true]) {
-  test.describe(`mcpHeadless: ${mcpHeadless}`, () => {
-    test.use({ mcpHeadless });
-    test.skip(process.platform === 'linux', 'Auto-detection wont let this test run on linux');
-    test.skip(({ mcpMode, mcpHeadless }) => mcpMode === 'docker' && !mcpHeadless, 'Headed mode is not supported in docker');
-
-    test('browser', async ({ client, server, mcpBrowser }) => {
-      test.skip(!['chrome', 'msedge', 'chromium'].includes(mcpBrowser ?? ''), 'Only chrome is supported for this test');
-      server.route('/', (req, res) => {
-        res.writeHead(200, { 'Content-Type': 'text/html' });
-        res.end(`
-          <body></body>
-          <script>
-            document.body.textContent = navigator.userAgent;
-          </script>
-        `);
-      });
-
-      const response = await client.callTool({
-        name: 'browser_navigate',
-        arguments: {
-          url: server.PREFIX,
-        },
-      });
-
-      expect(response).toHaveResponse({
-        pageState: (mcpHeadless ? expect : expect.not).stringContaining(`HeadlessChrome`),
-      });
-    });
-  });
-}

tests/http.spec.ts

@@ -1,259 +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 fs from 'node:fs';
-import url from 'node:url';
-
-import { ChildProcess, spawn } from 'node:child_process';
-import path from 'node:path';
-import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-
-import { test as baseTest, expect } from './fixtures.js';
-import type { Config } from '../config.d.ts';
-
-// NOTE: Can be removed when we drop Node.js 18 support and changed to import.meta.filename.
-const __filename = url.fileURLToPath(import.meta.url);
-
-const test = baseTest.extend<{ serverEndpoint: (options?: { args?: string[], noPort?: boolean }) => Promise<{ url: URL, stderr: () => string }> }>({
-  serverEndpoint: async ({ mcpHeadless }, use, testInfo) => {
-    let cp: ChildProcess | undefined;
-    const userDataDir = testInfo.outputPath('user-data-dir');
-    await use(async (options?: { args?: string[], noPort?: boolean }) => {
-      if (cp)
-        throw new Error('Process already running');
-
-      cp = spawn('node', [
-        path.join(path.dirname(__filename), '../cli.js'),
-        ...(options?.noPort ? [] : ['--port=0']),
-        '--user-data-dir=' + userDataDir,
-        ...(mcpHeadless ? ['--headless'] : []),
-        ...(options?.args || []),
-      ], {
-        stdio: 'pipe',
-        env: {
-          ...process.env,
-          DEBUG: 'pw:mcp:test',
-          DEBUG_COLORS: '0',
-          DEBUG_HIDE_DATE: '1',
-        },
-      });
-      let stderr = '';
-      const url = await new Promise<string>(resolve => cp!.stderr?.on('data', data => {
-        stderr += data.toString();
-        const match = stderr.match(/Listening on (http:\/\/.*)/);
-        if (match)
-          resolve(match[1]);
-      }));
-
-      return { url: new URL(url), stderr: () => stderr };
-    });
-    cp?.kill('SIGTERM');
-  },
-});
-
-test('http transport', async ({ serverEndpoint }) => {
-  const { url } = await serverEndpoint();
-  const transport = new StreamableHTTPClientTransport(new URL('/mcp', url));
-  const client = new Client({ name: 'test', version: '1.0.0' });
-  await client.connect(transport);
-  await client.ping();
-});
-
-test('http transport (config)', async ({ serverEndpoint }) => {
-  const config: Config = {
-    server: {
-      port: 0,
-    }
-  };
-  const configFile = test.info().outputPath('config.json');
-  await fs.promises.writeFile(configFile, JSON.stringify(config, null, 2));
-
-  const { url } = await serverEndpoint({ noPort: true, args: ['--config=' + configFile] });
-  const transport = new StreamableHTTPClientTransport(new URL('/mcp', url));
-  const client = new Client({ name: 'test', version: '1.0.0' });
-  await client.connect(transport);
-  await client.ping();
-});
-
-test('http transport browser lifecycle (isolated)', async ({ serverEndpoint, server }) => {
-  const { url, stderr } = await serverEndpoint({ args: ['--isolated'] });
-
-  const transport1 = new StreamableHTTPClientTransport(new URL('/mcp', url));
-  const client1 = new Client({ name: 'test', version: '1.0.0' });
-  await client1.connect(transport1);
-  await client1.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.HELLO_WORLD },
-  });
-  /**
-   * src/client/streamableHttp.ts
-   * Clients that no longer need a particular session
-   * (e.g., because the user is leaving the client application) SHOULD send an
-   * HTTP DELETE to the MCP endpoint with the Mcp-Session-Id header to explicitly
-   * terminate the session.
-   */
-  await transport1.terminateSession();
-  await client1.close();
-
-  const transport2 = new StreamableHTTPClientTransport(new URL('/mcp', url));
-  const client2 = new Client({ name: 'test', version: '1.0.0' });
-  await client2.connect(transport2);
-  await client2.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.HELLO_WORLD },
-  });
-  await transport2.terminateSession();
-  await client2.close();
-
-  await expect(async () => {
-    const lines = stderr().split('\n');
-    expect(lines.filter(line => line.match(/create http session/)).length).toBe(2);
-    expect(lines.filter(line => line.match(/delete http session/)).length).toBe(2);
-
-    expect(lines.filter(line => line.match(/create context/)).length).toBe(2);
-    expect(lines.filter(line => line.match(/close context/)).length).toBe(2);
-
-    expect(lines.filter(line => line.match(/create browser context \(isolated\)/)).length).toBe(2);
-    expect(lines.filter(line => line.match(/close browser context \(isolated\)/)).length).toBe(2);
-
-    expect(lines.filter(line => line.match(/obtain browser \(isolated\)/)).length).toBe(2);
-    expect(lines.filter(line => line.match(/close browser \(isolated\)/)).length).toBe(2);
-  }).toPass();
-});
-
-test('http transport browser lifecycle (isolated, multiclient)', async ({ serverEndpoint, server }) => {
-  const { url, stderr } = await serverEndpoint({ args: ['--isolated'] });
-
-  const transport1 = new StreamableHTTPClientTransport(new URL('/mcp', url));
-  const client1 = new Client({ name: 'test', version: '1.0.0' });
-  await client1.connect(transport1);
-  await client1.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.HELLO_WORLD },
-  });
-
-  const transport2 = new StreamableHTTPClientTransport(new URL('/mcp', url));
-  const client2 = new Client({ name: 'test', version: '1.0.0' });
-  await client2.connect(transport2);
-  await client2.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.HELLO_WORLD },
-  });
-  await transport1.terminateSession();
-  await client1.close();
-
-  const transport3 = new StreamableHTTPClientTransport(new URL('/mcp', url));
-  const client3 = new Client({ name: 'test', version: '1.0.0' });
-  await client3.connect(transport3);
-  await client3.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.HELLO_WORLD },
-  });
-
-  await transport2.terminateSession();
-  await client2.close();
-  await transport3.terminateSession();
-  await client3.close();
-
-  await expect(async () => {
-    const lines = stderr().split('\n');
-    expect(lines.filter(line => line.match(/create http session/)).length).toBe(3);
-    expect(lines.filter(line => line.match(/delete http session/)).length).toBe(3);
-
-    expect(lines.filter(line => line.match(/create context/)).length).toBe(3);
-    expect(lines.filter(line => line.match(/close context/)).length).toBe(3);
-
-    expect(lines.filter(line => line.match(/create browser context \(isolated\)/)).length).toBe(3);
-    expect(lines.filter(line => line.match(/close browser context \(isolated\)/)).length).toBe(3);
-
-    expect(lines.filter(line => line.match(/obtain browser \(isolated\)/)).length).toBe(1);
-    expect(lines.filter(line => line.match(/close browser \(isolated\)/)).length).toBe(1);
-  }).toPass();
-});
-
-test('http transport browser lifecycle (persistent)', async ({ serverEndpoint, server }) => {
-  const { url, stderr } = await serverEndpoint();
-
-  const transport1 = new StreamableHTTPClientTransport(new URL('/mcp', url));
-  const client1 = new Client({ name: 'test', version: '1.0.0' });
-  await client1.connect(transport1);
-  await client1.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.HELLO_WORLD },
-  });
-  await transport1.terminateSession();
-  await client1.close();
-
-  const transport2 = new StreamableHTTPClientTransport(new URL('/mcp', url));
-  const client2 = new Client({ name: 'test', version: '1.0.0' });
-  await client2.connect(transport2);
-  await client2.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.HELLO_WORLD },
-  });
-  await transport2.terminateSession();
-  await client2.close();
-
-  await expect(async () => {
-    const lines = stderr().split('\n');
-    expect(lines.filter(line => line.match(/create http session/)).length).toBe(2);
-    expect(lines.filter(line => line.match(/delete http session/)).length).toBe(2);
-
-    expect(lines.filter(line => line.match(/create context/)).length).toBe(2);
-    expect(lines.filter(line => line.match(/close context/)).length).toBe(2);
-
-    expect(lines.filter(line => line.match(/create browser context \(persistent\)/)).length).toBe(2);
-    expect(lines.filter(line => line.match(/close browser context \(persistent\)/)).length).toBe(2);
-
-    expect(lines.filter(line => line.match(/lock user data dir/)).length).toBe(2);
-    expect(lines.filter(line => line.match(/release user data dir/)).length).toBe(2);
-  }).toPass();
-});
-
-test('http transport browser lifecycle (persistent, multiclient)', async ({ serverEndpoint, server }) => {
-  const { url } = await serverEndpoint();
-
-  const transport1 = new StreamableHTTPClientTransport(new URL('/mcp', url));
-  const client1 = new Client({ name: 'test', version: '1.0.0' });
-  await client1.connect(transport1);
-  await client1.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.HELLO_WORLD },
-  });
-
-  const transport2 = new StreamableHTTPClientTransport(new URL('/mcp', url));
-  const client2 = new Client({ name: 'test', version: '1.0.0' });
-  await client2.connect(transport2);
-  const response = await client2.callTool({
-    name: 'browser_navigate',
-    arguments: { url: server.HELLO_WORLD },
-  });
-  expect(response.isError).toBe(true);
-  expect(response.content?.[0].text).toContain('use --isolated to run multiple instances of the same browser');
-
-  await client1.close();
-  await client2.close();
-});
-
-test('http transport (default)', async ({ serverEndpoint }) => {
-  const { url } = await serverEndpoint();
-  const transport = new StreamableHTTPClientTransport(url);
-  const client = new Client({ name: 'test', version: '1.0.0' });
-  await client.connect(transport);
-  await client.ping();
-  expect(transport.sessionId, 'has session support').toBeDefined();
-});

tests/iframes.spec.ts

@@ -1,46 +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 { test, expect } from './fixtures.js';
-
-test('stitched aria frames', async ({ client }) => {
-  expect(await client.callTool({
-    name: 'browser_navigate',
-    arguments: {
-      url: `data:text/html,<h1>Hello</h1><iframe src="data:text/html,<button>World</button><main><iframe src='data:text/html,<p>Nested</p>'></iframe></main>"></iframe><iframe src="data:text/html,<h1>Should be invisible</h1>" style="display: none;"></iframe>`,
-    },
-  })).toHaveResponse({
-    pageState: expect.stringContaining(`- generic [active] [ref=e1]:
-  - heading "Hello" [level=1] [ref=e2]
-  - iframe [ref=e3]:
-    - generic [active] [ref=f1e1]:
-      - button "World" [ref=f1e2]
-      - main [ref=f1e3]:
-        - iframe [ref=f1e4]:
-          - paragraph [ref=f2e2]: Nested
-\`\`\``),
-  });
-
-  expect(await client.callTool({
-    name: 'browser_click',
-    arguments: {
-      element: 'World',
-      ref: 'f1e2',
-    },
-  })).toHaveResponse({
-    code: `await page.locator('iframe').first().contentFrame().getByRole('button', { name: 'World' }).click();`,
-  });
-});